summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2014-02-06 12:26:41 +0000
committerMichael Palimaka <kensington@gentoo.org>2014-02-06 12:26:41 +0000
commita9a2a43c5e6e15d21477f9ad825895886a30420f (patch)
treed0890cb48eb1e3d661c6e0ac68c7fe0d01a85031 /media-video
parentPin virtual/jpeg to SLOT 0. (diff)
downloadgentoo-2-a9a2a43c5e6e15d21477f9ad825895886a30420f.tar.gz
gentoo-2-a9a2a43c5e6e15d21477f9ad825895886a30420f.tar.bz2
gentoo-2-a9a2a43c5e6e15d21477f9ad825895886a30420f.zip
Pin virtual/jpeg to SLOT 0.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog8
-rw-r--r--media-video/mplayer/mplayer-1.1.1-r1.ebuild6
-rw-r--r--media-video/mplayer/mplayer-1.2_pre20130729.ebuild6
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild6
4 files changed, 15 insertions, 11 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index a0c666993cd1..e66c9e325cda 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.911 2013/09/25 07:18:13 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.912 2014/02/06 12:26:41 kensington Exp $
+
+ 06 Feb 2014; Michael Palimaka <kensington@gentoo.org> mplayer-1.1.1-r1.ebuild,
+ mplayer-1.2_pre20130729.ebuild, mplayer-9999.ebuild:
+ Pin virtual/jpeg to SLOT 0.
25 Sep 2013; Justin Lecher <jlec@gentoo.org> mplayer-1.2_pre20130729.ebuild,
mplayer-9999.ebuild, metadata.xml:
diff --git a/media-video/mplayer/mplayer-1.1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1.1-r1.ebuild
index 3eea2598a7b5..294407cb3f86 100644
--- a/media-video/mplayer/mplayer-1.1.1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild,v 1.11 2013/07/28 21:13:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild,v 1.12 2014/02/06 12:26:41 kensington Exp $
EAPI=4
@@ -91,7 +91,7 @@ RDEPEND+="
gsm? ( media-sound/gsm )
iconv? ( virtual/libiconv )
jack? ( media-sound/jack-audio-connection-kit )
- jpeg? ( virtual/jpeg )
+ jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
ladspa? ( media-libs/ladspa-sdk )
libass? ( >=media-libs/libass-0.9.10[enca?] )
diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
index e482eeecf3b7..521c85af2e79 100644
--- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.3 2013/09/25 07:18:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.4 2014/02/06 12:26:41 kensington Exp $
EAPI=5
@@ -91,7 +91,7 @@ RDEPEND+="
gsm? ( media-sound/gsm )
iconv? ( virtual/libiconv )
jack? ( media-sound/jack-audio-connection-kit )
- jpeg? ( virtual/jpeg )
+ jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
ladspa? ( media-libs/ladspa-sdk )
libass? ( >=media-libs/libass-0.9.10[enca?] )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 46f8703fc70b..72b3d9238ca7 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.154 2013/09/25 07:18:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.155 2014/02/06 12:26:41 kensington Exp $
EAPI=5
@@ -91,7 +91,7 @@ RDEPEND+="
gsm? ( media-sound/gsm )
iconv? ( virtual/libiconv )
jack? ( media-sound/jack-audio-connection-kit )
- jpeg? ( virtual/jpeg )
+ jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
ladspa? ( media-libs/ladspa-sdk )
libass? ( >=media-libs/libass-0.9.10[enca?] )