fix gtk/gtk2 use flags

5 files changed, 36 insertions, 28 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 7381e8586f0a..2676e5209c14 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.96 2003/11/16 17:11:20 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.97 2003/12/04 17:27:44 seemant Exp $
+
+  04 Dec 2003; Seemant Kulleen <seemant@gentoo.org> mplayer-0.92.ebuild,
+  mplayer-1.0_pre1-r1.ebuild, mplayer-1.0_pre2.ebuild:
+  fix the gtk/gtk2 USE flag syntax, closing bug #34567 by Spider
+  <spider@gentoo.org>
 
   16 Nov 2003; Brad House <brad_mssw@gentoo.org> mplayer-1.0_pre2.ebuild:
   mark stable on amd64
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index e03e50512038..e09c14e19f47 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,8 @@
-MD5 130b280df998b3be840d8250a0b259c8 mplayer-1.0_pre2.ebuild 11712
+MD5 6e4cd04df5cea0c54044d82fea4e1c59 mplayer-1.0_pre2.ebuild 11693
+MD5 9adeb555572aece3c0e951a526116e3c mplayer-1.0_pre1-r1.ebuild 11501
+MD5 9cbdd77f8750550be5c7d9cf42e11737 ChangeLog 17078
+MD5 93694398515284a729c544200e65ba8b mplayer-0.92.ebuild 11816
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 9e064190a914d26b0392a266753161ed files/mplayer-0.90-ppc-benh.patch 2029
 MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
 MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
@@ -11,7 +15,3 @@ MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2 358
 MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
 MD5 89440216f99b2e09265d46fead5363fb files/digest-mplayer-1.0_pre1-r1 358
 MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
-MD5 329cebb97d1db25670de35bb33a90ec7 mplayer-1.0_pre1-r1.ebuild 11524
-MD5 487595d6fbfc2f619192b65f8b4acb36 ChangeLog 16864
-MD5 c835d9e3b9c541623c6324822cdc066c mplayer-0.92.ebuild 11816
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
diff --git a/media-video/mplayer/mplayer-0.92.ebuild b/media-video/mplayer/mplayer-0.92.ebuild
index 41cbe25217dd..4cc253460a59 100644
--- a/media-video/mplayer/mplayer-0.92.ebuild
+++ b/media-video/mplayer/mplayer-0.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.92.ebuild,v 1.8 2003/10/13 19:15:22 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.92.ebuild,v 1.9 2003/12/04 17:27:44 seemant Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc"
 
@@ -27,15 +27,16 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	x86? ( >=media-libs/xvid-0.9.0
 			>=media-libs/divx4linux-20020418
 			>=media-libs/win32codecs-0.60 )
-	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2*
-					=dev-libs/glib-1.2* )
-			media-libs/libpng
-			>=x11-base/xfree-4.2.1-r2 )
-	gtk2? ( >=x11-libs/gtk+-2.0.6
-			>=dev-libs/glib-2.0.6 )
+	gtk? ( media-libs/libpng
+			>=x11-base/xfree-4.2.1-r2
+		!gtk2? ( =x11-libs/gtk+-1.2*
+				=dev-libs/glib-1.2* )
+		gtk2? ( >=x11-libs/gtk+-2.0.6
+				>=dev-libs/glib-2.0.6 )
+		)
 	jpeg? ( media-libs/jpeg )
 	gif? ( media-libs/giflib
-			media-libs/libungif )
+		media-libs/libungif )
 	truetype? ( >=media-libs/freetype-2.1 )
 	esd? ( media-sound/esound )
 	ggi? ( media-libs/libggi )
@@ -47,7 +48,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	aalib? ( media-libs/aalib )
 	svga? ( media-libs/svgalib )
 	encode? ( media-sound/lame
-			>=media-libs/libdv-0.9.5 )
+		>=media-libs/libdv-0.9.5 )
 	xmms? ( media-sound/xmms )
 	opengl? ( virtual/opengl )
 	directfb? ( dev-libs/DirectFB )
diff --git a/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild
index a105bcbea0cb..80a7a59e2c35 100644
--- a/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild,v 1.11 2003/10/19 16:34:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild,v 1.12 2003/12/04 17:27:44 seemant Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc matroska"
 
@@ -27,12 +27,13 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	x86? ( >=media-libs/xvid-0.9.0
 	       >=media-libs/divx4linux-20030428
 	       >=media-libs/win32codecs-0.60 )
-	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2*
-	               =dev-libs/glib-1.2* )
-	       media-libs/libpng
-	       >=x11-base/xfree-4.2.1-r2 )
-	gtk2? ( >=x11-libs/gtk+-2.0.6
-	        >=dev-libs/glib-2.0.6 )
+	gtk? ( media-libs/libpng
+	       >=x11-base/xfree-4.2.1-r2
+		!gtk2? ( =x11-libs/gtk+-1.2*
+				=dev-libs/glib-1.2* )
+		gtk2? ( >=x11-libs/gtk+-2.0.6
+				>=dev-libs/glib-2.0.6 )
+	)
 	jpeg? ( media-libs/jpeg )
 	gif? ( media-libs/giflib
 	       media-libs/libungif )
diff --git a/media-video/mplayer/mplayer-1.0_pre2.ebuild b/media-video/mplayer/mplayer-1.0_pre2.ebuild
index f273c8fb91a7..8c4254e61cea 100644
--- a/media-video/mplayer/mplayer-1.0_pre2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre2.ebuild,v 1.13 2003/11/16 17:11:20 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre2.ebuild,v 1.14 2003/12/04 17:27:44 seemant Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc matroska debug joystick"
 
@@ -28,12 +28,13 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	x86? ( >=media-libs/xvid-0.9.0
 	       >=media-libs/divx4linux-20030428
 	       >=media-libs/win32codecs-0.60 )
-	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2*
-	               =dev-libs/glib-1.2* )
-	       media-libs/libpng
-	       >=x11-base/xfree-4.2.1-r2 )
-	gtk2? ( >=x11-libs/gtk+-2.0.6
+	gtk? ( media-libs/libpng
+	       >=x11-base/xfree-4.2.1-r2
+		!gtk2? ( =x11-libs/gtk+-1.2*
+			=dev-libs/glib-1.2* )
+		gtk2? ( >=x11-libs/gtk+-2.0.6
 	        >=dev-libs/glib-2.0.6 )
+	)
 	jpeg? ( media-libs/jpeg )
 	gif? ( media-libs/giflib
 	       media-libs/libungif )