bump, rm olds

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

9 files changed, 54 insertions, 497 deletions

diff --git a/dev-python/celery/ChangeLog b/dev-python/celery/ChangeLog
index fdcac8efaf7a..e56163f1123a 100644
--- a/dev-python/celery/ChangeLog
+++ b/dev-python/celery/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/celery
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.32 2014/04/26 15:21:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.33 2014/05/04 10:18:35 idella4 Exp $
+
+*celery-3.1.11 (04 May 2014)
+
+  04 May 2014; Ian Delaney <idella4@gentoo.org> +celery-3.1.11.ebuild,
+  +files/celery-3.1.11-test.patch, -celery-3.0.12.ebuild, -celery-3.0.13.ebuild,
+  -celery-3.0.15.ebuild, -celery-3.0.16.ebuild, -celery-3.0.17.ebuild,
+  -celery-3.0.19.ebuild:
+  bump, rm olds
 
   26 Apr 2014; Ian Delaney <idella4@gentoo.org> celery-3.1.10.ebuild:
   take out white space
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index 45192fcbfe1a..9864c9d3af5b 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -4,35 +4,26 @@ Hash: SHA256
 AUX celery-3.0.11-require-python-dateutil-2.1.patch 1219 SHA256 6803b6aa70eef403285d05e0b2894bff660d56eb8184eff9efb186e8be1b0218 SHA512 2a7eb1c9cbffefdc0d3927c752918cdb6c13eeedc4d7896ff8a47612a2e883fd1de33eecb801d8d810bdcdbf45e021fe08f5ca2d6448ab2b750fddce41f1bfe8 WHIRLPOOL 88905787a0b6e797efe0c01dee2f8e64ee8ddbe5b7ad7cc861ee1754e8f43c1d9e4e8a5706194bfb281cfa010bf1eb042c19cf5e46ea5ba77404e200da776c70
 AUX celery-3.0.12-require-python-dateutil-2.1.patch 1221 SHA256 cf6aadb6c44b78ccd235ad4ba4e4b22034a9054f1f561de1b6bd9d59d5d49b4b SHA512 31fe2428ba80b4ca58ad5d13590945b0e0c71b090aa162a2c1062f8c5f4da8293606408ab16c99951f56880414c3a153b53c77f8b48859d790c48f36c11556da WHIRLPOOL caf13426644d12ec752bc282fe9c6483c042b368b4db367f037abe373ecd9ef729bb752fc91105448c850a59c2b948b3a54d1df6b88b2f37282aeee4f641f39b
 AUX celery-3.1.10-test.patch 1752 SHA256 515d28c8979dfa985a29d96aee3fa70bb588e91a5346cd032a6aa9f280c1caeb SHA512 6c72073e24eaeb5bde6f22d8d66e7ab1e5d94c801a1e9dd47d83b21ca605072c8e1c538742119828d9143749bd52ed72c4b572de1f349d4a0c7d0e25db98651e WHIRLPOOL 433db9d66df552fdc9990e052ce5ebdec939e3303dd134d7ff4b3526d20f337f8e87d59c3946d150f7cb2fa7c07b12c7089c68deb487468c3bdd761fb9684bb9
+AUX celery-3.1.11-test.patch 1072 SHA256 10f0208fce3303a5a9ac09cc40e380b70d0926a3019b6dc02d5b37e3fbe060ba SHA512 297ae635d47ef2ac9e45b08f3370d59afd10199436c1e0689fa6a55cfdfef9db6604095d738e614406a6c7cdd9986fd5c326184fa282f1f7f88455db80619984 WHIRLPOOL ce07fccd2a0d3a6c343c73382ea0436373e518c70f7cd32b10343af25a11b07c4a67519de97ba98a204dfff25c8cc51324ecd4b53d577ae2bd2f5819b6e62c82
 AUX celery-docs.patch 779 SHA256 7fe9c7458abc6dd62f076c5904cf219aec2e42425758e59881d786e1536c5039 SHA512 813d3a772ce0ab19854519915f770d5785371f9d8b0c916e93a286383c4262f0c6a9e554c5d76fc0d81e53efbdc8ed4a7a7009ae07c71489e30464d7b0de6ef1 WHIRLPOOL 4935c4c8d812e486e33b33d67913a91c2c86c0093ed4f4b8aa808ad191c2c3aa427ae52c1c8357a5a8c36cbe1d77185f5b28332f3762589740240704e6a3902f
 AUX celery.confd 1860 SHA256 33d824dee40c01f79ea177b7e574a7e061e943fe728426760030ae3faeaecb1c SHA512 7d7389f3c3201f7d00e7183c2f2eeae52ef64495114c08fb19e0425909019fa6470df5687d7fa6992d5ef1e2905fecbe79e1ea8e1d08f56bf7bee38377735acb WHIRLPOOL 71e14e0bcc3a7d65f5eb8d70cadbf3fbcb13cdb30436bdf112e5c0e86420c5a51192bd2514bac76319524f5d6d0de192801319afe5bf2d5f23c2d17968af1275
 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.0.12.tar.gz 1218262 SHA256 716a465327ded5048893d518eafdade5eb09eb9d941e6efdbdaaac73b0251d3d SHA512 4ce7da636b52b0f87d46444c27ac1c6ba2e6afc1cd3378829e1a01c01f18adf6ed91e64e08ff19a52833071df58dbf6d452ffcfd008a4fe1ce57ccbff0bb0ed6 WHIRLPOOL 5d045eb19394d09b6816d60a745508565d75775b814225939ee9e252b0690cca2b4b73850a970ba98a6c3ad21bede1747d297b7a8e757bb0cb8d366ced275650
-DIST celery-3.0.13.tar.gz 1223019 SHA256 1a8d045c94bfda832db2afbc786e8c99ac0e094d6019a5d89c8adfe04f396d6a SHA512 20bfa638893497f1bbb29859fa0b6f488341aa07d0243da7a713642b9723825de7f747dca09d0f5544dddc7b9595775e947ce247d03204f4080be51d5e3a4955 WHIRLPOOL ac699c0900631138247fccf0de4f13ed8f508e3edb2c5fd01582d36e96ebbdb80bdd9fae00b9c2984f6088cf14cda30114335ebdc1afc5a8da3981a3e541bffe
 DIST celery-3.0.14.tar.gz 1229097 SHA256 57006a6e477282a2e55ace498729bf13218ac2c7ad5d9d920ad86b2469458df2 SHA512 df98a4a5661a005ed295339f527aef15e7d25c625904bb60bf3e305f40136c21ecd30d557cffe71b1888214e28099205df31e56e26d1d698e4b1366c11cbb722 WHIRLPOOL 29e984da6d5120ac31f04e5bf789ed1163d0726351725921d8c776a2fea1dd10e83a64a9979149f3bd2690884908f3963c7caa0374e49ca33fc7098aed8dda57
-DIST celery-3.0.15.tar.gz 1229180 SHA256 c20637d2ad68ddc407f4fba89e3afccbe7a9c55a3b79059579ba9fcf5de5d976 SHA512 697d88797d90cba747d8d331d2bef30427ef2ce574674543c0aec37d22a59c324a64092d1a0218c89ac122178a65488bb9a97e83b2a319272afd2538c2f6985b WHIRLPOOL af92937d660b12f560a18e7ebe94be448773b490e1c76d2bb017c434d95c871f988c6bedad746aa8da94cb6b87e34ca46ef73dbefc8f3af28f7925e4c8f81e44
-DIST celery-3.0.16.tar.gz 1233799 SHA256 31dc01e2e9c52825419d760422de7a6ce6fc789960fa087e8227ff4a528a2120 SHA512 4f483cb98f614868a7199d9621a68a1eaeff55740718b500385b73a0aca1f2ff67970316e3c4e88bba476ce0240adfff1e36703a7698f9c03ebdb989e156a337 WHIRLPOOL 5d6ff8cf7730806643f8c618eece2b014e847b8d3ee1c888f332e5c8dd718bd80f3e78132a379f29e55d274d30af788c640dce8f480c03f7b29a974bbe993c04
-DIST celery-3.0.17.tar.gz 1235117 SHA256 554d1e0c7cd8346aa372bb7f2b971441eee8e192a6a3855c89bad4d33b7bd947 SHA512 b426dc0e06efb4d9bccaaad57368ffedae275f758a5f6325b4aa78646b68620e381389a52d2f84d5d007269089230ac349620a021986e0fafd8acee1a1e55ecc WHIRLPOOL 38e8e412e1a419dcbd9874c9e17a17443bf6377c1b6d98fe76c53020042033edf4696021edaa04baaafe3c3acc3b4fa88c36a414ea3f99cafc74cfe520793563
-DIST celery-3.0.19.tar.gz 1242004 SHA256 70ce2ff1143d964378b3e50817366256a036e78422e85cd89724d5e6ef022e55 SHA512 e6401adeafd1fe5e69a99bf69fe2a1a7ffe033d24fdec2732d5f564c7026cda78ca5fa1a8dfd3cebc9d4879e15e77b5b54018c4b6ba9f65db92d44ed99dcb178 WHIRLPOOL f47d5cdfb56e9695aff470d7966a920d95e03ce19a0af4e56cfb7d88e47b9cb78f4a8ae41efa789cb0de4e1675d8b1098dfb52adceadea4eaeb24efd6281ce83
 DIST celery-3.0.21.tar.gz 1094747 SHA256 c1a76a94ba0d766630678df4912e211dc916f73143a189f8a6e37148ad2ffa53 SHA512 d6ef29a8cfad6016935398d3df7639dd06f5e47159b08550e7a83a80cc2d00da6ef2e284ffc1bde4c7e1d5f1213c83b17097c8d62a39ab390f300a4d4d22f39a WHIRLPOOL 29a4af9dcc99797ccdb8e4db022dd6688ddb1f1656e9fdaa5f06d4b109d2adda305f72a8089a418be0422d117f8edbf3b42e698eaa0633c81c9d4c1ea5719d57
 DIST celery-3.1.10.tar.gz 1287618 SHA256 0c292e17d439db20e10e07dd78ef51ec1d748af78cf247b69ee02bbce4923d36 SHA512 fa818db8a839516f2d54590d3d9e834eb16f7acb2e49373d79cec460af1b4d6a34ea4a2b9ceab8b40d964f608768dccc4a2286ac29f8bc4ec5691b90aa250c23 WHIRLPOOL 0db911c0c593d4a09c621d1e2b9a2b1aaa24884e965bb11c14c3380112e548a2fcc72404f6aaf8374d03b624efdcc0d17dcebb43280a78c5f720b75792f2ebb8
-EBUILD celery-3.0.12.ebuild 2406 SHA256 87034140505821bc000872c78af237d232e5658353c1e5f1be1cee696f99b7c9 SHA512 f1b437618936d8d23769fe227a6724a0d50b4371d0ce3146ac7c33008d3270de92df78e543804bbe4dfbe059f2b5bcc146951ec58efaa9035acf4191ce125457 WHIRLPOOL 89f59dba35c5ef2f4a39c60faf7c6a292d31e024a35eb3c0674102d68855ce87656b6b5eb1ca27473c726eca625b1ccdbb5e46f554fdacdd27477a2589663674
-EBUILD celery-3.0.13.ebuild 2326 SHA256 c2f7ecf80e494a56eccd65bcf5f8ef6294d6b7b9e20cb8fc5cd5a4a1c725a208 SHA512 26a8e2151da8b8964ba3484b7777d8a2875f45851abbf3ad4a39e9ddc19d9cf0220d4cb04c355a0d8be22425a53dfb0680ea51c00938f5bdb0896073d5275e97 WHIRLPOOL 3297a43ed89330ce05ca3285f3833a18989eacf7194bdc6a152563dae9fb9793d5da332d59b66f93d01cb5efb26e3cf034089f7e1e46eedd99bcb33c89a16c6a
+DIST celery-3.1.11.tar.gz 1289359 SHA256 7614e789a997a540bab589ca763f1006c6881e64479e8a03f72b225c25ff5250 SHA512 74ea4bb08412007b47b070d6a5144ba538ae488ef5a24da19e303a5737ef74bcb7c3e7a98b89869750b318df6ba115368dd0517f394003b1c9a191fe0a861ecf WHIRLPOOL b72b31b4429a7fc0553e52d8054bdeaa1df879279f59a6d47c56811926fca471b0471247aac4f8675aa080faf4e394a9cf701d735cd17d4eca27eca5108577af
 EBUILD celery-3.0.14-r1.ebuild 2329 SHA256 be942d939221fd8599dc17daf7107ab78fbeac48b861f4ef732beaf9910744c4 SHA512 be1a251101ebc7543197a5b718f74d4c42b05d42695e4b2ba5e0cc48327082c429d628b10db2dee8903d28c527a32ac377a1e8a1734b1184fc09ff04bc1724c3 WHIRLPOOL a2c961e4541794accb0e9a33a1e9cc0f9ae54cbe97e42ed4a1844e6a47bffdf4ab6d89a66403cef19618a33f735a6b62d0d498873fb0e032483b07912bebc740
-EBUILD celery-3.0.15.ebuild 2326 SHA256 f1517ecbebe2357dd42f66c4ca4d4ee0e971fae6e8bdd587084bbf27ad3212ba SHA512 5512b944ed015b4279138d992fbacf538457bd0fa5d339e825232974369299ace158f76b2f82dbc9d060533d363b343c20896c4ac7da50975ec3de4f6b9dda2a WHIRLPOOL bc36c8c7a7e905dff100db57dd4a67bb432b3126b2155614c4eda702b45050ea172759ac06d61faaf72a638774da1962383635a026112e579c780d183d7aee27
-EBUILD celery-3.0.16.ebuild 2326 SHA256 69a19a63c2a7020787614de14c25c15d76f5d4b162badfdc2b4403ee70640a39 SHA512 d8916a16a8cc877f4042eb72e02fde55745af1dcae7f9aad0668061a92e0a718872fb86e363406f18139cfd57700985438707a9c4b84f82bffb6260237ff05a5 WHIRLPOOL 1ffebf9deda8c9c2491ba57cb03173508074d245ccc0a77ad5c341a9365328a04e8726436c72a8f9d3e029064028f4012d4a362e0c4df12df028381a3cd41c50
-EBUILD celery-3.0.17.ebuild 2326 SHA256 e1f606fb2bf9d35b70e48029f8d1d0ef5d68cb11e19b370c7217269ddc12499a SHA512 a3f38cd63a08fdd6e29a70a416f00499c331fc9efb0ade827cfeeb722efe62dba27c942e92e534e4b23104f21b6cb36e8139e033aa84dee124256d86cc33c5ca WHIRLPOOL 0ca6f1973d058cee843e3efa9d2cb021e0b75e89f5ed50e28011e035239226416e8fbbe01803b9297368b0dec08e55f9c26ac6575f9fd8c3232e7b6fa844303e
-EBUILD celery-3.0.19.ebuild 2395 SHA256 30b24eb659930edbb7b3334965ff73a27a83f0159a1dfa598f394c2321973bc2 SHA512 1229d425c5d276cfdac72cd2700566a8a0d3c65e29e7b442f5aff3bf8ff160af0ea6bfd31c5ff4557b41c07a3e7e6f6fa9067dc39cd47337a24f731602b1ed2f WHIRLPOOL d0b9023e9b1d1cfef89adb10bde70b5977a66c1068d246589b6a836e62008979c2c62f58b9badba4dab1d83f2806d907fd99e776d52e76913be29162e0af0ea0
 EBUILD celery-3.0.21.ebuild 2395 SHA256 98304dd19a8ad6544702753a432176671951bd2ae0815d44f20a4b4d7efcfec3 SHA512 009a54cd9b1eb59326b62dc2e89ca356df50b2844839879a34cb32ee14b62989fc44ed259bf4250edddee4efd04facc6b1ae16d406a3bf940fe882a98e0125c5 WHIRLPOOL 59be02430dc19ab44c685bed5084a5b473e7902a9ea2480ee12a07e9ca46a7f23f23d10a1f482bbcfef65f7356ad361f4982ba8ee2d702b89316959e8a46c7ea
 EBUILD celery-3.1.10.ebuild 2188 SHA256 97b6d28ff4e7fb6a7636708488f57b1929e9b7601c6bf2275427e2d54f67be63 SHA512 f73fff5c10f614f05e2a9411e93184c0282781ddb288b5423fc92e76801f7d05b3e3a70ce5b8c7bd2df8c42d7121fc7efa98468042a514426ad1bf844e0d6b34 WHIRLPOOL b4df2569ad12a92cdebfd671b02cafbbc54dc30ec8eb93ea46ae1c548a21890befc304f79957406cbfc6519a3a81c016a3615895156a2f3d7833aab6419e2f70
-MISC ChangeLog 5439 SHA256 4fc38d1dcf069c8e7da31c73c892b2ce8b561df873ba7d5e6ad7d1a8a9f03734 SHA512 a9fb551aba355853d6386fb49326877e0fd39ca68c8155c26c6a5c5d59f6a08d624e6d97681446a2f284e21da3e97eb5f9ec1eb3386c3d17e4fc069d35afa0eb WHIRLPOOL 32bf7fbe11445321871f4c97e5be772f528e401c8d0ae210cb40f6d99b10ad160478853973d9df8b0fc2e9267c105c873184e8293aee95137239dfdc4e6fc4aa
+EBUILD celery-3.1.11.ebuild 2239 SHA256 42c8f27bc7d39bc439af2428fdbf865c759467b86587727820ac9e608adf1070 SHA512 b284b1f656945d9e91a0dc5058918af62649845470fbbb61d3d6d1f23a012f45f4cc58f5d7dd8b0dd209155fa4f8899fa39744bbf34c6946f0d03f2ea6ff71a3 WHIRLPOOL f659fd45da7c7b8a73290b6cf2507691a3315d0e1d97e4c7e66454fa96ef0a91e0a4f4f22aae7eb344c3a684810522c57913cba8625713a66f403e0d452e7368
+MISC ChangeLog 5734 SHA256 8f33a2c7bcc9568f69d79bfef7035321f0dd623c88916b18f4ba452ba7d0c66e SHA512 be3bba4f7ddc373ab5179ab775172fd1b75f88332df369db4f56e5f90933a2866eddb7fb5a0dd39147c0b42648821f38ecfeab9727faa8fda71697da2c483eab WHIRLPOOL f2625a4dd6e220b5623c9b51c168a6efc025e47ecf65144f390a7aa25191732f7f029de885104fe02cd9e2ca98bdcb8f1803125fb2b09814ad54b142947972bd
 MISC metadata.xml 337 SHA256 eaa4f67043b6768b8e9780428d478af5ce978550d1e525d51cfe7c9c8129c4ea SHA512 0d11efc64238d61565d354e7cd58a0a13a83397426f358e2625daa6d81fa101bf4390789834cc6a1818656794e3b25bd71485662c16d644d5caedfac624b5be7 WHIRLPOOL b804d28878153c55f6bc0af8d17ab349f1be3cc4f49c23e446cb919d5fe3a2da23867bd1dc22b305ee0881440fcb40c7d70860e98b0d26973536ec89c351a316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNbzU0ACgkQso7CE7gHKw2IbwCeNmSZCPHKJpCrdEeQ3Z7vLtjO
-4AQAn1CkLoBGGONnn2kt/razrYkR8hZE
-=vzTv
+iEYEAREIAAYFAlNmEj4ACgkQso7CE7gHKw36qQCdGjeb3A3IZoo8MjsEVncA2Pv5
+tvoAn1dJYB2mvkC17RHxXtdT2h5WkH6L
+=3jrI
 -----END PGP SIGNATURE-----
diff --git a/dev-python/celery/celery-3.0.12.ebuild b/dev-python/celery/celery-3.0.12.ebuild
deleted file mode 100644
index 5c74b7205a59..000000000000
--- a/dev-python/celery/celery-3.0.12.ebuild
+++ /dev/null
@@ -1,94 +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/celery/celery-3.0.12.ebuild,v 1.5 2013/09/12 22:29:28 mgorny Exp $
-
-EAPI="4"
-
-# Not broken but unsupported; dev-python/redis-py doesn't
-# support python3 which is a dep in tests. pypy fails just 1 test
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[5-6]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
-HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
-
-# jython would need: threadpool, simplejson
-# python2.5 would need: ordereddict, test? unittest2
-# python2.6 would need: multiprocessing, test? simplejson
-RDEPEND=">=dev-python/kombu-2.4.7
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	dev-python/pyparsing
-	>=dev-python/billiard-2.7.3.17
-	dev-python/pytz
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		virtual/python-unittest2
-		dev-python/pyopenssl
-		dev-python/nose-cover3
-		dev-python/sqlalchemy
-		dev-python/pymongo
-		dev-python/redis-py
-		dev-db/redis
-	)
-	doc? (
-		dev-python/docutils
-		dev-python/sphinx
-		dev-python/jinja
-		dev-python/sphinxcontrib-issuetracker
-		dev-python/sqlalchemy
-	)
-	dev-python/setuptools"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-require-python-dateutil-2.1.patch"
-}
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	dodocs() {
-		echo "test $PYTHON_ABI"
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir docs/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_install() {
-	distutils_src_install --install-scripts="/usr/bin"
-
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
-
-	if use examples; then
-		insinto usr/share/doc/${P}/
-		doins -r examples
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/celery/celery-3.0.13.ebuild b/dev-python/celery/celery-3.0.13.ebuild
deleted file mode 100644
index 6b591895268b..000000000000
--- a/dev-python/celery/celery-3.0.13.ebuild
+++ /dev/null
@@ -1,90 +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/celery/celery-3.0.13.ebuild,v 1.2 2013/09/12 22:29:28 mgorny Exp $
-
-EAPI="4"
-
-# Not broken but unsupported; dev-python/redis-py doesn't
-# support python3 which is a dep in tests. pypy fails just 1 test
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[5-6]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
-HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
-
-# jython would need: threadpool, simplejson
-# python2.5 would need: ordereddict, test? unittest2
-# python2.6 would need: multiprocessing, test? simplejson
-RDEPEND=">=dev-python/kombu-2.4.7
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	dev-python/pyparsing
-	>=dev-python/billiard-2.7.3.17
-	dev-python/pytz
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		virtual/python-unittest2
-		dev-python/pyopenssl
-		dev-python/nose-cover3
-		dev-python/sqlalchemy
-		dev-python/pymongo
-		dev-python/redis-py
-		dev-db/redis
-	)
-	doc? (
-		dev-python/docutils
-		dev-python/sphinx
-		dev-python/jinja
-		dev-python/sphinxcontrib-issuetracker
-		dev-python/sqlalchemy
-	)
-	dev-python/setuptools"
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	dodocs() {
-		echo "test $PYTHON_ABI"
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir docs/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_install() {
-	distutils_src_install --install-scripts="/usr/bin"
-
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
-
-	if use examples; then
-		insinto usr/share/doc/${P}/
-		doins -r examples
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/celery/celery-3.0.15.ebuild b/dev-python/celery/celery-3.0.15.ebuild
deleted file mode 100644
index cddde22d27d2..000000000000
--- a/dev-python/celery/celery-3.0.15.ebuild
+++ /dev/null
@@ -1,90 +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/celery/celery-3.0.15.ebuild,v 1.2 2013/09/12 22:29:28 mgorny Exp $
-
-EAPI="4"
-
-# Not broken but unsupported; dev-python/redis-py doesn't
-# support python3 which is a dep in tests. pypy fails just 1 test
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[5-6]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
-HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
-
-# jython would need: threadpool, simplejson
-# python2.5 would need: ordereddict, test? unittest2
-# python2.6 would need: multiprocessing, test? simplejson
-RDEPEND=">=dev-python/kombu-2.4.7
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	dev-python/pyparsing
-	>=dev-python/billiard-2.7.3.17
-	dev-python/pytz
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		virtual/python-unittest2
-		dev-python/pyopenssl
-		dev-python/nose-cover3
-		dev-python/sqlalchemy
-		dev-python/pymongo
-		dev-python/redis-py
-		dev-db/redis
-	)
-	doc? (
-		dev-python/docutils
-		dev-python/sphinx
-		dev-python/jinja
-		dev-python/sphinxcontrib-issuetracker
-		dev-python/sqlalchemy
-	)
-	dev-python/setuptools"
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	dodocs() {
-		echo "test $PYTHON_ABI"
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir docs/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_install() {
-	distutils_src_install --install-scripts="/usr/bin"
-
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
-
-	if use examples; then
-		insinto usr/share/doc/${P}/
-		doins -r examples
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/celery/celery-3.0.16.ebuild b/dev-python/celery/celery-3.0.16.ebuild
deleted file mode 100644
index 72894eb853b7..000000000000
--- a/dev-python/celery/celery-3.0.16.ebuild
+++ /dev/null
@@ -1,90 +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/celery/celery-3.0.16.ebuild,v 1.2 2013/09/12 22:29:28 mgorny Exp $
-
-EAPI="4"
-
-# Not broken but unsupported; dev-python/redis-py doesn't
-# support python3 which is a dep in tests. pypy fails just 1 test
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[5-6]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
-HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
-
-# jython would need: threadpool, simplejson
-# python2.5 would need: ordereddict, test? unittest2
-# python2.6 would need: multiprocessing, test? simplejson
-RDEPEND=">=dev-python/kombu-2.4.7
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	dev-python/pyparsing
-	>=dev-python/billiard-2.7.3.17
-	dev-python/pytz
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		virtual/python-unittest2
-		dev-python/pyopenssl
-		dev-python/nose-cover3
-		dev-python/sqlalchemy
-		dev-python/pymongo
-		dev-python/redis-py
-		dev-db/redis
-	)
-	doc? (
-		dev-python/docutils
-		dev-python/sphinx
-		dev-python/jinja
-		dev-python/sphinxcontrib-issuetracker
-		dev-python/sqlalchemy
-	)
-	dev-python/setuptools"
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	dodocs() {
-		echo "test $PYTHON_ABI"
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir docs/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_install() {
-	distutils_src_install --install-scripts="/usr/bin"
-
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
-
-	if use examples; then
-		insinto usr/share/doc/${P}/
-		doins -r examples
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/celery/celery-3.0.17.ebuild b/dev-python/celery/celery-3.0.17.ebuild
deleted file mode 100644
index e3ba70fda909..000000000000
--- a/dev-python/celery/celery-3.0.17.ebuild
+++ /dev/null
@@ -1,90 +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/celery/celery-3.0.17.ebuild,v 1.2 2013/09/12 22:29:28 mgorny Exp $
-
-EAPI="4"
-
-# Not broken but unsupported; dev-python/redis-py doesn't
-# support python3 which is a dep in tests. pypy fails just 1 test
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[5-6]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
-HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
-
-# jython would need: threadpool, simplejson
-# python2.5 would need: ordereddict, test? unittest2
-# python2.6 would need: multiprocessing, test? simplejson
-RDEPEND=">=dev-python/kombu-2.4.7
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	dev-python/pyparsing
-	>=dev-python/billiard-2.7.3.17
-	dev-python/pytz
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		virtual/python-unittest2
-		dev-python/pyopenssl
-		dev-python/nose-cover3
-		dev-python/sqlalchemy
-		dev-python/pymongo
-		dev-python/redis-py
-		dev-db/redis
-	)
-	doc? (
-		dev-python/docutils
-		dev-python/sphinx
-		dev-python/jinja
-		dev-python/sphinxcontrib-issuetracker
-		dev-python/sqlalchemy
-	)
-	dev-python/setuptools"
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	dodocs() {
-		echo "test $PYTHON_ABI"
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir docs/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_install() {
-	distutils_src_install --install-scripts="/usr/bin"
-
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
-
-	if use examples; then
-		insinto usr/share/doc/${P}/
-		doins -r examples
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/celery/celery-3.0.19.ebuild b/dev-python/celery/celery-3.1.11.ebuild
index 3fca227ce352..7ccc249909fc 100644
--- a/dev-python/celery/celery-3.0.19.ebuild
+++ b/dev-python/celery/celery-3.1.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.19.ebuild,v 1.6 2013/09/12 22:29:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.1.11.ebuild,v 1.1 2014/05/04 10:18:35 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3} )
 
 inherit distutils-r1
 
@@ -15,39 +15,38 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
+IUSE="doc examples redis test"
 
 PY2_USEDEP=$(python_gen_usedep python2_7)
-
-RDEPEND="<dev-python/kombu-3
-		>=dev-python/kombu-2.5.10[${PYTHON_USEDEP}]
+RDEPEND="<dev-python/kombu-4
+		>=dev-python/kombu-3.0.15[${PYTHON_USEDEP}]
 		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 		dev-python/pyparsing[${PYTHON_USEDEP}]
-		>=dev-python/billiard-2.7.3.28[${PYTHON_USEDEP}]
+		>=dev-python/billiard-3.3.0.17[${PYTHON_USEDEP}]
+		<dev-python/billiard-3.4[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/gevent[${PY2_USEDEP}]
-		>=dev-python/mock-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		virtual/python-unittest2[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/nose-cover3[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/pymongo[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
-		dev-db/redis
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}]
+			>=dev-db/redis-2.8.0 )
 	)
 	doc? (
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-issuetracker[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	)"
+		dev-python/sqlalchemy[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/celery-docs.patch )
+PATCHES=( "${FILESDIR}"/celery-docs.patch
+		"${FILESDIR}"/${P}-test.patch )
 
 python_compile_all() {
 	if use doc; then
@@ -57,21 +56,15 @@ python_compile_all() {
 }
 
 python_test() {
-	if [[ "$EPYTHON}" = python3* ]]; then
-		ewarn "dep gevent of testsuite doesn't support python3"
-		ewarn "testsuite also needs re-writing for py3 despite citing py3k"
-	else
-		nosetests || die "Tests failed with ${EPYTHON}"
-		# These have some failures, filed upstream
-		#einfo "running funtests"
-		#"${PYTHON}" funtests/setup.py test || die "Failure occured in funtests"
-	fi
+	# https://github.com/celery/celery/issues/1964
+#	nosetests -e test_cleanup || die "Tests failed with ${EPYTHON}"
+	nosetests || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
 	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
+	newinitd "${FILESDIR}/celery.initd-r1" celery
+	newconfd "${FILESDIR}/celery.confd-r1" celery
 
 	use examples && local EXAMPLES=( examples/. )
 
diff --git a/dev-python/celery/files/celery-3.1.11-test.patch b/dev-python/celery/files/celery-3.1.11-test.patch
new file mode 100644
index 000000000000..311de2d11445
--- /dev/null
+++ b/dev-python/celery/files/celery-3.1.11-test.patch
@@ -0,0 +1,19 @@
+https://github.com/celery/celery/commit/fb48b1f357f7a416d1413d0056158a74191185af.diff
+diff --git a/celery/tests/backends/test_mongodb.py b/celery/tests/backends/test_mongodb.py
+index f7546d3..a32d9ed 100644
+--- a/celery/tests/backends/test_mongodb.py
++++ b/celery/tests/backends/test_mongodb.py
+@@ -253,8 +253,8 @@ def test_restore_group(self, mock_get_database):
+         mock_collection.find_one.assert_called_once_with(
+             {'_id': sentinel.taskset_id})
+         self.assertEqual(
+-            ['date_done', 'result', 'task_id'],
+-            list(ret_val.keys()),
++            list(sorted(['date_done', 'result', 'task_id'])),
++            list(sorted(ret_val.keys())),
+         )
+ 
+     @patch('celery.backends.mongodb.MongoBackend._get_database')
+#diff -ur celery-3.1.10.orig/celery/tests/backends/test_mongodb.py celery-3.1.10/celery/tests/backends/test_mongodb.py
+#--- celery-3.1.10.orig/celery/tests/backends/test_mongodb.py	2014-02-28 21:43:26.000000000 +0800
+#+++ celery-3.1.10/celery/tests/backends/test_mongodb.py	2014-04-17 11:43:00.818430253 +0800