commit:     48f6e882d4fbbdee69fd4c8f0dba54e4b7533a9e
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 05:27:28 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Sep  1 05:30:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f6e882

dev-python/kombu: cleanup

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 dev-python/kombu/Manifest               |   1 -
 dev-python/kombu/kombu-3.0.37-r1.ebuild | 112 --------------------------------
 dev-python/kombu/metadata.xml           |   1 -
 3 files changed, 114 deletions(-)

diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index a69dcd6877c..a7d0a649e57 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,2 +1 @@
-DIST kombu-3.0.37.tar.gz 411790 BLAKE2B 
437e99beba410bd0e42b47e91b42fb8881443c8ccba454cb092adee94a94e93cb2104259b62652c423657c58f95a9969e0e966037040cc99e996e6daa7a8e2b7
 SHA512 
ba9bb00e23ce2d3da87eb07aacff8d63ef9879e6ca9f3fe82653cc2ee91610199fe8fc778d7c2e00df05b46130ecda0bdeceda48192b8af1fb0eca41fbb44712
 DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 
636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c
 SHA512 
fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861

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 b562ae57521..00000000000
--- 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/metadata.xml b/dev-python/kombu/metadata.xml
index b487c812a55..9379c4a1d89 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>

Reply via email to