Version bump, bug 324295.

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

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 4a24c0543dd169ca43b7ac2c0ca477fd057e1572..a2f4aadeb0d1e6ae24fd92ec82fab139907b7eb7 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.160 2010/05/22 20:59:55 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.161 2010/07/01 20:14:54 spatz Exp $
+
+*curl-7.21.0 (01 Jul 2010)
+
+  01 Jul 2010; Dror Levin <spatz@gentoo.org> -curl-7.19.7.ebuild,
+  -curl-7.20.0.ebuild, -curl-7.20.0-r1.ebuild, +curl-7.21.0.ebuild:
+  Version bump, bug 324295.
 
   22 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   curl-7.20.0-r2.ebuild:

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 26eb35941ba1ac70abcbd2d8a2dd3b44ca411b20..d13e040d9101375514b471e15b36d641abc9c6d5 100644 (file)
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,16 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 AUX curl-7.20.0-libcurlm4.patch 490 RMD160 d4b821bf728286011ce11d7ccc9704522afae98a SHA1 2c592feba55b77965a8cf7e5491f7d0d1db9305e SHA256 b302bcce3d5fccf017eb80dc56e5e129164614c8b24b4c2415aaf63149362f55
 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
 DIST curl-7.20.0.tar.bz2 2088522 RMD160 9418ab686551af58df84960277868c77836d6817 SHA1 89215fc4c4cd1e42134d6117255c401372e628de SHA256 eb516915da615d8f6b2b855004d5d4b19c468f080e3736d7a73c5599b9acab11
 DIST curl-7.20.1.tar.bz2 2097637 RMD160 0ba44872862788ab315c12a13a50c200096a4eee SHA1 bc3ba6d83069ef1f13d320f29b26f1c63f6056b3 SHA256 70664da8e2a8c84327abd10ed30d5a3fc9fa2151def9ee5b75f27e3538554e56
+DIST curl-7.21.0.tar.bz2 2130889 RMD160 121eb3645c1286d583462244c1d7e7356129c440 SHA1 5cb1213187fb25d1b4392ddaca3a7945c749d083 SHA256 fe95b4c414951b28987df9c31baea83013cca757124bac4e59869c8806d487ba
 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
-EBUILD curl-7.20.0-r1.ebuild 3237 RMD160 1a87d8c61a3edd482cafb7decdb90428999d0f47 SHA1 1319858edc989f468f17fea830731a508696d76a SHA256 d679664ccaa80ae3df369eff68802aff25025330b7e34883c5617dc49532aa27
 EBUILD curl-7.20.0-r2.ebuild 3273 RMD160 4ddc154d74aec6e2742a4095fb908b2943512f07 SHA1 311c2c49c9bb0395303803b4f8ab0845a882fb44 SHA256 df38cd61d36ca1e72ac9b4b81bebf003d49092d082e171938d6f143ce90993c2
-EBUILD curl-7.20.0.ebuild 3055 RMD160 bb01a4e0bf60501e283e903cdb736912a48fc86f SHA1 99900c330d6fcd9b99355f34bdf52bc9813e1b1e SHA256 751cbd667c11352b34938ab9069e75cdfc2f843f76b22023aca8ab31fe634b18
 EBUILD curl-7.20.1.ebuild 3199 RMD160 89e6290e6eaad376ce0e1676f99956186a82c8c8 SHA1 580a07d1c9f7b3a19ce8ce25bfa42031758a217f SHA256 48ed254257d49c3820aca25f9d07765fc882e97d650d28e6d3ae3ca21819b6c3
-MISC ChangeLog 27151 RMD160 5b40d1f5ba11989157b1f50b3d60f0dae4819487 SHA1 922b1206d6fd6ca3ddd2487a41e301b1ce685b9b SHA256 9d1f5403cd7dde821ddb4c570ca55d93ea19d737eb4e7ec6c2f70126a08da172
+EBUILD curl-7.21.0.ebuild 3453 RMD160 099c7c9d2f9c7d703c421cfbfb008b91d98ab385 SHA1 f04833000b9628c4af34eb6f92a0ef6bee083548 SHA256 c846a3de708f40b70e6cee719ab3792b9c929db28e6e2d20c5a11a2bdae6e5ca
+MISC ChangeLog 27339 RMD160 0728db7e0923eab9e7ebf2f06cfa922d02eb54c0 SHA1 b5104b6c275ed851c66f8ec5b63874714c4af2c9 SHA256 4e07cfdb0394a257836f841bc81174ea19fc9524fbe5c27fe312a670dc1f95f1
 MISC metadata.xml 697 RMD160 75f1a38985395bbb89971476c5fc004e8f247959 SHA1 d3f52a273d008cfaee85396ff1e01694a2ba3f19 SHA256 f78ea4a02ffb68ecdaa3947f1c0b3a8aaefa36cebb0aa12e9cee1413868463cb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQEcBAEBCgAGBQJMLPdHAAoJEAWF714uGAc6p5AH/0K6uO/o5LcCMvKP8C/Yp8TD
+lnG8qwkQwxjQpXOLKH8UdUP/LSWxyaVE+MsIFpVHIXFthAShtAZqyhvDuM/l/40g
+udJKxDvzUOTKtg1/SnljAx1mlWIYVuC+6x/nOTRB8fYRhnOrBn3o6Vkblk1OqbFQ
+4XYKiL2G7IxtNjkESAvVrm76E7urL4utX2g4A2f4tg0vQIghTzP2FeS+ofY+2mol
+Pr0Y1lrJrCRYquDHcsiOdcULAW/MT1k1qq3Zz6i4Wh0+XDHImsrxsnQdWmQIZiIx
+8IVi77zCaThrysVyjuWgnUhYftQhCFiyHr5sve4YAS4MqzsYdFSey3IfvOjkFT4=
+=qHWO
+-----END PGP SIGNATURE-----

diff --git a/net-misc/curl/curl-7.19.7.ebuild b/net-misc/curl/curl-7.19.7.ebuild
deleted file mode 100644 (file)
index 0b1c2ec..0000000
--- a/net-misc/curl/curl-7.19.7.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.7.ebuild,v 1.2 2010/02/11 17:08:45 ulm Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-inherit multilib eutils
-
-#MY_P=${P/_pre/-}
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
-#SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2"
-#SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
-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 ~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 ) )
-       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 )
-       kerberos? ( virtual/krb5 )
-       libssh2? ( >=net-libs/libssh2-0.16 )"
-
-# fbopenssl (not in gentoo) --with-spnego
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-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}"/curl-7.17.0-strip-ldflags.patch
-       epatch "${FILESDIR}"/curl-7.19.7-test241.patch
-}
-
-src_compile() {
-
-       myconf="$(use_enable ldap)
-               $(use_enable ldap ldaps)
-               $(use_with idn libidn)
-               $(use_with kerberos gssapi /usr)
-               $(use_with libssh2)
-               $(use_enable ipv6)
-               $(use_enable ares)
-               --enable-http
-               --enable-ftp
-               --enable-gopher
-               --enable-file
-               --enable-dict
-               --enable-manual
-               --enable-telnet
-               --enable-nonblocking
-               --enable-largefile
-               --enable-maintainer-mode
-               --disable-sspi
-               --without-krb4
-               --without-spnego"
-
-       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 openssl; then
-               myconf="${myconf} --without-gnutls --without-nss --with-ssl"
-               myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
-       else
-               myconf="${myconf} --without-gnutls --without-nss --without-ssl"
-       fi
-
-       econf ${myconf} || die 'configure failed'
-
-       emake || die "install failed for current version"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "installed failed for current version"
-       rm -rf "${D}"/etc/
-
-       # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
-       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
-}

diff --git a/net-misc/curl/curl-7.20.0.ebuild b/net-misc/curl/curl-7.20.0.ebuild
deleted file mode 100644 (file)
index 10f5883..0000000
--- a/net-misc/curl/curl-7.20.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.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!
-
-inherit multilib eutils
-
-#MY_P=${P/_pre/-}
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
-#SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2"
-#SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
-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 ~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 ) )
-       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 )
-       kerberos? ( virtual/krb5 )
-       libssh2? ( >=net-libs/libssh2-0.16 )"
-
-# fbopenssl (not in gentoo) --with-spnego
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-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}"/${P}-strip-ldflags.patch
-       epatch "${FILESDIR}"/${PN}-7.19.7-test241.patch
-}
-
-src_compile() {
-
-       myconf="$(use_enable ldap)
-               $(use_enable ldap ldaps)
-               $(use_with idn libidn)
-               $(use_with kerberos gssapi /usr)
-               $(use_with libssh2)
-               $(use_enable ipv6)
-               $(use_enable ares)
-               --enable-http
-               --enable-ftp
-               --enable-gopher
-               --enable-file
-               --enable-dict
-               --enable-manual
-               --enable-telnet
-               --enable-smtp
-               --enable-pop3
-               --enable-imap
-               --enable-rtsp
-               --enable-nonblocking
-               --enable-largefile
-               --enable-maintainer-mode
-               --disable-sspi
-               --without-krb4
-               --without-spnego"
-
-       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 openssl; then
-               myconf="${myconf} --without-gnutls --without-nss --with-ssl"
-               myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
-       else
-               myconf="${myconf} --without-gnutls --without-nss --without-ssl"
-       fi
-
-       econf ${myconf} || die 'configure failed'
-
-       emake || die "install failed for current version"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "installed failed for current version"
-       rm -rf "${D}"/etc/
-
-       # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
-       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
-}

diff --git a/net-misc/curl/curl-7.20.0-r1.ebuild b/net-misc/curl/curl-7.21.0.ebuild
similarity index 78%
rename from net-misc/curl/curl-7.20.0-r1.ebuild
rename to net-misc/curl/curl-7.21.0.ebuild
index 161752bfdcf12e3d0f65828f3ea72a6ee0f74a19..2bc94f8e99ccff459203538d5b61b1623e8777f6 100644 (file)
--- a/net-misc/curl/curl-7.20.0-r1.ebuild
+++ b/net-misc/curl/curl-7.21.0.ebuild
@@ -1,9 +1,11 @@
 # 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.20.0-r1.ebuild,v 1.1 2010/03/16 21:43:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.1 2010/07/01 20:14:54 spatz Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
+EAPI=2
+
 inherit multilib eutils
 
 #MY_P=${P/_pre/-}
@@ -16,7 +18,7 @@ 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 ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test"
+IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test threads"
 
 RDEPEND="ldap? ( net-nds/openldap )
        ssl? (
@@ -44,17 +46,20 @@ pkg_setup() {
                ewarn "USE='gnutls nss' are ignored without USE='ssl'."
                ewarn "Please review the local USE flags for this package."
        fi
+       if use ares && use threads; then
+               eerror "USE flags 'ares' and 'threads' are mutually exclusive,"
+               eerror "please disable one of them."
+               eerror
+               die "USE flags 'ares' and 'threads' both enabled"
+       fi
 }
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}"/${P}-strip-ldflags.patch
-       epatch "${FILESDIR}"/${PN}-7.19.7-test241.patch
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
+               "${FILESDIR}"/${PN}-7.19.7-test241.patch
 }
 
-src_compile() {
-
+src_configure() {
        myconf="$(use_enable ldap)
                $(use_enable ldap ldaps)
                $(use_with idn libidn)
@@ -62,6 +67,7 @@ src_compile() {
                $(use_with libssh2)
                $(use_enable ipv6)
                $(use_enable ares)
+               $(use_enable threads threaded-resolver)
                --enable-http
                --enable-ftp
                --enable-gopher
@@ -96,8 +102,6 @@ src_compile() {
        fi
 
        econf ${myconf} || die 'configure failed'
-
-       emake || die "install failed for current version"
 }
 
 src_install() {
@@ -106,9 +110,9 @@ src_install() {
 
        # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
        insinto /usr/share/aclocal
-       doins docs/libcurl/libcurl.m4
+       doins docs/libcurl/libcurl.m4 || die
 
-       dodoc CHANGES README
-       dodoc docs/FEATURES docs/INTERNALS
-       dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
+       dodoc CHANGES README || die
+       dodoc docs/FEATURES docs/INTERNALS || die
+       dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE || die
 }