Fixed bug #157539 thanks to Timothy - attempted installtion of non-existant files...

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index e536e87f602b75d6ab1d1f2d828d338ea059a7b7..e1a06fc0b47a24378220cbceda4eb2d6b78212e6 100644 (file)
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -14,29 +14,24 @@ MD5 fb8fd9ce337fa113e817a230adf4a8e6 files/curl-7.15.1-test46.patch 929
 RMD160 30bff8e56226a5db2c034fd5883e9f1d386623a9 files/curl-7.15.1-test46.patch 929
 SHA256 eb981acd24581ac8034a48a03d276a80fa59027fef0dde8736cab67813b10f9f files/curl-7.15.1-test46.patch 929
 DIST curl-7.15.1.tar.bz2 1437950 RMD160 c733937754b579d45de8c26cf4dfa6c5cec82fae SHA1 2b94192557954bba396bfbb980feed17aadc6295 SHA256 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324
-DIST curl-7.15.3.tar.bz2 1467043 RMD160 35172fe66d5e6cc1df05e6160ffdf086448730f3 SHA1 7e764126ce564429fe2f142428a27cbfc8fb69ee SHA256 77771db616dee02f21b94c409ed423a72fa7f2b2d65c27395137b0f920388440
-DIST curl-7.15.4.tar.bz2 1519792 RMD160 bbef248926d3935272746f605d91e6f03badff6b SHA1 74d3ce2060754a2ccc7a7775712e22720f74a662 SHA256 11521127e175eb633c046a2c6ed11f97e81816d3aec9e8cac560763457a8e623
 DIST curl-7.15.5.tar.bz2 1543007 RMD160 4494cffb382c81b7211830c7e6e40ef9ed8f4ef0 SHA1 b79ee06d1da58c12c23a1b8aeccdb2b74a692cc7 SHA256 2980815e53f4caeafc5e35d183d9379bcaaec49f759be1a4ac628cfb6c392fe0
-EBUILD curl-7.15.1-r1.ebuild 2449 RMD160 4f731860e7a95b7d84a895273170651ae8a8d1dd SHA1 f11798c3b0c6f374feb3100b817e63b2fd9c2be6 SHA256 04c5c08d52012397f9bf743dfb77a243545958b53719199cf13d1f9ff568d851
-MD5 683ca40c8fa9d191cf05a2273a283be8 curl-7.15.1-r1.ebuild 2449
-RMD160 4f731860e7a95b7d84a895273170651ae8a8d1dd curl-7.15.1-r1.ebuild 2449
-SHA256 04c5c08d52012397f9bf743dfb77a243545958b53719199cf13d1f9ff568d851 curl-7.15.1-r1.ebuild 2449
-EBUILD curl-7.15.3.ebuild 2334 RMD160 b83772ebb02db7bfd72bc81df13293604ad37870 SHA1 4112f699f34b188712eca0e1aaa2a1abfc30990b SHA256 ca1c0caa8b27f0695809361da447eb3279e92de033fc132230fbf26474487631
-MD5 3913922ef62eb676d9fe8cfb65b28396 curl-7.15.3.ebuild 2334
-RMD160 b83772ebb02db7bfd72bc81df13293604ad37870 curl-7.15.3.ebuild 2334
-SHA256 ca1c0caa8b27f0695809361da447eb3279e92de033fc132230fbf26474487631 curl-7.15.3.ebuild 2334
-EBUILD curl-7.15.4.ebuild 2391 RMD160 3854a76080986e84f22bc7d8d53578015213cd65 SHA1 efba9f1fa24b30c7886c0f0ae5057aa829fc2de5 SHA256 12542685b0cf1c14dc2d00e9ddbbde2bfe8d19834a5a904607ec9953bb05022d
-MD5 58322869b1c1eba429bcf1c0321808b0 curl-7.15.4.ebuild 2391
-RMD160 3854a76080986e84f22bc7d8d53578015213cd65 curl-7.15.4.ebuild 2391
-SHA256 12542685b0cf1c14dc2d00e9ddbbde2bfe8d19834a5a904607ec9953bb05022d curl-7.15.4.ebuild 2391
-EBUILD curl-7.15.5.ebuild 2389 RMD160 acdb3509282448c235aa797e883c5fdef8fa8db6 SHA1 ab4346e906b6da38c49c65e3ffef2352bb99c58f SHA256 59df7245ea98945446aed6c55cb72bcb4418d4eb109208b454e1fce5c9123cdc
-MD5 7026480958551418f24c13651e19fb4b curl-7.15.5.ebuild 2389
-RMD160 acdb3509282448c235aa797e883c5fdef8fa8db6 curl-7.15.5.ebuild 2389
-SHA256 59df7245ea98945446aed6c55cb72bcb4418d4eb109208b454e1fce5c9123cdc curl-7.15.5.ebuild 2389
-MISC ChangeLog 14503 RMD160 9f23c67dd9196b677b5b45be01b1ccff8f920301 SHA1 eec26631b2bd2902ee7fdd9f815f64ecbd4b47f2 SHA256 cc2cbac9efcd931ce398365e402b1f71f171fbdca09cb70a4020ea1b0e9ac80c
-MD5 403e7c76760c55576f5158868422614b ChangeLog 14503
-RMD160 9f23c67dd9196b677b5b45be01b1ccff8f920301 ChangeLog 14503
-SHA256 cc2cbac9efcd931ce398365e402b1f71f171fbdca09cb70a4020ea1b0e9ac80c ChangeLog 14503
+DIST curl-7.16.0.tar.bz2 1566391 RMD160 1be2153a7a19ac6ec070a6923bc518bcc2c83c08 SHA1 2f6c3daafbb523f099d37e5c9dd13d8417099ac3 SHA256 fc8dcda5a933c370c15c832bf1e7316a0690f473fdd6000454d233edaa33bc23
+EBUILD curl-7.15.1-r1.ebuild 2439 RMD160 c5670394bdbf372ad2f5b8fda9f0824c4f50e281 SHA1 7bf3c65c7b438068e47ab3ecbae7fb98f90c75b0 SHA256 08a4eb3ebb99f5ba5b36435b86e593d98f9f5c519dd0964de30928b5cec037d2
+MD5 68f24e60c9cb824083bc3d880f70d001 curl-7.15.1-r1.ebuild 2439
+RMD160 c5670394bdbf372ad2f5b8fda9f0824c4f50e281 curl-7.15.1-r1.ebuild 2439
+SHA256 08a4eb3ebb99f5ba5b36435b86e593d98f9f5c519dd0964de30928b5cec037d2 curl-7.15.1-r1.ebuild 2439
+EBUILD curl-7.15.5.ebuild 2381 RMD160 a76e2ec7d97cbc386c0608d7ef9d8ef49df7b904 SHA1 ac111ee87e71359ac666fdd9825c274d5ef27285 SHA256 c5b1437fe2d1006fc4caacb34dd478e47a339cb0be9b5a16b2e3d3a651e62cfd
+MD5 7f46eb1a18d82961e29b49a1916452ee curl-7.15.5.ebuild 2381
+RMD160 a76e2ec7d97cbc386c0608d7ef9d8ef49df7b904 curl-7.15.5.ebuild 2381
+SHA256 c5b1437fe2d1006fc4caacb34dd478e47a339cb0be9b5a16b2e3d3a651e62cfd curl-7.15.5.ebuild 2381
+EBUILD curl-7.16.0.ebuild 2673 RMD160 ac4944e9704d8f78ab75e84cc30652a2dae378f2 SHA1 13914a308f7248015511625727584ed401a0ba7a SHA256 5eda9b0a3b8b1baa9f89c58c900ff91fc39b1e3debb0de7ac70034cdf6dcc498
+MD5 09d0183d08c7850ddda3d5d59e1ccdb9 curl-7.16.0.ebuild 2673
+RMD160 ac4944e9704d8f78ab75e84cc30652a2dae378f2 curl-7.16.0.ebuild 2673
+SHA256 5eda9b0a3b8b1baa9f89c58c900ff91fc39b1e3debb0de7ac70034cdf6dcc498 curl-7.16.0.ebuild 2673
+MISC ChangeLog 15016 RMD160 13a63a707ba04b98ab6e80be46984248f5aaa576 SHA1 47337cc113111b6fb6208a30271f4657a4fc3936 SHA256 721fa20e6514399a0be3f2b8d159fe7d5fa2d3b9528dc4137f23fdbfdcddce27
+MD5 9861acae3e3bb322bb1ceda315f74d11 ChangeLog 15016
+RMD160 13a63a707ba04b98ab6e80be46984248f5aaa576 ChangeLog 15016
+SHA256 721fa20e6514399a0be3f2b8d159fe7d5fa2d3b9528dc4137f23fdbfdcddce27 ChangeLog 15016
 MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219
@@ -44,19 +39,16 @@ SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138 metadata
 MD5 5da73178c73613470017f6ffe034605e files/digest-curl-7.15.1-r1 241
 RMD160 c18045697e94d5bbff88bdab7149ed6655666748 files/digest-curl-7.15.1-r1 241
 SHA256 0a9301fda2b9152303983b152f3e53f4c9900f6bc0fce5af99f472529c566994 files/digest-curl-7.15.1-r1 241
-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
-MD5 d480ea43353e4e714690ed2af172b4d7 files/digest-curl-7.15.4 241
-RMD160 a554cd3c37e16874934049ad57de676b72a9885b files/digest-curl-7.15.4 241
-SHA256 49f009cf0fa707d5a4938e068e2116e461bf59b4ef2c1a80b8c6222dfb0af893 files/digest-curl-7.15.4 241
 MD5 923fb85d0dc3de18b01240d300aabb21 files/digest-curl-7.15.5 241
 RMD160 9d700b90adbaf4ff83433206c6e63e5ba86c5637 files/digest-curl-7.15.5 241
 SHA256 7421859a42befe5d3c3777b0e96e5fb1f3d55fc0f9616b039237eb9ecac5e1e0 files/digest-curl-7.15.5 241
+MD5 e62c034b044a80eda2aca36c35d00a85 files/digest-curl-7.16.0 241
+RMD160 b1acec28f84846c9eab25e66d230ebd7aebcb334 files/digest-curl-7.16.0 241
+SHA256 63c45fe02ec721fbca410d7edc3e26d060e36c63359e6e6b6ba23d0ee0428027 files/digest-curl-7.16.0 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFO5q/bwxeDFj+ScoRAtjBAJ46u5Jpl6G6TSxpV4n/dlmaa7TOKACgzOmW
-vM+7Xs+RtFd61ctVBR7l6SI=
-=fJmB
+iD8DBQFFei4AmdTrptrqvGERAnk+AJ928Re6H1Qe+3u738Q0Dm0H5b8WAQCfQVBM
+jnjO1JKqzvV/gGdSTnw0N+w=
+=U6A1
 -----END PGP SIGNATURE-----

diff --git a/net-misc/curl/curl-7.15.3.ebuild b/net-misc/curl/curl-7.15.3.ebuild
deleted file mode 100644 (file)
index 3f4f7da..0000000
--- a/net-misc/curl/curl-7.15.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.5 2006/10/04 17:45:59 grobian Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-inherit libtool
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT X11"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl ipv6 ldap ares gnutls idn kerberos krb4 test"
-
-RDEPEND="gnutls? ( net-libs/gnutls )
-       ssl? ( !gnutls? ( dev-libs/openssl ) )
-       ldap? ( net-nds/openldap )
-       idn? ( net-dns/libidn )
-       ares? ( net-dns/c-ares )
-       kerberos? ( virtual/krb5 )
-       krb4? ( app-crypt/kth-krb )"
-
-DEPEND="${RDEPEND}
-       test? (
-               sys-apps/diffutils
-               dev-lang/perl
-       )"
-# used - but can do without in self test: net-misc/stunnel
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       elibtoolize
-}
-
-src_compile() {
-
-       myconf="$(use_enable ldap)
-               $(use_with idn libidn)
-               $(use_enable kerberos gssapi)
-               $(use_enable ipv6)
-               --enable-http
-               --enable-ftp
-               --enable-gopher
-               --enable-file
-               --enable-dict
-               --enable-manual
-               --enable-telnet
-               --enable-nonblocking
-               --enable-largefile"
-
-       if use ipv6 && use ares; then
-               ewarn "c-ares support disabled because it is incompatible with ipv6."
-               myconf="${myconf} --disable-ares"
-       else
-               myconf="${myconf} $(use_enable ares)"
-       fi
-
-       if use ipv6 && use krb4; then
-               ewarn "kerberos-4 support disabled because it is incompatible with ipv6."
-               myconf="${myconf} --disable-krb4"
-       else
-               myconf="${myconf} $(use_enable krb4)"
-       fi
-
-       if use gnutls; then
-               myconf="${myconf} --without-ssl --with-gnutls=/usr"
-       elif use ssl; then
-               myconf="${myconf} --without-gnutls --with-ssl=/usr"
-       else
-               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"
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die "installed failed for current version"
-
-       insinto /usr/share/aclocal
-       doins docs/libcurl/libcurl.m4
-
-       dodoc CHANGES README
-       dodoc docs/FEATURES docs/INTERNALS docs/LIBCURL
-       dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
-}

diff --git a/net-misc/curl/curl-7.15.4.ebuild b/net-misc/curl/curl-7.15.4.ebuild
deleted file mode 100644 (file)
index 021e2d2..0000000
--- a/net-misc/curl/curl-7.15.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.4.ebuild,v 1.2 2006/10/04 17:45:59 grobian Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-inherit libtool eutils
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT X11"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl ipv6 ldap ares gnutls idn kerberos krb4 test"
-
-RDEPEND="gnutls? ( net-libs/gnutls )
-       ssl? ( !gnutls? ( dev-libs/openssl ) )
-       ldap? ( net-nds/openldap )
-       idn? ( net-dns/libidn )
-       ares? ( net-dns/c-ares )
-       kerberos? ( virtual/krb5 )
-       krb4? ( app-crypt/kth-krb )"
-
-DEPEND="${RDEPEND}
-       test? (
-               sys-apps/diffutils
-               dev-lang/perl
-       )"
-# used - but can do without in self test: net-misc/stunnel
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch ${FILESDIR}/${PN}-7.15-strip-ldflags.patch
-       elibtoolize
-}
-
-src_compile() {
-
-       myconf="$(use_enable ldap)
-               $(use_with idn libidn)
-               $(use_enable kerberos gssapi)
-               $(use_enable ipv6)
-               --enable-http
-               --enable-ftp
-               --enable-gopher
-               --enable-file
-               --enable-dict
-               --enable-manual
-               --enable-telnet
-               --enable-nonblocking
-               --enable-largefile"
-
-       if use ipv6 && use ares; then
-               ewarn "c-ares support disabled because it is incompatible with ipv6."
-               myconf="${myconf} --disable-ares"
-       else
-               myconf="${myconf} $(use_enable ares)"
-       fi
-
-       if use ipv6 && use krb4; then
-               ewarn "kerberos-4 support disabled because it is incompatible with ipv6."
-               myconf="${myconf} --disable-krb4"
-       else
-               myconf="${myconf} $(use_enable krb4)"
-       fi
-
-       if use gnutls; then
-               myconf="${myconf} --without-ssl --with-gnutls=/usr"
-       elif use ssl; then
-               myconf="${myconf} --without-gnutls --with-ssl=/usr"
-       else
-               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"
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die "installed failed for current version"
-
-       insinto /usr/share/aclocal
-       doins docs/libcurl/libcurl.m4
-
-       dodoc CHANGES README
-       dodoc docs/FEATURES docs/INTERNALS docs/LIBCURL
-       dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
-}

diff --git a/net-misc/curl/files/digest-curl-7.15.3 b/net-misc/curl/files/digest-curl-7.15.3
deleted file mode 100644 (file)
index 027befc..0000000
--- a/net-misc/curl/files/digest-curl-7.15.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d71b2ee8febfde2c7dc30a43638ec0d9 curl-7.15.3.tar.bz2 1467043
-RMD160 35172fe66d5e6cc1df05e6160ffdf086448730f3 curl-7.15.3.tar.bz2 1467043
-SHA256 77771db616dee02f21b94c409ed423a72fa7f2b2d65c27395137b0f920388440 curl-7.15.3.tar.bz2 1467043

diff --git a/net-misc/curl/files/digest-curl-7.15.4 b/net-misc/curl/files/digest-curl-7.15.4
deleted file mode 100644 (file)
index 1613a65..0000000
--- a/net-misc/curl/files/digest-curl-7.15.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d9345a55c8bc67eafcd37fa1b728e00e curl-7.15.4.tar.bz2 1519792
-RMD160 bbef248926d3935272746f605d91e6f03badff6b curl-7.15.4.tar.bz2 1519792
-SHA256 11521127e175eb633c046a2c6ed11f97e81816d3aec9e8cac560763457a8e623 curl-7.15.4.tar.bz2 1519792