gentoo resync : 25.11.2020

5 files changed, 2 insertions, 185 deletions

diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 8a46e5f2600f..6f61e452f40d 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,7 +1,3 @@
-AUX pycurl-7.43.0.5-cc-cflags.patch 1145 BLAKE2B c67a94b7ee13c784d8ddd3870e00e5b0963228a0ce0080b6dae0b0919ff5cdf17b2c51112586e9e7ff1731862cb40a040edd158f551d4278a286b2af7895641d SHA512 b082f1987ffe6cd61b17fed260dd039acad446b597eb43d060cc9115c36fe38e0b1e61e69e81d725061f589c2f9aae76a4bf68f07c68bebd99d4b5c2cbe9d530
-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.ebuild 3282 BLAKE2B 64dbe0b8109bf5360c992912db7f2897bf1cc90162c3d13aff35dec07cf7d56a17e5367a18d50ce41cc684177b11a62fe8ca3248b08d13138fdf079d48a1ad68 SHA512 e948084e13314e7f30a45cd7775542a64317dcdbb58bde0b672752b7d09e52dc2bb723d776feed7302abc121e5531a6bfbd6e30a69e6d6d21ba61150e3f298d7
-EBUILD pycurl-7.43.0.6.ebuild 2948 BLAKE2B f10d935ca2b6f02b3e15ed16147a549f3ca0f498e706ba7ce567fa1f6541b0804462f210fb267ad84b1275fdf01aca97fc39ae57d386ecabe1ba1e822228e699 SHA512 fe6918f2311c1b4476501074c76762b709a8e3ec4a7d2eeef27024eaf8f590584d0fe186a88afd5bdeb55992dd42e52066e05da0acddd46fc37c0295fa1c4af6
+EBUILD pycurl-7.43.0.6.ebuild 2940 BLAKE2B b89456dd9f535e6a9b01671b661af525d5fab03e73eca1cd2d90cb9e40d48d8ba1a825ef9919d4ca398d0d222764c812138a35d7a78ff76c6dda031e0520880e SHA512 948cd8bb2fbb927ee6e441b434d0241821cf8d42963e99acef14c86d854666e095e75cbab5d8570fcd319f007d431be999e997768e5ee8dc44f2fa176f8fd01b
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/files/pycurl-7.43.0.5-cc-cflags.patch b/dev-python/pycurl/files/pycurl-7.43.0.5-cc-cflags.patch
deleted file mode 100644
index b1e66e0942d1..000000000000
--- a/dev-python/pycurl/files/pycurl-7.43.0.5-cc-cflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 861ba3143001caf2623ce5d84a1d04a69b502339 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 11 May 2020 08:52:04 +0200
-Subject: [PATCH 1/2] Support overriding CC, respect *FLAGS in fake-curl
-
-The shipped libraries (obviously) do not work on non-amd64 platforms,
-and rebuilding without the correct compiler and flags does not work
-on more complex setups such as ppc64 with 32-bit userland.  Make
-the Makefile permit CC override while preserving the current default,
-and use user-provided CFLAGS, CPPFLAGS and LDFLAGS.
----
- tests/fake-curl/libcurl/Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/fake-curl/libcurl/Makefile b/tests/fake-curl/libcurl/Makefile
-index b05bc89..8ece206 100644
---- a/tests/fake-curl/libcurl/Makefile
-+++ b/tests/fake-curl/libcurl/Makefile
-@@ -7,8 +7,11 @@ all: \
- 
- .SUFFIXES: .c .so
- 
-+CC = `curl-config --cc`
-+CFLAGS += `curl-config --cflags`
-+
- .c.so:
--	`curl-config --cc` `curl-config --cflags` -shared -fPIC \
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC \
- 		-Wl,-soname,$@ -o $@ $<
- 
- show-targets:
--- 
-2.26.2
-
diff --git a/dev-python/pycurl/files/pycurl-7.43.0.5-telnet-test.patch b/dev-python/pycurl/files/pycurl-7.43.0.5-telnet-test.patch
deleted file mode 100644
index c96b14d7c475..000000000000
--- a/dev-python/pycurl/files/pycurl-7.43.0.5-telnet-test.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1f747cc4194601e8e54084638085d60026f1dbc4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 4 May 2020 10:22:32 +0200
-Subject: [PATCH] Skip telnet tests when cURL is built without telnet support
-
----
- tests/option_constants_test.py |  1 +
- tests/util.py                  | 14 ++++++++++++++
- 2 files changed, 15 insertions(+)
-
-diff --git a/tests/option_constants_test.py b/tests/option_constants_test.py
-index 2d6d185..20228c6 100644
---- a/tests/option_constants_test.py
-+++ b/tests/option_constants_test.py
-@@ -387,6 +387,7 @@ class OptionConstantsSettingTest(unittest.TestCase):
-     def test_keypasswd(self):
-         self.curl.setopt(self.curl.KEYPASSWD, 'secret')
- 
-+    @util.only_telnet
-     def test_telnetoptions(self):
-         self.curl.setopt(self.curl.TELNETOPTIONS, ('TTYPE=1', 'XDISPLOC=2'))
- 
-diff --git a/tests/util.py b/tests/util.py
-index aabadf5..e12e251 100644
---- a/tests/util.py
-+++ b/tests/util.py
-@@ -138,6 +138,20 @@ def only_ssl(fn):
- 
-     return decorated
- 
-+def only_telnet(fn):
-+    import nose.plugins.skip
-+    import pycurl
-+
-+    @functools.wraps(fn)
-+    def decorated(*args, **kwargs):
-+        # pycurl.version_info()[8] is a tuple of protocols supported by libcurl
-+        if 'telnet' not in pycurl.version_info()[8]:
-+            raise nose.plugins.skip.SkipTest('libcurl does not support telnet')
-+
-+        return fn(*args, **kwargs)
-+
-+    return decorated
-+
- def only_ssl_backends(*backends):
-     def decorator(fn):
-         import nose.plugins.skip
--- 
-2.26.2
-
diff --git a/dev-python/pycurl/pycurl-7.43.0.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
deleted file mode 100644
index 321f11ec05b7..000000000000
--- a/dev-python/pycurl/pycurl-7.43.0.5.ebuild
+++ /dev/null
@@ -1,95 +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
-)
-
-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 7da02eb3d53b..aedd76a693fc 100644
--- a/dev-python/pycurl/pycurl-7.43.0.6.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
@@ -18,7 +18,7 @@ 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"
+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 )"