From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-python/pycurl/Manifest | 4 +- dev-python/pycurl/pycurl-7.43.0.3.ebuild | 76 -------------------------------- dev-python/pycurl/pycurl-7.43.0.5.ebuild | 7 ++- 3 files changed, 6 insertions(+), 81 deletions(-) delete mode 100644 dev-python/pycurl/pycurl-7.43.0.3.ebuild (limited to 'dev-python/pycurl') diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest index 0dd1e0e30aed..9944a805d213 100644 --- a/dev-python/pycurl/Manifest +++ b/dev-python/pycurl/Manifest @@ -1,7 +1,5 @@ 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.3.tar.gz 215003 BLAKE2B 2f1e61bd52873906a2d0480ab316c9026f2722cde14c059884ee552a2340fe6b646b4021326f72730aa9eed82f57b5ba923d19c2b8dfadb7a8f8819982116e7a SHA512 eec5c5f10b9a78bcf7e786368cdd5dc165faa4bb646df39ad52c1dfe8110e3e56456f5961f63ab7b460e51e56c41e66a0fc4652c8132411f1dee4074b3cffc00 DIST pycurl-7.43.0.5.tar.gz 216877 BLAKE2B 57605fa3426a76e0cdcc1bb4f247985a27439d67d32769945332f94c49eead7fadb2847accf98f0d0994e461fc9d6fd100a181ff6d3ac0765dad31d546a75ff4 SHA512 835ed6cca25d2dd3e7084f905f3b0b082d4af04761fa9d4dc4714865863a97c095c08e6f55ada91b9f60ccad7838328a82fb2add8108aea12056200cf1f12845 -EBUILD pycurl-7.43.0.3.ebuild 2671 BLAKE2B fd73be6647ac15afe8e6770c6cdd47d835b2efce1abc02895aebe2a29c70d6791589557056f493d79510d2c531e745521fef7ab69f552008110646232eb7ccaf SHA512 7b51cee2882727f5a4dd9e15f1e14f598d9c00be43b5b2d567cf9d556137ffcbbc1a8ee5efa6d4311983a906fb41e2c043a5f01dcb50c050c2ea3a6c56988bc3 -EBUILD pycurl-7.43.0.5.ebuild 3017 BLAKE2B 36400d03b1621720dfe4d5d3d7234b6c15272ffa8fcc8473014b3026d69407672963398ce1a7043af09c7caa6c44e08adea62ba04b42057a36ca90c4b09d82d7 SHA512 2534b4900f0b18ab352a49b7c11735c0973d9e91d93f98d3c03471ca00384d00e4c52b7fd493fc758dc5d9f7652525bf2a034a79845583b0051f0151013160b9 +EBUILD pycurl-7.43.0.5.ebuild 3136 BLAKE2B c8529f93479c72e9a8908288448a827922a4e0b1a6f70858bea0d97c40bb40a67d5c027e72db318258b740837680d0102abddeec393c1be12713c3de716cf761 SHA512 422ad568a23dd20a72ae2e69ada8704802eede3e04ddeaebb451b930583a5cf05769b298b7045eb3dad572126c0fdfea8a3687c861cc41630f894ce6aa24f8ef MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c diff --git a/dev-python/pycurl/pycurl-7.43.0.3.ebuild b/dev-python/pycurl/pycurl-7.43.0.3.ebuild deleted file mode 100644 index 20694a2260f7..000000000000 --- a/dev-python/pycurl/pycurl-7.43.0.3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 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_{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 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}] - )" -# 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.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild index 046812098a77..208be0af1b8f 100644 --- a/dev-python/pycurl/pycurl-7.43.0.5.ebuild +++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild @@ -3,8 +3,9 @@ EAPI=7 +DISTUTILS_USE_SETUPTOOLS=manual # The selftests fail with pypy, and urlgrabber segfaults for me. -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit distutils-r1 toolchain-funcs @@ -17,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 )" @@ -54,6 +55,8 @@ PATCHES=( 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 distutils-r1_python_prepare_all -- cgit v1.2.3