Version bump, restrict tests, bug #285669

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 203 insertions, 5 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 06496b2f42cc..81eef87c4bf4 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.218 2012/05/26 06:11:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.219 2012/05/26 13:42:11 blueness Exp $
+
+*curl-7.26.0 (26 May 2012)
+
+  26 May 2012; Anthony G. Basile <blueness@gentoo.org> +curl-7.26.0.ebuild:
+  Version bump, restrict tests, bug #285669
 
   26 May 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.25.0-r1.ebuild:
   Change dependency name net-libs/axTLS -> net-libs/axtls
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 8fa85483db62..bb556669b3db 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -18,6 +18,7 @@ DIST curl-7.22.0.tar.bz2 2337931 RMD160 c65a5f2c4454ec5be3db66d4816bd8c0fcc7a91a
 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
 DIST curl-7.25.0.tar.bz2 2418060 RMD160 e35b46a17fc2fc2a23fd12ed9488cc753bd941c5 SHA1 f6016a24051d98806ca3ddf754592701cb66e00c SHA256 cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491
+DIST curl-7.26.0.tar.bz2 2422651 RMD160 90d66cd2f77bf825ba01056f4f384ff74e7b04eb SHA1 c2e62eaace2407d377bf544d1f808aea6dddf64c SHA256 fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a
 EBUILD curl-7.21.4.ebuild 3514 RMD160 26928153ad4f83eaf306003c321cfbc97ebea882 SHA1 e5b9ab7b4c1a0073eed125a77d6fd564fb7d8590 SHA256 90020645c61c93a010fc61c020179e42ebcea70ee191fc8d18ac45916d99a328
 EBUILD curl-7.21.6.ebuild 3503 RMD160 ea0de18ac7a552cad6b1ebc2f9e302b4b1f96609 SHA1 a2ccad5589036fb9f954260ca630921016b46157 SHA256 2108f8a2705f38492490726262a5813427725b5ff34440003337f98c3299c10a
 EBUILD curl-7.21.7-r2.ebuild 3730 RMD160 b7ab9f117588f0996de6c58fa4134c4855b96a8f SHA1 8bd0db87537e74d5fb64718cd031d5294f292650 SHA256 d103f314e1e69d6136428d15ff6bb559de18dae923973e6df5cdb82775d60d40
@@ -27,12 +28,13 @@ EBUILD curl-7.23.1.ebuild 3703 RMD160 8c01615c2c3651c06cdcb9e143c03a14dfbce9ce S
 EBUILD curl-7.24.0.ebuild 3726 RMD160 9395edbd56508b98047ab1663be819d85519f141 SHA1 1b6f0aeb9a81a805370ef2d1a1c76b5ace9fa711 SHA256 ae2afb4021a571cfdbeffa2705b8a202d303b3101176908b6563324ff40969f1
 EBUILD curl-7.25.0-r1.ebuild 6027 RMD160 4fffdd69731d167b35df573105db531e6906efa4 SHA1 9a660916238e43ddb9f972b58f6cfb6f6bab3320 SHA256 460abe074fefb3fbbd4e384d8e527a5ce29fcbb66ffb71dc7d9e467c0f01f0de
 EBUILD curl-7.25.0.ebuild 4724 RMD160 8e30d9177ca93545756db8e7fc79eb972b449654 SHA1 05fda85730db96288043346978857954e5dd388d SHA256 4820124df447d3aad711fb7709fcf185fc5ae1163956e556437cc9862fedd7b5
-MISC ChangeLog 36009 RMD160 6cebad9821d42766b065fa919deb8ffbfd996204 SHA1 2cbb618228a0459466cc9974f8fb17ab2f07f328 SHA256 8eb4e65b860afc0e952f87b7dc3baca0b6f66de6a0e557771658a216de506006
+EBUILD curl-7.26.0.ebuild 6042 RMD160 408ee119188aea4e163b35481a78bc03acd55b9e SHA1 4adac2c3c2ddb649b0cb2cc45879d5d70f92c2d1 SHA256 7add94efe44d87e7f6c945054c9f3923a7cab74e5234f6d27f7310aada526022
+MISC ChangeLog 36158 RMD160 0366e99f19a7186485a37316ca3e6f479987309e SHA1 9f6ecd8f6fe70a06def122b78c0588775c54700a SHA256 55aa59e29200022fd96b172e24b316e2ddadb46e2b2c17183e861a5b5761b431
 MISC metadata.xml 741 RMD160 6461e1dadf405f3d3bb619386bc2a3760ef777c2 SHA1 c3232f9c75c8a2999bb35ada343b8c69ba2d61ba SHA256 fac785fc33b177d6a7ce27f38f3bfd10b6d2a98b7f8856269ef033bc19fd592d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk/AdCcACgkQl5yvQNBFVTXArwCfU5hGKtyQoyso+BOcqRdzPqoj
-sZkAnA4dP1KnMRQR47AQ1zLVJQhpCcgo
-=a0xg
+iEYEAREIAAYFAk/A3b0ACgkQl5yvQNBFVTXPMgCfbUzdh8pFH+Yj1LuoFwh9HhJP
+hh8An3LIUcceowiU7/yoAvSZy1SlkNb1
+=2Dr4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.26.0.ebuild b/net-misc/curl/curl-7.26.0.ebuild
new file mode 100644
index 000000000000..fa4efedc56de
--- /dev/null
+++ b/net-misc/curl/curl-7.26.0.ebuild
@@ -0,0 +1,191 @@
+# 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.26.0.ebuild,v 1.1 2012/05/26 13:42:11 blueness 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 ~amd64-fbsd ~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 idn ipv6 kerberos ldap ssh ssl static-libs test threads"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap )
+	ssl? (
+		curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates )
+		curl_ssl_gnutls? (
+			|| (
+				( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
+				( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
+				( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] )
+				( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] )
+			)
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? ( dev-libs/openssl[static-libs?] )
+		curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
+		curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates )
+	)
+	idn? ( net-dns/libidn[static-libs?] )
+	ares? ( net-dns/c-ares )
+	kerberos? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2[static-libs?] )
+	sys-libs/zlib"
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+	sys-apps/ed
+	virtual/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
+# only one ssl provider can be enabled
+REQUIRED_USE="threads? ( !ares )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_cyassl
+			curl_ssl_gnutls
+			curl_ssl_openssl
+			curl_ssl_nss
+			curl_ssl_polarssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
+		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
+		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+src_configure() {
+	einfo "\033[1;32m**************************************************\033[00m"
+
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	local myconf=()
+	myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl )
+	myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			einfo "NOTE: axtls is meant for embedded systems and"
+			einfo "may not be the best choice as an ssl provider"
+			myconf+=( --with-axtls )
+		fi
+		if use curl_ssl_cyassl; then
+			einfo "SSL provided by cyassl"
+			einfo "NOTE: cyassl is meant for embedded systems and"
+			einfo "may not be the best choice as an ssl provider"
+			myconf+=( --with-cyassl )
+		fi
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
+				einfo "gnutls compiled with dev-libs/nettle"
+				myconf+=( --with-gnutls --with-nettle )
+			else
+				einfo "gnutls compiled with dev-libs/libgcrypt"
+				myconf+=( --with-gnutls --without-nettle )
+			fi
+		fi
+		if use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		fi
+		if use curl_ssl_polarssl; then
+			einfo "SSL provided by polarssl"
+			einfo "NOTE: polarssl is meant for embedded systems and"
+			einfo "may not be the best choice as an ssl provider"
+			myconf+=( --with-polarssl )
+		fi
+		if use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+	einfo "\033[1;32m**************************************************\033[00m"
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	econf \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--enable-pop3 \
+		--without-librtmp \
+		--enable-rtsp \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		$(use_enable ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--enable-manual \
+		--enable-nonblocking \
+		--enable-proxy \
+		--disable-soname-bump \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		--disable-versioned-symbols \
+		$(use_with idn libidn) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		--without-krb4 \
+		--without-spnego \
+		--with-zlib \
+		"${myconf[@]}"
+}
+
+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
+}