gentoo resync : 12.05.2022

4 files changed, 26 insertions, 68 deletions

diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index d0b536c75c78..155cce2c7e4a 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,4 +1,4 @@
-AUX PySocks-1.7.1-test_server.patch 1382 BLAKE2B 82bbc57a47b4cc0c6ee3177d997a25ba905b0c43eb5cc9b444d31080d20a365a85f1ab1c954d3edf0b9ef54a70985eb3956dd1533c09b46766d407edce085c07 SHA512 810bcbffd4d61db66459a04f422e6789a89f46d1026afd55c2bb06b13302e087613fc643b2f53df5f17992432df82707e776c60d8d0d69a6eebab862351d9ece
 DIST PySocks-1.7.1.tar.gz 284429 BLAKE2B 8015e8a0a7ebfbb09ec542393aeb633a769701445c07f24bb9e62b07803d7bb605f22e79ad9ec83e47aa7fe843a1a057073d97e25482e742f42e18b2c7a2f1b3 SHA512 cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016
-EBUILD PySocks-1.7.1-r1.ebuild 1283 BLAKE2B 5a1eae5c801a343358bb31d5b833feebb4f8f0f35f77b53f2cb26b068723c253de87abfcf0923f94ca11982bd95156d465a502124910535733612aba7c49e911 SHA512 7d8d0f9d659fe0ab2d85b00cc46973d8216a3b8a234dd35780757f96ba875770c936f474b81a6c5ad21f0742b963cac3d1b6e91bec088e74ca4c6cae2312031c
+EBUILD PySocks-1.7.1-r1.ebuild 727 BLAKE2B cbe0438342b05e7183d002b0978b3257ff7995a73837cb587f3a6636d021f0b703af569f4d7f037c7a0825dabd9ef772943a15d634b8ac54eb37c054cdf3523e SHA512 6d2637fe3b2a20dc9ce8fd52949032a712b1cee51168771c88d4b84a2f0b1937a63372d398f8b0555ebc8d9e3c79216b382943a75aa4aca402b79c02da0a9e47
+EBUILD PySocks-1.7.1-r2.ebuild 767 BLAKE2B edb7bb033be34246dcce3006925d08418a07b4dea81cba2079d5c31bc53337ddb75add7044f5362fbfb97b8e1683fa9fbd682601c86ebd0be3fa2727164e0e06 SHA512 ef4a87761ff8943bd8dbf9a89651628d5cd72df7869ab1c345465b6f3f7e5585ec32c72e80a8332a9eabbf34c66f48c54819f09875ff1306d02e1409145d8a9f
 MISC metadata.xml 525 BLAKE2B 61d1c3a217ae1912a20e326a6aa00b003a0b6bb2d6d93e3fa361f21d2669c3d1a893d4d23641c3492388e8b671dee87f7c6d07c2df618910214786b999df3e74 SHA512 ce38eb19999a7b9bfbd9751fee536850c9d668f1f9ea3320cf9169714443bd19ad2d4a63097a00b66d6d379807064e21acb8a9c09988fbdcb98abba8f50ac802
diff --git a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
index b037c1562359..5c7528eeac5a 100644
--- a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
@@ -4,7 +4,7 @@
 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,37 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-#BDEPEND="
-#	test? (
-#		net-proxy/3proxy
-#		$(python_gen_cond_dep 'dev-python/test_server[${PYTHON_USEDEP}]' -3)
-#	)"
-
-#distutils_enable_tests pytest
-
-# tests fail semi-randomly; probably starting proxy server doesn't work
-# as expected
+# tests are broken beyond repair and the package is no longer maintained
 RESTRICT="test"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/PySocks-1.7.1-test_server.patch
-	)
-
-	rm test/bin/3proxy || die
-#	if use test; then
-#		ln -s "${BROOT}/usr/bin/3proxy" test/bin/3proxy || die
-#	fi
-
-	# requires Internet
-	sed -i -e 's:test_socks5_proxy_connect_timeout:_&:' \
-		test/test_pysocks.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/PySocks/PySocks-1.7.1-r2.ebuild b/dev-python/PySocks/PySocks-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..abceeceb002a
--- /dev/null
+++ b/dev-python/PySocks/PySocks-1.7.1-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="SOCKS client module"
+HOMEPAGE="https://github.com/Anorov/PySocks https://pypi.org/project/PySocks/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# tests are broken beyond repair and the package is no longer maintained
+RESTRICT="test"
diff --git a/dev-python/PySocks/files/PySocks-1.7.1-test_server.patch b/dev-python/PySocks/files/PySocks-1.7.1-test_server.patch
deleted file mode 100644
index 20d208549720..000000000000
--- a/dev-python/PySocks/files/PySocks-1.7.1-test_server.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 983f0451ed25c755da670a682703ae8f7795782b Mon Sep 17 00:00:00 2001
-From: John Vandenberg <jayvdb@gmail.com>
-Date: Wed, 4 Dec 2019 10:44:14 +0700
-Subject: [PATCH] Update tests for test-server 0.0.31
-
-Closes https://github.com/Anorov/PySocks/issues/117
----
- requirements_dev.txt | 2 +-
- test/test_pysocks.py | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_pysocks.py b/test/test_pysocks.py
-index 49893b2..03d2649 100644
---- a/test/test_pysocks.py
-+++ b/test/test_pysocks.py
-@@ -79,8 +79,7 @@ def setUpClass(cls):
-         from test_server import TestServer
- 
-         cls.test_server = TestServer(address=TEST_SERVER_HOST,
--                                     port=TEST_SERVER_PORT,
--                                     engine='subprocess')
-+                                     port=TEST_SERVER_PORT)
-         cls.test_server.start()
- 
-     @classmethod
-@@ -112,6 +111,7 @@ def assert_proxy_response(self, resp_data, content, address,
-                          self.test_server.request['headers']['user-agent'])
-         self.assertEqual('%s:%d' % address,
-                          self.test_server.request['headers']['host'])
-+        content = b'3\r\n' + content + b'\r\n0'
-         self.assertEqual(content, resp_body)
-         self.assertEqual(client_ip or PROXY_HOST_IP,
-                          self.test_server.request['client_ip'])