gentoo resync : 16.09.2021

4 files changed, 5 insertions, 96 deletions

diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 30c79c3ad5da..a9bd02ba575a 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,5 +1,3 @@
-DIST kombu-5.0.1.tar.gz 404428 BLAKE2B 89d4c2daf70c3dcd0a990c8f045074780f2d4f13f39899c0ab3b73b473948469746cf8872aaa8565f5c4b071bf18ff510cd565e8f9b6a3735a0bf1d0af55e9b6 SHA512 aa5d35b7753f5ec8d95512c322fabf0163628b9afbd228faa2be910a1cd4ea3236a7e43485e17650e1aa9aebae59a91a2b0bdc1950e4e4c622b499a4ae29ea0e
 DIST kombu-5.1.0.tar.gz 416353 BLAKE2B 2c26aac0a8eda62475e2a9a859b2548046dfce0699a8dafce3cc6471ee3b82f82882a53903a86f69cf16f948e4d0e66f379479f7f1f46aca2bcbdd031ba87811 SHA512 62ef16e8e3fb592882b8060f29b95e7224ba635132ed688eece0c2d254e7f7fb525c778cac23f15495464c6dbcf84d7a1372fde6f55fcfe66677cf43d3e9d4de
-EBUILD kombu-5.0.1.ebuild 2370 BLAKE2B 0733b0f462f325644531c0afc2466a2febdd7323441a1ccf0be77f1648115cb40bf7ce79ed8fab2d82046dd7567276794804516dbe39b72ca330f4089e712877 SHA512 6318f501b42fd2a35c68ed213e75a84643ad491b5651d36274feccd1551b48a26a52f8240405dcf9c81cc7383c3ab5d523354dd2d695993927391862fa623dab
-EBUILD kombu-5.1.0.ebuild 2331 BLAKE2B 7993c08dc75cef243125f29fcbbf938c71dc90b4990669835d79d534b633b5c67f3075cc6bee76a096e04c8f4e92c87c2efda0cb17c7d97ec23326639960fbc1 SHA512 ebf1938cb1453dc9a81df7b1ea9db06566ccfb85b7dc3f6a2a928c48ebacfe12504185a7f8f2406e942eed727b214146bb29384e1e5e7a4aa1d9f365e42e7806
-MISC metadata.xml 699 BLAKE2B 895ddd1afe0b826cb3ae4e279b2bd12eabeac29c68104aa4b819b412a66bbad8fc0da49dcf8aadb779573247094f8a6ea60a18c967b6385515cc2fd6420a3622 SHA512 3d1f92614be2f17ef5188d0d987d17721db7af60d27cd9901ddc8adc96c0b7523afa26210e36789bc8a9096994be7cebd7df72f624610f11b45cf4aea6e56cc7
+EBUILD kombu-5.1.0.ebuild 2329 BLAKE2B d63b2b3652df40e48293362bf121bfcbef45e78cd5f17c329b2d38425b517ca6263047834db12bc54935b5d9bba710ff3027caa6bf99b6852525593e308cafb7 SHA512 e00b2c6cbd181d353994b04000a89afa4bb6fafd57647655f748d03f562eeb0afbfb3f22f0827cd6b4d8ebfc4adb7eaef4150c13d6fcfac8203cdc8337db5cba
+MISC metadata.xml 385 BLAKE2B 174062695338558e56601db5b6ced5eff3f6e22c1b840f1fe3d9046d6bc5f810fe1d3c73a3e7f009dae9129050dcb6824aca48ca86c006ecbd53f069884e60ef SHA512 eba10417212f73894b7bf749962c055c44ca10afbbff80f57e36f74edd016097c4854625a94e5a3522b3adf638c2c150e357f163f1617a79dd7fb54c234a1435
diff --git a/dev-python/kombu/kombu-5.0.1.ebuild b/dev-python/kombu/kombu-5.0.1.ebuild
deleted file mode 100644
index 189ab9bc017a..000000000000
--- a/dev-python/kombu/kombu-5.0.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples mongodb msgpack redis sqs test yaml"
-RESTRICT="!test? ( test )"
-
-# zookeeper backend support possible via dev-python/kazoo
-RDEPEND="
-	>=dev-python/importlib_metadata-0.18[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pyro-4.76:4[${PYTHON_USEDEP}]
-	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
-	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
-	mongodb? ( >=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}] )
-	redis? ( >=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
-# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		<=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}]
-	)"
-
-# kazoo is optional for tests.
-# Refrain for now, no established demand for it from users
-
-# Req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	rm t/unit/transport/test_etcd.py || die
-	# allow use of new (renamed) msgpack
-	sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
-	# pytest-sugar is not packaged
-	sed -i '/pytest-sugar/d' requirements/test.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# Doc build misses and skips only content re librabbitmq which is not in portage
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/kombu/kombu-5.1.0.ebuild b/dev-python/kombu/kombu-5.1.0.ebuild
index 5d90881cb0c6..22dee35e6bf5 100644
--- a/dev-python/kombu/kombu-5.1.0.ebuild
+++ b/dev-python/kombu/kombu-5.1.0.ebuild
@@ -29,7 +29,7 @@ BDEPEND="
 		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		>=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}]
-		dev-python/pyro:4[${PYTHON_USEDEP}]
+		dev-python/Pyro4[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 		>=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
@@ -66,7 +66,7 @@ pkg_postinst() {
 	optfeature "Amazon SQS backend" "dev-python/boto3 dev-python/pycurl"
 	optfeature "Etcd backend" dev-python/python-etcd
 	optfeature "MongoDB backend" dev-python/pymongo
-	optfeature "Pyro 4 backend" dev-python/pyro:4
+	optfeature "Pyro 4 backend" dev-python/Pyro4
 	optfeature "Redis backend" dev-python/redis-py
 	optfeature "sqlalchemy backend" dev-python/sqlalchemy
 	optfeature "yaml backend" dev-python/pyyaml
diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml
index 4a0992c7fa88..659be9f1d87e 100644
--- a/dev-python/kombu/metadata.xml
+++ b/dev-python/kombu/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
@@ -10,11 +10,4 @@
 		<remote-id type="pypi">kombu</remote-id>
 		<remote-id type="github">celery/kombu</remote-id>
 	</upstream>
-	<use>
-		<flag name="sqs">Enables Amazon SQS transport module for Kombu</flag>
-		<flag name="mongodb">Enables MongoDB backend</flag>
-		<flag name="msgpack">Enables MessagePack (de)serializer for Python</flag>
-		<flag name="redis">Enables Redis backend</flag>
-		<flag name="yaml">Enables yaml backend</flag>
-	</use>
 </pkgmetadata>