gentoo auto-resync : 07:06:2024 - 00:08:01

4 files changed, 2 insertions, 133 deletions

diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index fd7f560167ac..b8494586b3a8 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,6 +1,3 @@
-AUX pycurl-7.45.2-skip-http3-test.patch 1116 BLAKE2B 9852580ab51cd978501d966292827c6f7739d52f65eb4cb01b3cd9517aa1b7f522c58dd0703264d662f431292ef55188f16d50f9f8df5b0dd1b7e32f0a185e64 SHA512 51567f97f96d94878a0af446a89a032aa79c6a062d2efbe1d32c8a9b70d1ba75eada54fff53ea9de37c739635225310d067976d4883937914dc2708de4837789
-DIST pycurl-7.45.2.tar.gz 234245 BLAKE2B 16257a967d2867de08d83478f602d00b54316d37b6a544804e606a814f61507530fb7e1ef3247be824dfa22b9487a69bbfc9b1038b2b776ebc556b18ed2d93ca SHA512 8a82346395acfc0bd37a8c4d8d2b17e5ab4602710308ed50f9ed88c223c73f15f5b1c95fc6191708e3bd9d647e4bc5ec91f740de433dd87e2ae0796ac79879ac
 DIST pycurl-7.45.3.tar.gz 236470 BLAKE2B 690e49f92f569352e26d95a0fa58508c4e96c845c7e3ae1169b8bc55036902f64859987880565217df56a57031dc2775e3c6979b4cfdf8a8c9a94c67ae94cb79 SHA512 12a55070602a1fd22b160ad582a4001bdd28531d2b2ccd365ff0136bc13dd23af80b19488bdbbc60a902a3a362b64383b9ae6acce6ed328c74dcffc8a6a3f4ad
-EBUILD pycurl-7.45.2-r1.ebuild 2932 BLAKE2B fc7d5f3744c0468d52ef6ea43861929a5e44023c783a7218d9d3c088940d982731b06582996bf3c032c7dd98ac274dc86a52bc4a3bf526395b23ead4df14be48 SHA512 05c9a4fca00c10d6b30abc42e929264e7271e44dc64c0080a181f0b1b12eb54ddd96ba17d620bbb706511e695adf0303e46d84dbafa77930ac85f232631b299c
-EBUILD pycurl-7.45.3.ebuild 2727 BLAKE2B 2097ae62c479c31d5343368cc3db75f6f53bddb85ca2b8fdf12771a887d9fa7fa57e3506ee10d64ba5e1984dade620c0bbee7fe9b9ebf278e72f73f6154a116f SHA512 843fed0127cafd5edfaf5e50630548444c2119839dca02599ca700e23fbc84ed9f5ba67002a17d84f696b8ffa43c14c90d037176b2053dcd1196692b22c8cfa2
+EBUILD pycurl-7.45.3.ebuild 2726 BLAKE2B 5c5c922315cb02abcdebdda51002c31da2cb4f55b3f030da1f2406ac04d7014f88d5c6d7dc76b9e09c364d5b14744770006f1def0c5150816efc7a258c9968ea SHA512 9fb014a47794d350801b9b1ad59e9e0b400412d704d7d98e891395345ee99c1597ef957d437f604181c8b24478415ae32392a3d802b9b628b72506e5ed0b1eda
 MISC metadata.xml 1100 BLAKE2B dfc7fe054c7cc34c61bf58fef0378df304a539c28cbc0dff4ffff65ccc8892c38aaf1e275885fc54d2854d9acc6b382947038041f815b5941859be7cfe75523f SHA512 f1de0dccd625ae0b02ff9a55cbc1bbf7944faa24dba28ffd711c728001f180afa598a255132aea860ad616637325cdc653577af531b1a954a3994e8902c774aa
diff --git a/dev-python/pycurl/files/pycurl-7.45.2-skip-http3-test.patch b/dev-python/pycurl/files/pycurl-7.45.2-skip-http3-test.patch
deleted file mode 100644
index 4ebf3b4b1ba8..000000000000
--- a/dev-python/pycurl/files/pycurl-7.45.2-skip-http3-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-In Gentoo, we don't yet usually have HTTP3 for curl either.
-
-https://src.fedoraproject.org/rpms/python-pycurl/raw/rawhide/f/0002-python-pycurl-7.45.2-disable-test_http_version_3.patch
-
-From 6c55e6822a064edb8dd6dfe1ee21080f4f30b5cf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
-Date: Tue, 7 Mar 2023 16:32:19 +0100
-Subject: [PATCH] tests: temporarily disable test_http_version_3
-
-HTTP3 support in curl is only experimental at the moment and is disabled
-in the corresponding Fedora package.
---- a/tests/option_constants_test.py
-+++ b/tests/option_constants_test.py
-@@ -508,10 +508,6 @@ class OptionConstantsSettingTest(unittest.TestCase):
-     def test_http_version_2prior_knowledge(self):
-         self.curl.setopt(self.curl.HTTP_VERSION, self.curl.CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE)
- 
--    @util.min_libcurl(7, 66, 0)
--    def test_http_version_3(self):
--        self.curl.setopt(self.curl.HTTP_VERSION, self.curl.CURL_HTTP_VERSION_3)
--
-     @util.min_libcurl(7, 21, 5)
-     def test_sockopt_constants(self):
-         assert self.curl.SOCKOPT_OK is not None
--- 
-2.39.2
-
-
diff --git a/dev-python/pycurl/pycurl-7.45.2-r1.ebuild b/dev-python/pycurl/pycurl-7.45.2-r1.ebuild
deleted file mode 100644
index e0b8e79c33dd..000000000000
--- a/dev-python/pycurl/pycurl-7.45.2-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi toolchain-funcs
-
-DESCRIPTION="Python bindings for curl/libcurl"
-HOMEPAGE="
-	http://pycurl.io/
-	https://github.com/pycurl/pycurl/
-	https://pypi.org/project/pycurl/
-"
-
-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_openssl examples ssl"
-
-# 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_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}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.45.2-skip-http3-test.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
-		# broken with curl 8.4.0+
-		tests/multi_callback_test.py::MultiCallbackTest::test_multi_socket_action
-		tests/multi_socket_select_test.py::MultiSocketSelectTest::test_multi_socket_select
-		# TODO
-		tests/option_constants_test.py::OptionConstantsTest::test_proxy_tlsauth
-		tests/option_constants_test.py::OptionConstantsTest::test_socks5_gssapi_nec_setopt
-	)
-
-	epytest -p flaky -p timeout --timeout=30 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.3.ebuild b/dev-python/pycurl/pycurl-7.45.3.ebuild
index 49d977613d57..8b71e3efc9af 100644
--- a/dev-python/pycurl/pycurl-7.45.3.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 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_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.