bump one remove one, fixes bug #548588

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

diff --git a/dev-python/celery/ChangeLog b/dev-python/celery/ChangeLog
index be24cd80edb3a87047511194420b6021b887d42e..26bb15a018f90108a0149af019a1d630748b9f35 100644 (file)
--- a/dev-python/celery/ChangeLog
+++ b/dev-python/celery/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/celery
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.48 2015/03/08 23:41:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.49 2015/05/08 08:47:05 idella4 Exp $
+
+*celery-3.1.18 (08 May 2015)
+
+  08 May 2015; Ian Delaney <idella4@gentoo.org> +celery-3.1.18.ebuild,
+  -celery-3.1.16.ebuild:
+  bump one remove one, fixes bug #548588
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> celery-3.1.17.ebuild:
   x86 stable, bug 540290

diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index d60c3bdbafc7da93b8c42239c3a60ebaab91bfc9..2720f016e134c7cdc4c8cb37bc405c08525ba933 100644 (file)
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -10,16 +10,18 @@ AUX celery.confd 1860 SHA256 33d824dee40c01f79ea177b7e574a7e061e943fe72842676003
 AUX celery.confd-r1 1377 SHA256 91971f917a1e282a59ec24e1488d469c2e2aea96def79c20ad8133731dd75f57 SHA512 3f1e1292ba20c146d4986f7aaaf2a93e62188eb4a8a515742938bbe4414f19b1f1402c047b7737e967caadadb445cca3d36c5e60fe4d9c165383c9e80a76226f WHIRLPOOL 2aa4ff3d2ed957e93e07fbce9508e1be926bfbc3c3db61ac3d74bb3cd1baa19973ebe43abeadaf770610bdea6c9da3dedb74d81f4bf79d488c6128c86dd062aa
 AUX celery.initd 6031 SHA256 aa47afffac71e7d12875e0f9d4b50d58e629d7c075a22ddd99e4e60a6e384ab4 SHA512 f7b4c0dc72fdd2a8920dea193cfba24c3cf340e27cb6fa5439bccd82364a48ebdd0cff86c1d3abf0fc1a448ec794d86370b58b2e1da81a6bd7d2062bad6b6975 WHIRLPOOL 91b2093ad31d1c1ba24688d51191df05fec90e6e96e3b28912e94c177834f6db5767e922742a1d60a9323fde85b76fb372d87fd1ac96c16ea76ef38aaefae42a
 AUX celery.initd-r1 4517 SHA256 0290d85573051af630e043fc3f8c9a1d88a30af24e4086813564e89c647dfaf0 SHA512 82a3d73a4ca364e030103dd16cb60507eabd64ccd6e7586589fefb7f9f9373f6cc360873f0a96af4a71020a7e575b7df2ca8db7c15b0ccd74836f0eb302e4142 WHIRLPOOL dcc4dc1437689651fce54d997a82e2247cd4ccdc28f7aaf3341c2a36b2bf65c82d23f5b1844f0ac3dafffe3f4b20b4d718ea5cf95158eceeed546f32c427f256
-DIST celery-3.1.16.tar.gz 1296002 SHA256 83079c2974b3e1ac7517b33cde829db59fc2f560482c85ee4f2c751d3dd4f8f3 SHA512 935beec3e0c987746640e38120a8c9dff00c332b46914c0569cf306e3d971873708bfcab1eb76ced4be8d780c387ceec0cf2cee4f3be68b80295b240ae822371 WHIRLPOOL d9824128aeaae60e536f709bc0bd58b9a194a20c55b005c97fa305787c7940e541dc2efdb8cc9d33eb0a23d103e819320b9dd22948683daa00bc46d366d11a84
 DIST celery-3.1.17.tar.gz 1297008 SHA256 cfe2b653268bd586e2d08a75e886f7be3be55ba372f72e2f5747aeb76c470362 SHA512 f45f92161c134f528719768ad863df6b49fa69e022b47ea801e590de8579c24c6a5ec9dd88f712e180ed7d23f4510cecf4f17a959c3338d4bad79f8d7d202453 WHIRLPOOL c0f4ddab40eab2afe579c88bc9e47d46a650a73212abb7cb1d343d7ba72c1d96913c1c04a6e9920789bd6f9bf6907c09e6326aa08e6ba3cf68545e44432b95de
-EBUILD celery-3.1.16.ebuild 2476 SHA256 5acdaabf62bdf63a7f8f456aa7132860d24e8a4ca81ab80416a05249947eb7ad SHA512 66f21385c663f624fcda28fc3b2bc9c35d5c27050808ce0c30aeba1541e85aacb322adc9f97906603f3f63d83cff15a2149f099140c1713f8f04505ede01af4d WHIRLPOOL 4536d2e93a5bf606b19cc6ab2278ebacdf1e2d2bf8f66cd3824b711cd3c2ddceeee6cc4163e976b19b8ec68d710553ec8508e6211156d71316a896f87f6d6aa5
+DIST celery-3.1.18.tar.gz 1298756 SHA256 0924f94070c6fc57d408b169848c5b38832668fffe060e48b4803fb23e0e3eaf SHA512 219291a64c72a0c95a2b184903e491d5b6b1396b4b519d54503bb059af305c2f118865b71510d5685b8f5946135596c9d80d6ca10162a938ed90baaf4c3c48c3 WHIRLPOOL 0d27eda95fea5b6235afd7d5f90de249eec6d7c58a7563afb0cc73d29b84cb6903eced4b9515fe574206111fc4a304c5f24d3c476b4315416b441f324f2ebfa5
 EBUILD celery-3.1.17.ebuild 2602 SHA256 0a6fcc2828a0e8fab2d166b1ba84d87bb86e3ed31b4a064a2429c8158cbaafe9 SHA512 2b5630943d824a3df683cc816ce41ee0bbe10ca4e2f0c12ef3b92c58173a017ab3f9a9d266299959cf0e53da24038c3d46a360a93f7a7091289ed97a823a5016 WHIRLPOOL 470dbb9bfac862bb4b2a59a5d3c3669eaf609a03ba0d36d40bda151e789a08b377dd65ecac9dbe0815bfc0ca120119219f09fb1f0d30ac3edd16f5f7022d28b1
-MISC ChangeLog 8126 SHA256 3a166c281c1d120a9f5f2274ceae889434bbf7f7876597d13b9ccadd5550e223 SHA512 2af4bf5b3918af4e97f00150373b1b31dfafb955c901e976b791a3889f89c151a975c9fa482f6f98a70c192db4316153dcd7439a6d5a63b3817706a0ba5f1dbc WHIRLPOOL 1fb0e0160604cab75a908a58be26093893077a55a65c36b4c71fe210f2092129537f619f4704abddf2daf79266d6b9b2ef255e331909ef22a99edcb46e18bebd
+EBUILD celery-3.1.18.ebuild 2606 SHA256 e0798cdec58511cd97ca590efb4d7bb940e2fdafa9eeefb626c5e3c73294bacd SHA512 55933ef83af773ab20919b104f33fa501bfea33add44dd69ecb969c1a4f54cb48825883c22de09510eb9fd56e5fd80008ebb78e8f9c92aaf0a93ff91b801ce8e WHIRLPOOL e0b472e2c39ca6678e571aa1a302cbf2009010cb7c7e1d3adabe80a99aaba12601fe6ef685ac5c1f0dbf700cf3cb2ab833e222cebd8de5e936a4bb98288ea915
+MISC ChangeLog 8296 SHA256 860d5f70477195599335c7cb77105295f4d20767e34ffb28c42985c40b15ff98 SHA512 6611bca33b8eaabd5dcae5c1e29b7bb1e039be0f77f75481d2a2ebc9c976413273bd040c3511037b5f72e7e88390d8f5ddc30306747b8066a1370f60b217621c WHIRLPOOL 342240aaeeda4757a904965e19c82c16491fd8b04cdae9942dcae35bdb1a8fe79136f2b0a97c02356f541670dee4111959d46607114f7c85619fa38e69867b03
 MISC metadata.xml 518 SHA256 9a8eafc27e056f51a367ef9543b5003632627dc7e15d2455d5599c383cefa84e SHA512 9c57c8453123aee1807b95caad42bc7a4733abf9b01d32f4637ec890578508586149e835afe4f439063c61ebb15c1d56f6941ba5eb3219c50fab706c9020fea5 WHIRLPOOL f8e4ea1342548d4060f4c675ef7aeb9b412a95b7e1c19f7a59e65631624da8f0d693dd2367f1a4f654ce45bc3e7e23435a2cfcde8469e70d8b2233bb62a436e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT83igACgkQCaWpQKGI+9Rh+ACffAUbp2GDjlZVRcgFZPykxs7p
-ec8AmweboSQaUrDFVX8gfm2X4bF3L6Q0
-=87R2
+iKYEAREIAGYFAlVMeBhfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw1hzwCgxWs+uyvgvTxiMCDVz8BNoiMu
+yfMAoJmyVtvadTKXLZAZsdhznu/wFkFo
+=XnZm
 -----END PGP SIGNATURE-----

diff --git a/dev-python/celery/celery-3.1.16.ebuild b/dev-python/celery/celery-3.1.18.ebuild
similarity index 78%
rename from dev-python/celery/celery-3.1.16.ebuild
rename to dev-python/celery/celery-3.1.18.ebuild
index 0606b6abf291e1112d09a44f5ed61af7b92e9ee4..92ab9458d65da29f3156b15933fc85f7cf8fbc70 100644 (file)
--- a/dev-python/celery/celery-3.1.16.ebuild
+++ b/dev-python/celery/celery-3.1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.1.16.ebuild,v 1.2 2014/12/08 09:02:56 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.1.18.ebuild,v 1.1 2015/05/08 08:47:05 idella4 Exp $
 
 EAPI=5
 
@@ -17,29 +17,31 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # There are a number of other optional 'extras' which overlap with those of kombu, however
 # there has been no apparent expression of interest or demand by users for them. See requires.txt
-IUSE="doc examples redis test"
+IUSE="doc examples redis sqs test yaml zeromq"
 
-PY2_USEDEP=$(python_gen_usedep python2_7)
+PY27_USEDEP=$(python_gen_usedep python2_7)
 RDEPEND="<dev-python/kombu-3.1[${PYTHON_USEDEP}]
-               >=dev-python/kombu-3.0.23[${PYTHON_USEDEP}]
+               >=dev-python/kombu-3.0.25[${PYTHON_USEDEP}]
                >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-               >=dev-python/billiard-3.3.0.18[${PYTHON_USEDEP}]
+               >=dev-python/billiard-3.3.0.20[${PYTHON_USEDEP}]
                <dev-python/billiard-3.4[${PYTHON_USEDEP}]
                dev-python/pytz[${PYTHON_USEDEP}]
                dev-python/greenlet[${PYTHON_USEDEP}]"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+       sqs? ( >=dev-python/boto-2.13.3[${PY27_USEDEP}] )
+       zeromq? ( >=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}] )
+       yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
        test? ( ${RDEPEND}
-               dev-python/gevent[${PY2_USEDEP}]
-               >=dev-python/mock-1.0.1[${PY2_USEDEP}]
+               dev-python/gevent[${PY27_USEDEP}]
+               >=dev-python/mock-1.0.1[${PY27_USEDEP}]
                dev-python/pyopenssl[${PYTHON_USEDEP}]
                dev-python/nose-cover3[${PYTHON_USEDEP}]
                dev-python/sqlalchemy[${PYTHON_USEDEP}]
                >=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}]
                redis? ( dev-python/redis-py[${PYTHON_USEDEP}]
                        >=dev-db/redis-2.8.0 )
-                >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-       )
+                >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] )
        doc? (
                dev-python/docutils[${PYTHON_USEDEP}]
                dev-python/sphinx[${PYTHON_USEDEP}]
@@ -61,8 +63,6 @@ python_compile_all() {
 
 python_test() {
        nosetests || die "Tests failed with ${EPYTHON}"
-       # alternate method to run testsuite
-       # esetup.py
 }
 
 python_install_all() {