bump; update dep celery to both 3.1 versions

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

5 files changed, 35 insertions, 69 deletions

diff --git a/dev-python/django-celery/ChangeLog b/dev-python/django-celery/ChangeLog
index 975316a20511..828a8cb6177c 100644
--- a/dev-python/django-celery/ChangeLog
+++ b/dev-python/django-celery/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/django-celery
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/ChangeLog,v 1.16 2014/04/09 11:01:57 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/ChangeLog,v 1.17 2014/04/11 06:29:13 idella4 Exp $
+
+*django-celery-3.1.10 (11 Apr 2014)
+
+  11 Apr 2014; Ian Delaney <idella4@gentoo.org> +django-celery-3.1.10.ebuild,
+  -django-celery-3.0.17-r1.ebuild, -django-celery-3.0.21.ebuild,
+  django-celery-3.1.9.ebuild:
+  bump; update dep celery to both 3.1 versions
 
 *django-celery-3.1.9 (09 Apr 2014)
 
diff --git a/dev-python/django-celery/Manifest b/dev-python/django-celery/Manifest
index 33075f58c568..b5437f7378ac 100644
--- a/dev-python/django-celery/Manifest
+++ b/dev-python/django-celery/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST django-celery-3.0.17.tar.gz 77373 SHA256 423c3e2c8cd9b79f5198fdb231fc66dda0bbe4934bd9a490157b7e90f6358ac5 SHA512 426a537a42e314e7bd8e9931b477548ff6217a32919bafd2bd0dd418e43d99ce032e09afdf3f8b1c577a9ac50255d2d036067fb35fc934b7566f1cabd30bd3ac WHIRLPOOL 2e609e7c8b4570d91c4b823d4e39e712d467c4157bb4605ee7d166590e080fcb31b09c2c76f611dc6ca97c71b6c9bada4511f5d7c5c8a09058e055c1dbd7e062
-DIST django-celery-3.0.21.tar.gz 77725 SHA256 5efc402993f38e83acc8aaf5daca801121598d5875eadf15162ab23b77d5ed62 SHA512 1256224dbb4d03ac6d80337cbb160572827d8557e1fa00c72b4119b3868f7df806e5b10dee6ede10fc6520531ec2eb33d4608ad6d68839951ba31248a0412ae5 WHIRLPOOL 5c6e65e9eadb25db3b3776aacf9ac9a2e168638a10d797501be98043fdf516c6322db85fb4994745d32dcf285bc4e98b12751e020fc6b0341cd51b94ff95bf8f
+DIST django-celery-3.1.10.tar.gz 76323 SHA256 0c724d1c9c01b1f77ca47f84d2a35f63f8ce8e29b85fb578d7465f86eb8a9180 SHA512 de814627978cb014ee8d674fd14097c547d4f4bc2db4b0254aec43caeffcc41f182bcdb529b290004d44cf8cf691544f58211208c54a906d6bfbf279823ed519 WHIRLPOOL 1c981b76a5ee9aa7a74846d273b075d2edf106a89113e9ed611d66a331fd13a9a7dc0789fbcbed7c6ca744e4f63c04c531e375a56ba92515f849c369adbea6e7
 DIST django-celery-3.1.9.tar.gz 76015 SHA256 5b6515074df25f265bcfec06ba6d53cc334acae949b776fc936572d84e0b1678 SHA512 ada3cbba58ae432aee6a1e76be0d7fe089f430251f894b645096bcb579a7967757e47c5f506e90ebbf5f25e2e5e45af9d4e267150a7a081fe1fb365501dc29b9 WHIRLPOOL 80d6292b75448aa430f8a56188d2fb351416119c4068ebd10795f6e74150dbc0391fac6bf1805dab20cdd70b276fb45ee52908c1fcd104ef27286057dc6411d6
-EBUILD django-celery-3.0.17-r1.ebuild 1342 SHA256 7bc39800885c846e795bf74bb55aca7580f38ec06cdd6ed45c696d86a4713180 SHA512 7b9d727a6e4e9ff388c8e63089cb41cf4ea90ffaa1c983175dd1f130ba903ff57a7953acd7ebfc1f859630aa2c4ae7c459aea3bec88a693e82efbfce6b9a6712 WHIRLPOOL 613a09769fb318d90de221e466be54144ca1612b77bfc3f4fbf5660bfd296be6b52cc0e30085f2ba40c792e7b5169ee455cffaa691956977f802178aea9badb3
-EBUILD django-celery-3.0.21.ebuild 1339 SHA256 072734d6fb7675eabe30e964cbd46a9b379ffe45010951ed97df8c1a985c002b SHA512 d718ee5d02eb71db4e28b8fe3a99cfc2e126aee04749b7c40083617075cab135a1db191b39c46e659d1be324aaa57b508381dc19d12372817a3335180f80c69b WHIRLPOOL cdfc4b1c22306a21e426967f02098e2020702e055e1c40f7957b827e281025f9ae4769ebf61efca6c8f425fa33896879df6fcbc58a73072251efff6dad7947f0
-EBUILD django-celery-3.1.9.ebuild 1711 SHA256 8e98fd116ce7dc9ddf52d03da1db751b251ceb74ae4d576910c7c20106cd939c SHA512 bfa8e0223a6011502b2582e4387888a12182392d074b4985459f1a98945407495bfb4b9e73cd3c500a0e7d5d5ba2ae7431d90f202c722e31c95b6cbb61b2948e WHIRLPOOL 962ba49e5ca8be98c132c589dd93aa8f7f657abbc6c79ea68b3cf9396adb234c7ec8e171525eabdf2200249b89b08cfcdf9faab7104ffb6f22699aad26bd6ac3
-MISC ChangeLog 2622 SHA256 32009c6b8ff64a01b0f6e4ba4c5e4ea2aafd488ae13f0f26b18f6a3045d29ce9 SHA512 a83d994075d387e3d55644aa1bee053dd6a91f94cc87dcb491beeb14f1056c08c3e0754ee9e039619a2eb5c5b76d52e2192d0f75b1291ab67bb4a4726c0c0337 WHIRLPOOL a0ef9c016db50541e99a56670c30e825bbf9aaebcc9886b5c1fbd25d9642f83f46a7ee9707a58f8f780342fc21c10bd8f269fa3063c4da5c4761ef5601b7402d
+EBUILD django-celery-3.1.10.ebuild 1633 SHA256 846c6f9d123d352b6a9ea96d7d8eb6ebe943da2cfc4d30db9661ac4c6b092e41 SHA512 c68ba879000a6394aafd0661be75cf706f741e3155c71875373bed5f5e407e30674bfca0b0fb27defa2e446c2ed489e6d956e88e139896e217df8938224cf684 WHIRLPOOL 437e5080ddca80c666fef439220e183d1b9b250406f0bdf94ba6768fb41593fe3e4d8b5a3037084996ea39631a049f8fe4d04ff3e874ee065c0c03726b6ff287
+EBUILD django-celery-3.1.9.ebuild 1710 SHA256 60ec2b2541f968ba6189be7ca976c19c85d8e52ba30fbf845e4e3ee3ecaea5b5 SHA512 e910c10d2d15091eb53519c24f67970a67ff8f780a34f5f024552671311ed6d360fbe65c1e3b2a6cd5a7b0f9e6c754f9261d077dec4c9ae2d7ee8f8882a4a4b0 WHIRLPOOL 2a54556d3ede9be5a8055755c4b6f51a786933946dbcc34a0f8acd0fcf977763938cc53d8a1d576df2177dc7c460f1f1a37427de4ae7521ae9e22cc763b2f250
+MISC ChangeLog 2880 SHA256 7204c3bd628d77224fe4fb44fed085e365880d77631a0eb61475e48d5410bbf6 SHA512 65da20c85eeac46991e6d263ec91d24178d7433c79958c63e52b3127c6ae4a5f9008a1392a6d338394b29fee784897472e938b3fc0d77f85166bad7ffd165727 WHIRLPOOL 9d719b62a1dc08b101381a0d55c90751cfb500836d629563a12c07ffca2b911a085b5a54f642923c0d966fb4becdf6603ffb45f3639483a283023afa538c90f0
 MISC metadata.xml 296 SHA256 851776265825797fb8d6f34032c97176de559c28e032810c604ed7791a5cde92 SHA512 6a5b73fb33931300f8f9db50c9f2bc89a1641a518ea34ceadf6a91a5726e877f52be9e2ab3453d8f40f183722ac067521d82303f759cbce76038ad23c3712071 WHIRLPOOL 8d3f64cabdaae4d21721c0a21fdabb4a96266a3e37e930e82ed97457b83b13393b3a81162deec8b2918c0b76501b1ff3a0758a6f58f0b591c8b5e7ca4e62c379
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNFJu4ACgkQso7CE7gHKw2/rwCgmmu2VvAg5KXTp8bSPwMK6pyg
-RBkAn2xbkawIdsEacxQsd3NVNkKnSuBp
-=GmQU
+iEYEAREIAAYFAlNHigAACgkQso7CE7gHKw03XgCffHzCnHhtX3gFJEzPizj6uooq
+r7sAn0H4P1ldka1uR2xdPNCatvPf7Rze
+=2FYP
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-celery/django-celery-3.0.21.ebuild b/dev-python/django-celery/django-celery-3.0.21.ebuild
deleted file mode 100644
index 46279712ecf2..000000000000
--- a/dev-python/django-celery/django-celery-3.0.21.ebuild
+++ /dev/null
@@ -1,48 +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/django-celery/django-celery-3.0.21.ebuild,v 1.1 2013/08/10 12:50:21 patrick Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Celery Integration for Django"
-HOMEPAGE="http://celeryproject.org/"
-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/celery-3.0.17[${PYTHON_USEDEP}]
-	>=dev-python/django-1.3[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		virtual/python-unittest2[${PYTHON_USEDEP}]
-		dev-python/django-nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nose-cover3[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/python-memcached )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-issuetracker[${PYTHON_USEDEP}]
-		dev-python/python-memcached
-	)"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	python tests/manage.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-celery/django-celery-3.0.17-r1.ebuild b/dev-python/django-celery/django-celery-3.1.10.ebuild
index dd8ce992880b..0e15e0897ebc 100644
--- a/dev-python/django-celery/django-celery-3.0.17-r1.ebuild
+++ b/dev-python/django-celery/django-celery-3.1.10.ebuild
@@ -1,9 +1,9 @@
-# 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/django-celery/django-celery-3.0.17-r1.ebuild,v 1.3 2013/05/21 18:23:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/django-celery-3.1.10.ebuild,v 1.1 2014/04/11 06:29:13 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3} )
 
 inherit distutils-r1
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
-RDEPEND=">=dev-python/celery-3.0.17[${PYTHON_USEDEP}]
+PY2_USEDEP=$(python_gen_usedep python2_7)
+RDEPEND=">=dev-python/celery-3.1.10[${PYTHON_USEDEP}]
 	>=dev-python/django-1.3[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
@@ -24,21 +25,29 @@ DEPEND="${RDEPEND}
 	test? (
 		virtual/python-unittest2[${PYTHON_USEDEP}]
 		dev-python/django-nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
 		dev-python/nose-cover3[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/python-memcached )
+		dev-python/python-memcached[${PY2_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-issuetracker[${PYTHON_USEDEP}]
-		dev-python/python-memcached
+		dev-python/sphinxcontrib-issuetracker[${PY2_USEDEP}]
+		dev-python/python-memcached[${PY2_USEDEP}]
 	)"
 
+PY27_REQUSE="$(python_gen_useflags 'python2.7')"
+REQUIRED_USE="
+	doc? ( ${PY27_REQUSE} )"
+
 python_compile_all() {
 	use doc && emake -C docs html
 }
 
 python_test() {
-	python tests/manage.py test
+	# py3 has masses of errors
+	# https://github.com/celery/django-celery/issues/321
+	if ! python_is_python3; then
+		"${PYTHON}" tests/manage.py test
+	fi
 }
 
 python_install_all() {
diff --git a/dev-python/django-celery/django-celery-3.1.9.ebuild b/dev-python/django-celery/django-celery-3.1.9.ebuild
index 3409e9da2213..d575518b3c93 100644
--- a/dev-python/django-celery/django-celery-3.1.9.ebuild
+++ b/dev-python/django-celery/django-celery-3.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/django-celery-3.1.9.ebuild,v 1.1 2014/04/09 11:01:57 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/django-celery-3.1.9.ebuild,v 1.2 2014/04/11 06:29:13 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3} )
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
 PY2_USEDEP=$(python_gen_usedep python2_7)
-RDEPEND=">=dev-python/celery-3.0.19[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/celery-3.1.9[${PYTHON_USEDEP}]
 	>=dev-python/django-1.3[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}