Do not provide useflags for pure runtime deps. If you want some codec feature just enable it on the libav/ffmpeg.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 41 insertions, 42 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index a51a4fa4f6a1..82dc226a2b49 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.30 2011/12/01 20:13:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.31 2011/12/02 08:10:36 scarabeus Exp $
+
+  02 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  mplayer2-2.0_p20111126.ebuild, mplayer2-9999.ebuild:
+  Do not provide useflags for pure runtime deps. If you want some codec feature
+  just enable it on the libav/ffmpeg.
 
   01 Dec 2011; Luca Barbato <lu_zero@gentoo.org> mplayer2-2.0_p20111126.ebuild,
   mplayer2-9999.ebuild, metadata.xml:
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index 7fb33d50b875..a45a1e52a055 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 2.0-ffmpeg.patch 9606 RMD160 bf4c21ed7b524c7865abfb0763754dce9b3603cc SHA1 b9964b34dd21a6ed43d1d98bba7f50b8faca3fe0 SHA256 22657481184ccb2940f9b4b9dab091fe8d42ed6051a2dda1f9bf6a851f2b9d80
 AUX 2.0-fmt-conversion.patch 286 RMD160 c7d5d5ea5abef00d894b0fbc4499113bb08a7f70 SHA1 d28e79d1da18fb1c812d90c9aead37381055ad77 SHA256 98345175367a9190eb82371fee71439d9c6341dbc24ae2bef72481c5890500fb
@@ -9,14 +9,24 @@ DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d14
 DIST mplayer2-2.0.tar.xz 3675080 RMD160 7dc37f0071a9a8bc348a40b26b480a365a904d62 SHA1 0df8d4e5484128b7b28029273b7704ab5d5419bc SHA256 f1d17397bbdfcff2220d8b4bc17e7de5b78488736e21dca2df0d8a3216c85910
 DIST mplayer2-2.0_p20111126.tar.xz 3349400 RMD160 7ba89e64d3421fba99fd8ed80b5ad66ea324b14f SHA1 0992f7450e84b6c3d55486edc6ca430dee2260a7 SHA256 540229ddaf0ca183c2e18da74713aa3d58713a38a8fcb306a6ce677d6a330d1e
 EBUILD mplayer2-2.0.ebuild 17099 RMD160 2730f5df208df4b786142560f6e5b585f64158bb SHA1 36fe31e66f3dadaf4a30c4e869ed460fb762897e SHA256 ea3ea3e6a2a4e0f339c73745f84192653a8ab7a5e829c6801012511e31ab8b16
-EBUILD mplayer2-2.0_p20111126.ebuild 16716 RMD160 8c8133a743c835ec9bdf21eb54059a5016f9f389 SHA1 61ac1eded7e5dc1b31d081966483a91ab36efc27 SHA256 b972a37136bf32e69b85070a01023fececb4a029e27cae567e9196f6397b9ef1
-EBUILD mplayer2-9999.ebuild 16708 RMD160 9c0fe3458c9d48c6c16ad30abde275d67388ea52 SHA1 a4ab901f03aed7ce08029c0640eb9dfd711d1716 SHA256 d9009fdb88eaab6d749ede4f39e4b9afb78c04864eb83410f03978102f722dfd
-MISC ChangeLog 7948 RMD160 50382d6ac8986f7736b77ac8e185220f4fa39695 SHA1 98c7aab4e518fa736e92f20954e23e75f7a85126 SHA256 ac5b9116bb36477a587b399c939f7e3ad74fef5ff87b83e017945475e84ddc06
+EBUILD mplayer2-2.0_p20111126.ebuild 16465 RMD160 b8f43efc0c0e4434da9d4e67a980713eccbc7f92 SHA1 03f0aefbc9cf6c3ce5204f47b47560bc4d21ca74 SHA256 635c3207915ebac7e7d46a6a4397158d4c3539b8270279beabe07df3e2d72e54
+EBUILD mplayer2-9999.ebuild 16457 RMD160 b47fba4861f3b00bbd8e1340e9ca6b9b28d2b716 SHA1 035e9f6b23c46d12f9654f885d94ffa349a1a657 SHA256 6cd482ef1e47937e8d6de63715cfdba94f5cd05cbf3be8852660b79513391853
+MISC ChangeLog 8179 RMD160 0b291751d4238b56306b1fd5a0bc846e2b90dfda SHA1 7dc8fe26dfd6b0000555c078051efd804d49448b SHA256 a541a099a6ffed08864defd3d00fe5410d612122087af57186666ff8ac9b393e
 MISC metadata.xml 4197 RMD160 ddd3782831ebffe26b073f86be6726f9d10f6f3a SHA1 2d58d43505f2869e30d3b50fa9eaa2a3dd5e813a SHA256 b53fa260149137d852aec1384bb20cc65f64bdedb94ed3c0967e0f940dcedc70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7X4AgACgkQYpJnKVbCxcx7VwEAl5BvqBgvzGz1Ptx4xwdSkzQn
-rLe7NdH/EeCF4Or/YZcA/1QEGh7LBEvZoDY+0jXYOK2o+Sds68veCYvZEvMDxXnV
-=OlkF
+iQIcBAEBAgAGBQJO2If+AAoJEOSiRoyO7jvo/w4QAJYaLRe+tTNl0PmfQyE2zMXf
+zOabuMo3xighdSRup+UcWzUw1gsiMELKQzO8RAvDKZCEs2jv0XwHWPjliSRqrafa
+/QxHjvWaV3rxYbMIb3toQxCQkcIHvi60iHGRmO/O6ThUgK6oYMtGgzHwzRlEQRhN
+8qEQu+ouvgxyK3m6ecGld3qsYq7xiyqqkbObegp79HYj4Uc6UtcVeIDEKGIQejUY
+gxFU1VZyVoFqWX7SpIreXN2+a1fPOg/XljKiDWtA4p0/DfQKCksZPpxY2zahw6JZ
+OfeG58QIT3c3KN6+82gtgY/fkniI+MK5EJofEk1XtDpVQd/X0kojIHAcSop1V5q1
+188X6UlwtIf0T7q2Ss7F3wu/nxEbRMeZgynn9B/uoHP4NzI1CrA3fjYLVCifj7uO
+bDjPIGzm2DBTmNZEZXwWZdE1RciSJM2Mxo5Tokt4IXy/K8g6Fob/+ocUH5X3ht1n
+2iajHr1t20WPYIZBydPAwKiVV7jpiv4zRXjmspArkoYQjB/awHLj/Flb4iRBZ5kc
+6iiCidjvgH9m10LBCsULRPs5iYDnzH23BBO4SmQ+iEFbu9GXVhSt708qC/ov8LG9
+W5K6lloe3EGQ6GhCIRXbv4rfsL2mIL5D1bMLzN1M2XDU2EkWsdRWsB1IR/301Xnt
+VSJNV9gqsHZ2h6j35yDO
+=28EI
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild b/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild
index 4707f0f4545d..73676a2802e1 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild,v 1.2 2011/12/01 20:13:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild,v 1.3 2011/12/02 08:10:36 scarabeus Exp $
 
 EAPI=4
 
@@ -33,16 +33,13 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux "
 fi
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl
-bluray bs2b +bzip2 cddb +cdio cdparanoia cpudetection custom-cpuopts
-custom-cflags debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav
-dxr3 +enca esd +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick
-jpeg jpeg2k kernel_linux ladspa libcaca lirc +live mad md5sum +mmx
-mmxext mng +mp3 nas +network nut amr +opengl oss png pnm pulseaudio
-pvr +quicktime radio +rar +real +rtc rtmp samba +shm +schroedinger
-sdl +speex sse sse2 ssse3 tga +theora threads +truetype +unicode
-v4l vdpau +vorbis vpx win32codecs +X xanim xinerama +xscreensaver
-+xv xvid
-"
+bluray bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags
+debug dga directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon ftp
+gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc +live
+mad md5sum +mmx mmxext mng +mp3 nas +network nut +opengl oss png pnm pulseaudio
+pvr +quicktime radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3 tga
++theora +truetype +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama
++xscreensaver +xv xvid"
 IUSE+=" symlink"
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
@@ -73,8 +70,6 @@ FONT_RDEPS="
 "
 # Rar: althrought -gpl version is nice, it cant do most functions normal rars can
 #	nemesi? ( net-libs/libnemesi )
-# virtual/ffmpeg does not have all USE
-LIBAV_USE="[amr?,bzip2?,dirac?,gsm?,jpeg2k?,rtmp?,schroedinger?,threads?,vpx?]"
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
@@ -149,10 +144,7 @@ RDEPEND+="
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
 	xvid? ( media-libs/xvid )
-	|| (
-		>=media-video/libav-0.6.2${LIBAV_USE}
-		>=media-video/ffmpeg-0.6_p25423${LIBAV_USE}
-	)
+	>=virtual/ffmpeg-0.6
 	symlink? ( !media-video/mplayer )
 "
 ASM_DEP="dev-lang/yasm"
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 7e40060fcd50..0d3cdec6148f 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.19 2011/12/01 20:13:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.20 2011/12/02 08:10:36 scarabeus Exp $
 
 EAPI=4
 
@@ -33,16 +33,13 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux "
 fi
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl
-bluray bs2b +bzip2 cddb +cdio cdparanoia cpudetection custom-cpuopts
-custom-cflags debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav
-dxr3 +enca esd +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick
-jpeg jpeg2k kernel_linux ladspa libcaca lirc +live mad md5sum +mmx
-mmxext mng +mp3 nas +network nut amr +opengl oss png pnm pulseaudio
-pvr +quicktime radio +rar +real +rtc rtmp samba +shm +schroedinger
-sdl +speex sse sse2 ssse3 tga +theora threads +truetype +unicode
-v4l vdpau +vorbis vpx win32codecs +X xanim xinerama +xscreensaver
-+xv xvid
-"
+bluray bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags
+debug dga directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon ftp
+gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc +live
+mad md5sum +mmx mmxext mng +mp3 nas +network nut +opengl oss png pnm pulseaudio
+pvr +quicktime radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3 tga
++theora +truetype +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama
++xscreensaver +xv xvid"
 IUSE+=" symlink"
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
@@ -73,8 +70,6 @@ FONT_RDEPS="
 "
 # Rar: althrought -gpl version is nice, it cant do most functions normal rars can
 #	nemesi? ( net-libs/libnemesi )
-# virtual/ffmpeg does not have all USE
-LIBAV_USE="[amr?,bzip2?,dirac?,gsm?,jpeg2k?,rtmp?,schroedinger?,threads?,vpx?]"
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
@@ -149,10 +144,7 @@ RDEPEND+="
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
 	xvid? ( media-libs/xvid )
-	|| (
-		>=media-video/libav-0.6.2${LIBAV_USE}
-		>=media-video/ffmpeg-0.6_p25423${LIBAV_USE}
-	)
+	>=virtual/ffmpeg-0.6
 	symlink? ( !media-video/mplayer )
 "
 ASM_DEP="dev-lang/yasm"