Gtkglext is always needed, remove gtk use flag thanks to Bård Sørngård <baard.sorngard@gmail.com> and Avuton Olrich <avuton@gmail.com> in bug 135010

Package-Manager: portage-2.1_rc3-r4

3 files changed, 23 insertions, 20 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index d62fa971d385..580ee50656a9 100644
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/gnash
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.11 2006/05/29 13:42:56 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.12 2006/06/01 19:39:12 genstef Exp $
+
+  01 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+  gnash-0.7.1_p20060528.ebuild:
+  Gtkglext is always needed, remove gtk use flag thanks to Bård Sørngård
+  <baard.sorngard@gmail.com> and Avuton Olrich <avuton@gmail.com> in bug
+  135010
 
   29 May 2006; <stefan@gentoo.org> gnash-0.7.1_p20060528.ebuild:
   gtkglext dep fix
diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 55405957dc13..374eb83827d3 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -16,14 +16,14 @@ EBUILD gnash-0.7.1.ebuild 2229 RMD160 c274ea987a00dd579ad9c516900c88784821472f S
 MD5 21ff21874073e37af2ac0e9b25e8784a gnash-0.7.1.ebuild 2229
 RMD160 c274ea987a00dd579ad9c516900c88784821472f gnash-0.7.1.ebuild 2229
 SHA256 73e1b49a9568a7d2fed40c9161a4aaacbda27a2505ceb1217b54dd3f1fa54eab gnash-0.7.1.ebuild 2229
-EBUILD gnash-0.7.1_p20060528.ebuild 2671 RMD160 d3a2299845bb11610d6e02d4c5c6083dee98ba9f SHA1 a67498d14c4e534bfedbe122600a5fe46fddd1e9 SHA256 ce6181b99f6f69504596ccbe2507386a8ea2ea020a1e6610037213e80a9a73fb
-MD5 1063ca8b51c004f6554358113e5a31f3 gnash-0.7.1_p20060528.ebuild 2671
-RMD160 d3a2299845bb11610d6e02d4c5c6083dee98ba9f gnash-0.7.1_p20060528.ebuild 2671
-SHA256 ce6181b99f6f69504596ccbe2507386a8ea2ea020a1e6610037213e80a9a73fb gnash-0.7.1_p20060528.ebuild 2671
-MISC ChangeLog 2114 RMD160 d4d4e4b39bcc104fb18a4dd06178dca3b6c4aecf SHA1 71ea6f8adbcb985bc6c446bafd5ebc19dd5abb25 SHA256 2f3b6c6676cfacad767ec730544e97c5232982c4807c781b5b804c16dfb72f68
-MD5 bbcb4016eda2a60e0d91dd0b1921b2a1 ChangeLog 2114
-RMD160 d4d4e4b39bcc104fb18a4dd06178dca3b6c4aecf ChangeLog 2114
-SHA256 2f3b6c6676cfacad767ec730544e97c5232982c4807c781b5b804c16dfb72f68 ChangeLog 2114
+EBUILD gnash-0.7.1_p20060528.ebuild 2682 RMD160 445e466e3881d284da81864ab8b02049d9fb62b7 SHA1 fba8888b1a4577091f35bdb0fda20d59c0f19db1 SHA256 cadcec526a54658b24d2a82fcc62b467ad17ff40400b5e7ed51985e10db9b25a
+MD5 75a0aa06a3f8692ef605c254939e970c gnash-0.7.1_p20060528.ebuild 2682
+RMD160 445e466e3881d284da81864ab8b02049d9fb62b7 gnash-0.7.1_p20060528.ebuild 2682
+SHA256 cadcec526a54658b24d2a82fcc62b467ad17ff40400b5e7ed51985e10db9b25a gnash-0.7.1_p20060528.ebuild 2682
+MISC ChangeLog 2358 RMD160 e076bd929ec9f1c59bd8567570af4d3ce1f7dc55 SHA1 31b1034274e1765463005f9c8f0e06f33c97bef0 SHA256 b00977449c9c3d7ea47960fb984639efa6b3e596ceb99fafd91ee36a3945740e
+MD5 75a184df9e80be58720420b09da72459 ChangeLog 2358
+RMD160 e076bd929ec9f1c59bd8567570af4d3ce1f7dc55 ChangeLog 2358
+SHA256 b00977449c9c3d7ea47960fb984639efa6b3e596ceb99fafd91ee36a3945740e ChangeLog 2358
 MISC metadata.xml 242 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c SHA1 383cfdd7a210a459dd71b1a8bad03be54f047d5b SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242
diff --git a/net-www/gnash/gnash-0.7.1_p20060528.ebuild b/net-www/gnash/gnash-0.7.1_p20060528.ebuild
index 907fb5d7a47f..c00837ce8a34 100644
--- a/net-www/gnash/gnash-0.7.1_p20060528.ebuild
+++ b/net-www/gnash/gnash-0.7.1_p20060528.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.1_p20060528.ebuild,v 1.3 2006/05/29 13:42:56 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.1_p20060528.ebuild,v 1.4 2006/06/01 19:39:12 genstef Exp $
 
 inherit nsplugins kde-functions autotools
 
@@ -11,7 +11,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86 ~amd64"
-IUSE="dmalloc mad nsplugin nptl xml kde gtk video_cards_i810"
+IUSE="dmalloc mad nsplugin nptl xml kde video_cards_i810"
 
 RDEPEND="dmalloc? ( dev-libs/dmalloc )
 	xml? ( dev-libs/libxml2 )
@@ -26,7 +26,6 @@ RDEPEND="dmalloc? ( dev-libs/dmalloc )
 	media-libs/libpng
 	media-libs/libsdl
 	media-libs/sdl-mixer
-	x11-libs/gtkglext
 	virtual/opengl
 	|| (
 		( x11-libs/libX11
@@ -36,13 +35,11 @@ RDEPEND="dmalloc? ( dev-libs/dmalloc )
 		x11-proto/xproto )
 		virtual/x11
 	)
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/cairo
-		>x11-libs/gtk+-2
-		x11-libs/pango
-	)"
+	dev-libs/atk
+	dev-libs/glib
+	x11-libs/cairo
+	>x11-libs/gtk+-2
+	x11-libs/pango"
 
 S=${WORKDIR}/gnash
 
@@ -79,6 +76,7 @@ src_compile() {
 	#--enable-gui=flavor Specify gui flavor:
 	#				GTK
 	#				SDL -> has no controls, we do not USE it
+	#$(use_enable gtk glext) with USE=-gtk, fails to detect gtkglext, bug 135010
 
 	econf \
 		$(use_enable dmalloc) \
@@ -86,7 +84,6 @@ src_compile() {
 		$(use_enable mad mp3) \
 		$(use_enable nptl pthreads) \
 		$(use_enable xml) \
-		$(use_enable gtk glext) \
 		$(use_enable video_cards_i810 i810-lod-bias) \
 		${myconf} || die "econf failed"
 	emake || die "emake failed"