Removed broken gtk2 patch from all versions still in portage and closing bug #15786.

7 files changed, 29 insertions, 68 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 3dac0643a445..f4c616ba08ea 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.121 2004/04/14 04:37:15 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.122 2004/04/19 22:34:26 wolf31o2 Exp $
+
+  19 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> mplayer-0.92-r1.ebuild,
+  mplayer-1.0_pre2-r1.ebuild, mplayer-1.0_pre3-r3.ebuild,
+  mplayer-1.0_pre3-r4.ebuild, mplayer-1.0_pre3-r5.ebuild:
+  Removed broken gtk2 patch from all versions still in portage and closing bug
+  #15786.
 
   13 Apr 2004; Scott W Taylor <swtaylor@gentoo.org>
   mplayer-1.0_pre3-r5.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 8347b6753989..ba6534a914d9 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,9 +1,9 @@
-MD5 f51499e146e6839aa021246a65038f99 mplayer-1.0_pre3-r4.ebuild 12131
-MD5 a9da267b040ddeaf03e4c6a5e646dd32 mplayer-1.0_pre3-r3.ebuild 11829
-MD5 19e1d19e15bddeab1b6f5494f77a5eca mplayer-1.0_pre2-r1.ebuild 11720
-MD5 161cb91a5c79a11fe117b30a032e7903 mplayer-1.0_pre3-r5.ebuild 11623
-MD5 b9caadadbde39fda82535e76a6fcbf04 mplayer-0.92-r1.ebuild 11850
-MD5 023ea69f0250fc32947005cfb89534e2 ChangeLog 20879
+MD5 b5879bc6ed587fe09e782b09e9e3f277 mplayer-1.0_pre3-r4.ebuild 11918
+MD5 9c167eef5d63ea7678acdd6c6103e973 mplayer-1.0_pre3-r3.ebuild 11616
+MD5 9f75c8a10e051291440089e942831bfa mplayer-1.0_pre2-r1.ebuild 11502
+MD5 deb6851cfa583aef8072b057fc247be4 mplayer-1.0_pre3-r5.ebuild 11410
+MD5 dd623a5ef4090e678cee2a8dd3511c84 mplayer-0.92-r1.ebuild 11635
+MD5 69a905c49727314c2b215d46e2521235 ChangeLog 21163
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
 MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
diff --git a/media-video/mplayer/mplayer-0.92-r1.ebuild b/media-video/mplayer/mplayer-0.92-r1.ebuild
index 20101ab6e54c..7434b88d4890 100644
--- a/media-video/mplayer/mplayer-0.92-r1.ebuild
+++ b/media-video/mplayer/mplayer-0.92-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/03/31 09:24:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.92-r1.ebuild,v 1.2 2004/04/19 22:34:26 wolf31o2 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"
+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 samba lirc"
 
 inherit eutils
 
@@ -29,11 +29,8 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 			>=media-libs/win32codecs-0.60 )
 	gtk? ( media-libs/libpng
 			virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2*
-				=dev-libs/glib-1.2* )
-		gtk2? ( >=x11-libs/gtk+-2.0.6
-				>=dev-libs/glib-2.0.6 )
-		)
+			=x11-libs/gtk+-1.2*
+			=dev-libs/glib-1.2* )
 	jpeg? ( media-libs/jpeg )
 	gif? ( media-libs/giflib
 		media-libs/libungif )
@@ -96,9 +93,6 @@ src_unpack() {
 	# security problem, bug #46246
 	cd ${S}/libmpdemux; epatch ${FILESDIR}/vuln02-fix.diff
 
-	# Use gtk-2.x
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.90_rc4-gtk2.patch
-
 	# Fix head/tail call for new coreutils
 	cd ${S}; epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
 
@@ -170,9 +164,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-gui --enable-x11 \
 		                     --enable-xv --enable-vm --enable-png"
 
-	( use gtk && use gtk2 ) \
-		&& myconf="${myconf} --enable-gtk2"
-
 	use truetype \
 		&& myconf="${myconf} --enable-freetype" \
 		|| myconf="${myconf} --disable-freetype"
diff --git a/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild
index 36933e252d6a..6bb4313b6244 100644
--- a/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/03/31 09:24:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild,v 1.2 2004/04/19 22:34:26 wolf31o2 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"
+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 samba lirc matroska debug joystick"
 
 inherit eutils
 
@@ -30,11 +30,8 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	       >=media-libs/win32codecs-0.60 )
 	gtk? ( media-libs/libpng
 	       virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2*
+			=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 )
@@ -98,9 +95,6 @@ src_unpack() {
 	# security problem, bug #46246
 	cd ${S}/libmpdemux; epatch ${FILESDIR}/vuln02-fix.diff
 
-	# Use gtk-2.x
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.90_rc4-gtk2.patch
-
 	# Fix head/tail call for new coreutils
 	cd ${S}; epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
 
@@ -157,9 +151,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-gui --enable-x11 \
 		                     --enable-xv --enable-vm --enable-png"
 
-	( use gtk && use gtk2 ) \
-		&& myconf="${myconf} --enable-gtk2"
-
 	use truetype \
 		&& myconf="${myconf} --enable-freetype" \
 		|| myconf="${myconf} --disable-freetype"
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild
index e95ab1e4850d..019b6252b5aa 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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_pre3-r3.ebuild,v 1.1 2004/03/31 09:24:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild,v 1.2 2004/04/19 22:34:26 wolf31o2 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"
+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 samba lirc matroska debug joystick"
 
 inherit eutils
 
@@ -30,11 +30,8 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	       >=media-libs/win32codecs-0.60 )
 	gtk? ( media-libs/libpng
 	       virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2*
+			=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 )
@@ -98,9 +95,6 @@ src_unpack() {
 	# security problem, bug #46246
 	cd ${S}/libmpdemux; epatch ${FILESDIR}/vuln02-fix.diff
 
-	# Use gtk-2.x
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.0-gtk2.patch
-
 	# Fix head/tail call for new coreutils
 	cd ${S}; epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
 
@@ -159,9 +153,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-gui --enable-x11 \
 		                     --enable-xv --enable-vm --enable-png"
 
-	( use gtk && use gtk2 ) \
-		&& myconf="${myconf} --enable-gtk2"
-
 	use truetype \
 		&& myconf="${myconf} --enable-freetype" \
 		|| myconf="${myconf} --disable-freetype"
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild
index 0c68d8638144..2e755e2f2bbf 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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_pre3-r4.ebuild,v 1.1 2004/03/31 09:24:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild,v 1.2 2004/04/19 22:34:26 wolf31o2 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"
+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 samba lirc matroska debug joystick"
 
 inherit eutils
 
@@ -30,11 +30,8 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	       >=media-libs/win32codecs-0.60 )
 	gtk? ( media-libs/libpng
 	       virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2*
+			=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 )
@@ -98,9 +95,6 @@ src_unpack() {
 	# security problem, bug #46246
 	cd ${S}/libmpdemux; epatch ${FILESDIR}/vuln02-fix.diff
 
-	# Use gtk-2.x
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.0-gtk2.patch
-
 	# Fix head/tail call for new coreutils
 	cd ${S}; epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
 
@@ -166,9 +160,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-gui --enable-x11 \
 		                     --enable-xv --enable-vm --enable-png"
 
-	( use gtk && use gtk2 ) \
-		&& myconf="${myconf} --enable-gtk2"
-
 	use truetype \
 		&& myconf="${myconf} --enable-freetype" \
 		|| myconf="${myconf} --disable-freetype"
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
index bb950a606f71..15d7b79e667b 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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_pre3-r5.ebuild,v 1.6 2004/04/14 04:37:15 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild,v 1.7 2004/04/19 22:34:26 wolf31o2 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 theora ipv6 v4l v4l2"
+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 samba lirc matroska debug joystick theora ipv6 v4l v4l2"
 
 inherit eutils flag-o-matic
 
@@ -30,11 +30,8 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	       >=media-libs/win32codecs-0.60 )
 	gtk? ( media-libs/libpng
 	       virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2*
+			=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 )
@@ -99,9 +96,6 @@ src_unpack() {
 	# security problem, bug #46246
 	cd ${S}/libmpdemux; epatch ${FILESDIR}/vuln02-fix.diff
 
-	# Use gtk-2.x
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.0-gtk2.patch
-
 	# Fix head/tail call for new coreutils
 	cd ${S}; epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
 
@@ -173,9 +167,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-gui --enable-x11 \
 		                     --enable-xv --enable-vm --enable-png"
 
-	( use gtk && use gtk2 ) \
-		&& myconf="${myconf} --enable-gtk2"
-
 	use encode \
 		&& myconf="${myconf} --enable-mencoder --enable-tv" \
 		|| myconf="${myconf} --disable-mencoder"