Remove win32codecs USE flag, bug 468406.

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

9 files changed, 64 insertions, 117 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 674cca5054f1..d257efe0f31c 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.95 2013/05/16 16:06:27 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.96 2013/05/16 19:14:38 ulm Exp $
+
+  16 May 2013; Ulrich Müller <ulm@gentoo.org> mplayer2-2.0_p20120309.ebuild,
+  mplayer2-2.0_p20120828.ebuild, mplayer2-2.0_p20121108.ebuild,
+  mplayer2-2.0_p20121128.ebuild, mplayer2-2.0_p20130126.ebuild,
+  mplayer2-2.0_p20130428.ebuild, mplayer2-9999.ebuild:
+  Remove win32codecs USE flag, bug 468406.
 
 *mplayer2-2.0_p20130428 (16 May 2013)
 
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index 3a8fb279d1a1..f4269e459a4c 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -14,23 +14,26 @@ DIST mplayer2-2.0_p20121108.tar.xz 1549508 SHA256 7d0f18998b6b059e1e06d66d030e5c
 DIST mplayer2-2.0_p20121128.tar.xz 1932656 SHA256 17ec9fadb59c74dc4852df2d1c49d3d551a4d5b38eb50fc6c7c24b0e24d0df57 SHA512 8a7cedbdbfccc8f4777de8de3f1a6388495157b596bbf88982382278d073b7fcf80c8f27319e222d89323162f3522ac90e3a150f2922350b6138ca0a4ba7bfc8 WHIRLPOOL 238bab7b78f0852d283d57b048bcb737aec9ad215d5e3e4cee244ee2bfea5315c8b93925306ea8a7c62c02fe10689e9d6a5fe1d4f52e3e4f518e59f120a0ea83
 DIST mplayer2-2.0_p20130126.tar.xz 1914780 SHA256 ed68090e1ed2698132065ab4567e2920a6fb9f2f0868efc172f612d6848919f5 SHA512 b54780a0a45619ababf874fe40797a6c73c4adea26469178bbd5bf3396cd1977631622a8e150c02b650cf4a415d1e5d80943fda1e50935d921328022187b65dc WHIRLPOOL b1876eece2223d1b1281aeb1043c1f436c518363a2e720a2eb6be92853cac3ed0dce16b3c4300acffe4746925831ccfddcc24553d5fdcac4cce385701d5625bf
 DIST mplayer2-2.0_p20130428.tar.xz 1911464 SHA256 41e54e6c86761196e111250fd6db79161bfd08f2cccf7d624e9b25b038fdf6c0 SHA512 da0101736b76535d38b1063c3ec7054003c8013f24df949bac26d51deebb41fcb6116af35d3b49bd6d9c1cc76842ab58c8e049a42e70dc5694058e3e6ed44bd8 WHIRLPOOL f97620ec26483e498d21b75fb533d09e41542ca18bb6a5a535c40c33fad34f745966f10a001026766610b6e40754dcecab3dc6292c00532437d2a92cb8d21079
-EBUILD mplayer2-2.0_p20120309.ebuild 16458 SHA256 31af6a795910ea876cb290c79c8c98d0ef808264d0dd45b862009d95a9ec6fcf SHA512 9fdb07a2788f7f351c98204247ec279634f0ba32f596aa7df49517e98098936b006e638f3a5fe427571d68d246eaf032831c66607d478f75dba5caf0acc5029c WHIRLPOOL d9cdf4f8e704b77a96b80756331995f8868fde1df1168fd3b03c6ee69c425f99539b74953ca9d98837c25d77dff462f81ea94d143a40b45e14b6fffaf703066d
-EBUILD mplayer2-2.0_p20120828.ebuild 14692 SHA256 832b32c46bb2a21e765e43ec8143f6adf45c2f8de349f4f466ead65dc1379357 SHA512 1b2d109c22c90ba2c96e69f43f62f8a9b5afafefc9a570f015638fa3c4df76e833a262b95411a6ddff9640e6aaf11f22d9d0b6e83ca72e401fec64ad708b6430 WHIRLPOOL dbb55c8aadfe243479caf0c6674b47f9a8477d99b5be93a85a07d9ea25ec806d03bfd5ec4938a065323eda57fc0b96ca6bf7473c651ffd2fca92c800effdecdb
-EBUILD mplayer2-2.0_p20121108.ebuild 12625 SHA256 0a6e2a4e96b6e3a8de7c1044d7d1d8dde489ab0479c0ac87ed2a25ca13285db5 SHA512 ff4c7417e821fc139e7cc59754a77bf9af51a0d83511b6c89ada9a51502e35f197e8d8f2ccbe928dfda6cf14438ad49ca8acfd291bdfd75456fbb0c1d003f649 WHIRLPOOL 70b7d0772a075fc549b4497f81531ff14f4718a88233ec499535115cf0e40ee9237b337a3bdce7d215016417c76a16e2024b1c6f9853c10db96c07a157a2b848
-EBUILD mplayer2-2.0_p20121128.ebuild 12657 SHA256 14f045c6c4f13642b8e9cbd6ccf92173d93bc63f37b91542e07584f93dbb8cd9 SHA512 120a67c99214ab7164651b20556a869b08e6d4c02827ac7f270b04f96e91eb6ada6d3c31cd1e173dd2c11d5a8ef3d3784f8d6af28e28bbd29d9249d1b1b1642f WHIRLPOOL 88c3f05facf5bce1d16a57eb53af24c3d757968d20dd13abf15ed0e67c5cdb4cd4a8c49f9bb4cc1db7ac084eca80b61ff3056e2c061e346941f66a6671553af1
-EBUILD mplayer2-2.0_p20130126.ebuild 12481 SHA256 86a82e65ae49ed668e3cc2b47437e20cbb6b06f80a729f51d553562b23226ab8 SHA512 33f52c330daca54131fcdc051a497429ca37e0f2c660d45eb99f041f8752e0206410c8b603f2cc9e7aed18ae77d81a94cb732e846975eab4da41418d393db442 WHIRLPOOL f68199abb46a1881a9e86ea90f74f164c7094319dc9fafc4af721af416d1cdf3f5e67d106a8fdd56ea223aac0844dabf70a6b924213e0ea6913135b657d7f9ef
-EBUILD mplayer2-2.0_p20130428.ebuild 12242 SHA256 0e3ad3b536908e0c0b20d4a4bc15e3dd1ad0f8a01d0e4896337e56169c4e7f99 SHA512 c5a9148b2afa1b3ae770c7cc3e23356fbebefd4f54312bccff2354b5372074d5f275bcc974c2a8f39027b01ec8da9008dc196453f22f77bb84d09734437275a5 WHIRLPOOL 364aa4a91edf25960775a16b8bcdeb5fae0f7f4214f7e612bb72d667f98d83d6f73dadb726f9c450f3bb4e2cb8791988aa6e4dfd51f865b3b54a50f1a190d608
-EBUILD mplayer2-9999.ebuild 12234 SHA256 21baa884f92268dd950722178918e5434ad55b741859c2a78256370acca92a78 SHA512 a6d7c29a3aaa1925ece847a1747b9a74dc4cfd4d49e7bb68a7107c3e5ac97217a879a7f4225a45443fdd99b46c3893c4cc83d34f1d815574443b80de657ca037 WHIRLPOOL 35b5d82e0d5b0d64c9f4d06fa1775c8105dfc98aac1122d508abaf607fefc0e3a1b5bb8bb7c57487678a3462e2ba4ac1330ae1b20bd8e253561723efbd61dc98
-MISC ChangeLog 18391 SHA256 212fc9ac9a28bae6ab805c30de070271042432778b27f2817c2b32aa70b00e36 SHA512 972a85c47d289fa1109098c498dd02ae795d0dacbea5e71296f54fc8f9b6433a86c42471244c81054dc1cb2533da9b82ac3b2efabb4d4b5c9a645d07f88f94fb WHIRLPOOL 2d4b165d7f883f4981f5d4d8c35546ff0c45ca25986d3adfe605c375430e846d0f966fc3832347c785bce0282de4459f15fce25c1811131da0c67244520a6443
+EBUILD mplayer2-2.0_p20120309.ebuild 16214 SHA256 36481dc8f196de5a5fec599e04f7abf5bf2a889545459dcaf4291ec6cd61f186 SHA512 34e3316d286e5900dc82ac050cb84c6c89d9c9e00d680651f933078d25143a79a3d87da22ee2307d4b70224090dff3183c923e09199cc345d88abb7ffa4f4561 WHIRLPOOL 08a7c1fd04f352f1fa8599d6a9b3ee4f51d84d11ff737daf3e44e84246001ae400fd892e41adf84a3488494d6e2284462639ebf530162dd31e4cd83c97bd1af3
+EBUILD mplayer2-2.0_p20120828.ebuild 14451 SHA256 788c6dd1250ee7a4c01ad8610dad488185aa5eeb2991192dec16269455d985dc SHA512 9608d588eeb0f7d2483801f6663739fb046d73a8be2934eb3520c0793e7adf185b1d2f2dd98274138a5712e213918d6c6bd3792e264c6374b34c1745784e64f2 WHIRLPOOL ff0a32be5eddf57a36b383da03e2691f7fe8ae4ea6c773da5757b087baee52200792dba919a1443e2aa0469cfba0c3f72629aaba8e0282f0bdf58a91dc77c7e1
+EBUILD mplayer2-2.0_p20121108.ebuild 12379 SHA256 82c8d8591054ec140be3850180cffa46b6cd8d776f27a58f581b59c7c4ad68a4 SHA512 7c7e41e35c5ff3ac5eee444ebfff52d225012b9323f231425adc6b8a869fd1acb064e0ed719bb1713e9104d0ab14bdffeea99c25557cffe3ba0cb0c55c511b73 WHIRLPOOL 843bab30c50855d1f6f7ccb7825c524c7d3bb785c5a80ffa8c870ef856e6e4080038500b060f8e0a5f97defd4e674f92fefd7db48c2bafc602a1a94ecfc1606c
+EBUILD mplayer2-2.0_p20121128.ebuild 12410 SHA256 dcefec6b0b9bd06526fa95e5e2f548d0e506fd749fa45ff4196270885b4c251e SHA512 64bd9fce0a9f098790c1493daa1dc0d33781daa10bf98fc2afe2aa19973c695821f4d33e7a194211688c6a5e6572bc6baed66e9f6924bf93b43155256d3ee44e WHIRLPOOL 69b2c0adc57a5883b5833ba8b37a17d6fd8d9186de2e3f5515a390c3fd77c7247cf04deccf5cd5a37210fe4ae68bed3b61dedc812e333b88e23bc52ad7c1735f
+EBUILD mplayer2-2.0_p20130126.ebuild 12235 SHA256 927a8caa1ed824659c1b8c3785d97d16af083d55de60d70a6a692c43d35340cb SHA512 6902265310e3f6dcf0766a26900eae0e42c378f431b20ca29fe145ae9a54103c3db0ad2c55564deae36fe9d22949736a9588d203b88dc3604c534e2675e13c59 WHIRLPOOL 103c6d808b870d4d442bb2415d3eed2ddb8d58f7fc76fa165c8f2c90944b226e47a8a1fd858f51c65e6063915b4c60b289abb2d09a7a507cff8cb3c5ea62d1ed
+EBUILD mplayer2-2.0_p20130428.ebuild 11995 SHA256 76adb6ea1dac3d78a10cbf5d9b9ccdbf1eb5767ccbc00e2a3a122682da3202fd SHA512 278a88d8be0ea4d2a8ff0ee1f03bd942acdee347f7bdf5e6b1421c61178866f7e1b6b9fb03c1e5c6a036fc50b0c0953c31e6a77d0f3124e89a4cc1bbf758e0c3 WHIRLPOOL 8b07335411f1ed1ef69f9eb454c68399f27051578d8180a302cd03a4428ea2ef177dbcbcaba04f9e2e053352aaacbf88703210ec1a862476b5ed859a8ad7ce2b
+EBUILD mplayer2-9999.ebuild 11987 SHA256 854ad6c6d3950e37cab7c87e41bc5592b78c4251ddff214d0d7ba00079dec85a SHA512 bc3a088c494935885f11995f35446a46ee19f110425ae35d40661be924a160d48b9ef23af18964c749115499685fc3236843700cd0a806e0d8a5c0467c5adce9 WHIRLPOOL f14caee8da74d85551e188211c8e84b563feb96100eae52db3d14cc45cb46ffb5fb3dc64e5068a41283d80b5a02f5b22ca083786352afd67079150d810c4dcf6
+MISC ChangeLog 18690 SHA256 bd93fc64f17084116df19da8b07206878e34d57ea2d128c472d05e53e11311fa SHA512 8f2921066ac067a81dc74df94a7f28866a15d912e297fe873f8d0a53accf200a890b6bae53ddcebb98b50ec7a1f0b548c77e4226376f03f47b04c38124e706ad WHIRLPOOL dbffde9d3fac83dddbaa9fc8d0c1a59d9fda3a4d8b04274ba52f65f9eb34284ef6b9413981a67c735ce0fbe24465650e5a1940a12af7e8693e55ea7cf5c1e1e6
 MISC metadata.xml 3397 SHA256 5e3414f08089179b422c3f2184e673866e735fcfe7d5514dbe220be61cc1f87b SHA512 1806b9e66fd9602c0d7be01af6869f3b8688964d8d3db4f65c8e0280e583619e2a408a4def31653b72963f97f76e0883803b65dc9d62d8a2432df3f58b88ac99 WHIRLPOOL f5acda8923fcb98e70d22e9c037c7d5bf066c94c65f5fa4f6b10c27b1c62ad9f9904aabda5f3f04140bc354e9f1b4aee9f9c5d8f17f305ba502ea8e51d28214f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRlQRBAAoJEAmJmMX429rebJIIAKGMPdVImzW5w5/YhilclvfS
-EfM6l0c+PcieNB5O917IQ93uOOu4ukezyH8P0jf19DNhks/jeRz2v7uXfYBVFUFv
-nv7LyvRqkEHU+p6RmFj3T9M1J+DYUVtmGs2RqXzdYec7eJT1DW/a6uabU/ieCUeC
-b+HIg6XMmeNQbJQWH2k6pRbA2ZgrEk5AU5qsbpNgnKxE7ULVyjk95XHeVAFgM+pX
-qx/aGEjEDZVLEvaCKzB+wKNZBCeQ6qLHWFQzbNdcTyExRDS3uHYwqFPg3GZQETVq
-Am+vPUb/ILUj9ZB02uA2ItpgNnvEJKqEzbrScC1Vc9Ge7/3B9y/hZbz+hJagaxk=
-=w4f5
+iQGcBAEBCAAGBQJRlTHnAAoJEJQzkH1pP7W4B/kL/1WVNVCskkzoSxiPAL3bhQDl
+IJCQPk0dm4jrMUwdx8CU12WXD+scscNJKMf7HBudl+mWep5+niB76MdNRRT8eXFd
+iDur3hmQv7Ag9tkvvPqdWWwlM/m2nyKqmf7M0YmZXyNZpPZ3/ALnD7xg4U2Q9Yth
+2xKCDGePOgSfbAfg+13vgExI17Lu0yHD0cnHRHxyKzDDg8wr75oZYXeZrmus/D3/
+BjRGLA8iGnNMihHfcvillNYy4CUoujTLR2g65Mf8HH15wp2OLrYqMhGkAtokovra
+t/XrMIJUI2rYywXTEfQIug7uGBlYFAc7G19NAS21IMHW3iYleXqxpl6GgJkvbXIJ
+Xm/7RCUZoTFRCCZ6dA4EwMmX7UPDN/LS+GSD1vvfishnJAZkNdLQWYjzviJ/wkOB
++JHpcJAeMmp+CfpvN2mS73ug3/BupBJ48mxEqj7PFlCsdEm77Kq6YVZVwRhRL4Ll
+n2TnFuqhlJD6WYskmmlr+s8XwYQXYUtO4PpEJ+LMOQ==
+=ry60
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild
index 94e1a38c39b8..a5da361fce94 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild,v 1.14 2012/12/26 08:51:52 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild,v 1.15 2013/05/16 19:14:38 ulm Exp $
 
 EAPI=4
 
@@ -32,13 +32,13 @@ if [[ ${PV} == *9999* ]]; then
 else
 	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
 fi
-IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl
+IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua bidi bl
 bluray bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts
 debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad fbcon ftp
 gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca lirc
 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
++theora +truetype +unicode v4l vdpau +vorbis +X xanim xinerama
 +xscreensaver +xv xvid"
 IUSE+=" symlink"
 
@@ -47,8 +47,7 @@ for x in ${VIDEO_CARDS}; do
 	IUSE+=" video_cards_${x}"
 done
 
-# bindist does not cope with win32codecs, which are nonfree
-REQUIRED_USE="bindist? ( !win32codecs )
+REQUIRED_USE="
 	cdio? ( !cdparanoia )
 	cddb? ( || ( cdio cdparanoia ) network )
 	dvdnav? ( dvd )
@@ -74,11 +73,6 @@ FONT_RDEPS="
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
-	!bindist? (
-		x86? (
-			win32codecs? ( media-libs/win32codecs )
-		)
-	)
 	X? (
 		x11-libs/libXext
 		x11-libs/libXxf86vm
@@ -370,9 +364,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 #
@@ -391,7 +383,7 @@ src_configure() {
 		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
 		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
 	fi
-	myconf+=" $(use_enable win32codecs win32dll)"
+	myconf+=" --disable-win32dll"
 
 	################
 	# Video Output #
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
index fcf55941444f..4d63a1c7258e 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20120828.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/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.15 2013/01/30 19:02:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.16 2013/05/16 19:14:38 ulm Exp $
 
 EAPI=4
 
@@ -32,12 +32,12 @@ if [[ ${PV} == *9999* ]]; then
 else
 	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
 fi
-IUSE="+a52 aalib +alsa aqua bidi bindist bl bluray bs2b cddb +cdio
+IUSE="+a52 aalib +alsa aqua bidi bl bluray bs2b cddb +cdio
 	cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad
 	fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
 	+libass libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm
 	portaudio postproc pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba
-	sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X
+	sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis +X
 	xanim xinerama +xscreensaver +xv xvid"
 IUSE+=" symlink"
 
@@ -51,9 +51,7 @@ for x in ${VIDEO_CARDS}; do
 	IUSE+=" video_cards_${x}"
 done
 
-# bindist does not cope with win32codecs, which are nonfree
 REQUIRED_USE="
-	bindist? ( !win32codecs )
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
 	dxr3? ( X )
@@ -73,11 +71,6 @@ REQUIRED_USE="
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
-	!bindist? (
-		x86? (
-			win32codecs? ( media-libs/win32codecs )
-		)
-	)
 	X? (
 		x11-libs/libXext
 		x11-libs/libXxf86vm
@@ -353,9 +346,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 #
@@ -374,7 +365,7 @@ src_configure() {
 		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
 		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
 	fi
-	myconf+=" $(use_enable win32codecs win32dll)"
+	myconf+=" --disable-win32dll"
 
 	################
 	# Video Output #
diff --git a/media-video/mplayer2/mplayer2-2.0_p20121108.ebuild b/media-video/mplayer2/mplayer2-2.0_p20121108.ebuild
index 248d06174726..0255269126d8 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20121108.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20121108.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20121108.ebuild,v 1.4 2012/12/26 08:51:52 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20121108.ebuild,v 1.5 2013/05/16 19:14:38 ulm Exp $
 
 EAPI=4
 
@@ -25,12 +25,12 @@ if [[ ${PV} == *9999* ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 fi
-IUSE="+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug
+IUSE="+a52 +alsa aqua bluray bs2b cddb +cdio cpudetection debug
 directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv
 ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad
 md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc
 pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga
-+theora +unicode v4l vcd vdpau +vorbis win32codecs +X xanim xinerama
++theora +unicode v4l vcd vdpau +vorbis +X xanim xinerama
 +xscreensaver +xv xvid yuv4mpeg
 "
 IUSE+=" symlink"
@@ -40,9 +40,7 @@ for x in ${CPU_FEATURES}; do
 	IUSE+=" ${x}"
 done
 
-# bindist does not cope with win32codecs, which are nonfree
 REQUIRED_USE="
-	bindist? ( !win32codecs )
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
 	lcms? ( opengl )
@@ -59,11 +57,6 @@ REQUIRED_USE="
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
-	!bindist? (
-		x86? (
-			win32codecs? ( media-libs/win32codecs )
-		)
-	)
 	X? (
 		x11-libs/libXext
 		x11-libs/libXxf86vm
@@ -318,9 +311,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 #
@@ -339,7 +330,7 @@ src_configure() {
 		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
 		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
 	fi
-	myconf+=" $(use_enable win32codecs win32dll)"
+	myconf+=" --disable-win32dll"
 
 	################
 	# Video Output #
diff --git a/media-video/mplayer2/mplayer2-2.0_p20121128.ebuild b/media-video/mplayer2/mplayer2-2.0_p20121128.ebuild
index 3e3a8fe81265..f96528001d28 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20121128.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20121128.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/mplayer2/mplayer2-2.0_p20121128.ebuild,v 1.3 2013/01/16 16:39:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20121128.ebuild,v 1.4 2013/05/16 19:14:38 ulm Exp $
 
 EAPI=4
 
@@ -25,12 +25,12 @@ if [[ ${PV} == *9999* ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 fi
-IUSE="+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug
+IUSE="+a52 +alsa aqua bluray bs2b cddb +cdio cpudetection debug
 directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv
 ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad
 md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc
 pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga
-+theora +unicode v4l vcd vdpau +vorbis win32codecs +X xanim xinerama
++theora +unicode v4l vcd vdpau +vorbis +X xanim xinerama
 +xscreensaver +xv xvid yuv4mpeg
 "
 IUSE+=" symlink"
@@ -40,9 +40,7 @@ for x in ${CPU_FEATURES}; do
 	IUSE+=" ${x}"
 done
 
-# bindist does not cope with win32codecs, which are nonfree
 REQUIRED_USE="
-	bindist? ( !win32codecs )
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
 	lcms? ( opengl )
@@ -59,11 +57,6 @@ REQUIRED_USE="
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
-	!bindist? (
-		x86? (
-			win32codecs? ( media-libs/win32codecs )
-		)
-	)
 	X? (
 		x11-libs/libXext
 		x11-libs/libXxf86vm
@@ -320,9 +313,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 #
@@ -341,7 +332,7 @@ src_configure() {
 		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
 		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
 	fi
-	myconf+=" $(use_enable win32codecs win32dll)"
+	myconf+=" --disable-win32dll"
 
 	################
 	# Video Output #
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild
index fdcbf1ca9137..f306f8a5ab2e 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20130126.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/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.3 2013/04/16 07:24:39 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.4 2013/05/16 19:14:38 ulm Exp $
 
 EAPI=4
 
@@ -25,12 +25,12 @@ if [[ ${PV} == *9999* ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 fi
-IUSE="+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug
+IUSE="+a52 +alsa aqua bluray bs2b cddb +cdio cpudetection debug
 directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv
 ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad
 md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc
 pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga
-+theora +unicode v4l vcd vdpau +vorbis win32codecs +X xanim xinerama
++theora +unicode v4l vcd vdpau +vorbis +X xanim xinerama
 +xscreensaver +xv xvid yuv4mpeg
 "
 IUSE+=" symlink"
@@ -40,9 +40,7 @@ for x in ${CPU_FEATURES}; do
 	IUSE+=" ${x}"
 done
 
-# bindist does not cope with win32codecs, which are nonfree
 REQUIRED_USE="
-	bindist? ( !win32codecs )
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
 	lcms? ( opengl )
@@ -59,11 +57,6 @@ REQUIRED_USE="
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
-	!bindist? (
-		x86? (
-			win32codecs? ( media-libs/win32codecs )
-		)
-	)
 	X? (
 		x11-libs/libXext
 		x11-libs/libXxf86vm
@@ -314,9 +307,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 #
@@ -335,7 +326,7 @@ src_configure() {
 		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
 		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
 	fi
-	myconf+=" $(use_enable win32codecs win32dll)"
+	myconf+=" --disable-win32dll"
 
 	################
 	# Video Output #
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130428.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130428.ebuild
index f3d8dbbdc57a..25df31eb7dc4 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20130428.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20130428.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/mplayer2/mplayer2-2.0_p20130428.ebuild,v 1.1 2013/05/16 16:06:27 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428.ebuild,v 1.2 2013/05/16 19:14:38 ulm Exp $
 
 EAPI=5
 
@@ -22,12 +22,12 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug
+IUSE="+a52 +alsa aqua bluray bs2b cddb +cdio cpudetection debug
 directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv
 ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad
 md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc
 pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga
-+theora +unicode v4l vcd vdpau +vorbis win32codecs +X xanim xinerama
++theora +unicode v4l vcd vdpau +vorbis +X xanim xinerama
 +xscreensaver +xv xvid yuv4mpeg
 "
 IUSE+=" symlink"
@@ -37,9 +37,7 @@ for x in ${CPU_FEATURES}; do
 	IUSE+=" ${x}"
 done
 
-# bindist does not cope with win32codecs, which are nonfree
 REQUIRED_USE="
-	bindist? ( !win32codecs )
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
 	lcms? ( opengl )
@@ -56,11 +54,6 @@ REQUIRED_USE="
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
-	!bindist? (
-		x86? (
-			win32codecs? ( media-libs/win32codecs )
-		)
-	)
 	X? (
 		x11-libs/libXext
 		x11-libs/libXxf86vm
@@ -317,9 +310,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 #
@@ -338,7 +329,7 @@ src_configure() {
 		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
 		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
 	fi
-	myconf+=" $(use_enable win32codecs win32dll)"
+	myconf+=" --disable-win32dll"
 
 	################
 	# Video Output #
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 23f9005e01ec..cb75e213808d 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-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/mplayer2/mplayer2-9999.ebuild,v 1.56 2013/04/27 17:47:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.57 2013/05/16 19:14:38 ulm Exp $
 
 EAPI=5
 
@@ -22,12 +22,12 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug
+IUSE="+a52 +alsa aqua bluray bs2b cddb +cdio cpudetection debug
 directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv
 ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad
 md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc
 pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga
-+theora +unicode v4l vcd vdpau +vorbis win32codecs +X xanim xinerama
++theora +unicode v4l vcd vdpau +vorbis +X xanim xinerama
 +xscreensaver +xv xvid yuv4mpeg
 "
 IUSE+=" symlink"
@@ -37,9 +37,7 @@ for x in ${CPU_FEATURES}; do
 	IUSE+=" ${x}"
 done
 
-# bindist does not cope with win32codecs, which are nonfree
 REQUIRED_USE="
-	bindist? ( !win32codecs )
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
 	lcms? ( opengl )
@@ -56,11 +54,6 @@ REQUIRED_USE="
 RDEPEND+="
 	sys-libs/ncurses
 	sys-libs/zlib
-	!bindist? (
-		x86? (
-			win32codecs? ( media-libs/win32codecs )
-		)
-	)
 	X? (
 		x11-libs/libXext
 		x11-libs/libXxf86vm
@@ -317,9 +310,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 #
@@ -338,7 +329,7 @@ src_configure() {
 		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
 		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
 	fi
-	myconf+=" $(use_enable win32codecs win32dll)"
+	myconf+=" --disable-win32dll"
 
 	################
 	# Video Output #