Fix 'status' action in init script and remove some old ebuilds.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64

6 files changed, 16 insertions, 194 deletions

diff --git a/dev-python/celery/ChangeLog b/dev-python/celery/ChangeLog
index 3b844bdc6312..5f45b14bb01f 100644
--- a/dev-python/celery/ChangeLog
+++ b/dev-python/celery/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/celery
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.17 2013/02/22 08:20:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.18 2013/03/06 09:16:20 iksaif Exp $
+
+*celery-3.0.14-r1 (06 Mar 2013)
+
+  06 Mar 2013; Corentin Chary <iksaif@gentoo.org> +celery-3.0.14-r1.ebuild,
+  -celery-3.0.11-r1.ebuild, -celery-3.0.14.ebuild, -celery-3.0.9.ebuild,
+  files/celery.initd:
+  Fix 'status' action in init script and remove some old ebuilds.
 
 *celery-3.0.14 (22 Feb 2013)
 
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index 8fce06f0641d..c05b0e7c5c0f 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -1,16 +1,12 @@
 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.confd 1860 SHA256 33d824dee40c01f79ea177b7e574a7e061e943fe728426760030ae3faeaecb1c SHA512 7d7389f3c3201f7d00e7183c2f2eeae52ef64495114c08fb19e0425909019fa6470df5687d7fa6992d5ef1e2905fecbe79e1ea8e1d08f56bf7bee38377735acb WHIRLPOOL 71e14e0bcc3a7d65f5eb8d70cadbf3fbcb13cdb30436bdf112e5c0e86420c5a51192bd2514bac76319524f5d6d0de192801319afe5bf2d5f23c2d17968af1275
-AUX celery.initd 6009 SHA256 40cdc4d91ab25433d308d2a3ec91ef415278f56bb827f261ae515adf45425522 SHA512 8af89a6e042bb60a5234ed2e7a1d60549dc234077e83fae4a58c96acf74f479892d0c21e027029f3fcbae9afca9498607b17cf658f1750ade73fc303e12a0e22 WHIRLPOOL 48afafca5c833a03babb301b307f9f070d1a45e994df71ee5d1d5f6e0e198535e00663a9dcaa99f1a88dc261a843a9b36ffa6291b10ce8ffcaa66303be3abe49
-DIST celery-3.0.11.tar.gz 1218453 SHA256 cf21361896a095bc602fe531b56fe6b58961233053fac43952abdeaa569e4951 SHA512 ddb2bddb6170670d6e95541c84ab5c7567f208ff347352e08303c309c4572baf4182f5220833fdae72f5cbe3b672d3e5373e9fc6d3250d7aaa5bf882f6f14abb WHIRLPOOL 09ec8aa9edc7d66ba21fd1ebba13177e9aaa9f2f822b9c7ae1dbcd0dd972cdb88c6e33f0b05692c34e85b9884499c98732e15bc10024a43a38094b797a1ac869
+AUX celery.initd 6031 SHA256 aa47afffac71e7d12875e0f9d4b50d58e629d7c075a22ddd99e4e60a6e384ab4 SHA512 f7b4c0dc72fdd2a8920dea193cfba24c3cf340e27cb6fa5439bccd82364a48ebdd0cff86c1d3abf0fc1a448ec794d86370b58b2e1da81a6bd7d2062bad6b6975 WHIRLPOOL 91b2093ad31d1c1ba24688d51191df05fec90e6e96e3b28912e94c177834f6db5767e922742a1d60a9323fde85b76fb372d87fd1ac96c16ea76ef38aaefae42a
 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.9.tar.gz 1213486 SHA256 5ca0156feb7de5fec47e0aa8e275039cb78e1f32842b59635c786a877e45b1de SHA512 df38f0cacec52bb146dbd538eef1cc548aca71e36c4db9f94ddc84bbc8dd226d89898a6ccbc3a2799afef2a8a1c79d2aca5591e6b4c7fa3b858983ce4058927c WHIRLPOOL e62f8e899b90d77297240433210cef129890b64dd27c1669d0ca95334c231d4f6bcc4bf3e842c1b27a41da9dbe8adb19113db9b86c6e50fb886a7deadff4319f
-EBUILD celery-3.0.11-r1.ebuild 2406 SHA256 d6fa042004285ea192323fff4758d74e17ded4560f900491f231c556e8ff146c SHA512 e48a9a1806bbe8c88047e322515537c95c680376a547a05ea9846970910f044f0dbb2063fe2cf3ba951528c99b5e0161ace03c8e59499b4d226e1eb72c4ac036 WHIRLPOOL a5a4cf46980ffa8add2d3b7aba2e48ec6db39563eb456669ab06acd6260962382d1368a2bdf49a8233c3c8d07217ed8d56b99e8d37e8ef79e1d6f5f0b0c74044
 EBUILD celery-3.0.12.ebuild 2403 SHA256 d6d7fa7389eedbffce042c6cfc07eccc2aa9a89240d0bd52b3e6ed85b5f48c02 SHA512 2202a4ebebd335bbfea505f31874bd6f70f3535cdbcbf10acc44475ceaecd1effc36b2aa4eaf83e6ee9676f1ce5832d149574fb973f97450edf2f94e4b2a9355 WHIRLPOOL ab6bd5c08c766a5a7552432fd9f1a8611719f839d08b4e261744f4fe3b8c3d7a42767868b73591632ea32ebfa60de5712ad862ea310c9bd12c16a2e5e7e05730
 EBUILD celery-3.0.13.ebuild 2324 SHA256 0f17b65ab0536de3c110fc10aee517678d0d143ed7d58bea3a243845a0b110e9 SHA512 dd1a904347cea2c77cac9d1f7dc9c5c8e6714f6649011506ab7ea0120a10e1be1417436f96a28a37158c983ae343cf63faf3404986b3bec9c9d36e1e976a8426 WHIRLPOOL e89e3ab259b9954e856585336b25118b13a16b5fe30ae84caebee23015cb9b9b551824addd2122350c63f5e1ee1bba44363a1c64d0068030468be986bccc04fb
-EBUILD celery-3.0.14.ebuild 2324 SHA256 f577ff3d877b9a64b06058ff399c6c86ca94a03d5e0665884e83b092b39e1e1d SHA512 5789812f9d152b2f9dca505f02ae06fec36e8adbf252a301e5dabc9cd61e70d35e285a437c7c84a52290748ecdddb6cf42e91095c4c7e7da25e4a882bf0cd685 WHIRLPOOL a0f3efdd5fcd650e362264f8dcf86e5634c2c2b15598ee91928decf4c3e78357f1f7dae5baf6b50a6bae72398ed8c08970557a89f9c257160608580149059e13
-EBUILD celery-3.0.9.ebuild 2271 SHA256 85491bdd9e1a667dbe3b1f7564412d58b19e1de0bc6227b4d112aed9e5d499af SHA512 d223af4f44521a98dcb2ab24acab0202dc222acc1d56996b7bcc30a36ce1e263db7dfed0f64e9381f6a6a55dc8cedd829c80c6fd1239ad9179d38eabc7bb7ba5 WHIRLPOOL 5069670c85fa38bdda7db1a6a676725fdbbe17f46c979e6b0def6871adee76ddf8527348023f145d8f1c42518ec57ab50657dc8e86aea231cac028bbc41d2aa5
-MISC ChangeLog 2901 SHA256 7ba0860741a1c1a7e5968870ea8b8baf60811bf683773b27adb38e5a52917412 SHA512 5f0f7c7b21e04a2aa0820e887b9ad2c14724473eb9325fec6150b1b5607be2dde23d5d7ad595d6a60d4c5caf64f64969cae7284d7d5aab6813ad5f2d783e9084 WHIRLPOOL 4cb3cf3fccbf37588b27589f973b0c8439085abb91c88b527c25a072cf6949a5c785622455c793b1f102aa5a7cc959452f9096bffc15ef243b13dfb97ae25899
+EBUILD celery-3.0.14-r1.ebuild 2326 SHA256 9ba4255bb0193b9094f7784c6a9dfefa7ce6958c224f3168a4a7365792578841 SHA512 afa85d76e7b5cbce5d5775167fa869d3e611da50d28127abc0f3a2fd7c4d9680d9958c3d9bb5fdb494018a329b9bee9245619857a8cf27e9669ff74cef03da04 WHIRLPOOL 7b4e1ed325a7734740c4ac83de4247958121f6203014535862be64d8193c248e8b867d7457632d90b27b46d0932712fac0111b32bff2c8fd02265404f04732ac
+MISC ChangeLog 3171 SHA256 b7b2a8c6baa139796d4c3a87dc42fa053c417d2e49a2b4adfd72f77978fcae53 SHA512 5d5c09bb28674105f150eb383f1ce5bdfcc4e06b4f7f408e85e0801016e00f7a9816de1b61248e7b80021e81dbd695575f4cdd8a291106641b9be5c36ad7f4f9 WHIRLPOOL fcea42c3cdac64be3eac483e9b06121ee460121fb1883376dc352df9d78495ea52832e36c792fb83884f814d7bc73e2b1f00d27332740fd4f720fca4ac056fdd
 MISC metadata.xml 381 SHA256 af2b8d52964a565630562f79dccd36e499b18854c2b4499d2a2a66b1b66aae37 SHA512 2f532aa222dffbe5f93b4e0a1d8e7e17a63c4bf5b0e9d0401ecc2b61285f94aa8c4b43c9963bfc8424bab1f480837bae0d7e22ab737d539028c15080d79cc35e WHIRLPOOL 47eb9c001c00807a6fa27b637875300fa3741f87e0966cbf319502ad085edd9cbe8fda0543e619bc4671b1650a99671e3a6fdfe18ffd096cf96d05a08994a185
diff --git a/dev-python/celery/celery-3.0.11-r1.ebuild b/dev-python/celery/celery-3.0.11-r1.ebuild
deleted file mode 100644
index c5329cc58be6..000000000000
--- a/dev-python/celery/celery-3.0.11-r1.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.11-r1.ebuild,v 1.3 2013/01/06 19:26:45 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
-	virtual/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.14.ebuild b/dev-python/celery/celery-3.0.14-r1.ebuild
index 930e647ebfd4..4ddca490c851 100644
--- a/dev-python/celery/celery-3.0.14.ebuild
+++ b/dev-python/celery/celery-3.0.14-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.14.ebuild,v 1.1 2013/02/22 08:20:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.14-r1.ebuild,v 1.1 2013/03/06 09:16:20 iksaif Exp $
 
 EAPI="4"
 
diff --git a/dev-python/celery/celery-3.0.9.ebuild b/dev-python/celery/celery-3.0.9.ebuild
deleted file mode 100644
index 92f66c71e518..000000000000
--- a/dev-python/celery/celery-3.0.9.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.9.ebuild,v 1.2 2012/12/31 12:58:43 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
-
-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.2.5
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	virtual/pyparsing
-	>=dev-python/billiard-2.7.3.12
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		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/files/celery.initd b/dev-python/celery/files/celery.initd
index 34515b7068b0..fe278df19a3b 100644
--- a/dev-python/celery/files/celery.initd
+++ b/dev-python/celery/files/celery.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the BSD license
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/files/celery.initd,v 1.4 2013/02/09 13:49:36 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/files/celery.initd,v 1.5 2013/03/06 09:16:20 iksaif Exp $
 
 extra_started_commands="reload"
 
@@ -30,7 +30,7 @@ export CELERY_LOADER
 
 if yesno "$CELERY_DJANGO"; then
 	CELERYD=${CELERYD:-"celeryd_detach"}
-	CELERYCTL=${CELERYCTL:-"python manage.py celeryd"}
+	CELERYCTL=${CELERYCTL:-"python manage.py celery"}
 	CELERYD_MULTI=${CELERYD_MULTI:-"python manage.py celeryd_multi"}
 	CELERYBEAT=${CELERYBEAT:-"python manage.py celerybeat"}
 	CELERYEV=${CELERYEV:-"python manage.py celeryev"}
@@ -263,5 +263,6 @@ reload() {
 status() {
 	checkconfig || return 1
 
-	${CELERYCTL} status
+	celery_chdir && \
+	    ${CELERYCTL} status
 }