net-misc/curl-7.37.0-r1

Turns out that the old curl library path avoidance hacks no longer cut
it.  Rather than adding more and more such hacks to this ebuild, go
ahead, bite the bullet, and add the hack I've been avoiding --
export LDFLAGS+=-L${EPREFIX}/usr/$(get_libdir) on a per-abi basis,
except for the native abi, during multilib_src_configure

This allows us to at least revert all the other hacks.  Bleh, wtf is
wrong with curl that this is needed?

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 40 insertions, 11 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 029b87f..4a69fd2 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.356 2014/04/21 10:50:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.362 2014/05/21 06:56:50 blueness Exp $
+
+*curl-7.37.0 (21 May 2014)
+
+  21 May 2014; Anthony G. Basile <blueness@gentoo.org> +curl-7.37.0.ebuild:
+  Version bump
+
+  14 May 2014; Anthony G. Basile <blueness@gentoo.org> -curl-7.35.0.ebuild:
+  Remove vulnerable version, bug #505864
+
+  14 May 2014; Agostino Sarubbo <ago@gentoo.org> curl-7.36.0.ebuild:
+  Stable for sparc, wrt bug #505864
+
+  13 May 2014; Agostino Sarubbo <ago@gentoo.org> curl-7.36.0.ebuild:
+  Stable for ia64, wrt bug #505864
+
+  11 May 2014; Agostino Sarubbo <ago@gentoo.org> curl-7.36.0.ebuild:
+  Stable for ppc64, wrt bug #505864
+
+*curl-7.36.0-r1 (29 Apr 2014)
+
+  29 Apr 2014; Anthony G. Basile <blueness@gentoo.org> +curl-7.36.0-r1.ebuild:
+  Add WinSSL support to build against elibc_Winnt, bug #508808
 
   21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> curl-7.36.0.ebuild:
   Stable for alpha, wrt bug #505864
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index c74996d..a65a750 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,6 +5,6 @@ AUX curl-7.36.0-hostcheck.patch 652 SHA256 92f25ef025037a1bf7823b4d136f00c548bae
 AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
 DIST curl-7.37.0.tar.bz2 2870197 SHA256 24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239b3e09e SHA512 67f0eafec79790753227e31c875f62e760041d5053d368a189d84ea4ef764112b87f17504e33d1e8d5212966d34ef0cc5626139857d9384cfa7b7ed55bfd0639 WHIRLPOOL 25c328e4246779db1d877f7ace0bf7859e8834b0f6f25a2203e249c9227a90f6552eebe2ad5940ab004136bbe96ff768b65658e74216e17b13cfcc2abc9c38a4
-EBUILD curl-7.37.0-r1.ebuild 7258 SHA256 f8f686a3754ae9fc799b5eb8c65cddbcfdf9a150c184f91829db216f97ab1620 SHA512 98f4fbfe3519bcfc9fbd3e6c7f66bb20e6b7167d10a443f171686b04b9405cfc7c1d6d8e4383f35d55693e5bc7844a5698d3c0436a21a1091fc8cc2a325f9991 WHIRLPOOL f8681c231290071ed0331bd0e8e18309f0bed15600cb3ecc148ec471efc5a6d9c05094d8afa19e42fcb802afb9cf9713103d8484e79d57a7a9a966599d3b03dc
-MISC ChangeLog 53571 SHA256 ea0a5611d94ab4451cb24c5acaa5fdd993965f7cfdde56541b60d458ddb2887f SHA512 e41f00eb0d8eaac31a0c9f2f90a1bad7bd50e1e3c1a6174d9eba24d17b76eb54deecad19dcd78ec76f79b99a6c3e96cf6bf58e8b6b43a630a092b4c3151c9dd2 WHIRLPOOL fcbe9a77e0c958c407c30cedea222600b84eee81ce512ccd4ec74b62a1519dc506439fbc3f8ef38b1383cca098a844c4c7b3a08ae9c5e48438088be0e00c8e8f
+EBUILD curl-7.37.0-r1.ebuild 7450 SHA256 2c0ccc7e71aeb85cf75eaa7a8edc3ba01c43723ae37c6f6ada1d8cc51f7f901e SHA512 97ffff72fb9ea0697a8dbfd3cefdceb79d92956c0c6773a791383489276c2b1234688dd0b123547a73b44253da03a3f445b57648b599c4de6ccc952839d9ff05 WHIRLPOOL 127ef0472fe8790950a9f8b18a59b688b03cae0ee62abf5fea5d6547932c8a96e2b05b0022da0f855f122ff6a4864b516cc40f6bddce4dff0fbd564b3c344f30
+MISC ChangeLog 54305 SHA256 fbb5322a0a731580145be3810e0442ec0c849f46f611ad4d264badf4184c725a SHA512 22d7109e8156b0682a6125919c4b709965be436f37d72e07c59a0a14b84198e6d9853d80338e3d076f0bb5fa02729c19a3620a4416182112a8aefa404387f781 WHIRLPOOL fec05dc345fff9c7e4e698e00f951907f540c60f49742ade0431f375eb180208c5c5c6b047d61d58da4f657c445a69385b541d8f101102a92e2ea57296c3de17
 MISC metadata.xml 868 SHA256 df66fe73acfdaff0fda0595656e112e6cfd4aebde2c52237c868c8031306e12e SHA512 a948ea9d372475d680c6f6fe4617ea5151d4378b1d5ea09e0566a88e403c9ed0a562c5426340bb1b03cf58a99c1f22411973bf215aa37ce8d30662a0e0101e4b WHIRLPOOL 0e058b6bb29d6c997a36a2563402b969b6dfa06912c3f8b854f8d89eb4113aa7fb376594ac0c756f1b59b3080aa508dab09426a9dfa982de56733f097baf9f37
diff --git a/net-misc/curl/curl-7.37.0-r1.ebuild b/net-misc/curl/curl-7.37.0-r1.ebuild
index b3e9a2b..373f3ac 100644
--- a/net-misc/curl/curl-7.37.0-r1.ebuild
+++ b/net-misc/curl/curl-7.37.0-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 		curl_ssl_openssl? ( dev-libs/openssl[static-libs?,${MULTILIB_USEDEP}] )
 		curl_ssl_nss? ( dev-libs/nss[${MULTILIB_USEDEP}] app-misc/ca-certificates )
-		curl_ssl_polarssl? ( net-libs/polarssl[${MULTILIB_USEDEP}] app-misc/ca-certificates )
+		curl_ssl_polarssl? ( net-libs/polarssl:=[${MULTILIB_USEDEP}] app-misc/ca-certificates )
 	)
 	idn? ( net-dns/libidn[static-libs?,${MULTILIB_USEDEP}] )
 	adns? ( net-dns/c-ares[${MULTILIB_USEDEP}] )
@@ -95,6 +95,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
 		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
 		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
 	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
 
 	epatch_user
@@ -108,7 +109,7 @@ multilib_src_configure() {
 	# 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  --without-winssl )
+	myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
 	myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
 	if use ssl ; then
 		if use curl_ssl_axtls; then
@@ -127,12 +128,10 @@ multilib_src_configure() {
 			einfo "SSL provided by gnutls"
 			if has_version ">=net-libs/gnutls-3[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then
 				einfo "gnutls compiled with dev-libs/nettle"
-				# prevent configure from getting mixed up in non-native ABI targets
-				myconf+=( --with-gnutls="${EPREFIX}"/usr/$(get_libdir) --with-nettle="${EPREFIX}"/usr/$(get_libdir) )
+				myconf+=( --with-gnutls --with-nettle )
 			else
 				einfo "gnutls compiled with dev-libs/libgcrypt"
-				# prevent configure from getting mixed up in non-native ABI targets
-				myconf+=( --with-gnutls="${EPREFIX}"/usr/$(get_libdir) --without-nettle )
+				myconf+=( --with-gnutls --without-nettle )
 			fi
 		fi
 		if use curl_ssl_nss; then
@@ -147,8 +146,7 @@ multilib_src_configure() {
 		fi
 		if use curl_ssl_openssl; then
 			einfo "SSL provided by openssl"
-			# prevent configure from getting mixed up in non-native ABI targets
-			myconf+=( --with-ssl="${EPREFIX}"/usr/$(get_libdir) --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+			myconf+=( --with-ssl --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
 		fi
 		if use curl_ssl_winssl; then
 			einfo "SSL provided by Windows"
@@ -159,6 +157,15 @@ multilib_src_configure() {
 	fi
 	einfo "\033[1;32m**************************************************\033[00m"
 
+	if ! multilib_is_native_abi ; then
+		# see docs/FAQ.  However, I find it very hard to accept that this is not libcurl's fault, as libcurl
+		# seems to be the ONLY package on God's green Earth that needs this comically stupid fucking hack.
+		# I suppose a proper solution is to figure out what is wrong with configure.in, and try to help
+		# upstream to merge some kind of reasonable solution to whatever the underlying problem is.  Until then...
+		local LDFLAGS="-L${EPREFIX}/usr/$(get_libdir) ${LDFLAGS}"
+		export LDFLAGS
+	fi
+
 	# 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: