gentoo auto-resync : 05:11:2022 - 21:18:38

4 files changed, 21 insertions, 75 deletions

diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 8dbb9f4658c3..8482dd994d19 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,6 +1,5 @@
 DIST rpyc-5.1.0.tar.gz 1260651 BLAKE2B 4be17e5de4b0475cd63b99bf20e55e3221149f974b9efec638e0387d71815a5a2e4ea782578152690e019e7b8a4ece17405eed6626578a9c9e379d0f4b589008 SHA512 e9783392f423abca6b488dff5be36dae066980004bd221ca5a1c451f0f9dc7e1daf749650106802f9159de619a8d5e2cd6dc90e9a5f49d16f01bbedd59b504cf
 DIST rpyc-5.2.3.tar.gz 1267934 BLAKE2B 3c03d587293375f875de31d6a89ba07b47bd4f4ff9fd5c7b23ed0c83e420e9d2bab08844c3538299797203ac90e7e81b955db02de70bf1cee5ea59d8475a6848 SHA512 4be189a719be100886e08d9c2c0769d12b7d1c5e167c197ebee1a3db542e228f2124fea976e5af3680136b298ce4632c79b2f302128dff31ebf45dcf52a9743f
 EBUILD rpyc-5.1.0.ebuild 1741 BLAKE2B aff12ad540be96c4cc71c5cdf2d0f4c8494d6a41757a9e57e0e5ef0030768f0829d8c088611178ffa244d3f6ec6ce2db1b46c0092d3b7e4154a40ac1e44d654a SHA512 b84c7a5cb1e053a8fcb2722b7d66ebff5d4e9030462b2ab078301549c5a037360120dfebab6cb0c453f6efd7fb2a2e37bd47e6f97a04e3e7b023f6a174d9d325
-EBUILD rpyc-5.2.3-r1.ebuild 1970 BLAKE2B 778eb4be38cf382fc870384f544454233cefab9c33db89cab92e9d62fc9df581bde9e4b86bcf0b5dbc63fbbae4c91793837feda3c1ad94272e0830f7896429a5 SHA512 98048a4fb69a2f8a45e06687b40e7bf18327bec7c428f163cdbf5f9d8bb6ff9840ae4641b9c9a7d68450a67e6f9dd53d54599ebf94651f94908add8b089e48c2
-EBUILD rpyc-5.2.3.ebuild 1774 BLAKE2B 787218825fce9fa0f9740333c30adb975fde0ecd20ae3e5e48f10d5a8119c1c87fe8807abe980af27ec9ffefc02b46b36c1242467214b7b18fabccc3866e743c SHA512 520219c1f37b09cc7df8148afb4f67b0566d4f56452d30d4e2385ed6e5ebeb310af4bbdad340bd9d80715a5addcb1e101191bf1694d4bfabc215360b3140c795
-MISC metadata.xml 654 BLAKE2B f84ea5b5fb66c2661bdcbed8566a77c872b6f1b3a6b0cb021269657b21fd414e70edf03f205ee2038d9d83a20e25d32b15760d915b98066aa7fe1a4cfeb3bd16 SHA512 6ea40af97501443c8d4ae783137bb9547c5a4cc3685c01b9d684691d110f67eb43056acfcebcc510c06fc40ff596ad9e3e30cf76cb07807f23250721e93b4954
+EBUILD rpyc-5.2.3-r3.ebuild 2091 BLAKE2B 386a4726b34d58870e09d6aa8453b5994125496e124ebb7466371b3ad3d4a4bfa59bb50a4f571146cc5e91a0695732a57195c5217a822eaf697d58392e5acfe1 SHA512 5f6eae0c2d6da571904b612ea197ed68cae8dcb67c8ee2e02cd05c734ae819c505f7d895d37f79fea5edd73153aa366cd0222a6696c985e468a9324753c0f2dd
+MISC metadata.xml 736 BLAKE2B d6f6d76b5118e6f8aef119b975572ba95875f89bc2a4b2bb072e1b1ccccfb4593845e16ea0c62a4436ce419a3792b89b7a995c36a2ce979cf85db0dbd5f6754f SHA512 7714c32ffeb31611fe41d2ec674b774fdd46b137a90bb52245b1dcc229f2577739d33d61788ec123cce0c4dec3da49a19fdcc4eb307ea3af26ae8c4195bb0d93
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index 9bb47af5f2a2..0cc85787c0c5 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -15,6 +15,8 @@
 		<flag name="numpy">Run tests depending on
 			<pkg>dev-python/numpy</pkg>, <pkg>dev-python/pandas</pkg>
 		</flag>
+		<flag name="gevent">Use <pkg>dev-python/gevent</pkg> for GeventServer
+		</flag>
 		<flag name="gdb">Run tests depending on <pkg>sys-devel/gdb</pkg>
 		</flag>
 	</use>
diff --git a/dev-python/rpyc/rpyc-5.2.3-r1.ebuild b/dev-python/rpyc/rpyc-5.2.3-r3.ebuild
index 94f50daaf6dd..457166812a05 100644
--- a/dev-python/rpyc/rpyc-5.2.3-r1.ebuild
+++ b/dev-python/rpyc/rpyc-5.2.3-r3.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
+# Teleporting currently does not work with python-3.11
+# see https://github.com/tomerfiliba-org/rpyc/issues/513
 
 inherit distutils-r1
 
@@ -11,21 +13,25 @@ DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
 HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
 	https://pypi.org/project/rpyc/
 	https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 # USE flags gdb, numpy are used *only* to run tests depending on these packages
-IUSE="test numpy gdb"
+IUSE="test numpy gdb gevent"
 RESTRICT="!test? ( test )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
+
+CDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
+	gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
 	gdb? ( sys-devel/gdb )"
 
-RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${CDEPEND}
+	dev-python/plumbum[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	default
@@ -42,14 +48,14 @@ src_prepare() {
 	# This test fails with NO_CIPHERS_AVAILABLE
 	rm tests/test_ssl.py || die "rm test_ssl.py failed"
 
-	# Temporarily removed
-	# https://github.com/tomerfiliba-org/rpyc/issues/513
-	rm tests/test_teleportation.py
-
 	if ! use numpy
 	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
 	fi
 
+	if ! use gevent
+	then rm tests/test_gevent_server.py || die "rm test_gevent_server.py failed"
+	fi
+
 	if ! use gdb
 	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
 	fi
diff --git a/dev-python/rpyc/rpyc-5.2.3.ebuild b/dev-python/rpyc/rpyc-5.2.3.ebuild
deleted file mode 100644
index 0f85434abd00..000000000000
--- a/dev-python/rpyc/rpyc-5.2.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
-	https://pypi.org/project/rpyc/
-	https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# USE flags gdb, numpy are used *only* to run tests depending on these packages
-IUSE="test numpy gdb"
-RESTRICT="!test? ( test )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
-	gdb? ( sys-devel/gdb )"
-
-RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	# Windows specific test
-	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
-
-	# These tests require running sshd
-	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
-
-	# This test requires internet access
-	rm tests/test_registry.py || die "rm test_registry.py failed"
-
-	# This test fails with NO_CIPHERS_AVAILABLE
-	rm tests/test_ssl.py || die "rm test_ssl.py failed"
-
-	if ! use numpy
-	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
-	fi
-
-	if ! use gdb
-	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
-	fi
-}
-
-python_test() {
-	# for some reason, when tests are run via pytest or nose, some of them hung
-	pushd tests > /dev/null || die "pushd tests failed"
-	for x in test_*.py
-	do ${PYTHON} ${x} || die "${x} failed"
-	done
-	popd > /dev/null
-}