bump; add pypy support, remove some old and versions + patches, now redundant

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

9 files changed, 15 insertions, 419 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index 565075012bed..b7923118fa3d 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for dev-python/kombu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.35 2014/06/07 12:27:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.36 2014/06/16 02:43:40 idella4 Exp $
 
 *kombu-3.0.18 (07 Jun 2014)
 
   07 Jun 2014; Ian Delaney <idella4@gentoo.org> +kombu-3.0.18.ebuild:
-  bump, adjust test phase according to new failaures
+  bump, adjust test phase according to new failures
 
 *kombu-3.0.16 (01 Jun 2014)
 
diff --git a/dev-python/kombu/files/kombu-2.1.1-add-assertIsInstance-with-unittest.patch b/dev-python/kombu/files/kombu-2.1.1-add-assertIsInstance-with-unittest.patch
deleted file mode 100644
index d8a0ccca522b..000000000000
--- a/dev-python/kombu/files/kombu-2.1.1-add-assertIsInstance-with-unittest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kombu/tests/utils.py	2012-02-07 17:57:27.000000000 +0100
-+++ b/kombu/tests/utils.py	2012-02-28 16:09:43.687489572 +0100
-@@ -23,6 +23,8 @@
- 
-     if not hasattr(unittest.TestCase, "assertItemsEqual"):
-         assertItemsEqual = unittest.TestCase.assertSameElements
-+    if not hasattr(unittest.TestCase, "assertIsInstance"):
-+        assertIsInstance = lambda inst, obj, cls: unittest.TestCase.assertTrue(inst, isinstance(obj, cls))
- 
- 
- class Mock(mock.Mock):
diff --git a/dev-python/kombu/files/kombu-2.5.10-tests.patch b/dev-python/kombu/files/kombu-2.5.10-tests.patch
deleted file mode 100644
index f5e72d0c4f54..000000000000
--- a/dev-python/kombu/files/kombu-2.5.10-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 95dacce13e704e83d640e488ff50ccd16ca8411b Mon Sep 17 00:00:00 2001
-From: Ask Solem <ask@celeryproject.org>
-Date: Tue, 25 Jun 2013 14:22:49 +0100
-Subject: [PATCH] Fixes test suite failures when logging enabled.  Closes #227
-
-diff -ur kombu-2.5.10.orig/kombu/tests/transport/test_pyamqp.py 
-kombu-2.5.10/kombu/tests/transport/test_pyamqp.py
---- kombu/tests/transport/test_pyamqp.py	2013-04-12 00:57:56.000000000 +0800
-+++ kombu/tests/transport/test_pyamqp.py	2013-06-27 23:39:30.545684336 +0800
-@@ -3,8 +3,10 @@
- 
- import sys
- 
-+from functools import partial
- from mock import patch
- from nose import SkipTest
-+from itertools import count
- 
- try:
-     import amqp    # noqa
-@@ -13,6 +15,7 @@
- else:
-     from kombu.transport import pyamqp
- from kombu import Connection
-+from kombu.utils.compat import next
- 
- from kombu.tests.utils import TestCase
- from kombu.tests.utils import mask_modules, Mock
-@@ -43,6 +46,7 @@
-                 pass
- 
-         self.conn = Mock()
-+        self.conn._get_free_channel_id.side_effect = partial(next, count(0))	
-         self.conn.channels = {}
-         self.channel = Channel(self.conn, 0)
- 
diff --git a/dev-python/kombu/kombu-2.5.10.ebuild b/dev-python/kombu/kombu-2.5.10.ebuild
deleted file mode 100644
index fed59a396549..000000000000
--- a/dev-python/kombu/kombu-2.5.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.10.ebuild,v 1.4 2013/08/15 03:47:53 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="http://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 ~x86"
-IUSE="amqplib doc examples test"
-
-RDEPEND=">=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		>=dev-python/py-amqp-1.0.12[${PYTHON_USEDEP}]
-		amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose-cover3[${PYTHON_USEDEP}]
-		>=dev-python/mock-0.7[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
-		dev-python/pymongo[$(python_gen_usedep python2_7)]
-		dev-python/msgpack[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/beanstalkc[$(python_gen_usedep python2_7)]
-		dev-python/couchdb-python[$(python_gen_usedep python2_7)] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html || die "kombu docs failed installation"
-	fi
-}
-
-# https://github.com/celery/kombu/issues/227
-python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	if [[ "${EPYTHON}" == python3* ]]; then
-		nosetests --py3where=build/lib \
-		-e test_produce_consume -e test_produce_consume_noack kombu/tests \
-		|| die "Tests failed under ${EPYTHON}"
-	else
-		nosetests || die "Tests failed under ${EPYTHON}"
-	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-2.5.4-r1.ebuild b/dev-python/kombu/kombu-2.5.4-r1.ebuild
deleted file mode 100644
index bacc4e338186..000000000000
--- a/dev-python/kombu/kombu-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.4-r1.ebuild,v 1.2 2013/02/09 17:09:19 floppym Exp $
-
-EAPI="4"
-
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[56]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="http://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 ~x86"
-IUSE="amqplib doc examples test"
-
-RDEPEND=">=dev-python/anyjson-0.3.3
-	amqplib? ( >=dev-python/amqplib-1.0.2 )
-	>=dev-python/py-amqp-1.0.6"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose-cover3
-	dev-python/mock
-	dev-python/simplejson
-	dev-python/anyjson
-	dev-python/redis-py
-	dev-python/pymongo
-	dev-python/msgpack )
-	doc? ( dev-python/sphinx
-	dev-python/django
-	dev-python/beanstalkc
-	dev-python/couchdb-python )
-	dev-python/setuptools"
-
-src_compile() {
-	distutils_src_compile
-
-	local SPHINXBUILD
-	if use doc; then
-		if python2.7 -c "import django.conf" &> /dev/null; then
-			# This will force sphinx-build to use python2.7
-			local EPYTHON=python2.7
-			export EPYTHON
-		else
-			die "kombu docs failed installation"
-		fi
-		einfo "building docs for kombu with python2.7"
-		PYTHONPATH="${S}" emake -C docs html
-	fi
-}
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	if use examples; then
-		docompress -x usr/share/doc/${P}/examples/
-		insinto usr/share/doc/${PF}/
-		doins -r examples/
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/kombu/kombu-2.5.4.ebuild b/dev-python/kombu/kombu-2.5.4.ebuild
deleted file mode 100644
index 2dbd3ebc844a..000000000000
--- a/dev-python/kombu/kombu-2.5.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.4.ebuild,v 1.2 2013/01/23 09:31:55 iksaif Exp $
-
-EAPI="4"
-
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[56]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="http://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 ~x86"
-IUSE="amqplib doc examples test"
-
-RDEPEND=">=dev-python/anyjson-0.3.3
-	amqplib? ( >=dev-python/amqplib-1.0.2 )
-	>=dev-python/py-amqp-1.0.6"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose-cover3
-	dev-python/mock
-	dev-python/simplejson
-	dev-python/anyjson
-	dev-python/redis-py
-	dev-python/pymongo
-	dev-python/msgpack )
-	doc? ( dev-python/sphinx
-	dev-python/django
-	dev-python/beanstalkc
-	dev-python/couchdb-python )
-	dev-python/setuptools"
-
-src_compile() {
-	distutils_src_compile
-
-	local SPHINXBUILD
-	if use doc; then
-		if python2.7 -c "import django.conf" &> /dev/null; then
-			SPHINXBUILD="sphinx-build-2.7"
-		else
-			die "kombu docs failed installation"
-		fi
-		einfo "building docs for kombu with python2.7"
-		PYTHONPATH="${S}" emake -C docs html SPHINXBUILD="${SPHINXBUILD}"
-	fi
-}
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	if use examples; then
-		docompress -x usr/share/doc/${P}/examples/
-		insinto usr/share/doc/${PF}/
-		doins -r examples/
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/kombu/kombu-2.5.6.ebuild b/dev-python/kombu/kombu-2.5.6.ebuild
deleted file mode 100644
index b7f62f9b38e0..000000000000
--- a/dev-python/kombu/kombu-2.5.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.6.ebuild,v 1.1 2013/02/22 08:05:02 patrick Exp $
-
-EAPI="4"
-
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[56]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="http://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 ~x86"
-IUSE="amqplib doc examples test"
-
-RDEPEND=">=dev-python/anyjson-0.3.3
-	amqplib? ( >=dev-python/amqplib-1.0.2 )
-	>=dev-python/py-amqp-1.0.6"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose-cover3
-	dev-python/mock
-	dev-python/simplejson
-	dev-python/anyjson
-	dev-python/redis-py
-	dev-python/pymongo
-	dev-python/msgpack )
-	doc? ( dev-python/sphinx
-	dev-python/django
-	dev-python/beanstalkc
-	dev-python/couchdb-python )
-	dev-python/setuptools"
-
-src_compile() {
-	distutils_src_compile
-
-	local SPHINXBUILD
-	if use doc; then
-		if python2.7 -c "import django.conf" &> /dev/null; then
-			# This will force sphinx-build to use python2.7
-			local EPYTHON=python2.7
-			export EPYTHON
-		else
-			die "kombu docs failed installation"
-		fi
-		einfo "building docs for kombu with python2.7"
-		PYTHONPATH="${S}" emake -C docs html
-	fi
-}
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	if use examples; then
-		docompress -x usr/share/doc/${P}/examples/
-		insinto usr/share/doc/${PF}/
-		doins -r examples/
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/kombu/kombu-3.0.14.ebuild b/dev-python/kombu/kombu-3.0.14.ebuild
deleted file mode 100644
index 57be35c76304..000000000000
--- a/dev-python/kombu/kombu-3.0.14.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.14.ebuild,v 1.1 2014/03/31 09:05:43 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="http://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 ~x86"
-IUSE="amqplib doc examples msgpack sqs test"
-
-PY27_GEN_USEDEP=$(python_gen_usedep python2_7)
-RDEPEND=">=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		>=dev-python/py-amqp-1.4.4[${PYTHON_USEDEP}]
-		<dev-python/py-amqp-2.0[${PYTHON_USEDEP}]
-		amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
-		sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] )
-		msgpack? ( dev-python/msgpack[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose-cover3[${PYTHON_USEDEP}]
-		>=dev-python/mock-0.7[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
-		dev-python/pymongo[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/beanstalkc[${PY27_GEN_USEDEP}]
-		dev-python/couchdb-python[${PY27_GEN_USEDEP}]
-		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )"
-#pyyaml is an optional package for tests, refrain for now
-# Req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PY27_REQUSE="$(python_gen_useflags 'python2.7')"
-REQUIRED_USE="sqs? ( ${PY27_REQUSE} )
-		doc? ( ${PY27_REQUSE} amqplib sqs )"		# 2 deps in doc build are only py2 capable
-
-python_prepare_all() {
-	https://github.com/celery/kombu/issues/246
-	sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py
-	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"
-	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
-		# funtests appears to be coded only for py2, a kind of 2nd tier.
-		nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
-		nosetests funtests || die "Tests failed under ${EPYTHON}"
-	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-3.0.15.ebuild b/dev-python/kombu/kombu-3.0.19.ebuild
index a5cb8712964f..26bacfb1ccec 100644
--- a/dev-python/kombu/kombu-3.0.15.ebuild
+++ b/dev-python/kombu/kombu-3.0.19.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.15.ebuild,v 1.1 2014/04/27 08:15:45 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild,v 1.1 2014/06/16 02:43:40 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 		dev-python/beanstalkc[${PY27_GEN_USEDEP}]
 		dev-python/couchdb-python[${PY27_GEN_USEDEP}]
 		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )"
+
 # pyyaml is an optional package for tests, refrain for now
 # Req'd for test phase
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -63,18 +64,19 @@ python_compile_all() {
 
 python_test() {
 	export DJANGO_SETTINGS_MODULE="django.conf"
+	# https://github.com/celery/kombu/issues/364. Cleaner for now to ignore the whole test_ file
 	if python_is_python3; then
 		2to3 --no-diffs -w build/lib/kombu/transport/
-		nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}"
+		nosetests --py3where=build/lib kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}"
 	else
-		# funtests appears to be coded only for py2, a kind of 2nd tier.
-		nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
-		# https://github.com/celery/kombu/issues/346
-		pushd funtests > /dev/null
-		# Disable test_redis.py for now
-		mv tests/test_redis.py tests/tredis.py || die
-		esetup.py test
-		popd > /dev/null
+		nosetests "${S}"/kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}"
+		# funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6.
+		if [[ "${EPYTHON}" == python2.7 ]]; then
+			pushd funtests > /dev/null
+			# For now, use nosetests manually, return to esetup.py on fixing of issues/364
+			nosetests -I test_amqplib.py || die "Tests failed under ${EPYTHON}"
+			popd > /dev/null
+		fi
 	fi
 }