Version bump to the latest.

Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64

3 files changed, 44 insertions, 42 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index be146c65c91c..55307bcba1b3 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.173 2011/02/20 14:22:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.174 2011/05/23 08:51:20 scarabeus Exp $
+
+*curl-7.21.6 (23 May 2011)
+
+  23 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> -curl-7.21.3-r1.ebuild,
+  +curl-7.21.6.ebuild:
+  Version bump to the latest.
 
   20 Feb 2011; Ulrich Mueller <ulm@gentoo.org> curl-7.21.4.ebuild:
   Rewrite REQUIRED_USE in more compact way, as discussed with scarabeus.
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 0fc91e4123d1..6d529360465c 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -8,17 +8,17 @@ AUX curl-7.20.0-strip-ldflags.patch 419 RMD160 9373e95129812c9da74e1dafed33adcfe
 AUX curl-7.21.3-buffer-overflow.patch 989 RMD160 ea64233b178efa76c32f973dfbc3e187ac8fd1f8 SHA1 12ef4552365429c33f47caf8d1b53a798b297d0f SHA256 2ad98337ac65fa7a5b16fa03c8b8010dad06350c935893732393445f15d4d520
 AUX curl-respect-cflags.patch 8180 RMD160 027b43d8fe11b5635af8473a4236cd483f6dadee SHA1 72d4829a2eac9b7f33343140ae0104fa3c796496 SHA256 fc9ac005a904efe408901cf2ee29359056bb1e49fe51a771377bedbae19bc665
 DIST curl-7.20.0.tar.bz2 2088522 RMD160 9418ab686551af58df84960277868c77836d6817 SHA1 89215fc4c4cd1e42134d6117255c401372e628de SHA256 eb516915da615d8f6b2b855004d5d4b19c468f080e3736d7a73c5599b9acab11
-DIST curl-7.21.3.tar.bz2 2194975 RMD160 775911baee866dd6697ba91996dcc37eba69ba40 SHA1 24a551e3653b91f883638a6ecec1582ae3022f9f SHA256 4fa554c56fdb09c299185a2c4c94416560e42a7e40655335f327e4d67c48bc39
 DIST curl-7.21.4.tar.bz2 2256354 RMD160 c18710206d30a0f1078b2156df25ded30443f7cf SHA1 9cc59be07932b63e1f7d714c56ffaaa92af55373 SHA256 d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1
+DIST curl-7.21.6.tar.bz2 2311355 RMD160 25741abc0ec79d6f0da249aa50d310397bb92d17 SHA1 049a3aff13d283f6e4ea1f9aa3aa6abc067fd42e SHA256 d9a3d3593796147ad9ca994c9e6834a42b49756420a10e996dbf849495d3d955
 EBUILD curl-7.20.0-r2.ebuild 3179 RMD160 14c6f1199f9e9761b16a49305e7662b54480cc5f SHA1 1045c7db6f92ab99d6eb6b753d2fd60aafafc9e3 SHA256 7d5508d6598a883ff9712eee2641b8326266bf83ba13fc8b3bea5ffe06950e8c
-EBUILD curl-7.21.3-r1.ebuild 3869 RMD160 16a9e0ff40225bf20d2ce89975b3d38347c37b3d SHA1 ecc6d390c14e8afa61bd64d6bf5813f0b88d921d SHA256 c460d93f8ae983818edd50383bf5dd0fd59d7fcec1c5e254badbe1a8ee025e34
 EBUILD curl-7.21.4.ebuild 3506 RMD160 6846bf3466c0fc5d34fbc38e72b986627e073421 SHA1 41accd4f07cfb0709c21318ab1fa3ccb685f34da SHA256 12843b2e5de23ede25d332f9d900573527d7754280996d5e226ce6f645f37436
-MISC ChangeLog 29553 RMD160 196974dc6967659083372f93bd49913518134c60 SHA1 6a8f22cb741f3c82ace9a077ce29f78d436b26ee SHA256 41faace378bb6882e95f5ca44ba0ff03bd9d94104e83713b9d8142affdf2f5e9
+EBUILD curl-7.21.6.ebuild 3491 RMD160 ff149e8b7243622e68984589b289914cce039ee3 SHA1 37e45a232c442d363460d6bcf06a50734a6f645e SHA256 2fe3323f68bd5e3a37bb06ab8d0a650ce467556e06233a776712a3e115f17c6d
+MISC ChangeLog 29720 RMD160 76e396cf2d4da69c94a225424a0c25db0076f992 SHA1 ab8b81d5eb51246dfb92437e5d697257291955b5 SHA256 a6d604439a3d97a3e3bde7d8da3dd9f1facb27d1219adfb0e7ecc0d6ed91717e
 MISC metadata.xml 632 RMD160 880f74804f58930ece5181aec729c39d3a5827e2 SHA1 f576b1b42403cde8c506d0deec8ba52634459389 SHA256 9d71150a8a4f182f5d6a9f9a33161ef0944437bec38fd05857dea2972f294d7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1hJT4ACgkQOeoy/oIi7uyORgCeIwWYIXCn1VtHj0PnAzUgLvWV
-75sAoMvJ+MXbZEKqxzEweUEXXV4X0nei
-=raXo
+iEYEARECAAYFAk3aIA0ACgkQHB6c3gNBRYc4rACdH/wUG3y8c5PO5WcbCoe/WNq6
+gUwAn3QC5L4fuCDMLnfaaTFvbHpNoMci
+=9JIk
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.21.3-r1.ebuild b/net-misc/curl/curl-7.21.6.ebuild
index 07f59b17d728..01c3ca7fec7e 100644
--- a/net-misc/curl/curl-7.21.3-r1.ebuild
+++ b/net-misc/curl/curl-7.21.6.ebuild
@@ -1,32 +1,30 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.3-r1.ebuild,v 1.1 2011/02/19 17:23:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild,v 1.1 2011/05/23 08:51:20 scarabeus Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
-EAPI=3
+EAPI=4
 
-inherit multilib eutils libtool prefix
+inherit autotools multilib eutils libtool prefix
 
-#MY_P=${P/_pre/-}
 DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="http://curl.haxx.se/"
-#SRC_URI="http://cool.haxx.se/curl-daily/${MY_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 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test threads"
+IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads"
 
 RDEPEND="ldap? ( net-nds/openldap )
 	ssl? (
-		gnutls? ( net-libs/gnutls app-misc/ca-certificates )
+		gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
 		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
 		!gnutls? ( !nss? ( dev-libs/openssl ) )
 	)
 	idn? ( net-dns/libidn )
-	!threads? ( ares? ( >=net-dns/c-ares-1.4.0 ) )
+	ares? ( >=net-dns/c-ares-1.4.0 )
 	kerberos? ( virtual/krb5 )
 	libssh2? ( >=net-libs/libssh2-0.16 )"
 
@@ -41,37 +39,34 @@ DEPEND="${RDEPEND}
 	)"
 # used - but can do without in self test: net-misc/stunnel
 
-pkg_setup() {
-	if ! use ssl && ( use gnutls || use nss ) ; then
-		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
-		ewarn "USE flags 'ares' and 'threads' are mutually exclusive,"
-		ewarn "disabling 'ares', please review and re-emerge if needed."
-	fi
-}
+# ares must be disabled for threads and both can be disabled
+# one can use wether gnutls or nss if ssl is enabled
+REQUIRED_USE="threads? ( !ares )
+	gnutls? ( ssl )
+	nss? ( ssl )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
 		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
 		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-7.21.3-buffer-overflow.patch
+		"${FILESDIR}"/${PN}-respect-cflags.patch
 
 	eprefixify curl-config.in
-	# for FreeMiNT
-	elibtoolize
+	eautoreconf
 }
 
 src_configure() {
+	local myconf
+
 	myconf="$(use_enable ldap)
 		$(use_enable ldap ldaps)
 		$(use_with idn libidn)
 		$(use_with kerberos gssapi "${EPREFIX}"/usr)
 		$(use_with libssh2)
+		$(use_enable static-libs static)
 		$(use_enable ipv6)
 		$(use_enable threads threaded-resolver)
-		$(use threads && echo --disable-ares || use_enable ares)
+		$(use_enable ares)
 		--enable-http
 		--enable-ftp
 		--enable-gopher
@@ -93,31 +88,32 @@ src_configure() {
 
 	if use ssl ; then
 		if use gnutls; then
-			myconf="${myconf} --without-ssl --with-gnutls --without-nss"
-			myconf="${myconf} --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+			myconf+=" --without-ssl --with-gnutls --without-nss"
+			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
 		elif use nss; then
-			myconf="${myconf} --without-ssl --without-gnutls --with-nss"
-			myconf="${myconf} --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+			myconf+=" --without-ssl --without-gnutls --with-nss"
+			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
 		else
-			myconf="${myconf} --without-gnutls --without-nss --with-ssl"
-			myconf="${myconf} --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
+			myconf+=" --without-gnutls --without-nss --with-ssl"
+			myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
 		fi
 	else
-		myconf="${myconf} --without-gnutls --without-nss --without-ssl"
+		myconf+=" --without-gnutls --without-nss --without-ssl"
 	fi
 
-	econf ${myconf} || die 'configure failed'
+	econf ${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "installed failed for current version"
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
 	rm -rf "${ED}"/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 || die
+	doins docs/libcurl/libcurl.m4
 
-	dodoc CHANGES README || die
-	dodoc docs/FEATURES docs/INTERNALS || die
-	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE || die
+	dodoc CHANGES README
+	dodoc docs/FEATURES docs/INTERNALS
+	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
 }