gentoo resync 08.09.2018

3 files changed, 1 insertions, 112 deletions

diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index 54e68a9b4c9d..477a0fafcf0d 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -3,10 +3,8 @@ AUX celery-4.0.2-log-endless-loop.patch 811 BLAKE2B 084a4462225445e0a5d691c5547e
 AUX celery-docs.patch 779 BLAKE2B 794fb995dbf4e3ea52b789c183004ef417401566604951ada10f72682264354a15c3c7bb7949e641ee93d6bfdb887bd76e79d10a18ed486772b55ba035034b8f SHA512 813d3a772ce0ab19854519915f770d5785371f9d8b0c916e93a286383c4262f0c6a9e554c5d76fc0d81e53efbdc8ed4a7a7009ae07c71489e30464d7b0de6ef1
 AUX celery.confd-r2 1442 BLAKE2B df6ab3585c12fef2272979ad3412f08827f59e9306b7b997642ee8bd0d4c84b168f32fd9b6427be3c889af411806d37673853588999d366b549908891491bd6e SHA512 ba3172e56a18df963b5886497c51b8aaf5298b5f3055214217561c8c691678b44c762d4f68f96e597807630af4d9185b7a9d557d13f7ffe25fc0092abcd09354
 AUX celery.initd-r2 4303 BLAKE2B 259821a93fc84c45580e06bcb4aa36b72a26290c917afea86b6e095489a1abde7b00f3ed91fa699452b4b7635d71bd72fd12ef9f46a3452f1f0d69c841c83b29 SHA512 722b5d526cad15589a4c26c4871c11255f8f1550b6d6a9d503962c07a6c60167d411f47135d55408acb6320636f885fff28e7691d74831ec1c2bb9d5dc48f3e2
-DIST celery-3.1.24.tar.gz 1330180 BLAKE2B 58e0643f4fcc8838cc2515e68a03c219ee7bab95bf4ecc2096ffe8ff275f2c2f0f5cb602a29c57b5e232cff8489b15143a1b76730018a5ff3d6063f5bd6f6af2 SHA512 6f2e1c5fe417183bc44f39deee669957800b805790475bea1c93d9efb37e0bb6db5aed9606ff79350f404c145908e3af6fa5ce94d86fb70238f2c2f2425ddd3c
 DIST celery-4.0.2.tar.gz 1337804 BLAKE2B b040ada555d02c2c943ac86211b06d03e738db586fc811fed5cf6c6c1a4d6945c909e04444170da4d00dfd0f874b0723bff1f18d01ab8d557f989edaadfe03c9 SHA512 1110b634cafa13f9d9ab0b0a7a17042325271bd5ea45a5f442e36e871db87b87e3f496d54b771d274a1676900d9dfdc7e21887943dfd1a299a9fcd8b3f6d2189
 DIST celery-4.1.0.tar.gz 1331689 BLAKE2B ac134d26a21bfd1172ea7a2ccc5f9934b4fdf56dccb6f840726040adf5b81ab0c675c0c93754340c0429c4eb5777a344be74415a795a9dd6654578979609cecd SHA512 5232adc43ba55d01f2b030382075750033e0c5c2abdc8308903e0cef7a465513b7765e2ae495da6555b377452ae233500530ef9d57e584a5352a54c5f4731c64
-EBUILD celery-3.1.24-r1.ebuild 3482 BLAKE2B 4538afe2f8b0e962c6145c92825badc7c77c13dfc3391e724562ec74789beddb0157932c21a765b6526426c5166efcc5b94fb7198691fa93e5b4bcae7f492f08 SHA512 8d6106606edcec4e54a0a1036b7c5c03b5017c313b9c7b9b0d959260829e4434ea7b090769bc06f57a397fd12431237fde3e1d845b4de4a1cd3db5695aebbfad
 EBUILD celery-4.0.2.ebuild 3553 BLAKE2B c4c7602e9ac2b231c9ebd7dd3c8d491d65e645413cab98b59fff3f689b89467849f46296c396f986c1f89e489a7eae96f8132da27b6d36dd9894e60a81dbef67 SHA512 b1a3ece067c63401684fe380f2078da4953b1bba7838daa4a57e85f2893508d180e483a1da1e235fa17498434ea312d278c72641f94bfd3b7dd616295fa5ab6d
 EBUILD celery-4.1.0.ebuild 3494 BLAKE2B cd6530eaa550aaef2fa28fa89d91668a0da3424fdae092b2ca3b094806fd5d04925f51dbf93c4a77427ca900bb9016b33612dc274a55d56623f0cdee30e74569 SHA512 538e2a67869db5e0162e961f1d73e4ac5867b8506ad77d37131073adb5a5c91c964968b29877591161241cc6344a62159298e61157971b6140d363f170c793b5
-MISC metadata.xml 598 BLAKE2B bc341fa57796448fd24ccdc7cc6aab80c4208fd70ed73a3d2d2387ecdcc91ecb9ef862794b204d404386e8d6508387fc5aabd0b1895674e717073c6403ef870e SHA512 3edfde62756b7f2ab3d138fd297bf7335b238d027dd1d6a261533979f48b05fa4913b0f43a766075fc106c59b1ddd43cb6ba21aaf9c67311b0ba3df00f20975c
+MISC metadata.xml 528 BLAKE2B e7c57658c1e2d86d4f437649706c340148e6c713e7e1fa8fae06e60afb332562683bcef6f4946555664a1d1a916857addb1e3134c49edd20245fbee58468eab2 SHA512 73fe8a564452f48193e92c3c72368868fb0a6c4ea54e836ac91547f8acd190a4c653b6770f36fb645b4aaad86ed720a4cf4793a8cbfaf3188ac297708508d59d
diff --git a/dev-python/celery/celery-3.1.24-r1.ebuild b/dev-python/celery/celery-3.1.24-r1.ebuild
deleted file mode 100644
index 57b09e0c912f..000000000000
--- a/dev-python/celery/celery-3.1.24-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 bash-completion-r1
-
-DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
-HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# There are a number of other optional 'extras' which overlap with those of kombu, however
-# there has been no apparent expression of interest or demand by users for them. See requires.txt
-IUSE="doc examples redis sqs test yaml zeromq"
-
-RDEPEND="
-	<dev-python/kombu-3.1[${PYTHON_USEDEP}]
-	>=dev-python/kombu-3.0.36[${PYTHON_USEDEP}]
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/billiard-3.3.0.23[${PYTHON_USEDEP}]
-	<dev-python/billiard-3.4[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/gevent[$(python_gen_usedep python2_7)]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/nose-cover3[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
-		>=dev-db/redis-2.8.0
-		>=dev-python/boto-2.13.3[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		)"
-
-PATCHES=(
-	"${FILESDIR}"/celery-docs.patch
-	"${FILESDIR}"/${PN}-3.1.19-test.patch
-)
-
-# testsuite needs it own source
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		mkdir docs/.build || die
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd-r2" celery
-	newconfd "${FILESDIR}/celery.confd-r2" celery
-
-	use examples && local EXAMPLES=( examples/. )
-
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-
-	newbashcomp extra/bash-completion/celery.bash ${PN}
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "zookeper support" dev-python/kazoo
-	optfeature "msgpack support" dev-python/msgpack
-	#optfeature "rabbitmq support" dev-python/librabbitmq
-	#optfeature "slmq support" dev-python/softlayer_messaging
-	optfeature "eventlet support" dev-python/eventlet
-	#optfeature "couchbase support" dev-python/couchbase
-	optfeature "redis support" dev-db/redis dev-python/redis-py
-	optfeature "couchdb support" dev-db/couchdb dev-python/couchdb-python
-	optfeature "gevent support" dev-python/gevent
-	optfeature "auth support" dev-python/pyopenssl
-	optfeature "pyro support" dev-python/pyro:4
-	optfeature "yaml support" dev-python/pyyaml
-	optfeature "beanstalk support" dev-python/beanstalkc
-	optfeature "memcache support" dev-python/pylibmc
-	#optfeature "threads support" dev-python/threadpool
-	optfeature "mongodb support" dev-python/pymongo
-	optfeature "zeromq support" dev-python/pyzmq
-	optfeature "sqlalchemy support" dev-python/sqlalchemy
-	optfeature "sqs support" dev-python/boto
-	#optfeature "cassandra support" dev-python/pycassa
-}
diff --git a/dev-python/celery/metadata.xml b/dev-python/celery/metadata.xml
index a398d248e37d..4b8a09186e44 100644
--- a/dev-python/celery/metadata.xml
+++ b/dev-python/celery/metadata.xml
@@ -11,7 +11,6 @@
 	<use>
 		<flag name="redis">Enables redis support</flag>
 		<flag name="sqs">Enables Amazon SQS transport module for celery</flag>
-		<flag name="zeromq">Enable logging and deployment via ZeroMQ</flag>
 		<flag name="yaml">Enable support of yaml as a configuration file format</flag>
 	</use>
 </pkgmetadata>