giflib mandatory dep.

Package-Manager: portage-2.1.1_pre2-r6

3 files changed, 21 insertions, 19 deletions

diff --git a/dev-lang/pike/ChangeLog b/dev-lang/pike/ChangeLog
index a2949a00f6c6..be739117489b 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.22 2006/07/11 11:15:15 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/ChangeLog,v 1.23 2006/07/11 12:52:28 araujo Exp $
+
+  11 Jul 2006; Luis F. Araujo <araujo@gentoo.org> pike-7.6.86-r1.ebuild:
+  Yet _another_ mandatory dep found. giflib
 
   11 Jul 2006; Luis F. Araujo <araujo@gentoo.org> pike-7.6.86-r1.ebuild:
   Fixing the gtk dependency bug reported in #136065
diff --git a/dev-lang/pike/Manifest b/dev-lang/pike/Manifest
index 8057239b8229..1cdaaa6e1bb5 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 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
+EBUILD pike-7.6.86-r1.ebuild 2898 RMD160 a9e9a75875cbafbaa28a78ae3081ba0375e79371 SHA1 8147a83a092284a05cc7ba25b0e8da58719577a6 SHA256 3874005baa5aece24739fdeaf50b3db50ac6e6afc54fdc5b3a69e30bbda83045
+MD5 0709d70b720175bf1c98da526b19db6a pike-7.6.86-r1.ebuild 2898
+RMD160 a9e9a75875cbafbaa28a78ae3081ba0375e79371 pike-7.6.86-r1.ebuild 2898
+SHA256 3874005baa5aece24739fdeaf50b3db50ac6e6afc54fdc5b3a69e30bbda83045 pike-7.6.86-r1.ebuild 2898
+MISC ChangeLog 3607 RMD160 8120b7aac9a6f69f2e4e844490431dc1ad05bc59 SHA1 11de9fdf330292b5e4e92314aa86290a5776e94e SHA256 1dddbc370a18c2b2bfb015559dc68ba90cca5c48401926fd54af356e431f6a70
+MD5 3d029acf9410b1005d459a8e1119bb80 ChangeLog 3607
+RMD160 8120b7aac9a6f69f2e4e844490431dc1ad05bc59 ChangeLog 3607
+SHA256 1dddbc370a18c2b2bfb015559dc68ba90cca5c48401926fd54af356e431f6a70 ChangeLog 3607
 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)
 
-iD8DBQFEs4icdZ42PGEF17URAgogAJsE4TU90rBaiOEL3GkAqgZ71qabKACg4A1P
-JfhQpT7hj/uPdu4fZ1MzUu0=
-=XhYH
+iD8DBQFEs59TdZ42PGEF17URAgTmAKDUXoU1PNbO7ITNGpkgrn2ZHx77qQCfTFcj
+0JhY829qPqxvaiVUf38ibPg=
+=p/Qu
 -----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 0d540e3c6b18..a52f89cabcef 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.2 2006/07/11 11:15:15 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.6.86-r1.ebuild,v 1.3 2006/07/11 12:52:28 araujo Exp $
 
 DESCRIPTION="Pike programming language and runtime"
 HOMEPAGE="http://pike.ida.liu.se/"
@@ -9,15 +9,15 @@ SRC_URI="http://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bzip2 debug doc fftw gdbm gif gtk hardened jpeg kerberos mime mmx mysql opengl pcre pdf scanner sdl ssl svg tiff truetype zlib"
+IUSE="bzip2 debug doc fftw gdbm gtk hardened jpeg kerberos mime mmx mysql opengl pcre pdf scanner sdl ssl svg tiff truetype zlib"
 
 DEPEND="dev-libs/nettle
 	dev-libs/gmp
+	media-libs/giflib
 	bzip2? ( app-arch/bzip2 )
 	fftw? ( sci-libs/fftw )
 	gdbm? ( sys-libs/gdbm )
-	gif? ( media-libs/giflib )
-	gtk? ( =x11-libs/gtk+-1.2* media-libs/giflib )
+	gtk? ( =x11-libs/gtk+-1.2* )
 	jpeg? ( media-libs/jpeg )
 	kerberos? ( virtual/krb5 )
 	mysql? ( dev-db/mysql )
@@ -42,8 +42,7 @@ 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 \
@@ -53,13 +52,13 @@ src_compile() {
 			--without-bundles \
 			--without-copt \
 			--with-crypt \
+			--with-gif \
 			--with-gmp \
 			--with-bignums \
 			$(use_with bzip2 Bz2) \
 			$(use_with debug rtldebug) \
 			$(use_with fftw) \
 			$(use_with gdbm) \
-			$(use_with gif) \
 			$(use_with jpeg jpeglib) \
 			$(use_with kerberos Kerberos) \
 			$(use_with mime MIME) \