gentoo auto-resync : 17:10:2022 - 07:54:11

11 files changed, 47 insertions, 85 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 494a2dc649f4..534c32355c86 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 7f2589d91acf..501dd1116acc 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,3 +1,3 @@
 DIST kombu-5.2.4.tar.gz 423450 BLAKE2B d0a180a4644876594eacea51706ca74fa4a95729ba965f69694da9694c2a91641ccf05aa1aec8a64f9d8c2260477d00bc2664d0a50143562b46524c98e4159b1 SHA512 695813bee71d627649e772b45b25494784a6a81bcad92331160705e34d8b2268fa90629983ebcfd04ec23208508d422f1834cc56895532911602d58ec0090a03
-EBUILD kombu-5.2.4.ebuild 2331 BLAKE2B 1232f5baab9c3ada437ea17afe379b311812c475140b1fd8a4c782a01f9f98a0815422ae2d69c2d2ad2269225e5103ab159fc6d598cf4386142fab0a6c29c979 SHA512 d9805006824957fb7e0b1d62fc15dd61d461297f3131078d73e6154f2b4f6be33ca395dd8c3c6002a8760cbf5e6794d2822f25ccdd54a8243fa1ed2c8122a20f
+EBUILD kombu-5.2.4.ebuild 2287 BLAKE2B 5dcdca0bb5c9005e4feaa38c60b84f8039386b98abd57039c1efbdffdc99d41b081933720cef82d7b707b78aa1e6de98c6c95128a820ead538e7756a8128fd54 SHA512 eaa1b53420a8acd7b1eff84c08a9def67286d0739228956496b6bd987660f0c797f2a2c5e6fb853dd7703561cbee492dea283d20b91cff6ed917bda4788546e4
 MISC metadata.xml 385 BLAKE2B 174062695338558e56601db5b6ced5eff3f6e22c1b840f1fe3d9046d6bc5f810fe1d3c73a3e7f009dae9129050dcb6824aca48ca86c006ecbd53f069884e60ef SHA512 eba10417212f73894b7bf749962c055c44ca10afbbff80f57e36f74edd016097c4854625a94e5a3522b3adf638c2c150e357f163f1617a79dd7fb54c234a1435
diff --git a/dev-python/kombu/kombu-5.2.4.ebuild b/dev-python/kombu/kombu-5.2.4.ebuild
index 21bca2d94b90..ee3abf177c8a 100644
--- a/dev-python/kombu/kombu-5.2.4.ebuild
+++ b/dev-python/kombu/kombu-5.2.4.ebuild
@@ -29,7 +29,6 @@ BDEPEND="
 	test? (
 		app-arch/brotli[python,${PYTHON_USEDEP}]
 		>=dev-python/boto3-1.4.4[${PYTHON_USEDEP}]
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
 		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		>=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index e1aa6003f598..2da7006a0a15 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,5 +1,3 @@
-DIST amqp-5.1.0.tar.gz 128629 BLAKE2B 8fe0b07233fce04b84b46e0ab4da1badf2de8a2ac53494dbb33b246d149ccec728de42c4f9f7d40752701a8e02851805456d8d54c2e519bbbfdbbb1274edf124 SHA512 9f4f3fd4cea6c214ff03a80a9aec7c5bff65a964ff1e77fbc937f1b6daf45f7b06be0b0873b2998afc3de22b4693a3327f0b439f70a4496060997b9f1aa73331
 DIST amqp-5.1.1.tar.gz 127869 BLAKE2B 3ba95874a45f6fce163cf95b0b1fae57e636bc2bec8311f64fc9597025ba36f35daf8d0457af3bc10fa1f1dae604b262ebf205d7b89d4f1745bf3480b542278d SHA512 f549a85e4f04543dd8e844edb68350ca185de9259aa896af31ae5ee5dfdfe73f904d95821c403dc797c7f3ada17ce6bff4e0fd9fcdf2abc1b33a94d079f99179
-EBUILD py-amqp-5.1.0.ebuild 1173 BLAKE2B 57ffcc4a2cfdaa50524687f0dae4326ea0c6da60e996b9dd1ecb9fdf438d9533b71456f95d2e2e2a285f90ae775181fe743e93d3245e71aa5fe4f5019e800804 SHA512 ea8523316837c7c580cdd2f4e3f5abb50cd061257131287fe09f1410f1d6229a8a3f804b94d9c9f74e8a5c1b6d1d63c6b9dcdc2da224939bbd16e11dd190deaf
-EBUILD py-amqp-5.1.1.ebuild 1173 BLAKE2B 57ffcc4a2cfdaa50524687f0dae4326ea0c6da60e996b9dd1ecb9fdf438d9533b71456f95d2e2e2a285f90ae775181fe743e93d3245e71aa5fe4f5019e800804 SHA512 ea8523316837c7c580cdd2f4e3f5abb50cd061257131287fe09f1410f1d6229a8a3f804b94d9c9f74e8a5c1b6d1d63c6b9dcdc2da224939bbd16e11dd190deaf
+EBUILD py-amqp-5.1.1-r1.ebuild 1098 BLAKE2B 5824b3e983f7e87bfd30da6d6d90406ff991c3ad4e5fceb017e66be0ca0de31bfd13e6b41c9f3a1efd98271bbd6666eb5934f23fe71023484ba2cf5c5f2e7985 SHA512 79aba5657d7376a9a53dc12e52620538277b6a6f69dc8f3e50eecd433214c45b55327c227f98df30ca09325262314acdc232f24243038adcfc19173b5c5bfb09
 MISC metadata.xml 505 BLAKE2B edee860b2641c1f220cca3efcf400391018389615234d72cf2a48e499c410608ddb664d65c7a3aba925b882bab96ba7b4f0c1173e28c385fe0a73b377e950af9 SHA512 b9b969cfcdc38791dec5c54ce96dcddc2eaf29bd023dc6a7c8e2f95dd00ece57abf02bf7d9e0179eb5716a20a041c2216dda94904e5d0a73007e775c14149552
diff --git a/dev-python/py-amqp/py-amqp-5.1.0.ebuild b/dev-python/py-amqp/py-amqp-5.1.1-r1.ebuild
index 0492c0df1c89..f13dd1a1cc33 100644
--- a/dev-python/py-amqp/py-amqp-5.1.0.ebuild
+++ b/dev-python/py-amqp/py-amqp-5.1.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -19,11 +19,11 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="extras"
 
-BDEPEND="
+RDEPEND="
 	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
 	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/py-amqp/py-amqp-5.1.1.ebuild b/dev-python/py-amqp/py-amqp-5.1.1.ebuild
deleted file mode 100644
index 0492c0df1c89..000000000000
--- a/dev-python/py-amqp/py-amqp-5.1.1.ebuild
+++ /dev/null
@@ -1,51 +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..10} )
-
-inherit distutils-r1
-
-MY_P="amqp-${PV}"
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/amqp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="extras"
-
-BDEPEND="
-	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_celery
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# rmq tests require a rabbitmq instance
-	t/integration/test_rmq.py
-)
-
-EPYTEST_DESELECT=(
-	# fails when gssapi is installed (how does that test make sense?!)
-	t/unit/test_sasl.py::test_SASL::test_gssapi_missing
-)
-
-python_install_all() {
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index d1fc54fde11f..db1d27b46ac5 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,3 +1,3 @@
 DIST python-versioneer-0.26.gh.tar.gz 75408 BLAKE2B 492538de63d0394f622e5d344955024559b66dea71909cabb366aa7df5cf8b43d3599af6693df3d8cb98c96df314f6cafa12bd237dc6f44be42370fe9cf0224f SHA512 7729cb94d30d3a666ac7e24f9c98880e801d54f986f9bd442695bc71e01ffc06ac53c952e67ab9a5db5d1cefe2a2dc37cd34e84cd5810e7873ae96a7afb65ad0
-EBUILD versioneer-0.26.ebuild 1133 BLAKE2B d145555887ab6f6a1e3de9543b6cb89858787932d246f4ff0a633b1e40cdb7323915ecae12e0f53df50ef0eca2941274c8ac8d561824b6fdd09cfa1ea72c8c05 SHA512 3b24bb5292a881f2a83e1d87a2cf64e94e809ba3589c79fe771344142b0a0c831b4004ef8f5e0c26085a4e5209e8f1c738ffea93f6057a9ea0fa531a4df3cada
+EBUILD versioneer-0.26.ebuild 1323 BLAKE2B 56d7c0fa860937155c3b8f9ce3188645362a3b198d23c591801e79ad66871864823b1ff093f45be4f3ecb8fc0838cff8cb9a6e8f7d045159d696ee442a6b46f6 SHA512 4e48e00e9696dc2a3e556bd7c5813a80a5cd26bb96603d080eab0db735f96da7b71d81037287cc4a0a2acf79ce5e40e6a367dc323118c6c21f2b4366d12828ad
 MISC metadata.xml 426 BLAKE2B 050a6c51f12ce466d0149041e103227c176f792326f859474c996a38f510544f09a594b6a70036b3cdad78013ff9982316c671e77be6ed2e7f0fa643bf89d320 SHA512 da99aef0b58491715dca230579ecba68bfe357909dd8bd122e790d7f0300e0b1d11cf224ea3a3c76763d593f45013cca6cfe27cc774c6eb90dd6da562a061c38
diff --git a/dev-python/versioneer/versioneer-0.26.ebuild b/dev-python/versioneer/versioneer-0.26.ebuild
index 2405afe4e4b0..6f029c227ac9 100644
--- a/dev-python/versioneer/versioneer-0.26.ebuild
+++ b/dev-python/versioneer/versioneer-0.26.ebuild
@@ -35,6 +35,14 @@ BDEPEND="
 	)
 "
 
+python_compile() {
+	cat > "${T}"/versioneer.py <<-EOF || die
+		raise ImportError("Please pretend I'm not here!")
+	EOF
+	local -x PYTHONPATH=${T}:${PYTHONPATH}
+	distutils-r1_python_compile
+}
+
 python_test() {
 	esetup.py make_versioneer
 
diff --git a/dev-python/vine/Manifest b/dev-python/vine/Manifest
index 9e763f5330b1..7349ed46ab71 100644
--- a/dev-python/vine/Manifest
+++ b/dev-python/vine/Manifest
@@ -1,3 +1,3 @@
 DIST vine-5.0.0.tar.gz 48758 BLAKE2B 11f90ceb3d3f0b008551db458e18a41b301b797a2109e011154cc3e6063433c3c917b0aa2cfdd0df8b868a3b459c061e6ed97fd23b9fb8cfdf58f5833e17459a SHA512 ff8f4b3f675220772ed0523e468eedbaec4aca793877b984e9a215603d1288cc3cc71dfeb152219d22f98de0ac7e9f9fa0cc35c2424ff36044cfc8f28192c159
-EBUILD vine-5.0.0.ebuild 513 BLAKE2B b4547b3400c108264d545fb22c70f2e1dfa53771328b71c54a5ab3ef73ddf08a304579e08898b7602ef91d9c9f301576447e818525d73b3c72316f2f2a27f741 SHA512 6c3e9707271cd6d4b376ea099ad46c2d859250233282294e1a706a9400108911a0a75c99618bfa49cf099f5ee240c4d39c01c78001786c829b41a9e39e9445c5
+EBUILD vine-5.0.0-r1.ebuild 666 BLAKE2B 53adaa576f3f715e82dd24c6ca1aaf8e90c23896452f4d8f079800d792b72990e5754772990d31fefdb0abe383626dd57cfa9f5058dc218554c66da6700206ae SHA512 f440fe12dbb4824ae24353350e05f43696b5d1b3446288faa11b4c4fa392f497e7a0930749a4b238b64cdb4e2d073918b56b7aa6fee1689218afb4e99504bb69
 MISC metadata.xml 462 BLAKE2B 7e59d35623baa0fc93b843d3b79ac5e4e505da52fdacce8f29c145af35b04c2226b2b6df0c64598af2c6de1640cf6de3091842a79830631b5adf328d91b135a6 SHA512 9ffdf8f9e99e992f12119f919fe43f5f3be4931b742c4cc74446a5a7288269faa4e7e857d03f0bf6a50e36a32cfe30253a9d7f247c80e51167c1691aa1ee899d
diff --git a/dev-python/vine/vine-5.0.0-r1.ebuild b/dev-python/vine/vine-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..70d4f44fc673
--- /dev/null
+++ b/dev-python/vine/vine-5.0.0-r1.ebuild
@@ -0,0 +1,31 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Promises"
+HOMEPAGE="
+	https://github.com/celery/vine/
+	https://pypi.org/project/vine/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove the dep on dead dev-python/case package
+	sed -i -e 's:from case:from unittest.mock:' t/unit/*.py || die
+	# also removed upstream
+	rm t/unit/conftest.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/vine/vine-5.0.0.ebuild b/dev-python/vine/vine-5.0.0.ebuild
deleted file mode 100644
index 2572581272f6..000000000000
--- a/dev-python/vine/vine-5.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python Promises"
-HOMEPAGE="https://pypi.org/project/vine/ https://github.com/celery/vine"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest