Version bump

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

3 files changed, 138 insertions, 5 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 1acda299f345..22ecf163c3bb 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.191 2011/08/21 15:40:07 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.192 2011/09/17 08:55:15 angelos Exp $
+
+*curl-7.22.0 (17 Sep 2011)
+
+  17 Sep 2011; Christoph Mende <angelos@gentoo.org> +curl-7.22.0.ebuild:
+  Version bump
 
   21 Aug 2011; Christoph Mende <angelos@gentoo.org>
   +files/curl-respect-cflags-3.patch, curl-7.21.7-r2.ebuild:
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index b047d244a9f4..f2ca3be7e0b9 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -13,16 +13,18 @@ AUX curlbuild.h.ed 219 RMD160 745d3b5cb3613eab1b828fa5fcbee00b27856b86 SHA1 c8f9
 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
 DIST curl-7.21.7.tar.bz2 2319682 RMD160 c4c8afe66fb30be9eec8233c22db6d5beed00e39 SHA1 88aab0188ac86c3d13118bb5b6ee49a83e53b0ce SHA256 1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a
+DIST curl-7.22.0.tar.bz2 2337931 RMD160 c65a5f2c4454ec5be3db66d4816bd8c0fcc7a91a SHA1 8e7b2b0ca933812614ec0eade2f83e77632247d6 SHA256 bda0da862322b122784f5a9d7a65efdd99a6061292cfb8e9357e0c67c03e5112
 EBUILD curl-7.21.4.ebuild 3500 RMD160 da59518fe336b44075f2b93524fa48e57db94401 SHA1 3d318ddd125f1c6f723a9f96af895e74202808ce SHA256 a3c54ce1f7690fa7396236be7d2b247d4cd0ec9fe3b0ee8dc7b9c52261080de6
 EBUILD curl-7.21.6.ebuild 3491 RMD160 ff149e8b7243622e68984589b289914cce039ee3 SHA1 37e45a232c442d363460d6bcf06a50734a6f645e SHA256 2fe3323f68bd5e3a37bb06ab8d0a650ce467556e06233a776712a3e115f17c6d
 EBUILD curl-7.21.7-r2.ebuild 3716 RMD160 a3ef5e30a134b232bca6c9b273283fefef076f95 SHA1 196de6831df4b1065f0bda045a46cdddafa8c00b SHA256 27d0c8d72c7c13fcf1f9d0a40b5962e9e48cd9296140520c92b6326ac41109c0
 EBUILD curl-7.21.7.ebuild 3537 RMD160 d18c4326bd7b53625019add90b6e68cb03871442 SHA1 9d95054e41000a5d042e3df2dd7018367e696d09 SHA256 2fce4d8718548f70f1c7328cf922d31e038bfa7e68a3cec3cbc7046d6db10603
-MISC ChangeLog 32065 RMD160 619456a1e2fd9a02ee0a76dfaf0666d0734f0f74 SHA1 12f18548ff49543d24ac28a2a94e8a98ac2114d7 SHA256 66096d7010d62978c59278581bebae1f8bd986d9f7cf860a3e87d1154997f279
+EBUILD curl-7.22.0.ebuild 3663 RMD160 b24a22d183d99107ab732a6188b9d012cef7c8fa SHA1 125a26a785715d2c20ce7d70577956a22b079b51 SHA256 242bb8aa8c224d23969ddb2098c51083cdab6707314e41480aab20baeb428034
+MISC ChangeLog 32182 RMD160 1857a6b79306415d956f4433fa01778868544e7c SHA1 3b593b7ec99225a966a3d762de0bf80543d9f9a7 SHA256 381cc2735665ad8d43c144bfdd0905c6ffaddfcc437a2e8d695aefc15d305da2
 MISC metadata.xml 661 RMD160 01583b468ecdaef206cc2ed15da0a481e2f3b9c8 SHA1 2a3b2ebdc360ba87a1926b18f1ff3be5257565db SHA256 17dc3be94df3140e158ce615047e02a8604286c74bf33f62fe1aabd33c4a1890
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5RJtkACgkQmWq1bYTyC0N/RgD/aPmPvm80+IfUe3UnmC8kTJXO
-+p8Ts6bvcsa7dTDI1u8A/RzUWSEq9x4Se3rB+QkwsNgn6ubGOqtINvWuhoF0hpXZ
-=SKBj
+iF4EAREIAAYFAk50YG0ACgkQmWq1bYTyC0NnqwD/aFiObzfwQEor00D28xeDhki/
+xUKwxVDpnR+wL343lKMBALPh5DvX/i347IsvDXHib1cPX3PjHwIrTEL1aeb5Jy20
+=B9LP
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.22.0.ebuild b/net-misc/curl/curl-7.22.0.ebuild
new file mode 100644
index 000000000000..618293dc07fb
--- /dev/null
+++ b/net-misc/curl/curl-7.22.0.ebuild
@@ -0,0 +1,126 @@
+# 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.22.0.ebuild,v 1.1 2011/09/17 08:55:15 angelos Exp $
+
+EAPI=4
+
+inherit autotools multilib eutils libtool prefix
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/"
+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 static-libs test threads"
+
+RDEPEND="ldap? ( net-nds/openldap )
+	ssl? (
+		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 )
+	ares? ( >=net-dns/c-ares-1.6 )
+	kerberos? ( virtual/krb5 )
+	libssh2? ( >=net-libs/libssh2-0.16 )"
+
+# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
+# fbopenssl (not in gentoo) --with-spnego
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+	sys-apps/ed
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+# used - but can do without in self test: net-misc/stunnel
+
+# 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 )
+	nss? ( !gnutls )"
+
+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}-respect-cflags-3.patch
+
+	eprefixify curl-config.in
+	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_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-librtmp
+		--without-spnego"
+
+	if use ssl ; then
+		if use gnutls; then
+			myconf+=" --without-ssl --with-gnutls --without-nss"
+			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		elif use nss; then
+			myconf+=" --without-ssl --without-gnutls --with-nss"
+			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		else
+			myconf+=" --without-gnutls --without-nss --with-ssl"
+			myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
+		fi
+	else
+		myconf+=" --without-gnutls --without-nss --without-ssl"
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	default
+	ed - lib/curl_config.h < "${FILESDIR}"/config.h.ed || die
+	ed - src/curl_config.h < "${FILESDIR}"/config.h.ed || die
+	ed - include/curl/curlbuild.h < "${FILESDIR}"/curlbuild.h.ed || die
+}
+
+src_install() {
+	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
+
+	dodoc CHANGES README
+	dodoc docs/FEATURES docs/INTERNALS
+	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
+}