gentoo auto-resync : 15:07:2022 - 13:42:19

3 files changed, 2 insertions, 98 deletions

diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 024b60e47c13..df6e40f75fdd 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,6 +1,4 @@
 AUX 7.44-fix-tests.patch 1679 BLAKE2B ca0126a6dc12203ba8409c70ffa5142288bc94fd07ccc4404ee6f19a8515a46cc4e257dd26a12266aa3263e359e9167daa3ef36bde9867d2a4346ce38fcaac1b SHA512 743fbc3335daccb4e1d21b4c0e659d87582120b21d1cacecf0725fed9fe1eb6251761fdb50814c04e79ac3b13408335b34072e94bc704d3c333b96eaa9d52f76
-DIST pycurl-7.44.1.tar.gz 227562 BLAKE2B 7dcbde563140f28382768b89b95422f873d5396a1f050dfcd3686d87b0ca2c3f3871281ed87b1dfbe7e4268728c2ec3ba7a76e7d7ef57754af5c185bf2a6fbe8 SHA512 e251db332791de07364695b5fd59b3a290486eabbde8be9914b5edeefa8702b4dd9ab678739ad765f76ededeb7192444fefe2a076d3977f454259dfd06731059
 DIST pycurl-7.45.1.tar.gz 233879 BLAKE2B 8a6fe72f00cfd172b4f5e257f4526c4115047aa911d7fb3802d3bf105ac70dc866b27fa4878aae9f92229a5dd5108a2b5e1c9acfe93e1a94dac60d9405c5d5e6 SHA512 05639d484aac6d6688677589e391975158c5ef778456a47df575ad13fb8bd0db67ff8f5a39bdd99d82a67926aca421c01e687eec9d4fd87f32822b492b429635
-EBUILD pycurl-7.44.1-r1.ebuild 2598 BLAKE2B 633630a72681052118b90decdec88c4dc89d3f732099a51aef2fafae6f2559841e263c9b284e746cc067b55e847e56c1973949f1b07d9b83689d627b673a6f89 SHA512 8a24ade216d126828771c3134365624eb593514041df26feb157c3fdc66fca1af47a8f149614fab3fcbb9233e531d003bbeb0f9b1b5ab1e5f082ae757579271b
-EBUILD pycurl-7.45.1.ebuild 2569 BLAKE2B 5fdc980db7fe3344b919df629ced19adda0ad55ccb35a53ed914a76efdd0524030efef6be6fa6423a5b7835b48c9c867244b4e34636c710e202de65de6b8643c SHA512 e023afc42cf5e2859baa9693a587b1c1ae76628d7358d56ab0dc80bc643caaf9c701cdf5d79f37032ee2271b8b5c9a631e1da11648e5940aadcea54008c45d22
+EBUILD pycurl-7.45.1.ebuild 2568 BLAKE2B e3f212c0ba6ee1caf06cfe7e5df2df7cf1a91b377979b252afc6d9b3cb6ac4910f1e40894d19cf127a335533c7924d34984ae49a31ac50ffe1f804e8d9861b04 SHA512 e3b561f3b481dad6aa8e3f7fbf200f2f4b3e4c756fe2cb50ed61a4a9117020fefe723184ebb08458242b591792549f393bbf3ae8a7180c86bdf3662cb7fbab06
 MISC metadata.xml 1100 BLAKE2B dfc7fe054c7cc34c61bf58fef0378df304a539c28cbc0dff4ffff65ccc8892c38aaf1e275885fc54d2854d9acc6b382947038041f815b5941859be7cfe75523f SHA512 f1de0dccd625ae0b02ff9a55cbc1bbf7944faa24dba28ffd711c728001f180afa598a255132aea860ad616637325cdc653577af531b1a954a3994e8902c774aa
diff --git a/dev-python/pycurl/pycurl-7.44.1-r1.ebuild b/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
deleted file mode 100644
index 972d883b082a..000000000000
--- a/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="
-	http://pycurl.io/
-	https://github.com/pycurl/pycurl/
-	https://pypi.org/project/pycurl/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls 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.
-DEPEND="
-	>=net-misc/curl-7.25.0-r1:=[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_openssl? ( dev-libs/openssl:= )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/7.44-fix-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# docs installed into the wrong directory
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# TODO
-	sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
-		-i tests/option_constants_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# Override faulty detection in setup.py, bug 510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-src_test() {
-	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_DESELECT=(
-		# refcounting tests are unreliable
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_readdata_refcounting
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writedata_refcounting
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writeheader_refcounting
-	)
-
-	epytest -p flaky tests
-}
-
-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.45.1.ebuild b/dev-python/pycurl/pycurl-7.45.1.ebuild
index 1324929a4530..33b0bfa5747a 100644
--- a/dev-python/pycurl/pycurl-7.45.1.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.1.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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.