From 40026024a8c51809eaaf8dfdcf441818ecbe31f1 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sat, 14 Apr 2007 00:35:26 +0000 Subject: [PATCH] version bump. remove old versions. remove krb4 as per bug #173354 Package-Manager: portage-2.1.2.2 --- net-misc/curl/ChangeLog | 10 +- net-misc/curl/Manifest | 62 ++++------- net-misc/curl/curl-7.15.1-r1.ebuild | 14 +-- net-misc/curl/curl-7.15.5.ebuild | 14 +-- net-misc/curl/curl-7.16.0.ebuild | 105 ------------------ ...{curl-7.16.1.ebuild => curl-7.16.2.ebuild} | 17 +-- .../files/curl-7.16.2-strip-ldflags.patch | 10 ++ net-misc/curl/files/digest-curl-7.16.0 | 3 - net-misc/curl/files/digest-curl-7.16.2 | 3 + 9 files changed, 56 insertions(+), 182 deletions(-) delete mode 100644 net-misc/curl/curl-7.16.0.ebuild rename net-misc/curl/{curl-7.16.1.ebuild => curl-7.16.2.ebuild} (81%) create mode 100644 net-misc/curl/files/curl-7.16.2-strip-ldflags.patch delete mode 100644 net-misc/curl/files/digest-curl-7.16.0 create mode 100644 net-misc/curl/files/digest-curl-7.16.2 diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 0902965b9f29..c3465bfa555b 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/curl # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.80 2007/02/11 04:07:12 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.81 2007/04/14 00:35:26 dragonheart Exp $ + +*curl-7.16.2 (14 Apr 2007) + + 14 Apr 2007; +files/curl-7.16.2-strip-ldflags.patch, + curl-7.15.1-r1.ebuild, curl-7.15.5.ebuild, -curl-7.16.0.ebuild, + -curl-7.16.1.ebuild, +curl-7.16.2.ebuild: + version bump. remove old versions. remove krb4 as per bug #173354 + 7.16.2 has broken selftests 405 534 that i'll look at later. *curl-7.16.1 (11 Feb 2007) diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 738d58898e78..5f613260579b 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX curl-7.15-libtftp.patch 651 RMD160 1138e01e5c898d669a11192845c1330d99eb5bc2 SHA1 faefd6e0e7283c9ad57ff6d079d0891a29222930 SHA256 93a7f7ed54d04af4958cbc86b6c4845a667b3aaf90b455c6de8d5614a0781d79 MD5 9359740309a1cbbeb6a7a5e065586ffd files/curl-7.15-libtftp.patch 651 RMD160 1138e01e5c898d669a11192845c1330d99eb5bc2 files/curl-7.15-libtftp.patch 651 @@ -21,30 +18,29 @@ AUX curl-7.16.1-strip-ldflags.patch 372 RMD160 613156ce82f590f39705a03453d469348 MD5 9c7d546d9d8bfda9cde04a8eddd03ce6 files/curl-7.16.1-strip-ldflags.patch 372 RMD160 613156ce82f590f39705a03453d469348a390be5 files/curl-7.16.1-strip-ldflags.patch 372 SHA256 fd54d14af96714e8a034078f3beb5a3a25c055e58dbb6ec7f9c03615ee0320dc files/curl-7.16.1-strip-ldflags.patch 372 +AUX curl-7.16.2-strip-ldflags.patch 401 RMD160 873ec8516d55d00cf2cd3b84075c8612a0511c94 SHA1 81ef0f7498b34540508914da496d927f8f12b027 SHA256 2da722f848cd4e3b7748598676e2c4d895273e9c21b129585509df155aa2f818 +MD5 e54c99e0ad01e31f90f9a616c484f499 files/curl-7.16.2-strip-ldflags.patch 401 +RMD160 873ec8516d55d00cf2cd3b84075c8612a0511c94 files/curl-7.16.2-strip-ldflags.patch 401 +SHA256 2da722f848cd4e3b7748598676e2c4d895273e9c21b129585509df155aa2f818 files/curl-7.16.2-strip-ldflags.patch 401 DIST curl-7.15.1.tar.bz2 1437950 RMD160 c733937754b579d45de8c26cf4dfa6c5cec82fae SHA1 2b94192557954bba396bfbb980feed17aadc6295 SHA256 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324 DIST curl-7.15.5.tar.bz2 1543007 RMD160 4494cffb382c81b7211830c7e6e40ef9ed8f4ef0 SHA1 b79ee06d1da58c12c23a1b8aeccdb2b74a692cc7 SHA256 2980815e53f4caeafc5e35d183d9379bcaaec49f759be1a4ac628cfb6c392fe0 -DIST curl-7.16.0.tar.bz2 1566391 RMD160 1be2153a7a19ac6ec070a6923bc518bcc2c83c08 SHA1 2f6c3daafbb523f099d37e5c9dd13d8417099ac3 SHA256 fc8dcda5a933c370c15c832bf1e7316a0690f473fdd6000454d233edaa33bc23 -DIST curl-7.16.1.tar.bz2 1592074 RMD160 8251efba8f4bde512b7cf68ad0acb5efb4302d9b SHA1 645f87f63d29f71dced74869450d52f84a75c2b6 SHA256 257b204acf1d80314694b4cf63cccbc7c70bccee75cb3d9924bbb061ec6bccef -EBUILD curl-7.15.1-r1.ebuild 2487 RMD160 2c7c5e2c2534bff20573c5c44c17ad05823423b6 SHA1 efd3ec784a062dec9cbea0687fb1e4f27ffd9e9c SHA256 8460d92cf1c7a24a35989d9873e36fe58956c9770aa80aea58ce67311a0d4ed2 -MD5 438100748e2a083b7cc024d0cf10628f curl-7.15.1-r1.ebuild 2487 -RMD160 2c7c5e2c2534bff20573c5c44c17ad05823423b6 curl-7.15.1-r1.ebuild 2487 -SHA256 8460d92cf1c7a24a35989d9873e36fe58956c9770aa80aea58ce67311a0d4ed2 curl-7.15.1-r1.ebuild 2487 -EBUILD curl-7.15.5.ebuild 2426 RMD160 1ccb3bfce03ecff533ac18ca59d5e2e85e4df59f SHA1 7c2a392cd1926c18334a066381be594070e2018b SHA256 e5621ac46fa619a995f89085959f026b940f1cea6a4a2f7ea129ac1952ae4780 -MD5 a398e2f1fec5e44c2b979667ca8e7024 curl-7.15.5.ebuild 2426 -RMD160 1ccb3bfce03ecff533ac18ca59d5e2e85e4df59f curl-7.15.5.ebuild 2426 -SHA256 e5621ac46fa619a995f89085959f026b940f1cea6a4a2f7ea129ac1952ae4780 curl-7.15.5.ebuild 2426 -EBUILD curl-7.16.0.ebuild 2718 RMD160 c49df4c147ada631a881ae15eeb6e45da9c4e0a0 SHA1 a973bc8e05e001877e8cd5590d14a12bf89809de SHA256 5c28197bb60fd21d30a4521328f98ce3ae35edca4f21f6e6aeab14ac559f03a7 -MD5 8f0e87f73a1d3fb394aae70daff80334 curl-7.16.0.ebuild 2718 -RMD160 c49df4c147ada631a881ae15eeb6e45da9c4e0a0 curl-7.16.0.ebuild 2718 -SHA256 5c28197bb60fd21d30a4521328f98ce3ae35edca4f21f6e6aeab14ac559f03a7 curl-7.16.0.ebuild 2718 -EBUILD curl-7.16.1.ebuild 2750 RMD160 d0a3067d08cb58e39ccd669586ba33fd7afe391f SHA1 1e06b886cba825f8754dba7e67818f101aa89620 SHA256 f080f05dd1d4807f794370ea1f429b68d30cb8f0401c18c6c39b13bd60e0a108 -MD5 af73ebed0442bc9d1b5810d2fbc5edd4 curl-7.16.1.ebuild 2750 -RMD160 d0a3067d08cb58e39ccd669586ba33fd7afe391f curl-7.16.1.ebuild 2750 -SHA256 f080f05dd1d4807f794370ea1f429b68d30cb8f0401c18c6c39b13bd60e0a108 curl-7.16.1.ebuild 2750 -MISC ChangeLog 15346 RMD160 501ccd9bb0cca923727510d6f3677ac204bcd2fc SHA1 013ea4664bc33e7e841150b61c64ea4d53fdbeec SHA256 979dea0a3ac615e878432bbeda211a1ec78689345d2b441ec6ae7caa48dfd034 -MD5 02a955797d668ce34acb4454882f2d6f ChangeLog 15346 -RMD160 501ccd9bb0cca923727510d6f3677ac204bcd2fc ChangeLog 15346 -SHA256 979dea0a3ac615e878432bbeda211a1ec78689345d2b441ec6ae7caa48dfd034 ChangeLog 15346 +DIST curl-7.16.2.tar.bz2 1664414 RMD160 28edfab5659d410bf00725a0ac7228583fc171b6 SHA1 b23d35b5af7b75e53c6632cd4c9d0cb0c08cafe5 SHA256 2e833e81d43f6294e5bd0d1776d68bd147bdab31e86c7544dc1462e44db9bfa2 +EBUILD curl-7.15.1-r1.ebuild 2259 RMD160 3974aa1c8cf2c9bd91481edec45c7f1166cf0b9c SHA1 a042998854a51d5d29396fa1e1352528d2c4558a SHA256 60e895f2f1d8152febd1495ef3f62a7363d4a67525e2e373fd96c6ba779af9d7 +MD5 a8d25b53972d71f84e5e035c5b248a1c curl-7.15.1-r1.ebuild 2259 +RMD160 3974aa1c8cf2c9bd91481edec45c7f1166cf0b9c curl-7.15.1-r1.ebuild 2259 +SHA256 60e895f2f1d8152febd1495ef3f62a7363d4a67525e2e373fd96c6ba779af9d7 curl-7.15.1-r1.ebuild 2259 +EBUILD curl-7.15.5.ebuild 2198 RMD160 3bde2277ae53ad706f66a826678ec38fb0695d99 SHA1 084b4f6fc32bbc0e8fa25e79fa9ba8b638288561 SHA256 1fc7ec26d425f622c1a59d6086047ed9b78a25b9b89527e7f23827fef31e044c +MD5 6e267693279a344ce04d7104cd711c1f curl-7.15.5.ebuild 2198 +RMD160 3bde2277ae53ad706f66a826678ec38fb0695d99 curl-7.15.5.ebuild 2198 +SHA256 1fc7ec26d425f622c1a59d6086047ed9b78a25b9b89527e7f23827fef31e044c curl-7.15.5.ebuild 2198 +EBUILD curl-7.16.2.ebuild 2479 RMD160 5472182dee948d957137f588600acdc219299e38 SHA1 4ae58efbb39b2a6d481e1f99391cb817eb4b632a SHA256 38d0a2761063c7229c2744187472ef2b47abed55e041b39095aa5cac61a9c6c5 +MD5 63c9572241b7f0d8865bd87f0ff69d96 curl-7.16.2.ebuild 2479 +RMD160 5472182dee948d957137f588600acdc219299e38 curl-7.16.2.ebuild 2479 +SHA256 38d0a2761063c7229c2744187472ef2b47abed55e041b39095aa5cac61a9c6c5 curl-7.16.2.ebuild 2479 +MISC ChangeLog 15688 RMD160 42f5b2d84500175518105bac598ff2f467356a62 SHA1 34dc8591dabbde7b44ba0066705cce1f95904724 SHA256 0c2780280e8bc3dc2960b136bfb9f6a8af775ef4cf08189d00851db1f2ebc7d8 +MD5 4ddb708e11d8bf300f606307baae31b7 ChangeLog 15688 +RMD160 42f5b2d84500175518105bac598ff2f467356a62 ChangeLog 15688 +SHA256 0c2780280e8bc3dc2960b136bfb9f6a8af775ef4cf08189d00851db1f2ebc7d8 ChangeLog 15688 MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219 @@ -55,16 +51,6 @@ SHA256 0a9301fda2b9152303983b152f3e53f4c9900f6bc0fce5af99f472529c566994 files/di 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 -MD5 e4642f05d6eb3227792b3c2b25a89805 files/digest-curl-7.16.1 241 -RMD160 ebbfa54aa747dcdd35ad688a5ec7a7a2d10d9796 files/digest-curl-7.16.1 241 -SHA256 5045da0e22a96600f027a0f7865f2c20bfb53d69fcba6bfe23a4215e37ef4f99 files/digest-curl-7.16.1 241 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFFzpaSmdTrptrqvGERAkWNAJ4igK4+kuVQ+sMy9QXpSLjhSSsksQCeMUb3 -FuFCDkVNBclToV/ktHhOH+0= -=83LX ------END PGP SIGNATURE----- +MD5 57fc5c81fa904d2fe9095d04b87f68ea files/digest-curl-7.16.2 241 +RMD160 941f9bb82eca7ba8e07971c93113c4581eea1c0d files/digest-curl-7.16.2 241 +SHA256 94b4f93c722c48109a9f596b8d2f8db7d370985905e0ea9a6f576e5779256d49 files/digest-curl-7.16.2 241 diff --git a/net-misc/curl/curl-7.15.1-r1.ebuild b/net-misc/curl/curl-7.15.1-r1.ebuild index 67f3c3cae63f..302020958951 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-2007 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.10 2007/02/11 04:07:12 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.1-r1.ebuild,v 1.11 2007/04/14 00:35:26 dragonheart Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -13,15 +13,14 @@ 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" -IUSE="ssl ipv6 ldap ares gnutls idn kerberos krb4 test" +IUSE="ssl ipv6 ldap ares gnutls idn kerberos 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 )" + kerberos? ( virtual/krb5 )" DEPEND="${RDEPEND} test? ( @@ -61,13 +60,6 @@ src_compile() { 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 diff --git a/net-misc/curl/curl-7.15.5.ebuild b/net-misc/curl/curl-7.15.5.ebuild index 81efa244a53e..74c987bf890c 100644 --- a/net-misc/curl/curl-7.15.5.ebuild +++ b/net-misc/curl/curl-7.15.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.5.ebuild,v 1.3 2007/02/11 04:07:12 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.5.ebuild,v 1.4 2007/04/14 00:35:26 dragonheart Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -13,15 +13,14 @@ 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" +IUSE="ssl ipv6 ldap ares gnutls idn kerberos 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 )" + kerberos? ( virtual/krb5 )" DEPEND="${RDEPEND} test? ( @@ -61,13 +60,6 @@ src_compile() { 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 diff --git a/net-misc/curl/curl-7.16.0.ebuild b/net-misc/curl/curl-7.16.0.ebuild deleted file mode 100644 index ba5d24153460..000000000000 --- a/net-misc/curl/curl-7.16.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.0.ebuild,v 1.2 2007/02/11 04:07:12 dragonheart 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 - epatch ${FILESDIR}/curl-7.15.1-test62.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 - --enable-maintainer-mode" - - 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="${myconf} --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 - dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE -} - -pkg_postinst() { - if [[ -e "${ROOT}"/usr/$(get_libdir)/libcurl.so.3 ]] ; then - ewarn "You must re-compile all packages that are linked against" - ewarn "curl-7.15.* by using revdep-rebuild from gentoolkit:" - ewarn "# revdep-rebuild --library libcurl.so.3" - fi -} diff --git a/net-misc/curl/curl-7.16.1.ebuild b/net-misc/curl/curl-7.16.2.ebuild similarity index 81% rename from net-misc/curl/curl-7.16.1.ebuild rename to net-misc/curl/curl-7.16.2.ebuild index 78654626ab06..b162ceed379c 100644 --- a/net-misc/curl/curl-7.16.1.ebuild +++ b/net-misc/curl/curl-7.16.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.1.ebuild,v 1.1 2007/02/11 04:07:12 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.2.ebuild,v 1.1 2007/04/14 00:35:26 dragonheart Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -13,15 +13,14 @@ SRC_URI="http://curl.planetmirror.com/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" +IUSE="ssl ipv6 ldap ares gnutls idn kerberos 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 )" + kerberos? ( virtual/krb5 )" DEPEND="${RDEPEND} test? ( @@ -33,8 +32,7 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" - epatch ${FILESDIR}/${P}-strip-ldflags.patch - epatch ${FILESDIR}/curl-7.15.1-test62.patch + epatch "${FILESDIR}"/${P}-strip-ldflags.patch elibtoolize } @@ -62,13 +60,6 @@ src_compile() { 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 diff --git a/net-misc/curl/files/curl-7.16.2-strip-ldflags.patch b/net-misc/curl/files/curl-7.16.2-strip-ldflags.patch new file mode 100644 index 000000000000..12e8586d8f0b --- /dev/null +++ b/net-misc/curl/files/curl-7.16.2-strip-ldflags.patch @@ -0,0 +1,10 @@ +--- curl-7.16.2/libcurl.pc.in.orig 2007-04-14 10:11:14.000000000 +1000 ++++ curl-7.16.2/libcurl.pc.in 2007-04-14 10:11:26.000000000 +1000 +@@ -33,6 +33,6 @@ + URL: http://curl.haxx.se/ + Description: Library to transfer files with ftp, http, etc. + Version: @VERSION@ +-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@ ++Libs: -L${libdir} -lcurl @LIBS@ + Libs.private: @LIBCURL_LIBS@ @LIBS@ + Cflags: -I${includedir} diff --git a/net-misc/curl/files/digest-curl-7.16.0 b/net-misc/curl/files/digest-curl-7.16.0 deleted file mode 100644 index 45dac32cac3e..000000000000 --- a/net-misc/curl/files/digest-curl-7.16.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5819f56e93d04cde2992fe88b54cbfad curl-7.16.0.tar.bz2 1566391 -RMD160 1be2153a7a19ac6ec070a6923bc518bcc2c83c08 curl-7.16.0.tar.bz2 1566391 -SHA256 fc8dcda5a933c370c15c832bf1e7316a0690f473fdd6000454d233edaa33bc23 curl-7.16.0.tar.bz2 1566391 diff --git a/net-misc/curl/files/digest-curl-7.16.2 b/net-misc/curl/files/digest-curl-7.16.2 new file mode 100644 index 000000000000..ea5831640851 --- /dev/null +++ b/net-misc/curl/files/digest-curl-7.16.2 @@ -0,0 +1,3 @@ +MD5 37a1de15c4300ca9413d39d2bcea9b36 curl-7.16.2.tar.bz2 1664414 +RMD160 28edfab5659d410bf00725a0ac7228583fc171b6 curl-7.16.2.tar.bz2 1664414 +SHA256 2e833e81d43f6294e5bd0d1776d68bd147bdab31e86c7544dc1462e44db9bfa2 curl-7.16.2.tar.bz2 1664414 -- 2.26.2