fix kerberos dep (#109806)

Package-Manager: portage-2.1_pre9

5 files changed, 49 insertions, 23 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 2ea028c7330b..1d372597f16a 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.71 2006/04/23 17:49:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.72 2006/04/27 22:29:03 liquidx Exp $
+
+  27 Apr 2006; Alastair Tse <liquidx@gentoo.org> curl-7.15.1.ebuild,
+  curl-7.15.1-r1.ebuild, curl-7.15.3.ebuild:
+  fix kerberos dep (#109806)
 
   28 Apr 2006; Joshua Kinard <kumba@gentoo.org> curl-7.15.1-r1.ebuild:
   Marked stable on mips.
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index aec8a34123b5..d424b93328eb 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX curl-7.15-libtftp.patch 651 RMD160 1138e01e5c898d669a11192845c1330d99eb5bc2 SHA1 faefd6e0e7283c9ad57ff6d079d0891a29222930 SHA256 93a7f7ed54d04af4958cbc86b6c4845a667b3aaf90b455c6de8d5614a0781d79 size 651
 MD5 9359740309a1cbbeb6a7a5e065586ffd files/curl-7.15-libtftp.patch 651
 RMD160 1138e01e5c898d669a11192845c1330d99eb5bc2 files/curl-7.15-libtftp.patch 651
@@ -8,22 +11,22 @@ RMD160 72bea54e0a93d459fe51c810b4e9e4d005dbb7f1 files/curl-7.15.0-versionnumber.
 SHA256 f1eb3bafe294f7eba9882befdf7a4b16bb157b5b6d4c83be80995ec271ba0514 files/curl-7.15.0-versionnumber.patch 550
 DIST curl-7.15.1.tar.bz2 1437950 RMD160 c733937754b579d45de8c26cf4dfa6c5cec82fae SHA256 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324 size 1437950
 DIST curl-7.15.3.tar.bz2 1467043 RMD160 35172fe66d5e6cc1df05e6160ffdf086448730f3 SHA256 77771db616dee02f21b94c409ed423a72fa7f2b2d65c27395137b0f920388440 size 1467043
-EBUILD curl-7.15.1-r1.ebuild 2352 RMD160 22457fd4ff89471a36dbaceb4cb46f62651a409e SHA1 1cb46f4a8eda0bd05dcf4af3f6447a9104d4d8ff SHA256 52e873d668bac1201fd9a72fb7d6b905ae78212cbc5cad7c4adab4a20e35eaed size 2352
-MD5 abecde365c43be6eb418eb24c8320b47 curl-7.15.1-r1.ebuild 2352
-RMD160 22457fd4ff89471a36dbaceb4cb46f62651a409e curl-7.15.1-r1.ebuild 2352
-SHA256 52e873d668bac1201fd9a72fb7d6b905ae78212cbc5cad7c4adab4a20e35eaed curl-7.15.1-r1.ebuild 2352
-EBUILD curl-7.15.1.ebuild 2233 RMD160 4fab67185cf4c6152e83d881d95aadc2dcb23a3a SHA1 80ef6c201197f8b4c520139d55aecf88f5cd36fc SHA256 b7b81e392e66dca350100141825950cd0840d653d79e7c6a92ac8fbb7b55dad8 size 2233
-MD5 80aa54c72163c50a9fbfa6799ef19940 curl-7.15.1.ebuild 2233
-RMD160 4fab67185cf4c6152e83d881d95aadc2dcb23a3a curl-7.15.1.ebuild 2233
-SHA256 b7b81e392e66dca350100141825950cd0840d653d79e7c6a92ac8fbb7b55dad8 curl-7.15.1.ebuild 2233
-EBUILD curl-7.15.3.ebuild 2209 RMD160 4eabf9594d17ad6c8ba9182c096de7bd2f0d453c SHA1 186ec4d81237981adf96298ad2fbfeb93e2610d3 SHA256 92b8cebf3e239b636d3e83cdf0074142d396b2c1d5797b1c8ba20ee04268ff40 size 2209
-MD5 71f283398da11430bbf943a5931f01a6 curl-7.15.3.ebuild 2209
-RMD160 4eabf9594d17ad6c8ba9182c096de7bd2f0d453c curl-7.15.3.ebuild 2209
-SHA256 92b8cebf3e239b636d3e83cdf0074142d396b2c1d5797b1c8ba20ee04268ff40 curl-7.15.3.ebuild 2209
-MISC ChangeLog 13388 RMD160 0f6d6fbac981984eef96335fadf4719a42a05f2b SHA1 d0a291b340710c836cccb94d5076dd3ff2b26c48 SHA256 7d1edc6a1bb6c2b7821a66543c66cd3929c35b94bf150bec15ccfdeb46ec8fbe size 13388
-MD5 bfb9a76d67c2d3d23e0487066f5f33d5 ChangeLog 13388
-RMD160 0f6d6fbac981984eef96335fadf4719a42a05f2b ChangeLog 13388
-SHA256 7d1edc6a1bb6c2b7821a66543c66cd3929c35b94bf150bec15ccfdeb46ec8fbe ChangeLog 13388
+EBUILD curl-7.15.1-r1.ebuild 2419 RMD160 7070376804633db1ef7fe28b33fefa5b7545907a SHA1 baa0a8f5420d1139dad8180bc9a8db750bcc0351 SHA256 5af2c9dff92dc42cb47ee18cd0dc533e8ddbbaa57857174a0fcb296851af2300 size 2419
+MD5 8b886d63d3f48d3d381c6b753f381460 curl-7.15.1-r1.ebuild 2419
+RMD160 7070376804633db1ef7fe28b33fefa5b7545907a curl-7.15.1-r1.ebuild 2419
+SHA256 5af2c9dff92dc42cb47ee18cd0dc533e8ddbbaa57857174a0fcb296851af2300 curl-7.15.1-r1.ebuild 2419
+EBUILD curl-7.15.1.ebuild 2300 RMD160 1de8c5e90a74b9fcd6559c87b000546d09343bbc SHA1 8be21a661a5a4c76a10310b55afc0e701b986965 SHA256 aa0354bfe3f65388589f7f470ce452d81f30284c438b352784ab8c062bec2883 size 2300
+MD5 bb0de6841f5424b2b073b52e40aef9c3 curl-7.15.1.ebuild 2300
+RMD160 1de8c5e90a74b9fcd6559c87b000546d09343bbc curl-7.15.1.ebuild 2300
+SHA256 aa0354bfe3f65388589f7f470ce452d81f30284c438b352784ab8c062bec2883 curl-7.15.1.ebuild 2300
+EBUILD curl-7.15.3.ebuild 2272 RMD160 133e3c6942015ac76ed930280ae56756080edaef SHA1 a37e6d0381f258394152c860d4eb0e918285831a SHA256 972acbe4f47f89438cd9a70f96dc4f5d1791bd6cd010045b5fa4d31d0023b846 size 2272
+MD5 328330a6d978e265225cee1c9870d75e curl-7.15.3.ebuild 2272
+RMD160 133e3c6942015ac76ed930280ae56756080edaef curl-7.15.3.ebuild 2272
+SHA256 972acbe4f47f89438cd9a70f96dc4f5d1791bd6cd010045b5fa4d31d0023b846 curl-7.15.3.ebuild 2272
+MISC ChangeLog 13534 RMD160 29ce239c99425edd2429bc068cc8e159a311a8d3 SHA1 fe161bcd6157e5310cdcf232f099df105db8adac SHA256 be718a3ee9c26b44a257cee66b242ca28ac1b8cd87641490e0135e1b16e33cc8 size 13534
+MD5 6efea77950f275a60f0be231840ddd9f ChangeLog 13534
+RMD160 29ce239c99425edd2429bc068cc8e159a311a8d3 ChangeLog 13534
+SHA256 be718a3ee9c26b44a257cee66b242ca28ac1b8cd87641490e0135e1b16e33cc8 ChangeLog 13534
 MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138 size 219
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219
@@ -40,3 +43,10 @@ MD5 868d53492ffadba614d01f9185b1d399 files/digest-curl-7.15.3 241
 RMD160 4445d656f0911de97e3e4b7935e13325542881f2 files/digest-curl-7.15.3 241
 SHA256 ab906ddff402d28446f56eac44e39a688e01aaa4a2249b570658c1065a15cd71 files/digest-curl-7.15.3 241
 size 241 files/digest-curl-7.15.3 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEUUXL9ZFPrqoILX8RAkz1AKCzITqmslcg+9UsnMpDDKsWEM8JVQCeNX40
+1qKpzRPnN7UnGgO2Mv3edSQ=
+=bvH5
+-----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.15.1-r1.ebuild b/net-misc/curl/curl-7.15.1-r1.ebuild
index 8a1c5fa0aba2..97df2be473b5 100644
--- a/net-misc/curl/curl-7.15.1-r1.ebuild
+++ b/net-misc/curl/curl-7.15.1-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/net-misc/curl/curl-7.15.1-r1.ebuild,v 1.4 2006/04/23 17:49:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.1-r1.ebuild,v 1.5 2006/04/27 22:29:03 liquidx Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -20,7 +20,7 @@ RDEPEND="gnutls? ( net-libs/gnutls )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/libidn )
 	ares? ( net-dns/c-ares )
-	kerberos? ( app-crypt/mit-krb5 )
+	kerberos? ( virtual/krb5 )
 	krb4? ( app-crypt/kth-krb )"
 
 DEPEND="${RDEPEND}
@@ -74,6 +74,10 @@ src_compile() {
 		myconf="${myconf} --without-gnutls --without-ssl"
 	fi
 
+	if use kerberos; then
+	   myconf="${myconfg} --with-gssapi=/usr"
+	fi
+
 	econf ${myconf} || die 'configure failed'
 	emake || die "install failed for current version"
 }
diff --git a/net-misc/curl/curl-7.15.1.ebuild b/net-misc/curl/curl-7.15.1.ebuild
index c374cdd5ea78..329f285abac9 100644
--- a/net-misc/curl/curl-7.15.1.ebuild
+++ b/net-misc/curl/curl-7.15.1.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-misc/curl/curl-7.15.1.ebuild,v 1.10 2006/02/26 05:37:08 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.1.ebuild,v 1.11 2006/04/27 22:29:03 liquidx Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -18,7 +18,7 @@ RDEPEND="gnutls? ( net-libs/gnutls )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/libidn )
 	ares? ( net-dns/c-ares )
-	kerberos? ( app-crypt/mit-krb5 )
+	kerberos? ( virtual/krb5 )
 	krb4? ( app-crypt/kth-krb )"
 
 DEPEND="${RDEPEND}
@@ -66,6 +66,10 @@ src_compile() {
 		myconf="${myconf} --without-gnutls --without-ssl"
 	fi
 
+	if use kerberos; then
+	   myconf="${myconfg} --with-gssapi=/usr"
+	fi
+
 	econf ${myconf} || die 'configure failed'
 	emake || die "install failed for current version"
 }
diff --git a/net-misc/curl/curl-7.15.3.ebuild b/net-misc/curl/curl-7.15.3.ebuild
index 2ba5803a0f95..32a9c196ddd3 100644
--- a/net-misc/curl/curl-7.15.3.ebuild
+++ b/net-misc/curl/curl-7.15.3.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-misc/curl/curl-7.15.3.ebuild,v 1.2 2006/04/23 09:25:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.3.ebuild,v 1.3 2006/04/27 22:29:03 liquidx Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -18,7 +18,7 @@ RDEPEND="gnutls? ( net-libs/gnutls )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/libidn )
 	ares? ( net-dns/c-ares )
-	kerberos? ( app-crypt/mit-krb5 )
+	kerberos? ( virtual/krb5 )
 	krb4? ( app-crypt/kth-krb )"
 
 DEPEND="${RDEPEND}
@@ -66,6 +66,10 @@ src_compile() {
 		myconf="${myconf} --without-gnutls --without-ssl"
 	fi
 
+	if use kerberos; then
+	   myconf="${myconfg} --with-gssapi=/usr"
+	fi
+
 	econf ${myconf} || die 'configure failed'
 	emake || die "install failed for current version"
 }