Remove win32codecs USE flag, bug 468406.

Package-Manager: portage-2.1.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

5 files changed, 34 insertions, 53 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 0cdac53ca992..60d1693faafd 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.885 2013/05/08 08:22:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.886 2013/05/16 18:56:08 ulm Exp $
+
+  16 May 2013; Ulrich Müller <ulm@gentoo.org> mplayer-1.1-r1.ebuild,
+  mplayer-1.1.1.ebuild, mplayer-9999.ebuild:
+  Remove win32codecs USE flag, bug 468406.
 
 *mplayer-1.1.1 (08 May 2013)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 2e192cc6d5e7..fb24fb7d4ddb 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -15,16 +15,23 @@ DIST MPlayer-1.1.tar.xz 11208088 SHA256 76cb47eadb52b420ca028276ebd8112114ad0ab3
 DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
 DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
-EBUILD mplayer-1.1-r1.ebuild 18603 SHA256 09a16356cd546d629d422453de5c3af0d8074e21b71e589cb691a39b77a72e0f SHA512 ab611749a723d7fcf7a88e4ddfa9b2d8a2ae0c5ce5674e2b4173f5dd8c93a120552aedcdcd2a51f9f8ce99ac5d52e822ed5f57712d2a3fcb81bfcecaeaef128b WHIRLPOOL 4e704947f88a5762be80a25f53c7c518129c70a6c229781e2863ad493e47faa93e24f8967c6d32e547f087f4f1537f45571e51d3fc7d7dd433b7253c35591055
-EBUILD mplayer-1.1.1.ebuild 18639 SHA256 906b999caa52a3613a5336b86018ffdd6cd00d1bbfd46235ea352ab0c0479b8d SHA512 2456d752f4d156163dcd50c348cc410321fb50939eaff22682654efa5a9df68ad93357bddeb786d0029d8cd294f010750ca1b6eb45e137f381a4e2212266900e WHIRLPOOL ec0430162171a7c74cdf973b1e8ce9fd8fdf2bc06744dc2543251f830d0ee6268d1b0babb40c55d3764e6ba65289671c3e24f294e99cbd8a946aa94613c5d47e
-EBUILD mplayer-9999.ebuild 17220 SHA256 7a2a27398c181b77e65b4a127e0c104fb6f02e33ab0701fe1ab69cdbf351bae4 SHA512 5c677e9f8ef27534b5a708714ac3358cf3b772a5c2e9637913a668a1dbcb17578af140bd3091c13847899fb88bb30158529774b75096f33d368b8ca788a2b6ba WHIRLPOOL a5c8857b3fd989d817665e35413f17f544a8152b748dd87206c38f9044b2fcc414932d395af3b4123c48f221f602ee27c8a3cd6a4adaf26c6bbabc79b715ffdb
-MISC ChangeLog 47413 SHA256 24b1e50af390fbdeea9499966b4f6ec84653155c3da5ed99598904dfdefa4bd6 SHA512 bdca9acbe36d1a9dbbfb0a32ffc7c82fa71dfd245235dce1571845013a036370fc087510378e63b3aadc4a734f024e81366ad4e17035d1609d8934188b2b36c5 WHIRLPOOL bfbeffaf48aac68864003733c42f15e5ca10e5e0849ab229ddf72bb7a029284d568caf3d4466d770980b844db408fa6525ec18f2179180286a0c01b6dc745114
+EBUILD mplayer-1.1-r1.ebuild 18438 SHA256 839fc9741f324d48b1819d8896d6433b3d71c2e388e4c881432aa861cbf1d53d SHA512 edb2ca981da2cb90b14cf3dc19d5585a2f9093b938c7327235a48cb1dd304c8d62d5954e7cf552df4aeeb6e9d46ea63730322eddf94d79c21e384c9c20cf5fdd WHIRLPOOL 2864ed7e9c70c6d54ac0701243b4bffe2edb39b3b16b8a8d36f4bd348b56a1f09089ef825db10fea94b0194d519a7fe25f874d835bf0648ff8a93d712ef2a737
+EBUILD mplayer-1.1.1.ebuild 18475 SHA256 4a81033713a170666966aaa5aa0cc09804220de3d844a1decd720fbbf7edbf31 SHA512 84d3350296ced655c6b8a5c0d1e3147ac2e59bdab42ce15c39091056fc5dc6a741cdcf7990767f246b0854f55a1946941f3fed1df37b302c29eb0aa902ce3e52 WHIRLPOOL f71edaf98384cc2f70d7e592e7000b6449c122792459d2754a179f67888d14d59de7ef47243115c9640b0a192bbba749bcecf548c7ade398075ae80665ead3ec
+EBUILD mplayer-9999.ebuild 16961 SHA256 4149bd215800eb8568c1f8ba52613aa2e2a0952629245676872beae9d070a48e SHA512 a89565884deda17e9a2ee1e5a52ab64c364c84a6362990b81638aa19c71e6dcd0376f31b22f9160574aeff764c8e65f473b29fa353ae64646d32667411b248e7 WHIRLPOOL e7c60b1032294792b0050ea66db9d02cf4c12717c409e69aedcec3081025852773bb763bc00c621703a93f74b999b7037e2da4f0f919884814943d5724d91dd8
+MISC ChangeLog 47567 SHA256 21f3f1b73c49ef4cae462b4d715701237f478ad4e13eb277ca486b7af6350f00 SHA512 3513bcedb282970fe4e6cf66d6ad8dd485e313a407d97a45469697789c0b0a64dd9cd90a78d622092f907dbb766917751918f69d7036082a26a6a2e5563bb105 WHIRLPOOL 870d02ee68ff9187198897d471fc6f7c0419cadca048fbc07bb1e16f948f75a852cba9a96951188f1bea5bd37637a7c72dc7e46fba04fc453f8849ea9a30df72
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
 MISC metadata.xml 2817 SHA256 02dd96afd2d4b87856cc7757069d4aeb17a03be8e04fbb36cb273519a854ae74 SHA512 648468880abae503c37efc5bc07390e343d80b967ae17019a1f6829e10e3268f4f5b8256aa0320ba25f7934e1eee39b33d6ab88d9bf5fa3802ff5b98788b1ba5 WHIRLPOOL 9961358cfa55c13452a93a487aa7884c910f8e9517439c0648f83f7cf1fad539b42babb14bca71e35d97c4d36cc9a7b2b70d06a7b14c1948eac2244dc8438e22
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGKC0kACgkQvFcC4BYPU0ohlgCgnk9elIecP5O1oV5IDbZkVv60
-u3IAn27bsFsd9UxhtyB9kpgBs/VLoTEC
-=bkgC
+iQGcBAEBCAAGBQJRlS2MAAoJEJQzkH1pP7W4nigL/AqKeXXKwi6S/WBAAaZBdYjd
+dh8t1btjjVAWDM6UDkMGu6758/cspjTUVmyCc1b3ZrkQUX0WJkwzC0OVFRruVOB7
+1eblpOGFK2j/rLPdtcMwZcV5gjRS1JGWPFO81aKywKymCEqTQsuYMBwtH1UOLzSn
+ppxEKiHGqnrEq9RKj8i8GxOgvz35KeAF5PXJmGnV7axFDhGo60r8ryb4oKTqT34A
+tNcm8dVsZh3F62DGYhnVDpuk99IP42+6EeX/yHYg0JfVMgZR3ikNUDCeXqNCXBol
+zTGs4cdui2Fg3qyB/LsFm7BvuNy383MtxjijpakAFexSLGjd4a8JlUAaNGM1dLHO
+C2jzkmmHK3OkWhtznPXmja8KokZnXz7xGhcJXnA4Wcrkvjg1XcN/iw1NnWyotT7G
+FK3v5L1WifDA5r4Wyoq0q4OpiJtN8Z3Z2y/s48MISNpZd5A6xitzTmbPK3esNwab
+/vkuT73lgnVQMZh3OXt+aeXvRR5q+V6kgvCVQ0XNkg==
+=vxae
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild
index 276e9500a12f..0b2b35890ec9 100644
--- a/media-video/mplayer/mplayer-1.1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.21 2013/03/21 07:08:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.22 2013/05/16 18:56:08 ulm Exp $
 
 EAPI=4
 
@@ -18,8 +18,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
 radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
 tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
-+vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
-zoran"
++vorbis +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 
 VIDEO_CARDS="s3virge mga tdfx"
 for x in ${VIDEO_CARDS}; do
@@ -62,11 +61,6 @@ RDEPEND+="
 	app-arch/bzip2
 	sys-libs/zlib
 	>=virtual/ffmpeg-0.10.3
-	!bindist? (
-		x86? (
-			win32codecs? ( media-libs/win32codecs )
-		)
-	)
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
@@ -175,7 +169,7 @@ fi
 # libvorbis require external tremor to work
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
-REQUIRED_USE="bindist? ( !faac !win32codecs )
+REQUIRED_USE="bindist? ( !faac )
 	dvdnav? ( dvd )
 	libass? ( truetype )
 	truetype? ( iconv )
@@ -441,9 +435,7 @@ src_configure() {
 	# Binary codecs #
 	#################
 	# bug 213836
-	if ! use x86 || ! use win32codecs; then
-		use quicktime || myconf+=" --disable-qtx"
-	fi
+	use quicktime || myconf+=" --disable-qtx"
 
 	######################
 	# RealPlayer support #
@@ -456,7 +448,7 @@ src_configure() {
 
 	# internal
 	use real || myconf+=" --disable-real"
-	myconf+=" $(use_enable win32codecs win32dll)"
+	myconf+=" --disable-win32dll"
 
 	################
 	# Video Output #
diff --git a/media-video/mplayer/mplayer-1.1.1.ebuild b/media-video/mplayer/mplayer-1.1.1.ebuild
index b98458227c2c..4c039d982288 100644
--- a/media-video/mplayer/mplayer-1.1.1.ebuild
+++ b/media-video/mplayer/mplayer-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.ebuild,v 1.1 2013/05/08 08:22:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1.1.ebuild,v 1.2 2013/05/16 18:56:08 ulm Exp $
 
 EAPI=4
 
@@ -18,8 +18,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
 radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
 tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
-+vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
-zoran"
++vorbis +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 
 VIDEO_CARDS="s3virge mga tdfx"
 for x in ${VIDEO_CARDS}; do
@@ -62,11 +61,6 @@ RDEPEND+="
 	app-arch/bzip2
 	sys-libs/zlib
 	>=virtual/ffmpeg-0.10.3
-	!bindist? (
-		x86? (
-			win32codecs? ( media-libs/win32codecs )
-		)
-	)
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
@@ -175,7 +169,7 @@ fi
 # libvorbis require external tremor to work
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
-REQUIRED_USE="bindist? ( !faac !win32codecs )
+REQUIRED_USE="bindist? ( !faac )
 	dvdnav? ( dvd )
 	libass? ( truetype )
 	truetype? ( iconv )
@@ -441,9 +435,7 @@ src_configure() {
 	# Binary codecs #
 	#################
 	# bug 213836
-	if ! use x86 || ! use win32codecs; then
-		use quicktime || myconf+=" --disable-qtx"
-	fi
+	use quicktime || myconf+=" --disable-qtx"
 
 	######################
 	# RealPlayer support #
@@ -456,7 +448,7 @@ src_configure() {
 
 	# internal
 	use real || myconf+=" --disable-real"
-	myconf+=" $(use_enable win32codecs win32dll)"
+	myconf+=" --disable-win32dll"
 
 	################
 	# Video Output #
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 1aed10f11de5..96ec59b8cff8 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.142 2013/04/13 17:17:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.143 2013/05/16 18:56:08 ulm Exp $
 
 EAPI=4
 
@@ -18,8 +18,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr
 radio +rar +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
 tga +theora tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
-+vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
-zoran"
++vorbis +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 
 VIDEO_CARDS="s3virge mga tdfx"
 for x in ${VIDEO_CARDS}; do
@@ -62,11 +61,6 @@ RDEPEND+="
 	app-arch/bzip2
 	sys-libs/zlib
 	|| ( >=media-video/ffmpeg-1.1 >=media-video/libav-9 )
-	!bindist? (
-		x86? (
-			win32codecs? ( media-libs/win32codecs )
-		)
-	)
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
@@ -175,7 +169,7 @@ fi
 # unicode transformations are usefull only with iconv
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
-REQUIRED_USE="bindist? ( !faac !win32codecs )
+REQUIRED_USE="bindist? ( !faac )
 	dvdnav? ( dvd )
 	libass? ( truetype )
 	truetype? ( iconv )
@@ -410,11 +404,7 @@ src_configure() {
 	#################
 	# Binary codecs #
 	#################
-	if use win32codecs ; then
-		myconf+=" --enable-win32dll"
-	else
-		myconf+=" --disable-qtx --disable-real --disable-win32dll"
-	fi
+	myconf+=" --disable-qtx --disable-real --disable-win32dll"
 
 	################
 	# Video Output #
@@ -559,10 +549,6 @@ src_install() {
 	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
 	docinto TOOLS/
 	dodoc -r TOOLS
-	if use win32codecs; then
-		docinto tech/realcodecs/
-		dodoc DOCS/tech/realcodecs/*
-	fi
 	docinto tech/mirrors/
 	dodoc DOCS/tech/mirrors/*