bump; Add local IUSE flags msgpack, also to metadata.xml; sqs update deps, add REQUIRED_USE conditions, update test phase, kind of fixes Bug #493810 by Patrick, rm old

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

6 files changed, 92 insertions, 208 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index 05dfe2cec479..a5f04fd0005f 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,15 @@
 # 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.31 2014/03/30 09:19:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.32 2014/03/31 09:05:43 idella4 Exp $
+
+*kombu-3.0.14 (31 Mar 2014)
+
+  31 Mar 2014; Ian Delaney <idella4@gentoo.org> +kombu-3.0.14.ebuild,
+  -kombu-1.0.4-r1.ebuild, -kombu-1.0.4.ebuild, -kombu-2.4.10.ebuild,
+  metadata.xml:
+  bump; Add local IUSE flags msgpack, also to metadata.xml; sqs update deps, add
+  REQUIRED_USE conditions, update test phase, kind of fixes Bug #493810 by
+  Patrick, rm old
 
   30 Mar 2014; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer as talked with him (#398377)
diff --git a/dev-python/kombu/kombu-1.0.4-r1.ebuild b/dev-python/kombu/kombu-1.0.4-r1.ebuild
deleted file mode 100644
index f9361403b142..000000000000
--- a/dev-python/kombu/kombu-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,65 +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-1.0.4-r1.ebuild,v 1.2 2013/03/26 06:24:38 prometheanfire Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_2 )
-
-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="doc examples test"
-
-RDEPEND="dev-python/anyjson
-	>=dev-python/amqplib-0.6"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose-cover3
-			dev-python/mock
-			virtual/python-unittest2
-			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"
-
-python_compile() {
-	distutils-r1_python_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
-}
-
-python_test() {
-	nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests || die "nose tests
-	failed for ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_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-1.0.4.ebuild b/dev-python/kombu/kombu-1.0.4.ebuild
deleted file mode 100644
index d68c7b7bc771..000000000000
--- a/dev-python/kombu/kombu-1.0.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-1.0.4.ebuild,v 1.2 2013/03/21 18:40:40 prometheanfire 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="doc examples test"
-
-RDEPEND=">=dev-python/anyjson-0.3.3
-	>=dev-python/amqplib-0.6"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose-cover3
-	dev-python/mock
-	virtual/python-unittest2
-	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.4.10.ebuild b/dev-python/kombu/kombu-2.4.10.ebuild
deleted file mode 100644
index 91cb9045f7dc..000000000000
--- a/dev-python/kombu/kombu-2.4.10.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.4.10.ebuild,v 1.4 2013/01/06 19:40:16 mgorny 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="doc examples test"
-
-RDEPEND=">=dev-python/anyjson-0.3.3
-	>=dev-python/amqplib-1.0.2"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose-cover3
-	dev-python/mock
-	virtual/python-unittest2
-	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-3.0.14.ebuild b/dev-python/kombu/kombu-3.0.14.ebuild
new file mode 100644
index 000000000000..57be35c76304
--- /dev/null
+++ b/dev-python/kombu/kombu-3.0.14.ebuild
@@ -0,0 +1,80 @@
+# 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/metadata.xml b/dev-python/kombu/metadata.xml
index 12531ac94404..8d1c50b912d1 100644
--- a/dev-python/kombu/metadata.xml
+++ b/dev-python/kombu/metadata.xml
@@ -8,5 +8,7 @@
 	</upstream>
 	<use>
 		<flag name="amqplib">Enable amqplib support</flag>
+		<flag name="sqs">enables Amazon SQS transport module for Kombu</flag>
+		<flag name="msgpack">enables MessagePack (de)serializer for Python</flag>
 	</use>
 </pkgmetadata>