Version bump (bug 306097), remove old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 645f605323cd7812d882861e6527225f23e9cb0b..a2959fb381890468f297824fe38079538dc6a038 100644 (file)
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.152 2010/02/11 17:08:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.153 2010/03/11 18:01:15 spatz Exp $
+
+*curl-7.20.0 (11 Mar 2010)
+
+  11 Mar 2010; Dror Levin <spatz@gentoo.org> -curl-7.19.4.ebuild,
+  +curl-7.20.0.ebuild, +files/curl-7.20.0-strip-ldflags.patch:
+  Version bump (bug 306097), remove old.
 
   11 Feb 2010; Ulrich Mueller <ulm@gentoo.org> curl-7.19.4.ebuild,
   curl-7.19.6.ebuild, curl-7.19.7.ebuild:

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 1d22a80bf2bd2f1cf2f98a3352fb5c6875bd8c4f..501ceb01e585ae4c68a60da26011078eac7e8b88 100644 (file)
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,20 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX curl-7.17.0-strip-ldflags.patch 796 RMD160 1bcb5af41c63b0afb7758e3c4c8f9bea5e52c29c SHA1 c63330a3505adb684dd2f1cfa89eae5159cb9cc6 SHA256 f3892c3d2a16f96319fd11cb516f66b5df0ece18ca8271cf3b9c1f286e9b5d73
 AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450
-DIST curl-7.19.4.tar.bz2 2296879 RMD160 91f46c421e0f23f268640d39f45a74621e951245 SHA1 6b8cb206990cd68d8653cea16a47bd0febd5c50d SHA256 fb3436280dedbc8f8141d3841a5964c4491dd6457bc5b7123854aed0b794be86
+AUX curl-7.20.0-strip-ldflags.patch 419 RMD160 9373e95129812c9da74e1dafed33adcfeea84d3d SHA1 11f5466959fe0b93e2e2e47121a44093ac79c0b2 SHA256 eabd5d5ed0c154b834376a76334581c5ef0ef6a51ea7229c79e4cfc02bd446c6
 DIST curl-7.19.6.tar.bz2 2347791 RMD160 7627d78ec681a513972be0cb5473b26805f44d83 SHA1 b7cb98c7a6577de7073d0b0c23eecdb8ed993e8e SHA256 ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021
 DIST curl-7.19.7.tar.bz2 2355121 RMD160 b170b24af3a6d3fc3357e90fc7ae5ef34d722fb4 SHA1 c306ebf0f65fb90df3c9c9a12fb04fb77cc29e2c SHA256 1a15f94ae3401e3bd6208ce64155c2577815019824bceae7fd3221a12bc54a70
-EBUILD curl-7.19.4.ebuild 3304 RMD160 b8ba30525eb2dcd73f6bb657f6137c2d9731f94f SHA1 30802e046bc76314cf8a9deb7d7c9d19366f0a74 SHA256 461f60d7d663ddd0e4220d800b8d79266921d9ed6a9627f3842ed321beaa7863
+DIST curl-7.20.0.tar.bz2 2088522 RMD160 9418ab686551af58df84960277868c77836d6817 SHA1 89215fc4c4cd1e42134d6117255c401372e628de SHA256 eb516915da615d8f6b2b855004d5d4b19c468f080e3736d7a73c5599b9acab11
 EBUILD curl-7.19.6.ebuild 3304 RMD160 2c14d844edb46fa3cb60de2b393bd87b8c48f0b5 SHA1 f4e7af1c290b8cd1be78ceed33853e69fe5149b0 SHA256 40f6347005f10691b1bb091d7e6f0062620c46921832b5329a613216b602ad46
 EBUILD curl-7.19.7.ebuild 2995 RMD160 474a66a21278b34e13d4bce9cc7ce85f1d8f7cb8 SHA1 dcc2a70aa356104e4ca99973a9fa786bf18295b6 SHA256 cb76ac97a2aeffb505fe7620dbdee05fd5a582c7c1a520e373c6069cfb97c77d
-MISC ChangeLog 25929 RMD160 c65d82f92cdac1bb5ec2ceb81f95eebe92f0cdda SHA1 b98e4511eeb4c1325862559810f885f960d8fdb2 SHA256 83e0d850828ee31ad5a023bbb6c085a8b88b0ae2f8775894100e736004b258ba
+EBUILD curl-7.20.0.ebuild 3055 RMD160 bb01a4e0bf60501e283e903cdb736912a48fc86f SHA1 99900c330d6fcd9b99355f34bdf52bc9813e1b1e SHA256 751cbd667c11352b34938ab9069e75cdfc2f843f76b22023aca8ab31fe634b18
+MISC ChangeLog 26130 RMD160 fd022437306ad82d5226c2e945c9621c18d7be4c SHA1 84e2541b8273a25b188ce88e40879112cca621b5 SHA256 9f6bdd1479c073b2dcb8bab12a24006048be976d5e5023aaeb89ff6345aed27f
 MISC metadata.xml 564 RMD160 fbc71d245e583491775c6c934312e428539a5596 SHA1 b752c747556474e320c0361136580f3975924326 SHA256 66e6a91e67ff9bc0669b755e0a5d1256e69a4389eef6593b9cdd9aa3a406e3f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt0ObsACgkQOeoy/oIi7uwkQACdGv4sR+2VI8Dl6fJMD4tV58CF
-ta0AoLdPOiztOCPPUspxSDAbaasnfgfn
-=RtUK
+iQEcBAEBCgAGBQJLmS/0AAoJEAWF714uGAc6EdAH/2KdRphRqUt2odnuVvvOLXT3
+2cFpsTRiZYwzsNA1uTi9/svx1yi6GBOyM1KwEiayYcuvGZPY2iizOp3ORO0d8V+6
+cwgcUfzGOS5iZfhsli3gvTBRO8C8W1JgnEZyeK7pnWTayrpWTyJjGG33iSV67/P8
+TUjriltD62sNp9u/HD5dvQdxQdHDHbTWbPCqMmdORtzHC8LJP9SDINglt9RrgiR6
+UJrxFzvXVUUPEgIRTzPV17WAS0+HCJGNfMo2OAywLylwL3AjxId6YkZ8/ExEplT5
+SOqcIv4ps1vUa3prQZf7M1S+0ydgIwxWvZp0M+DzGNytO2nJtZCmfBogIDMhh48=
+=Uf6b
 -----END PGP SIGNATURE-----

diff --git a/net-misc/curl/curl-7.19.4.ebuild b/net-misc/curl/curl-7.20.0.ebuild
similarity index 75%
rename from net-misc/curl/curl-7.19.4.ebuild
rename to net-misc/curl/curl-7.20.0.ebuild
index df8c5ec329130675c72007b5861361db48614ef2..10f5883a60ed09bf42224ed1a0121424838a95c0 100644 (file)
--- a/net-misc/curl/curl-7.19.4.ebuild
+++ b/net-misc/curl/curl-7.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.19.4.ebuild,v 1.6 2010/02/11 17:08:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.20.0.ebuild,v 1.1 2010/03/11 18:01:15 spatz Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -15,16 +15,12 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-#IUSE="ssl ipv6 ldap ares gnutls nss idn kerberos test"
-IUSE="ssl ipv6 ldap ares gnutls libssh2 nss idn kerberos test"
-
-# TODO - change to openssl USE flag in the not too distant future
-# https://bugs.gentoo.org/show_bug.cgi?id=207653#c3 (April 2008)
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="openssl ipv6 ldap ares gnutls libssh2 nss idn kerberos test"
 
 RDEPEND="gnutls? ( net-libs/gnutls app-misc/ca-certificates )
        nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
-       ssl? ( !gnutls? ( !nss? ( dev-libs/openssl app-misc/ca-certificates ) ) )
+       openssl? ( !gnutls? ( !nss? ( dev-libs/openssl app-misc/ca-certificates ) ) )
        ldap? ( net-nds/openldap )
        idn? ( net-dns/libidn )
        ares? ( >=net-dns/c-ares-1.4.0 )
@@ -40,12 +36,12 @@ DEPEND="${RDEPEND}
                dev-lang/perl
        )"
 # used - but can do without in self test: net-misc/stunnel
-#S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}"/curl-7.17.0-strip-ldflags.patch
+       epatch "${FILESDIR}"/${P}-strip-ldflags.patch
+       epatch "${FILESDIR}"/${PN}-7.19.7-test241.patch
 }
 
 src_compile() {
@@ -56,6 +52,7 @@ src_compile() {
                $(use_with kerberos gssapi /usr)
                $(use_with libssh2)
                $(use_enable ipv6)
+               $(use_enable ares)
                --enable-http
                --enable-ftp
                --enable-gopher
@@ -63,6 +60,10 @@ src_compile() {
                --enable-dict
                --enable-manual
                --enable-telnet
+               --enable-smtp
+               --enable-pop3
+               --enable-imap
+               --enable-rtsp
                --enable-nonblocking
                --enable-largefile
                --enable-maintainer-mode
@@ -70,20 +71,13 @@ src_compile() {
                --without-krb4
                --without-spnego"
 
-       if use ipv6 && use ares; then
-               elog "c-ares support disabled because it is incompatible with ipv6."
-               myconf="${myconf} --disable-ares"
-       else
-               myconf="${myconf} $(use_enable ares)"
-       fi
-
        if use gnutls; then
                myconf="${myconf} --without-ssl --with-gnutls --without-nss"
                myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
        elif use nss; then
                myconf="${myconf} --without-ssl --without-gnutls --with-nss"
                myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
-       elif use ssl; then
+       elif use openssl; then
                myconf="${myconf} --without-gnutls --without-nss --with-ssl"
                myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
        else

diff --git a/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch b/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch
new file mode 100644 (file)
index 0000000..8c074fb
--- /dev/null
+++ b/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch
@@ -0,0 +1,14 @@
+--- curl-config.in.orig        2007-09-14 07:36:18.000000000 +1000
++++ curl-config.in     2007-09-14 07:37:14.000000000 +1000
+@@ -187,9 +187,9 @@
+          CURLLIBDIR=""
+       fi
+       if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
+-        echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
++        echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ @LIBS@
+       else
+-        echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
++        echo ${CURLLIBDIR}-lcurl @LIBS@
+       fi
+       ;;
+