gentoo resync : 14.12.2020

3 files changed, 2 insertions, 84 deletions

diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index c82cfe1d2034..1b43d0178afa 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,5 +1,3 @@
-DIST kombu-4.6.8.tar.gz 406196 BLAKE2B 43ddb45e7e6a5bc1aff55867a816ebf7a1afed68bd41d9d74b6179a45d951ac4a4f0f687bbaebd23cf81b67fe2b81d47498b3e25eead0822e16d9acbb436338a SHA512 65b4ebb283ae380388de5d9f8fdc1ec0f41a9910744906b23eb150bc62ecb55ae6d65bb96ad31d8a033f26c2a8dc386939fced393866b6467e77a9760dfa17cc
 DIST kombu-5.0.1.tar.gz 404428 BLAKE2B 89d4c2daf70c3dcd0a990c8f045074780f2d4f13f39899c0ab3b73b473948469746cf8872aaa8565f5c4b071bf18ff510cd565e8f9b6a3735a0bf1d0af55e9b6 SHA512 aa5d35b7753f5ec8d95512c322fabf0163628b9afbd228faa2be910a1cd4ea3236a7e43485e17650e1aa9aebae59a91a2b0bdc1950e4e4c622b499a4ae29ea0e
-EBUILD kombu-4.6.8.ebuild 2368 BLAKE2B 8626497de01426d473a5784a31515b4b3be59c406aa5d7b2b6490de2b4bd8f2404c2a6b1b63c4f1c679e9d70e62268b7ed4cf71083d20ee73674fffe1a320534 SHA512 9a6918db2a8805061f5b7469258ba528135da5a5c009c04978bfc75a76d689c5f2fd8c006db6ed14518ff95d9bed598746511cd18aa89b5fbe8e161c83a3c94b
-EBUILD kombu-5.0.1.ebuild 2413 BLAKE2B fe70b4d51580e42a6cd54a11632e005acc03337c3e68d67ecb7f172b838193f93fff2112704163b7aa99653e9364ae3a31c065c185e7c38d42b67eebf0535dc0 SHA512 dffd5c990013ff739812a09c706df439d6cfaeb212d6fc581cf593a2eb9a0dd02bc6ef381ec013fa0a377f8a32c840ece00012d9a7c30363611f53c3d81f0c4e
+EBUILD kombu-5.0.1.ebuild 2411 BLAKE2B fd75c9569d0122d2e7be230ca114a5fd8cdf00a17723062f6512ff69182d9d2aa2422110ec90c6950dd58921901c8cacdd922ca15f0600a914e9b55af6bf0203 SHA512 7ae55e46441cbb05c983b897ede2c2ba6edf7ac9ebb89af07b6dd305679f7833b520ec20af1872e1efb139187ece41bf38bda2f3879600846fbf71b083b7947e
 MISC metadata.xml 699 BLAKE2B 895ddd1afe0b826cb3ae4e279b2bd12eabeac29c68104aa4b819b412a66bbad8fc0da49dcf8aadb779573247094f8a6ea60a18c967b6385515cc2fd6420a3622 SHA512 3d1f92614be2f17ef5188d0d987d17721db7af60d27cd9901ddc8adc96c0b7523afa26210e36789bc8a9096994be7cebd7df72f624610f11b45cf4aea6e56cc7
diff --git a/dev-python/kombu/kombu-4.6.8.ebuild b/dev-python/kombu/kombu-4.6.8.ebuild
deleted file mode 100644
index 3fb47be86b10..000000000000
--- a/dev-python/kombu/kombu-4.6.8.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-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.5.2[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-2.6[${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[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/unittest2[${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.0.1.ebuild b/dev-python/kombu/kombu-5.0.1.ebuild
index 60d86b72d311..25a13582c429 100644
--- a/dev-python/kombu/kombu-5.0.1.ebuild
+++ b/dev-python/kombu/kombu-5.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples mongodb msgpack redis sqs test yaml"
 RESTRICT="!test? ( test )"