gentoo resync : 10.03.2018

4 files changed, 8 insertions, 81 deletions

diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 491a823e0336..9432956d692a 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,7 +1,6 @@
 AUX kombu-NA-tests-fix.patch 495 BLAKE2B 08c35788e488b2ae94f643850b649df379bff7c87b53f80039734245303b1d6396559c70786d5938e31a9ddcdc2856f9a13b9939086ac91a08ab9194da3623fc SHA512 0399ddcd6992182577a09e5892b042ab2c232a6f86fda46a8ac4b6254ad73fd2fc342b863d59154371a266dd0927ae72c299c4ad16bc1c8cad557d26865ff264
 DIST kombu-3.0.37.tar.gz 411790 BLAKE2B 437e99beba410bd0e42b47e91b42fb8881443c8ccba454cb092adee94a94e93cb2104259b62652c423657c58f95a9969e0e966037040cc99e996e6daa7a8e2b7 SHA512 ba9bb00e23ce2d3da87eb07aacff8d63ef9879e6ca9f3fe82653cc2ee91610199fe8fc778d7c2e00df05b46130ecda0bdeceda48192b8af1fb0eca41fbb44712
 DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861
-EBUILD kombu-3.0.37.ebuild 3727 BLAKE2B 5a74030b0df42b993eb11940eaeadca125802f2aa15b3958228fa40ba73080ab370ee4e0c2ca58da1ad51e311edf588e6fcf68fbee1050aa528e00294c148b57 SHA512 4d82688457a71ad8606b499a21a662495b049cba0561ca4647f730d67fe9c57e768350af90f9dd5d3e395d17d0ba52c9396c7f8f1053e3cbce17a8eb1231420a
-EBUILD kombu-4.1.0-r1.ebuild 2241 BLAKE2B 5ff47a44d0d6a623325a51728b60d8593c396660f294ea71a3396144ab0dbd9e9dc7fdf7d1b6d8e40a24387c406ac86892327078f8066d9eea62c406cbe8e0a5 SHA512 5ee7fcea8dfe8cfbdc54943d9ce3be1e67193a9ee4c9e274d89b0fd02ae51a3f863fbcf21d72bb5ecf8d48bc4cc031b3e2257bad6dc42249859386762bfcf304
-EBUILD kombu-4.1.0.ebuild 2148 BLAKE2B 36c0c8ae345ccfff8db38b2f4d4be1c0f5d64a012263ce87f45c6ddd2818d9ab1fc075f2a491cb878093976b1a33b7f89ce8da9fb5eaecba7090149655d08749 SHA512 d1ae7cc79599172007b374d324476cb52bca0e143808c637020d8f9eec1cb6d86c9ce77ed555fd499e44d010a9ead284fd100bb5112e07fb1a9bf50ce193ecb3
+EBUILD kombu-3.0.37-r1.ebuild 3825 BLAKE2B aeedd7c93d756025508dd7507488c1dc4a12fdbc0efb17b2dc823a87240e4a4a7fd7441ac9f5d4c4021604a876215b8ec915e93732883cb9fdae54009a79856b SHA512 663176996230701ce4e2ccf3a455d0338b54b292c2376498f5fee5cd278437926075987ffa91e97c905c8f592ce24aa8c6b37107b3e70d7de123278ca04e9aed
+EBUILD kombu-4.1.0-r1.ebuild 2337 BLAKE2B 827d40aff62ff40756c916725f83e553671e85cac04c9d26d551f41691e45ecb51e1a172210c0cd5ff1d4cf161819b10dc5743795305e02f1f9737b2eb1c20f5 SHA512 992f5e8481d2f483df14a6d30b7e81156dd32d8ec220e2e78a064f8232dc27caa0412ca5ef36169ce10bfddcee2bc26b9aecf63e2ed623fda1009ddfbcabbe33
 MISC metadata.xml 728 BLAKE2B 4da0d6e3a26ef9e1c091806f4c57c783456e7bd45e1119e8909e4deed6bb0206e2f6f84c53eb437542a593b6f3697cdc30a741016d2c0ae47815bdd56e8c23d9 SHA512 fa21e5537b57b55de995577fcbccd530cf505b9bc37422e7caf6f471a50027100856bca0a9a132ca42dfabd26b42e16306a03e0f3c117fadd51fd28766723201
diff --git a/dev-python/kombu/kombu-3.0.37.ebuild b/dev-python/kombu/kombu-3.0.37-r1.ebuild
index 5f608fd2bb8f..e51e0846c5ff 100644
--- a/dev-python/kombu/kombu-3.0.37.ebuild
+++ b/dev-python/kombu/kombu-3.0.37-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -71,6 +71,8 @@ pkg_setup() {
 python_prepare_all() {
 	# https://github.com/celery/kombu/issues/246
 	sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/kombu/kombu-4.1.0-r1.ebuild b/dev-python/kombu/kombu-4.1.0-r1.ebuild
index 08cdcdd61cc1..b240e572196b 100644
--- a/dev-python/kombu/kombu-4.1.0-r1.ebuild
+++ b/dev-python/kombu/kombu-4.1.0-r1.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"
 
 # couchdb backend support possible via dev-python/couchdb-python
@@ -52,6 +52,8 @@ 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
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/kombu/kombu-4.1.0.ebuild b/dev-python/kombu/kombu-4.1.0.ebuild
deleted file mode 100644
index fe5302327bf7..000000000000
--- a/dev-python/kombu/kombu-4.1.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.python.org/pypi/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 msgpack sqs test"
-
-# couchdb backend support possible via dev-python/couchdb-python
-# ditto dev-python/kazoo(>=1.3.1)
-RDEPEND="
-	>=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-3.0[${PYTHON_USEDEP}]
-	dev-python/pyro:4[${PYTHON_USEDEP}]
-	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
-	msgpack? ( >=dev-python/msgpack-0.3.0[${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/redis-py-2.10.3[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/couchdb-python[${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
-	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 || die "kombu docs failed installation"
-	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
-}