Remove win32codecs USE flag, bug 468406.

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

4 files changed, 19 insertions, 45 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/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/*