gentoo resync : 03.11.2019

4 files changed, 87 insertions, 6 deletions

diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 656674122042..26f53f5d4b92 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,5 +1,7 @@
 DIST pycurl-7.43.0.2.tar.gz 214212 BLAKE2B dae74be194334809048782de6a1adef8405e123464ffb0cad02d998d82fb59579d54bb7c5150895224d7622edfe4375f7b2336abd381270b5f64f44b09c8612f SHA512 8635fb33107c9351b7527036b8ab16d76aad72c2170643928034641770d07ab1507a8b2adc8b1a1dcfff29272f55cb00fee65abfcc0c639db14fdc20fc3a0fd0
+DIST pycurl-7.43.0.3.tar.gz 215003 BLAKE2B 2f1e61bd52873906a2d0480ab316c9026f2722cde14c059884ee552a2340fe6b646b4021326f72730aa9eed82f57b5ba923d19c2b8dfadb7a8f8819982116e7a SHA512 eec5c5f10b9a78bcf7e786368cdd5dc165faa4bb646df39ad52c1dfe8110e3e56456f5961f63ab7b460e51e56c41e66a0fc4652c8132411f1dee4074b3cffc00
 DIST pycurl-7.43.0.tar.gz 182522 BLAKE2B af6c85934565d851ea2280253ec6c61ab85f2dea047c83fc5ad65a6f05d3b8bf97932a161ae171c573a7333a99f2a25d4280c70be7ed3aef5eae19b5c392f5c7 SHA512 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5
-EBUILD pycurl-7.43.0.2.ebuild 2567 BLAKE2B c5b7800a0caa375d2c152b5db5a291bd94c48f98c015d04750c2c91faa7c12e72f12fa50c713aad6be199344f6e4d53680ede2e330839b393c56d9946d13a0c1 SHA512 a3d525647a3a0922b9637851a4ee78b3bd86f0fbba43e1480b705d7f07629a82eca3269450e2a706cf9bad41294027a7957fc32fb298628ad7f4ef9b472d26c3
-EBUILD pycurl-7.43.0.ebuild 2511 BLAKE2B c98954daee1bfc2a8563b06fca7e030d8b09243b9774577ced3d5420f48049d45b1bd9a214720c5799b2e94bed7e2d913c3b3f7da57d11842a83596550a81517 SHA512 6d916a0e68c1fb7e8edd1c4172effdb1ffa292917f6893c976f3bd3694a18eb97e072b193e89571439cf6aa60eef90dd38dc4f343a6f7faa8f6e930353cda788
+EBUILD pycurl-7.43.0.2.ebuild 2659 BLAKE2B 09ec026b8dc3afe084d695b2665bb6b339b343c574ccfbb9743e16c99578813eb885996bb6b885404cb5f95552b080d9af9d0e04f237858a99d9eb4d0f9f14cd SHA512 50a8282839ee3be3b5cad8e3efaf877029900f55ec3c6a310895371b7abd417925079ddf37ce31ef345b11fdb3658a3324b867e6c4e704baa2d88c6a56e5d417
+EBUILD pycurl-7.43.0.3.ebuild 2659 BLAKE2B 09ec026b8dc3afe084d695b2665bb6b339b343c574ccfbb9743e16c99578813eb885996bb6b885404cb5f95552b080d9af9d0e04f237858a99d9eb4d0f9f14cd SHA512 50a8282839ee3be3b5cad8e3efaf877029900f55ec3c6a310895371b7abd417925079ddf37ce31ef345b11fdb3658a3324b867e6c4e704baa2d88c6a56e5d417
+EBUILD pycurl-7.43.0.ebuild 2603 BLAKE2B c4287c54cc5dd2524b3801cbb6665ce9cc2e53fe54695b328406a0a5a79946ce4b7a1cbbecf71bfa9a1c2a305ea85366a0b2a9e59af16e45c8aaf1c14b1f3d12 SHA512 dc44f7766954295edf9a66040f87bdc4b187f5867cacb529657187e5edac4742edbd6e2b203d099a95da0251e4b3a989cef4450dc4056b97eaf41fec144c33b7
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.2.ebuild b/dev-python/pycurl/pycurl-7.43.0.2.ebuild
index f80cf3bba8e5..9b0c7f968424 100644
--- a/dev-python/pycurl/pycurl-7.43.0.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.2.ebuild
@@ -27,10 +27,12 @@ IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples
 # does not need to initialize gcrypt threading and we do not need to
 # explicitly link to libgcrypt.
 RDEPEND="
-	>=net-misc/curl-7.25.0-r1[ssl=]
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
 	ssl? (
 		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_libressl? ( dev-libs/libressl:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
 	)"
 
 # bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
diff --git a/dev-python/pycurl/pycurl-7.43.0.3.ebuild b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
new file mode 100644
index 000000000000..9b0c7f968424
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="
+	https://github.com/pycurl/pycurl
+	https://pypi.org/project/pycurl/
+	http://pycurl.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND="
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_libressl? ( dev-libs/libressl:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
+	)"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+	)"
+# Needed for individual runs of testsuite by python impls.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycurl/pycurl-7.43.0.ebuild b/dev-python/pycurl/pycurl-7.43.0.ebuild
index cd33b0eb12c7..ada6e65f2531 100644
--- a/dev-python/pycurl/pycurl-7.43.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.ebuild
@@ -27,10 +27,12 @@ IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples
 # does not need to initialize gcrypt threading and we do not need to
 # explicitly link to libgcrypt.
 RDEPEND="
-	>=net-misc/curl-7.25.0-r1[ssl=]
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
 	ssl? (
 		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_libressl? ( dev-libs/libressl:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
 	)"
 
 # bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180