commit: 341645008ff69bb8d1d94095c80f13d4f2414899
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 8 13:44:06 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 8 13:44:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34164500
dev-python/pycurl: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pycurl/Manifest | 1 -
.../pycurl/files/pycurl-7.43.0.5-cc-cflags.patch | 34 --------
.../pycurl/files/pycurl-7.43.0.5-telnet-test.patch | 50 ------------
dev-python/pycurl/pycurl-7.43.0.5.ebuild | 95 ----------------------
4 files changed, 180 deletions(-)
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 8dd8f303804..6d773c4d835 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,2 +1 @@
-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
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 b1e66e0942d..00000000000
--- 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?= <mgo...@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 c96b14d7c47..00000000000
--- 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?= <mgo...@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 321f11ec05b..00000000000
--- 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
-}
