gentoo resync : 05.01.2018

3 files changed, 0 insertions, 103 deletions

diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 552c1d01c0b2..7d4fb1f9e5c5 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,9 +1,6 @@
-AUX kombu-4.0.2-dict-iter.patch 1022 BLAKE2B d9c52fe4ad213ad65a645b3b104fea2b05a22d0aff44d78d602cc0f4a333ed346d9a327672b7255f7b5f7cfa374ae9088417a56c79b68e7eb1334db85b3620c3 SHA512 fbb52e5fa20b4d295cd7414ef1e8b49fee6cd31e465b4059f01ccd65d96c966af0e62388fa2f486a152fe7174deb75a889c86a7cb1eb4c02a886e2c57fe0bb27
 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.0.2.tar.gz 418051 BLAKE2B 28328692519188fa67eda545ee06f56edc681ea5bebbed73cfabf812e0b544dd8f8cb8416cc930587e3f7658bb4b2701bfb0c8eb2005b3a3a9b506e9252a424c SHA512 99be6aa833eedc02897da90ebbd838bf0ac2a21db91350e235fae99ce31607cbc749f73f99d24f76acfc68b81d6263688d35b72ed62bb21d024a3ab385fa666e
 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.0.2.ebuild 2141 BLAKE2B f1ecefe48e944395400d1aa59dc60f13b5ccdddd7aa220311eab1f0023a0d523102cb8700fca93702175e09155fcf888e394033db8fc308330183407ce38e913 SHA512 816f2b3f8e1381c482c6945612ad8f41d92fa3b85dd0cf45461a7494833a603cdbf0f99cdacae65fbc61e7ea03133a5546358b34db7f10de93aff68a2af17d78
 EBUILD kombu-4.1.0.ebuild 2148 BLAKE2B 36c0c8ae345ccfff8db38b2f4d4be1c0f5d64a012263ce87f45c6ddd2818d9ab1fc075f2a491cb878093976b1a33b7f89ce8da9fb5eaecba7090149655d08749 SHA512 d1ae7cc79599172007b374d324476cb52bca0e143808c637020d8f9eec1cb6d86c9ce77ed555fd499e44d010a9ead284fd100bb5112e07fb1a9bf50ce193ecb3
 MISC metadata.xml 576 BLAKE2B 05dc771ac713703f5d403483255e64d7f8df363b81856af7019c954a819d4b4fb051c5250a588d714d755e9785cfd0bd55502c9355aecb99171539b672072087 SHA512 9d5fccd7c511196d4c98b80dd668e4f683d52335d3eee7fa372558091d131f1305aedd4bbcaaa895fe25679bb8912a4452f3f69fbd37ea45a5780c621cc1ae9b
diff --git a/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch b/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch
deleted file mode 100644
index fa3e545c6273..000000000000
--- a/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2940a4b1830bc2fc6d3f65de4feeec6ea5a49fe5 Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars@archlinux.org>
-Date: Tue, 21 Feb 2017 11:52:18 -0600
-Subject: [PATCH] Don't modify dict size while iterating over it (#676)
-
-This fixes https://github.com/celery/kombu/issues/675.
----
- kombu/messaging.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kombu/messaging.py b/kombu/messaging.py
-index 03e7e15..e1800b5 100644
---- a/kombu/messaging.py
-+++ b/kombu/messaging.py
-@@ -397,7 +397,8 @@ def revive(self, channel):
-         """Revive consumer after connection loss."""
-         self._active_tags.clear()
-         channel = self.channel = maybe_channel(channel)
--        for qname, queue in items(self._queues):
-+        # modify dict size while iterating over it is not allowed
-+        for qname, queue in list(items(self._queues)):
-             # name may have changed after declare
-             self._queues.pop(qname, None)
-             queue = self._queues[queue.name] = queue(self.channel)
diff --git a/dev-python/kombu/kombu-4.0.2.ebuild b/dev-python/kombu/kombu-4.0.2.ebuild
deleted file mode 100644
index b5d030da5273..000000000000
--- a/dev-python/kombu/kombu-4.0.2.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/pyro:4[${PYTHON_USEDEP}]
-	sqs? ( >=dev-python/boto-2.13.3[${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-0.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=(
-	"${FILESDIR}"/${P}-dict-iter.patch
-	)
-
-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
-}