Disable divx4linux in every version, not just the last one, to avoid breakage now that the package is gone.

(Portage version: 2.0.53_rc6)

5 files changed, 19 insertions, 17 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 2ff38a83f8f7..b4e8129d904b 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.328 2005/10/30 19:27:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.329 2005/10/31 09:47:21 flameeyes Exp $
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mplayer-1.0_pre6-r4.ebuild, mplayer-1.0_pre6-r5.ebuild,
+  mplayer-1.0_pre6-r6.ebuild, mplayer-1.0_pre7.ebuild:
+  Disable divx4linux in every version, not just the last one, to avoid
+  breakage now that the package is gone.
 
   30 Oct 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
   Removed ancient divx4linux support, internal support if far better anyway.
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild
index f4db497fbc8d..d5545c5fe456 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild,v 1.8 2005/07/09 19:01:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild,v 1.9 2005/10/31 09:47:21 flameeyes Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi debug dga doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -28,7 +28,6 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 # 'encode' in USE for MEncoder.
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	x86? (
-		divx4linux? (  >=media-libs/divx4linux-20030428 )
 		avi? ( >=media-libs/win32codecs-20040916 )
 		real? ( >=media-video/realplayer-10.0.3 )
 		)
@@ -344,7 +343,7 @@ src_compile() {
 	#########
 	# Codecs #
 	########
-	myconf="${myconf} $(use_enable divx4linux)"
+	myconf="${myconf} --disable-divx4linux"
 	myconf="${myconf} $(use_enable gif)"
 	myconf="${myconf} $(use_enable jpeg)"
 	#myconf="${myconf} $(use_enable ladspa)"
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild
index 3ab39ae4d496..c1c25efad384 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild,v 1.4 2005/07/09 19:01:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild,v 1.5 2005/10/31 09:47:21 flameeyes Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi bl debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi bl debug dga doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -28,7 +28,6 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 # 'encode' in USE for MEncoder.
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	x86? (
-		divx4linux? (  >=media-libs/divx4linux-20030428 )
 		avi? ( >=media-libs/win32codecs-20040916 )
 		real? ( >=media-video/realplayer-10.0.3 )
 		)
@@ -343,7 +342,7 @@ src_compile() {
 	#########
 	# Codecs #
 	########
-	myconf="${myconf} $(use_enable divx4linux)"
+	myconf="${myconf} --disable-divx4linux"
 	myconf="${myconf} $(use_enable gif)"
 	myconf="${myconf} $(use_enable jpeg)"
 	#myconf="${myconf} $(use_enable ladspa)"
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild
index 2a5350085880..bd704cedce76 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild,v 1.13 2005/07/09 19:01:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild,v 1.14 2005/10/31 09:47:21 flameeyes Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
 IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl cpudetection
-custom-cflags debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv
+custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv
 dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca
 lirc live lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia vorbis opengl
 oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2
@@ -32,7 +32,6 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	divx4linux? (  >=media-libs/divx4linux-20030428 )
 	win32codecs? ( >=media-libs/win32codecs-20040916 )
 	x86? ( real? ( >=media-video/realplayer-10.0.3 ) )
 	aalib? ( media-libs/aalib )
@@ -341,7 +340,7 @@ src_compile() {
 	#########
 	# Codecs #
 	########
-	myconf="${myconf} $(use_enable divx4linux)"
+	myconf="${myconf} --disable-divx4linux"
 	myconf="${myconf} $(use_enable gif)"
 	myconf="${myconf} $(use_enable jpeg)"
 	#myconf="${myconf} $(use_enable ladspa)"
diff --git a/media-video/mplayer/mplayer-1.0_pre7.ebuild b/media-video/mplayer/mplayer-1.0_pre7.ebuild
index abf462a01160..ced4df35a540 100644
--- a/media-video/mplayer/mplayer-1.0_pre7.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7.ebuild,v 1.17 2005/08/25 20:01:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7.ebuild,v 1.18 2005/10/31 09:47:21 flameeyes Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
 IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl cpudetection
-custom-cflags debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv
+custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv
 dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca
 lirc live lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia vorbis opengl
 oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2
@@ -32,7 +32,6 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	divx4linux? (  >=media-libs/divx4linux-20030428 )
 	win32codecs? ( >=media-libs/win32codecs-20040916 )
 	x86? ( real? ( >=media-video/realplayer-10.0.3 ) )
 	aalib? ( media-libs/aalib )
@@ -320,7 +319,7 @@ src_compile() {
 	#########
 	# Codecs #
 	########
-	myconf="${myconf} $(use_enable divx4linux)"
+	myconf="${myconf} --disable-divx4linux"
 	myconf="${myconf} $(use_enable gif)"
 	myconf="${myconf} $(use_enable jpeg)"
 	#myconf="${myconf} $(use_enable ladspa)"