gentoo resync : 23.09.2020

4 files changed, 2 insertions, 246 deletions

diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 351942d22479..8a46e5f2600f 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,9 +1,7 @@
 AUX pycurl-7.43.0.5-cc-cflags.patch 1145 BLAKE2B c67a94b7ee13c784d8ddd3870e00e5b0963228a0ce0080b6dae0b0919ff5cdf17b2c51112586e9e7ff1731862cb40a040edd158f551d4278a286b2af7895641d SHA512 b082f1987ffe6cd61b17fed260dd039acad446b597eb43d060cc9115c36fe38e0b1e61e69e81d725061f589c2f9aae76a4bf68f07c68bebd99d4b5c2cbe9d530
-AUX pycurl-7.43.0.5-multiple-ssl.patch 5530 BLAKE2B 2a6657c417ccba6d42cefc79721170c6990ef73c85361e31fd6090dfa4a8bd0a74f78343a46032cb550ace7812c5101b587aab24a9b7cf06307f24b1bff879a3 SHA512 2a0c49a95e922414b37ed60e133aaded631cf7b10d10b26d69b2fd083dc991a5170b56a1f28fd9d800c77c331f35dd6216a71699af638096a590f1d03c17bd4c
 AUX pycurl-7.43.0.5-telnet-test.patch 1561 BLAKE2B 640203da8a9b6a13cb5fce187c6699127d8492f0e5ab3a9b8d540b458416a095b474cc84e7ed2068a15e20860e5f7becfe42f010747a8c2a5fa551300e4082db SHA512 58046c87e42ea6f86ee3b23f541e616b33be5f09ee5a2d3d1fd6bce717f59dc52a56a3cd5dc3aaebc9aa5948e4dcad91c1841bf1e1b66f31e66f04d095820cef
 DIST pycurl-7.43.0.5.tar.gz 216877 BLAKE2B 57605fa3426a76e0cdcc1bb4f247985a27439d67d32769945332f94c49eead7fadb2847accf98f0d0994e461fc9d6fd100a181ff6d3ac0765dad31d546a75ff4 SHA512 835ed6cca25d2dd3e7084f905f3b0b082d4af04761fa9d4dc4714865863a97c095c08e6f55ada91b9f60ccad7838328a82fb2add8108aea12056200cf1f12845
 DIST pycurl-7.43.0.6.tar.gz 222895 BLAKE2B 5a923a3d7a57aa553361206fd0c0e43e6ad66a70af72540c08a29903a9a71ed6b9460c06ab6e50fc2a01d1badd45edf41eb36f6dd97fca3c83bef30f12e41c40 SHA512 5625d9e38159fb785afaf539372a8ac658d9118fb25f581f11629859fde400b6fccf65e03a19e182534a78169531304639b1e6f1bfdd2cb09bce95d581b52850
-EBUILD pycurl-7.43.0.5-r1.ebuild 3340 BLAKE2B 9d4b8b02f9c2f274d02a72fc67ac7a563d18b2926dee0ae2422ff94f64bea30da16d90d92504450af2a1c87e4f78870209ff7fc2b0d70763dbd703ff58f9f3a7 SHA512 538fe2175d4e7b4aa8f08ba8f17c8393c2190345a30e5a154b9f5f251f09940a60759c2723dfc9d69c1f4e5d161500cbe75af15ee61e699dc9c7f4b4212f2c2e
 EBUILD pycurl-7.43.0.5.ebuild 3282 BLAKE2B 64dbe0b8109bf5360c992912db7f2897bf1cc90162c3d13aff35dec07cf7d56a17e5367a18d50ce41cc684177b11a62fe8ca3248b08d13138fdf079d48a1ad68 SHA512 e948084e13314e7f30a45cd7775542a64317dcdbb58bde0b672752b7d09e52dc2bb723d776feed7302abc121e5531a6bfbd6e30a69e6d6d21ba61150e3f298d7
-EBUILD pycurl-7.43.0.6.ebuild 2952 BLAKE2B d629ed5149b8ef953e962fac94682ea96bc7a3a0c11dca5ef195ecc076f9b9aab553549462225a752af1ef96179b9e56c7460158f9fef8634ec0bd97d66bcaba SHA512 948d84a2d7420b3eb7a93688b52df66efd3d632c0b270372eb1da3607bc59381de1040c63f48e672ef718b5b3661d371b675d354449fc4a31bca4e0d2301552f
+EBUILD pycurl-7.43.0.6.ebuild 2948 BLAKE2B f10d935ca2b6f02b3e15ed16147a549f3ca0f498e706ba7ce567fa1f6541b0804462f210fb267ad84b1275fdf01aca97fc39ae57d386ecabe1ba1e822228e699 SHA512 fe6918f2311c1b4476501074c76762b709a8e3ec4a7d2eeef27024eaf8f590584d0fe186a88afd5bdeb55992dd42e52066e05da0acddd46fc37c0295fa1c4af6
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch b/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch
deleted file mode 100644
index 035ad6f9ca36..000000000000
--- a/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 290d762ea13a1d95affa0888c5450b33b00241e8 Mon Sep 17 00:00:00 2001
-From: Bo Anderson <mail@boanderson.me>
-Date: Tue, 21 Jul 2020 18:28:31 +0100
-Subject: [PATCH] Handle MultiSSL
-
-Upstream-Status: Accepted [https://github.com/pycurl/pycurl/pull/639]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/module.c | 41 ++++++++++++++++++++++++++++++++++++++++-
- src/pycurl.h | 11 +++++++++++
- 2 files changed, 51 insertions(+), 1 deletion(-)
-
-diff --git a/src/module.c b/src/module.c
-index 23387ec..dbc5b0c 100644
---- a/src/module.c
-+++ b/src/module.c
-@@ -322,12 +322,21 @@ initpycurl(void)
- {
-     PyObject *m, *d;
-     const curl_version_info_data *vi;
--    const char *libcurl_version, *runtime_ssl_lib;
-+    const char *libcurl_version;
-     size_t libcurl_version_len, pycurl_version_len;
-     PyObject *xio_module = NULL;
-     PyObject *collections_module = NULL;
-     PyObject *named_tuple = NULL;
-     PyObject *arglist = NULL;
-+#ifdef HAVE_CURL_GLOBAL_SSLSET
-+    const curl_ssl_backend **ssllist = NULL;
-+    CURLsslset sslset;
-+    int i, runtime_supported_backend_found = 0;
-+    char backends[200];
-+    size_t backends_len = 0;
-+#else
-+    const char *runtime_ssl_lib;
-+#endif
- 
-     assert(Curl_Type.tp_weaklistoffset > 0);
-     assert(CurlMulti_Type.tp_weaklistoffset > 0);
-@@ -346,6 +355,35 @@ initpycurl(void)
-     }
- 
-     /* Our compiled crypto locks should correspond to runtime ssl library. */
-+#ifdef HAVE_CURL_GLOBAL_SSLSET
-+    sslset = curl_global_sslset(-1, COMPILE_SSL_LIB, &ssllist);
-+    if (sslset != CURLSSLSET_OK) {
-+        if (sslset == CURLSSLSET_NO_BACKENDS) {
-+            strcpy(backends, "none");
-+        } else {
-+            for (i = 0; ssllist[i] != NULL; i++) {
-+                switch (ssllist[i]->id) {
-+                case CURLSSLBACKEND_OPENSSL:
-+                case CURLSSLBACKEND_GNUTLS:
-+                case CURLSSLBACKEND_NSS:
-+                case CURLSSLBACKEND_WOLFSSL:
-+                case CURLSSLBACKEND_MBEDTLS:
-+                    runtime_supported_backend_found = 1;
-+                    break;
-+                default:
-+                    break;
-+                }
-+                if (backends_len < sizeof(backends)) {
-+                    backends_len += snprintf(backends + backends_len, sizeof(backends) - backends_len, "%s%s", (i > 0) ? ", " : "", ssllist[i]->name);
-+                }
-+            }
-+        }
-+        if (runtime_supported_backend_found == COMPILE_SUPPORTED_SSL_BACKEND_FOUND) {
-+            PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backends (%s) do not include compile-time ssl backend (%s)", backends, COMPILE_SSL_LIB);
-+            goto error;
-+        }
-+    }
-+#else
-     if (vi->ssl_version == NULL) {
-         runtime_ssl_lib = "none/other";
-     } else if (!strncmp(vi->ssl_version, "OpenSSL/", 8) || !strncmp(vi->ssl_version, "LibreSSL/", 9) ||
-@@ -366,6 +404,7 @@ initpycurl(void)
-         PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backend (%s) is different from compile-time ssl backend (%s)", runtime_ssl_lib, COMPILE_SSL_LIB);
-         goto error;
-     }
-+#endif
- 
-     /* Initialize the type of the new type objects here; doing it here
-      * is required for portability to Windows without requiring C++. */
-diff --git a/src/pycurl.h b/src/pycurl.h
-index 02db495..a83c85b 100644
---- a/src/pycurl.h
-+++ b/src/pycurl.h
-@@ -154,6 +154,10 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
- #define HAVE_CURLINFO_HTTP_VERSION
- #endif
- 
-+#if LIBCURL_VERSION_NUM >= 0x073800 /* check for 7.56.0 or greater */
-+#define HAVE_CURL_GLOBAL_SSLSET
-+#endif
-+
- #undef UNUSED
- #define UNUSED(var)     ((void)&var)
- 
-@@ -165,6 +169,7 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
- #   include <openssl/ssl.h>
- #   include <openssl/err.h>
- #   define COMPILE_SSL_LIB "openssl"
-+#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
- # elif defined(HAVE_CURL_WOLFSSL)
- #   include <wolfssl/options.h>
- #   if defined(OPENSSL_EXTRA)
-@@ -187,6 +192,7 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
- #    endif
- #   endif
- #   define COMPILE_SSL_LIB "wolfssl"
-+#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
- # elif defined(HAVE_CURL_GNUTLS)
- #   include <gnutls/gnutls.h>
- #   if GNUTLS_VERSION_NUMBER <= 0x020b00
-@@ -195,13 +201,16 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
- #     include <gcrypt.h>
- #   endif
- #   define COMPILE_SSL_LIB "gnutls"
-+#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
- # elif defined(HAVE_CURL_NSS)
- #   define COMPILE_SSL_LIB "nss"
-+#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
- # elif defined(HAVE_CURL_MBEDTLS)
- #   include <mbedtls/ssl.h>
- #   define PYCURL_NEED_SSL_TSL
- #   define PYCURL_NEED_MBEDTLS_TSL
- #   define COMPILE_SSL_LIB "mbedtls"
-+#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
- # else
- #  ifdef _MSC_VER
-     /* sigh */
-@@ -218,9 +227,11 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
-    /* since we have no crypto callbacks for other ssl backends,
-     * no reason to require users match those */
- #  define COMPILE_SSL_LIB "none/other"
-+#  define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 0
- # endif /* HAVE_CURL_OPENSSL || HAVE_CURL_WOLFSSL || HAVE_CURL_GNUTLS || HAVE_CURL_NSS || HAVE_CURL_MBEDTLS */
- #else
- # define COMPILE_SSL_LIB "none/other"
-+# define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 0
- #endif /* HAVE_CURL_SSL */
- 
- #if defined(PYCURL_NEED_SSL_TSL)
--- 
-2.28.0
-
diff --git a/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild b/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild
deleted file mode 100644
index e5a319f2804a..000000000000
--- a/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit distutils-r1 toolchain-funcs
-
-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 ~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"
-RESTRICT="!test? ( 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}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/pycurl-7.43.0.5-telnet-test.patch
-	"${FILESDIR}"/pycurl-7.43.0.5-cc-cflags.patch
-	"${FILESDIR}"/pycurl-7.43.0.5-multiple-ssl.patch
-)
-
-python_prepare_all() {
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# disable automagic use of setuptools
-	sed -e 's:import wheel:raise ImportError:' -i setup.py || die
-	# these tests are broken with newer versions of bottle
-	sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
-	# temporary hack to make setuptools->distutils change less painful
-	# (suggested by Arfrever)
-	sed -e "/VERSION/s:${PV}:&.0:" -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}
-}
-
-src_test() {
-	# upstream bundles precompiled amd64 libs
-	rm tests/fake-curl/libcurl/*.so || die
-	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
-	distutils-r1_src_test
-}
-
-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.6.ebuild b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
index b9e03ef669f6..7da02eb3d53b 100644
--- a/dev-python/pycurl/pycurl-7.43.0.6.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=manual
+DISTUTILS_USE_SETUPTOOLS=no
 # The selftests fail with pypy, and urlgrabber segfaults for me.
 PYTHON_COMPAT=( python3_{6,7,8,9} )