Override faulty curl ssl detection in setup.py, bug 510974 by Hanspeter Spalinger.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 25 insertions, 10 deletions

diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog
index ea9bfbf3dced..6b89b1df8ed1 100644
--- a/dev-python/pycurl/ChangeLog
+++ b/dev-python/pycurl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pycurl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.93 2014/05/17 14:47:05 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.94 2014/05/28 15:20:44 floppym Exp $
+
+  28 May 2014; Mike Gilbert <floppym@gentoo.org> pycurl-7.19.0-r3.ebuild,
+  pycurl-7.19.3.1.ebuild:
+  Override faulty curl ssl detection in setup.py, bug 510974 by Hanspeter
+  Spalinger.
 
   17 May 2014; Ian Delaney <idella4@gentoo.org> pycurl-7.19.3.1.ebuild:
   restrict test due to extensive keyword deficits in new test deps
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 49b0296082fc..33ef4f3e2c41 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -8,15 +8,15 @@ DIST pycurl-7.19.0.tar.gz 71346 SHA256 eb782dfcc5a7c023539a077462b83c167e178128e
 DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296
 EBUILD pycurl-7.19.0-r1.ebuild 1921 SHA256 4f2c354d7c8239438b14695744f4d9757232aefc07ad69c9ab94848527d2fbb6 SHA512 f83d41674b60c720be6283568c7dc83c5e87aaf018bead5dfcfe4ece4ac5bc2529acf6e88e8d0ef8d91adf2f34770ab6b2ea05b817f6446d3cf363f2f19575ad WHIRLPOOL 0f0fa88c99616239141e70f8c28a2b168affc41dece3c394fb51fd075da1c64c7d0fd58c842a554c96e2870479cb80a58c997ee352c219ea8dfe58c09cde5eec
 EBUILD pycurl-7.19.0-r2.ebuild 1832 SHA256 0da115f7447c70bbe846152cfc8f986c5569e62684b993aa0fcecde37f941fbb SHA512 75fa9a99963193ff177afe7e25cde89f9bd67b81b3bb2ee01ee8b8675d2936f42008082fc886528a675d7fbe5932f8e8b7dfd169515296d45b2d6fc6a09807b2 WHIRLPOOL f22d14602451c27a0b9c53898b372e1456b93e098f2d27d3cd8615f11fef21507777bc7d850b8c55a682982e45628859d46059c44850800ce768adce40a9a77c
-EBUILD pycurl-7.19.0-r3.ebuild 1990 SHA256 6746883c50f70c239727a65dce5780c4f195e081ea492cf353ec5ddcac627976 SHA512 dec4638d3ded6423d0763f9746e939af1e6942125d591c08b1e300961233da0d2d17b40fe0be2894dfa025f0e2a762f152b58326f960f7103f8154b5e30199b4 WHIRLPOOL 840514f12cade3e6efafc1e129ddb99421985609293276f019242cbd7150534d38c90fadf67d7ba70a8d8b0285f0636f21aaf9496d6b4e172866fe6bf5f87d8a
+EBUILD pycurl-7.19.0-r3.ebuild 2104 SHA256 c97748aa9a648d79190f7a2cc1daf5a79415248f11ea514440899bbc8ba6d287 SHA512 424007aef367ccaa22ebafc1a3c3b3013564b31702092b1aed8d30d91cde04dd057def785c08fd87e4beaa14bf47fd012f9a5b7c29ff6d2252f1237525559e81 WHIRLPOOL 259f9abbd8898c720f0b3a9ec9b27170dc719cefcb81532248ed374e391479fe28e5a8925c2ad8d3b2c81399f033fabc697be18d5056c2a4f56737269b2b8771
 EBUILD pycurl-7.19.0.ebuild 1294 SHA256 56309f8ad5c8bcfda86ff052970247c3140cffff6a906c59b7d9bcccc0e3c67f SHA512 a8e491accef2beb38faf8a8a16cb6f3a9be235b1d4e151e2ef51c38916e46018275752ce412ad269721f46c3bb629e19faf1a954dcbc79b8590587ca72d9a429 WHIRLPOOL 14337dd68f25be650bd77a8828af747268ab0e5b08719607b26692afc7ea866333b52a2a88804d438310f06a9025b43e51da8b87aa5642fa307c562ab7260288
-EBUILD pycurl-7.19.3.1.ebuild 2338 SHA256 f5cd1490507e98affbf3bb63278744016b83f50984236bcf27dd67beb0674da6 SHA512 a6d6cedbb29d346546d2f44a0bd61f96cd31a8a5749702d06c89d442cc202519c239dfc94644a903c8ea4025be9939e96e691fc83d2875a0a982ed4f71e1a82b WHIRLPOOL 09316a51debde29b21fa8c579ad9b3a0a54ba6c610abf8fb1ad9e4bf52491a531e9c6e4d269e1d0d4cbff0fd1c14e111927d04b0a31e928106b8c0f308f69cc4
-MISC ChangeLog 12672 SHA256 6e95ef350dd77eea86fed98608d630d698d43904f6c60a3469c4c6958251d90a SHA512 631f571b23967eecc5946c1022c141afcbf96d4e4bbd9a9512d3593c651aa1bfb92aaf2ff85217aa5d05997c9d83fdb0c1c0eeb581f10fda786b39f16654ab91 WHIRLPOOL ae57e5518d1aeecf58c80b48326569856472686cfbd73b90472d2c4ea43bfef785a1ad3dd0fee86b75681335164709b17360015e17f6cc068db9952f4bd1db41
+EBUILD pycurl-7.19.3.1.ebuild 2452 SHA256 1391fba34ba4cdccfab9071caf4e0216eaa4a711abb0f5159eb33f09f217a343 SHA512 5f48c436a80bfceef2ee9eb02ec4519acf743898739197ac571de6de145554efde3bf22f521c23cf6fcfecfb1b9c2fe31a5124a77bfc88447380ba99af1c2f9c WHIRLPOOL 984af321c818adb801a0ad97c66149fdb0ee91ce60b7c9ed809bbe1dfaf8e08d77e6fb4b3da9a661f5a40821c6ad7c4f2d4226e46b5d5d27248cb48d26fe524d
+MISC ChangeLog 12860 SHA256 e26b7af8267522e2344f58df0ce9a2f55965054f66fd2d460b6c07fcaa0aa7ad SHA512 dc7fba5157e2ad08c27b01d356a5a9fdd1534ba50ae5628b3aa66b0d313e001e4cf9ef011593495bf3145f1e8a1b8db8c699fcfa4044b93fb158373ea2bd1dcf WHIRLPOOL 96fe69a29c45f5237ee2ea591e03d47356b44e981088490e43b2b15cd128b6ee2c4cbb8bfdd1b5040ccbc88015c7f834078fa662a45211ff5b0f33db578fb92c
 MISC metadata.xml 826 SHA256 fdc8c57902acabf11f4b07cd9ac36960db5c41d8f9e94e238cf9e40903a51dad SHA512 cd860d6a4151ac15bb7d9c355d0222f91b429993d56083670f3325ecde4f4fda8f4bf374aba3b1c65270a786e12c30c0344917fd04b608ebdc0c94b392279e61 WHIRLPOOL 397cf201be522437cc691b94d0aee887c8678b73e4533938edbbd1774c0a26907585b18584b39ce83e2868c6d896445c3dc940c2a2abf061ecb703ddbd35ca72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlN3dKEACgkQso7CE7gHKw03fQCbB+jg5jv2uAsV+LLQW8gjOwyN
-QX8An3ESIU8WrNm42LxTY6wfdCOQyv0v
-=du0c
+iF4EAREIAAYFAlOF/s0ACgkQC77qH+pIQ6SHggD9ESKAGUKVDoVdoP8IlYWbpSSF
+5aR9UC09CxsKWhl5+1ABAMXMAYqsRqafXduFEDiSeppYlsR+GchAKSB7DYbytBNr
+=EbLw
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
index bf77c43c598f..3fa44060b78c 100644
--- a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.12 2013/09/14 22:50:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.13 2014/05/28 15:20:44 floppym Exp $
 
 EAPI=5
 
@@ -42,6 +42,11 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+src_configure() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL}
+}
+
 python_compile() {
 	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
 	distutils-r1_python_compile
diff --git a/dev-python/pycurl/pycurl-7.19.3.1.ebuild b/dev-python/pycurl/pycurl-7.19.3.1.ebuild
index 69a43ec824ca..4dc0ceed7355 100644
--- a/dev-python/pycurl/pycurl-7.19.3.1.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild,v 1.2 2014/05/17 14:47:05 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild,v 1.3 2014/05/28 15:20:44 floppym Exp $
 
 EAPI=5
 
@@ -38,6 +38,11 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+src_configure() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL}
+}
+
 python_compile() {
 	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
 	distutils-r1_python_compile