bump; update deps, fixes bug #548592

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

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index 316199da6aa82f7dc2c44887c807ff7a4f08d47c..1a2497e05049930e6621a17b921f26d3fd0d7f05 100644 (file)
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/kombu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.44 2015/03/08 23:52:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.45 2015/05/07 05:20:58 idella4 Exp $
+
+*kombu-3.0.26 (07 May 2015)
+
+  07 May 2015; Ian Delaney <idella4@gentoo.org> +kombu-3.0.26.ebuild:
+  bump; update deps, fixes bug #548592
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> kombu-3.0.24.ebuild:
   x86 stable, bug 540290

diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 3900fae75f5f726acc0accece14ce256c87cf4c2..815a61f821d0413955bb0f785f3bca007b46b08d 100644 (file)
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -4,14 +4,18 @@ Hash: SHA256
 AUX kombu-NA-tests-fix.patch 495 SHA256 e83b9ca823d1a972a203fc02cce2cf1ab740e65957e89be50fc4343def926ac4 SHA512 0399ddcd6992182577a09e5892b042ab2c232a6f86fda46a8ac4b6254ad73fd2fc342b863d59154371a266dd0927ae72c299c4ad16bc1c8cad557d26865ff264 WHIRLPOOL 55ba444b7607fa169cf53463965520c82bdf74ce2781a127c844d496a4f9c208ff366c24a3832839ddea14bff3ee3b545d8ed960cde524688cc916ca114282e9
 DIST kombu-3.0.23.tar.gz 343923 SHA256 448c3e3ce671a10f00ee03979ba3c7866b4bfce49f65edec9f93a0cefa87ec16 SHA512 239ffbeb3c901227de7fb44f7c0b5ca611b8648eea81cd0c371bdadc1cd855a0f19001556aaa62abf7cb610b26dc182058251b97d85c8529a42a2e675edd0aaf WHIRLPOOL 0842ff10715b45c92d43923b32a3c81b5216a9c5fe0b6432d3790b1e08a02388f3631d380b7234cb050e8c8b711ab0ecb8aab676499f576b14d1a3b90844688f
 DIST kombu-3.0.24.tar.gz 374539 SHA256 b9ff0437607113aea701fd5122c2afa40c05dff6f1da4f58b2f1ea18d9f2bf8d SHA512 fdc42073d37c0888f564ae3feec517212e3cadd534cae2a0893f799c6fea7c217aa979617ec73b63466a7b5a3dbb836b57422ce514087d4e4821e88eec5e4ffa WHIRLPOOL 8513cbe9df4337fe3545cc2a2ff3cec3c9f28b60f200aff5395b2acb484c6b75fe710b5227df6eb3fd41a6faeb49a0aaf968618e66594e9e87c20c448475d27c
+DIST kombu-3.0.26.tar.gz 375553 SHA256 1f565abd44c4b7dfaa4dd543d52f982d2f006aba0a2b3830542b4d25a801fe09 SHA512 71656cc8f44101700c5489e0b0a66918a00cf8ff39e65feab1090865e3c8d50b6dd2458f95d48fb58cc4387de954530fe27a5713838509d51123bac7009631a2 WHIRLPOOL d706dcd752e24eebc3a1091a8a2ba91a0b6adf30fa9be4d9d1a95b5c008f8036eb518f03ccb1d3393502488120c9ad2ad2f2e01c41b59beb3576389b3f9c000f
 EBUILD kombu-3.0.23.ebuild 3165 SHA256 71bdd286c34dba0a394ffc74014e6be57aee489f2adf88836093166dccb03d7d SHA512 4cacc80f72bf52149de8b44041ff2da2da1f8ee1b06a7a24985f8b6e1c2d43716a6c29f43c1dc820bf652de840cc157f5649b1e862ef7fc11079918619a41bfe WHIRLPOOL 5b700a8b79839afc02ce99a9709364d2abbcc168f943690c417b62f0c26f055675f1c82d2377f8beb93f061f211fb9d24ccf7ca587f96323f11a2798622621b6
 EBUILD kombu-3.0.24.ebuild 3327 SHA256 d07fb3874facde2fe35a7f731bd4dc30ff00bd3ef247d45745163b42575ad07b SHA512 80644dbdeca01ee625e6bd36c108b60c611896e105915bd594867cf29a8e8f300f89e4298b571441f381ba1fb5901ad60dd0eb61a262c7db4e9d538a9ba44ef3 WHIRLPOOL 47942d959c7f448d29c6846a321dfc542268354683fdce59d82185a35720c724ed6ce8c593f13e8b8ee9b6d8c76635c008befca5ed14d131229390a3b440ea2c
-MISC ChangeLog 6755 SHA256 9a0606edc4795d9b40fb5f97a0908a597640038293c025ad300076a945d41795 SHA512 643216e13be8932528cec46d9e630682b5f362a1d49e240d2870ebb7715e2635f9b05095dd3e4a7bc3bc64884b4c391779a0017272b2b2c162a72830a67cd438 WHIRLPOOL 954bea9692c8aaf6612d0bebbe358e0031e517546a9d4c2125e7e5fa4161de31c296fe47d8f8bfac8c5b49affce2a18c0c24c8915b841f9534255a12c8358d2a
+EBUILD kombu-3.0.26.ebuild 3612 SHA256 f284b6290ebe64dedf49ac57162c1a8d2b136e5c182f5619ddaecdaac47d413c SHA512 0d976d992946bf398766b873a8a608b79204b8e171df701cf5b61b2aac3f45c723496e0eb9850f1820b69cfa08dc79623c590f1f53d6fb28668e59f0be00efc7 WHIRLPOOL 0ec464e2eb7fabafb91b8e4ae77ff69564cfdb552fd76acfb70c92edeadfd2b04e9049416d0c52c043adcc3cc62d5c32cf9f41fc85efe08c61c8b1bbb044927a
+MISC ChangeLog 6896 SHA256 6ccda8cba9710a87374a1642a4f3de9bd2c4054d63d568ae731596c2a726e3b0 SHA512 ee4a830c474db7face8feacd9f862554b719466a7760c8709e1218d6dc1139b4bc148d876f3305b69fe9f6efb35a2c45fa23a34f233f6f66f9f2386eedff26a2 WHIRLPOOL 4387810a3cd83f10ad2b8cca1b51d9c5e9db141f9087ab0a123f87ffd735441410b702c037a6b852665838ac4c38ac4c97e908cca5523f2b193f8f07261fbacf
 MISC metadata.xml 496 SHA256 b6c768b63bca591c1f60051f25fbbbafc7ace357d7054b47ced30645e2e2f54e SHA512 efbe9196a4e9e3fd2d33652f9e2058a7336e038cf2770492ee1f76a15d379f5fcb67f94732c94711b65932a988d6fceb1ea4a2fdaeaf30f83b2780720aeeb6e1 WHIRLPOOL d016d33c1d8a4735fdfc01151e04764d01f1acd9368aa898738fb24e8c90da041196704749e947e085a0007f08ef9d3100c0b070c69e306c27f50af1305f5809
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT84K8ACgkQCaWpQKGI+9TD7gCfR9r3hDzoyFoRc1nqfKtouhrf
-rrUAnRRSh2X55/uknz2YSbTT6nVXden4
-=yThA
+iKYEAREIAGYFAlVK9khfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw2XxACgkZPoojCjVqOFqG8meS8ALpUe
+988AoLU+XE3DzVBUtzr4QqBXVbMKA2fx
+=vFrC
 -----END PGP SIGNATURE-----

diff --git a/dev-python/kombu/kombu-3.0.26.ebuild b/dev-python/kombu/kombu-3.0.26.ebuild
new file mode 100644 (file)
index 0000000..2356019
--- /dev/null
+++ b/dev-python/kombu/kombu-3.0.26.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.26.ebuild,v 1.1 2015/05/07 05:20:58 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"
+
+# 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.6[${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/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-2.6.2[${PYTHON_USEDEP}]
+               <dev-python/pymongo-3.0[${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.7')"
+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 )
+
+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"
+       # 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
+               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
+}