gentoo resync 08.09.2018

4 files changed, 82 insertions, 116 deletions

diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index f2d06bd77896..545116a480e9 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,6 +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-r1.ebuild 3822 BLAKE2B b48aa9c0733860ed3ea7d0c5af42bfee17609b73d6db4ea009a88ef868e58d639ca209a8af6e2397c37b16017db637ef85210218b415a8ae959af9f4b3608dad SHA512 66c939458a75ff368479c0ad4d581cda7a81fd69b3ffd9dacd653b9795bcc27dfba5ab7ff1974771f0b21f549e6fd01558fa771afd9894b43310ac1aaeef1a88
+DIST kombu-4.2.1.tar.gz 423926 BLAKE2B 8566e3d81bd77c93982f54300e837e2aaac1d1fbfc716c87607fb83b86bc80148afc37b11145ee33ff3a6cef9fadb6178c370dc5b47c0774a56e6b08b6bf951e SHA512 a480444199aeee4e0048803a49ee85f2b348734eccf0e746189ea7db3787cb27baa89765a71cf88288ec7171252d55e13bc787641a543d3f91d6eb3d30c6a90c
 EBUILD kombu-4.1.0-r1.ebuild 2334 BLAKE2B ae7e9c060fbb785bebb9ffc253abc6096a441e341b38512bb914dbedc8a8b611cc5addf8baa5afe8fe4f76f2d1d998d2dab560f3d2afea6028c4abb8325e12ce SHA512 964e75b80f656ff3a2c008667dd44e28bf5cb69cccdfac7f9357b4503b113846a41347cf088863e68fb951789819b6a33474eaabe06e926b9890ff9bd5a7141c
-MISC metadata.xml 728 BLAKE2B 4da0d6e3a26ef9e1c091806f4c57c783456e7bd45e1119e8909e4deed6bb0206e2f6f84c53eb437542a593b6f3697cdc30a741016d2c0ae47815bdd56e8c23d9 SHA512 fa21e5537b57b55de995577fcbccd530cf505b9bc37422e7caf6f471a50027100856bca0a9a132ca42dfabd26b42e16306a03e0f3c117fadd51fd28766723201
+EBUILD kombu-4.2.1.ebuild 2336 BLAKE2B c5717c1fe4dc9f193e7976c22b6c86e4b2b2860395ce1bd13375b6288a415400729c10d447c66371f8b8c465bb815bc07fe0d79321921a6d1cc3d94ff5ba12b1 SHA512 423c42d60a8b46d76362a7f4688bf57edadf9a4e149c6e5eab03e5068493462a31a588bbbbd5d93b104884a6131eb6fc6e4a579bd69d36cb5e0abe59586ecfab
+MISC metadata.xml 675 BLAKE2B 6bab5465ca22ad8ab27ff08418abb6c6616972605b2b9bec7ec559f887962c80df01e6c9aa8eed5b1ffcbc392a8476f86ea477fa3c4084ba37e1ba350786f8d5 SHA512 37288783570daecc3bd70a8f5e9b96e652cd2271f1a36f9ecd644b6fb98f4dadbb2f2cbe36457c46d4b99d67fc5cfa6fea78f37bfd96b3b639cd26de4e948541
diff --git a/dev-python/kombu/kombu-3.0.37-r1.ebuild b/dev-python/kombu/kombu-3.0.37-r1.ebuild
deleted file mode 100644
index b562ae575218..000000000000
--- a/dev-python/kombu/kombu-3.0.37-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-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="amqplib doc examples msgpack sqs test"
-
-# couchdb backend support possible via dev-python/couchdb-python
-# ditto dev-python/kazoo(>=1.3.1) and dev-python/beanstalkc
-PY27_GEN_USEDEP=$(python_gen_usedep python2_7)
-PYPY_GEN_USEDEP=$(python_gen_usedep python2_7 pypy)
-RDEPEND="
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-1.4.9[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-2.0[${PYTHON_USEDEP}]
-	dev-python/pyro:4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]' 'python*')
-	amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
-	sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_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-0.7[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose-cover3[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}]
-		dev-python/django[${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/django[${PYTHON_USEDEP}]
-		dev-python/beanstalkc[${PY27_GEN_USEDEP}]
-		dev-python/couchdb-python[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )"
-
-# kazoo and sqlalchemy are optional packages for tests.
-# Refrain for now, no established demand for it from users
-
-# Req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PY27_REQUSE="$(python_gen_useflags 'python2*')"
-REQUIRED_USE="
-	sqs? ( ${PY27_REQUSE} )
-	doc? ( ${PY27_REQUSE} amqplib sqs )"	# 2 deps in doc build are py2 capable only
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-NA-tests-fix.patch
-	)
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-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
-}
-
-python_compile_all() {
-	# Doc build must be done by py2.7
-	# 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() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	# https://github.com/celery/kombu/issues/474
-	# tests need </pymongo-3.0; known to cause some breakage
-	if python_is_python3; then
-		2to3 --no-diffs -w build/lib/kombu/transport/
-		nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}"
-	else
-		nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
-		# funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6.
-		# https://github.com/celery/kombu/issues/411
-		# Fix to https://github.com/celery/kombu/issues/474 breaks the
-		# funtests under >=dev-python/pymongo-3.0.2
-#		if [[ "${EPYTHON}" == python2.7 ]]; then
-#			pushd funtests > /dev/null
-#			esetup.py test
-#			popd > /dev/null
-#		fi
-	fi
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/kombu/kombu-4.2.1.ebuild b/dev-python/kombu/kombu-4.2.1.ebuild
new file mode 100644
index 000000000000..3a30c9fc6baf
--- /dev/null
+++ b/dev-python/kombu/kombu-4.2.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 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.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"
+
+# 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}] )
+	mongodb? ( >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] )
+	redis? ( >=dev-python/redis-py-2.10.5[${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/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
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' requirements/extras/msgpack.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 || 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
+}
diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml
index b487c812a554..9379c4a1d89e 100644
--- a/dev-python/kombu/metadata.xml
+++ b/dev-python/kombu/metadata.xml
@@ -10,7 +10,6 @@
 		<remote-id type="github">celery/kombu</remote-id>
 	</upstream>
 	<use>
-		<flag name="amqplib">Enable amqplib support</flag>
 		<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>