bump; add optional deps pyro:4, pyzmq

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 112 insertions, 5 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index 78396eb698e0..79a72fce2b87 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2014/07/01 04:04:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.39 2014/07/17 02:33:34 idella4 Exp $
+
+*kombu-3.0.21 (17 Jul 2014)
+
+  17 Jul 2014; Ian Delaney <idella4@gentoo.org> +kombu-3.0.21.ebuild,
+  metadata.xml:
+  bump; add optional deps pyro:4, pyzmq
 
   01 Jul 2014; Patrick Lauer <patrick@gentoo.org> -kombu-2.5.14.ebuild:
   Remove old version with unsatisfiable dependencies
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 6993f405a588..16646f96b57a 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX kombu-NA-tests-fix.patch 495 SHA256 e83b9ca823d1a972a203fc02cce2cf1ab740e65957e89be50fc4343def926ac4 SHA512 0399ddcd6992182577a09e5892b042ab2c232a6f86fda46a8ac4b6254ad73fd2fc342b863d59154371a266dd0927ae72c299c4ad16bc1c8cad557d26865ff264 WHIRLPOOL 55ba444b7607fa169cf53463965520c82bdf74ce2781a127c844d496a4f9c208ff366c24a3832839ddea14bff3ee3b545d8ed960cde524688cc916ca114282e9
 DIST kombu-3.0.16.tar.gz 342440 SHA256 c1e0a1146ef109b85a35cc5f7f8e4b652211aa4d666efba5d727c554e25e2957 SHA512 3d7a7f960a95376e59cf1040924aa3cfbf538e5bb57524b7172e253b20ee7829e81c881f21476a80a9a47dfd6b9c6a23b8731e21f5d47f9fa8a1e19591a70a59 WHIRLPOOL 575f69f54296e208a206f0cd060e3d6d26f01ac62c921f1ff92bde5050c5bb781e0c7d35d830099d2ad84b162d175405afaca6633d51ba1a4ba541333fc09c60
 DIST kombu-3.0.18.tar.gz 343083 SHA256 a6efb207c19ff64fb52af074d079611c53548e7f75f59a40422a1d0034dd8256 SHA512 f8b409f26f42e7f4e057b37cda12bdd7909f2ec698912c2cb39ebc8fc39fab6875f50f74e5449678f55051983d697b5debb56728b138ca74cf2d462f97c22a4f WHIRLPOOL 0f21a7bc9127efde41baff0a1efb9aabfb272356980a7c665fa2a0157d1878d9c7dfa0099fec45a8b6f6205112a590b72de2fdea2c53be5f14c477832eae792a
 DIST kombu-3.0.19.tar.gz 343272 SHA256 26a0ccb2bbca5ef27733ad1d3f05e0f69bc9fc93ff6aeaef55f8a94609c835b7 SHA512 ad649e037c045078d1315b65d2d2101202c9c163bdaefb2a7dcc4882e0c7bb1038f27924fdf5b3529ba703b43d78d16c6eade67b9d244f856c345fb8f8e5dea9 WHIRLPOOL 57d780c02dec39e81bcd9e4ea7e7d3e371c265f342b5e6d3f2226eecbf7fe25139ab74b91da68e87f6ae197c185d55be03b00f061fe9ffddf146d43eb2f5c86d
+DIST kombu-3.0.21.tar.gz 343363 SHA256 2eaca88496bcfcf9b6d597999776853792ef35f919c37e2f0f151dfe38a60d3a SHA512 341a453b0daaa50a45e490359b9b3baabdf68d9f7bd728c91daaed165a78471292dc1af1a68ffe8f1fdcf4321dca55f926f3b48d7acf11e13894a8c97d194e5d WHIRLPOOL 9188688d99ca89f723d5095c4a65723b11fb6788362f0ffb118fee231404b60c4dee99f2cc2a58d040be1f8f7d010cbfb8e3043c8f832d79fe1e9e28c20269ec
 EBUILD kombu-3.0.16.ebuild 2815 SHA256 cceaf71aca92ec4fb4af063fdfb66e8af2dd48536057d4c709c662a70570894e SHA512 f667ebc19487e5918e8e02cc1bad5dddf295c2870c2103dcdc9b11add5dc9860e284e6851de5e59a62c70ac6be87035334ac2801a8b00c98ee01aed424e94c6f WHIRLPOOL 6ecba41e1008dd683399ec69c630a7d53799aeb31478cbbb1babb83d6f456f1499b07f592a3576e42001161a36d715db70679a772af88c8b08bd226523b2c8db
 EBUILD kombu-3.0.18.ebuild 2867 SHA256 ded37b9313eef8baec4787c6f8282d2e352d410df5e46bb30d637ff871d3efbb SHA512 9e39f428adc8e0a973af4dcc12daf92efc61a4ea7a44d747f18c06e690a750d99a0f7bd848886743a5e21990b4fa11a2b3bd6f648443f4bd2bbf4139cfdd66fb WHIRLPOOL 5ce5d7c8ba4878d5c787f6e529a6f244f649a1118e2fd441d09ce301983b025b44493c3f28206ff5c835bf905d47a878b5f4aea94dd52258dde9a89bd48c446f
 EBUILD kombu-3.0.19.ebuild 2938 SHA256 9382e644b30c7dd4e6ee50bc035a16a7f0d5744be2409872548f10bdfc2c9ee5 SHA512 7c160aa95071cfe057511ad5d485294cb1f8816dd65c8189c5a17dd49d9e6e95ee7d05811c8f87cced81b345b1423fc1f6609d89ce5e4c8b33ec6433fd6ea126 WHIRLPOOL 95ada61373061b8ac9edc182270fa2546994967f3a98a51a0db08d71b54f9af59ab2d003b7acc49f252daa1579b6140c59c75d59a27e26515485d93f29b3cf0d
-MISC ChangeLog 5984 SHA256 3d43066f96320e5d5d68fdfa6898bd0ececbc30f40695efd37e3b4ce160ef4a1 SHA512 deaf2546eeb0c7fc3c9505aea3de267f7ac9c0e3416a38c82787c6f33f207db5dec4d38c0a9aea33e1582d4ff46fff7a41b4f2296bee5589e9682d7d73f5244e WHIRLPOOL 02f6e3ca26ed1285de2fb47bd3b738a94eaf9e84421a241acc949627a73694ab16411a2ffe35f8f373b47274e44397649e4169b00986646cd6e3c946cb51ae8e
-MISC metadata.xml 496 SHA256 a221bd2f78c6decc3f199c818a13a0c4596e0028ea119af82a1d54dec03e8410 SHA512 af2b75ead1edf44293fed821d8b113e9562a48bc66c191adcd913f265824314b667e8634fedad323dd3dd2a7205135a29f5b29596591e5c44f45ea7dd1440c7e WHIRLPOOL c74ca093c23b7152794250d67e2a74d4c48239635a03512ca5f1e3da0dc7c5dfb62c9e779f54dd7ca96cde436d8d3b390dc2e4556da2bc41cfc3482743f4fe6e
+EBUILD kombu-3.0.21.ebuild 3103 SHA256 8f2e49f76dc4636b2662ae39bc57abae76e08ec85209cc3a975968058be73d74 SHA512 ddbc90592a7d16510fe4795c60940d9cd0546a0edcb4c20a9b6de4d21050aedad548b696da99fadc6bdd66bd3c4ec749b25428d20ec58a1d53394f82c4cd253d WHIRLPOOL 0f9f5e1980203d0e96a577dca21108bedb1449c4ed7e4a2f20767710de59fca846140f706460db949ce38edcd5fed9fa360d85b859994605967a3ea6e6097446
+MISC ChangeLog 6140 SHA256 02277d99ec5f65ec44c6e67dc8b37c91976634d4239a864c24dc5eec54a4ef47 SHA512 13a73527d39fab3551f433fa0dfaf112e3ffdb84da8c7fdbf74af51e36149c52e545fc7874d955ab1cfe28352d611f7640a021d5b29488fb38333305560b6cda WHIRLPOOL bd097c819f9a0c589463dd053b3dc92b519106126ff6843e4b8cb1d38e95f59d11739b724291970303d8b592b8df21177c0de0db6c6b663aca78bf9a2b044026
+MISC metadata.xml 496 SHA256 b6c768b63bca591c1f60051f25fbbbafc7ace357d7054b47ced30645e2e2f54e SHA512 efbe9196a4e9e3fd2d33652f9e2058a7336e038cf2770492ee1f76a15d379f5fcb67f94732c94711b65932a988d6fceb1ea4a2fdaeaf30f83b2780720aeeb6e1 WHIRLPOOL d016d33c1d8a4735fdfc01151e04764d01f1acd9368aa898738fb24e8c90da041196704749e947e085a0007f08ef9d3100c0b070c69e306c27f50af1305f5809
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlPHM/8ACgkQso7CE7gHKw2MOgCeILeVJyznia8H3dF9+rCfwFAl
+2sMAn3cAuLw7kHSqHy9fwkSYCMX+PrID
+=mnJz
+-----END PGP SIGNATURE-----
diff --git a/dev-python/kombu/kombu-3.0.21.ebuild b/dev-python/kombu/kombu-3.0.21.ebuild
new file mode 100644
index 000000000000..50b9db90b0f3
--- /dev/null
+++ b/dev-python/kombu/kombu-3.0.21.ebuild
@@ -0,0 +1,89 @@
+# 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.21.ebuild,v 1.1 2014/07/17 02:33:34 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+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.5[${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}]' python2_7 python{3_3,3_4})
+		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}] )"
+
+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-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-0.5.0[${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,so also kazoo, 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
+
+PATCHES=( "${FILESDIR}"/${PN}-NA-tests-fix.patch )
+
+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
+		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.
+		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 8d1c50b912d1..d9cbb330499e 100644
--- a/dev-python/kombu/metadata.xml
+++ b/dev-python/kombu/metadata.xml
@@ -8,7 +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>
+		<flag name="sqs">Enables Amazon SQS transport module for Kombu</flag>
+		<flag name="msgpack">Enables MessagePack (de)serializer for Python</flag>
 	</use>
 </pkgmetadata>