Fixing gtk deps bug #136065

Package-Manager: portage-2.1.1_pre2-r6

3 files changed, 19 insertions, 15 deletions

diff --git a/dev-lang/pike/ChangeLog b/dev-lang/pike/ChangeLog
index a6918b1ad365..a2949a00f6c6 100644
--- a/dev-lang/pike/ChangeLog
+++ b/dev-lang/pike/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/pike
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/ChangeLog,v 1.21 2006/07/11 07:42:53 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/ChangeLog,v 1.22 2006/07/11 11:15:15 araujo Exp $
+
+  11 Jul 2006; Luis F. Araujo <araujo@gentoo.org> pike-7.6.86-r1.ebuild:
+  Fixing the gtk dependency bug reported in #136065
 
 *pike-7.6.86-r1 (11 Jul 2006)
 
diff --git a/dev-lang/pike/Manifest b/dev-lang/pike/Manifest
index 5fd3b5ab845c..8057239b8229 100644
--- a/dev-lang/pike/Manifest
+++ b/dev-lang/pike/Manifest
@@ -22,14 +22,14 @@ EBUILD pike-7.6.6.ebuild 2969 RMD160 2389e524013ca68a230314375a7e06b714ba3303 SH
 MD5 efb8b8386a7864dad0ac5678188e6387 pike-7.6.6.ebuild 2969
 RMD160 2389e524013ca68a230314375a7e06b714ba3303 pike-7.6.6.ebuild 2969
 SHA256 b66b912680be3e73f603fcddf60c275ae8db39d0bd8952c88fd5b2bc4803ead3 pike-7.6.6.ebuild 2969
-EBUILD pike-7.6.86-r1.ebuild 2940 RMD160 b486469a7cec5a34aeba6835cc3537dfc081f433 SHA1 10e53e9c8d404172cb48bcacd93e148302652b06 SHA256 71f7b98a7a8c6949b4bc3429a918907f94ac9459af4636f3a61a20c8db3a0154
-MD5 0364f652b31a06dfd543b56cd28996aa pike-7.6.86-r1.ebuild 2940
-RMD160 b486469a7cec5a34aeba6835cc3537dfc081f433 pike-7.6.86-r1.ebuild 2940
-SHA256 71f7b98a7a8c6949b4bc3429a918907f94ac9459af4636f3a61a20c8db3a0154 pike-7.6.86-r1.ebuild 2940
-MISC ChangeLog 3363 RMD160 15a63d4af1673622299ea0c9bf41c93883ce0a82 SHA1 38543ca2c5cb0644bea80cfb7e9be158849d4b64 SHA256 63c8623633e4d1fc0b2c4c20cd797f2237d11d70b71219ae21bf3c9899726435
-MD5 8a9adbe77826e81ff194b58e0e914e41 ChangeLog 3363
-RMD160 15a63d4af1673622299ea0c9bf41c93883ce0a82 ChangeLog 3363
-SHA256 63c8623633e4d1fc0b2c4c20cd797f2237d11d70b71219ae21bf3c9899726435 ChangeLog 3363
+EBUILD pike-7.6.86-r1.ebuild 3027 RMD160 4d25d906b297ecba46140e4b2c77be530e875c81 SHA1 6db1a97e378e7c1aedd3c58858bfbce946376550 SHA256 0c331855c75f6f91fb74d9240fd16604339fe20fa0a2db8bb53dd9c0c4b650cc
+MD5 2763b5d7c77441e77d9a68976c028b4f pike-7.6.86-r1.ebuild 3027
+RMD160 4d25d906b297ecba46140e4b2c77be530e875c81 pike-7.6.86-r1.ebuild 3027
+SHA256 0c331855c75f6f91fb74d9240fd16604339fe20fa0a2db8bb53dd9c0c4b650cc pike-7.6.86-r1.ebuild 3027
+MISC ChangeLog 3489 RMD160 3f16b9931167ab8702c185a9a5ac324c2f1ddc9b SHA1 1ebf24d95553049ab41e9b87e9342f24dd999252 SHA256 9dd7d0c1111d37686536f37ba39484b178e6ac1585bd81bc17652089d61be63d
+MD5 1d76196580aae679876d6ed5cd24ac40 ChangeLog 3489
+RMD160 3f16b9931167ab8702c185a9a5ac324c2f1ddc9b ChangeLog 3489
+SHA256 9dd7d0c1111d37686536f37ba39484b178e6ac1585bd81bc17652089d61be63d ChangeLog 3489
 MISC metadata.xml 525 RMD160 146c22c7b14d679951bf83d124a37880e801af34 SHA1 18c5ff49ca4cf3abb05cc776ee7e85fc456ac813 SHA256 ee543068e8759fd84639e167869465b8a6b80acb6ce53b337bc9b6570f53d494
 MD5 c3df1534f09ed54cec33327f18377aec metadata.xml 525
 RMD160 146c22c7b14d679951bf83d124a37880e801af34 metadata.xml 525
@@ -52,7 +52,7 @@ SHA256 fd7e5e964f67ea1f515fd0d0ddff1ecfbca08f5067ebe4b1163399894590cfdd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEs1bWdZ42PGEF17URAs2nAKCXHnGa/bvvwcS8mGbE659W/YVlUwCfZgiq
-jsjC3EOR8wo87gLgj3oVqLo=
-=mFd5
+iD8DBQFEs4icdZ42PGEF17URAgogAJsE4TU90rBaiOEL3GkAqgZ71qabKACg4A1P
+JfhQpT7hj/uPdu4fZ1MzUu0=
+=XhYH
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/pike/pike-7.6.86-r1.ebuild b/dev-lang/pike/pike-7.6.86-r1.ebuild
index de4c171cd57f..0d540e3c6b18 100644
--- a/dev-lang/pike/pike-7.6.86-r1.ebuild
+++ b/dev-lang/pike/pike-7.6.86-r1.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/dev-lang/pike/pike-7.6.86-r1.ebuild,v 1.1 2006/07/11 07:42:53 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.6.86-r1.ebuild,v 1.2 2006/07/11 11:15:15 araujo Exp $
 
 DESCRIPTION="Pike programming language and runtime"
 HOMEPAGE="http://pike.ida.liu.se/"
@@ -17,7 +17,7 @@ DEPEND="dev-libs/nettle
 	fftw? ( sci-libs/fftw )
 	gdbm? ( sys-libs/gdbm )
 	gif? ( media-libs/giflib )
-	gtk? ( =x11-libs/gtk+-1.2* )
+	gtk? ( =x11-libs/gtk+-1.2* media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	kerberos? ( virtual/krb5 )
 	mysql? ( dev-db/mysql )
@@ -42,6 +42,8 @@ src_compile() {
 	# on hardened, disable runtime-generated code
 	# otherwise let configure work it out for itself
 	use hardened && myconf="${myconf} --without-machine-code"
+	# gtk support depends on gif libraries.
+	use gtk && myconf="${myconf} --with-GTK --with-gif"
 	make \
 		CONFIGUREARGS=" \
 			--prefix=/usr \
@@ -58,7 +60,6 @@ src_compile() {
 			$(use_with fftw) \
 			$(use_with gdbm) \
 			$(use_with gif) \
-			$(use_with gtk GTK) \
 			$(use_with jpeg jpeglib) \
 			$(use_with kerberos Kerberos) \
 			$(use_with mime MIME) \