Remove win32codecs USE flag, bug 468406.

(Portage version: 2.1.12/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

8 files changed, 45 insertions, 101 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/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 #