Version bump #400799.

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

3 files changed, 145 insertions, 15 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 63f43095117d..f6277a07cd67 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.197 2012/01/26 19:20:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.198 2012/01/26 19:41:53 vapier Exp $
+
+*curl-7.24.0 (26 Jan 2012)
+
+  26 Jan 2012; Mike Frysinger <vapier@gentoo.org> +curl-7.24.0.ebuild:
+  Version bump #400799.
 
   26 Jan 2012; Mike Frysinger <vapier@gentoo.org> curl-7.21.4.ebuild,
   curl-7.21.6.ebuild, curl-7.21.7.ebuild, curl-7.21.7-r2.ebuild,
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index dd635923a27a..4c918a3d0c74 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -15,28 +15,30 @@ DIST curl-7.21.6.tar.bz2 2311355 RMD160 25741abc0ec79d6f0da249aa50d310397bb92d17
 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
 DIST curl-7.23.1.tar.bz2 2376653 RMD160 96c45f38361d04a939e135c9e5fcf27ca1180abe SHA1 9bac69696446ead85e59d8488098ee84cf897b7e SHA256 7d8c8cef8f244118245c37853cb175bd95c156ff453730ec2c88189b05a7c06e
+DIST curl-7.24.0.tar.bz2 2406936 RMD160 b2b3116318813478b4683ae479cb889c4fc05cea SHA1 2f2775a67de9fc91b47f5bb70fb7d359f7db55e7 SHA256 ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16
 EBUILD curl-7.21.4.ebuild 3515 RMD160 99c08bbdab085247d1cf46f8768417403f33619f SHA1 341fb3e20dc55f1080b62b9e183f2b92e25d5b68 SHA256 b8608bdec765d38e419aeb640d15996288871e58b3139d2d1674b0ed39509fda
 EBUILD curl-7.21.6.ebuild 3504 RMD160 af8d1df0541e6add51a20d016f1927b88830b774 SHA1 95bc7503c2d1c8d5c2e53c8e6951c08269b5e9bf SHA256 82e8fd80c4bd111396a07512489412b0b20ec05be44e9905535671637ce38016
 EBUILD curl-7.21.7-r2.ebuild 3731 RMD160 956ebed98bbb739aea22067a4427bcc8ca2fda9b SHA1 5ecb7c583b2567710209b98977a88a053c3b296a SHA256 caed8ecdb3c028e732c9e49dd66756df44de1b8547f3f25a48502d99f00405eb
 EBUILD curl-7.21.7.ebuild 3552 RMD160 9c6603e702433d9a0d1b7175690c3e601545e694 SHA1 bfa2c7e0fde2e0ae9af02f2ec1640bcd04f4223f SHA256 bd27fe936c8bc62e86afa3c42dbb36a5f3651a14ad8f2e39dd4c21a036ef2cad
 EBUILD curl-7.22.0.ebuild 3623 RMD160 f8c1b529548f6ca91d02fb433ee09018a55905c3 SHA1 5a0976b5674f5eb06553dcd8be7d7e879eb959a5 SHA256 1a8ec1b6d7ac6de349cc8fcbc7314752a1fbbb5ba6eff5ca75ca53936683aaa2
 EBUILD curl-7.23.1.ebuild 3704 RMD160 ba889eed9125b675446bc3bc4bd92813f14e5bae SHA1 01849e67262e0370d334ef665351d1ea3c00c564 SHA256 597b4979e67cef1e945fdf711e16270092805045ae13184072c02057f48bf0d6
-MISC ChangeLog 33182 RMD160 11eca9372892b260fa0e0cd3152700596858e5c0 SHA1 2e2dc2803d7ed73c414d521fe79c467f842c37fb SHA256 5a98a4b98ee2c3ebce3c00a36b1947daacc69b8c67cc9e9cb52086b36aba870f
+EBUILD curl-7.24.0.ebuild 3737 RMD160 ebe182850d413c15c9d4289a6cd83641c17d4723 SHA1 f6c50b01c7108dbb11beff9280fea759751b4874 SHA256 ff8dfee82367d04320c2c6102abff2fc9375062f8f02fce2307beee7faaf0fdf
+MISC ChangeLog 33306 RMD160 aa85a79b347acc2744adb5d1f57ff8b9aac724d7 SHA1 038b36bc3d9b431be3a8cf8851f56f86d8bfc0fc SHA256 f883ad652fe2b085d2f8eaab4e2caacd0c2e0f5f93c9452fa3054fdc7bfe0bdc
 MISC metadata.xml 634 RMD160 0ab808e27fb759016357631bd78a6c2716cc4b09 SHA1 88b81601958d6474e542f4c2ca0b4d54ece55500 SHA256 41048ab9db0fac2e2885cdb2c611f855452f59e2e8f4d5e2fc5fa38472d567aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPIae2AAoJELEHsLL7fEFW11gP/jJFDhSTYtIgGauCKKf2kWoQ
-TyxI6D7mGFSekBFMwk+gQRJVAt+oJvXOaTs3FsoLmuvIeUSQ1m3c2T4Ye1N+26sS
-WVaKdnGsn8a47+GsIltx3Ajec9epuQ5BauEOhtWmcDM4f5XBvbjkEQbGJ2dRbLXe
-b0eR4wH6Px03sYe0KGS+jG1vLIs5HJTEEDNUtzb0TmSxAONdSgoza2V4vXNn3oni
-NBtNC2Y0Y0SuIENXPmOeiS3tvBmQBXauYik/DCdcLXoBwPjC58g7lxg46s5oEXSL
-3J5SKyLOiZSEdD2PXrFmZQhM4aIvu+42WrO0eJmC0D5FFBlrHDQ2KNZgS/XdpgdE
-gxiqDAOfbR0IN/+luy8h5wGQ7XYUAzRW3OBv4kyPOi4My1tv4Hq/o9Iqt5uV/098
-3pYlJK0In0S0MOkoT0zy3lUw/z1dy8Erf7zUDsbYj7PhxAAA1NXjxrZ2K13rp6xk
-KqdVmuAPXtEiAq7OdeDXA97SjcD1ZvS45YwaTgbDJYHUXdUHe55Je7ppFhIrHWIJ
-QUwkESNfHolItZnVX6VAkO7A86KvEyOdHyxXt30BBfG5/X1AtaWORsfk9j9wmwPc
-nEyo5URlmtVjr/JpWLs2GUIlRVAV+zTb1vLyIeAgu2KCu4mB6R/rfPlnoCpQO8av
-qrJzzcN1VplQKmznQ6CL
-=1kod
+iQIcBAEBAgAGBQJPIay7AAoJELEHsLL7fEFWaZcP/RY+erI4XvvopVDiBk7mRp76
+0wkglE82HKO6k/I5jQJyscC6D/jcI5sdC36pD3dhOJHOK/9T3GY/qdrC/n/8K1vx
+Bgh/EgnjozJSWV77K1bbtsWa8yCu1dNNuCXPvVM9l4FaqzoKgQ7mqU8WlCNr8wxW
+8SC07k3IHFibzSNxFcAB5nLcbGnbzfFVNPK9m3515Pieo+wW/B+RPPnagVxBAVT6
+aScn6GHKt49wcBKJd36kCIi3PE+ep6BLWdkGnnf3dVnZM7TnKanePur+10JlVuJ5
+AF6AQCOdb7slY01nDivV4mEsXhYK7Y1Hgrk7TQVsx4E5m30mhjeR5auNuRPm2HY8
+XfklmmacZ85fCCJ8VL7X343X0FzzsmMpxCrE7/WAVcADQiyds61I923Mcvcho5o7
+G9G/eahq2d8nCapNagJssCg7Bd8HOV2BFruJGEFPXSkBGbyAgCwIZFZReI2Ocn0E
+Xd+MoQMY7EA55Rfd4N/THD7fzkuTQ7gAH97WY5NoiS7ZgFm4CA3k93It8Gv7J2Yk
++9ClyWBS/xJAmg/6uZHoLIfMpk662g5/IZUJT8wdTFzyN6vY6fylL/UPuTZopvKO
+/Z5mrAUgKF1nGYw6L+aujB/62qy5xHvmrjTxE5xHPvP0CBSAQ5KiHNj+L825xUxB
+PoO8z8eVz/wucd0tehOb
+=RnXc
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.24.0.ebuild b/net-misc/curl/curl-7.24.0.ebuild
new file mode 100644
index 000000000000..1b92f6882ea6
--- /dev/null
+++ b/net-misc/curl/curl-7.24.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.24.0.ebuild,v 1.1 2012/01/26 19:41:53 vapier Exp $
+
+EAPI="4"
+
+inherit autotools eutils 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 nss ssh ssl static-libs test threads"
+
+RDEPEND="ldap? ( net-nds/openldap )
+	gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
+	ssl? ( !gnutls? ( dev-libs/openssl ) )
+	nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) )
+	idn? ( net-dns/libidn )
+	ares? ( >=net-dns/c-ares-1.6 )
+	kerberos? ( virtual/krb5 )
+	ssh? ( >=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
+	dev-util/pkgconfig
+	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 )
+	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
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use gnutls; then
+		myconf+=( --without-ssl --with-gnutls    --without-nss )
+		myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+	elif use ssl; then
+		myconf+=( --with-ssl    --without-gnutls --without-nss )
+		myconf+=( --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+	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-ssl --without-gnutls --without-nss )
+	fi
+
+	econf \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		$(use_with idn libidn) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with ssh 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 \
+		"${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' -delete
+	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
+}