Remove unittest2 dependency.

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

4 files changed, 82 insertions, 5 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index 7d45a0e37ed0..15a4ee86718a 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/kombu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.15 2013/01/08 22:07:41 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.16 2013/01/23 09:31:55 iksaif Exp $
+
+*kombu-2.5.4-r1 (23 Jan 2013)
+
+  23 Jan 2013; Corentin Chary <iksaif@gentoo.org> +kombu-2.5.4-r1.ebuild,
+  kombu-2.5.4.ebuild:
+  Remove unittest2 dependency.
 
 *kombu-2.5.4 (08 Jan 2013)
 
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 992a3151f3aa..4f21eca0c42b 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -2,6 +2,7 @@ AUX kombu-2.1.1-add-assertIsInstance-with-unittest.patch 467 SHA256 a38902c382db
 DIST kombu-2.4.10.tar.gz 291204 SHA256 211cb68b133578338aac0990d31d9255ed54b5f1861fb2cd54c1bb28bdbc8a6e SHA512 e2d10d2d3c13072b079e29f12094b9a88e55f58e1368da1ebc0eedface3c1e0bdd5d3d7ac00469027051b61c3285a30f7b6d47a0fe8345d8bf04cb2a7b1f8748 WHIRLPOOL 6e4324dbabc1a61c7f4596e6bd54d750fc6f39f28e364c13213f130149a070153bd36fd76e2fef3ceaea4ded4cd79b3cc1c3708a2da20be4c5f1d06a2fa3bc6c
 DIST kombu-2.5.4.tar.gz 300506 SHA256 92cfb82af1d3e8753258d660003769461b75abe0f1a03d720709a211042f358b SHA512 5b6ba84de66f3b86b68778d1473cae4ddbab96f27aedb0906d258b496be3180fcd72c387bf76e46f98f899090cd1f9d25e38a8278b903759127a3e411c581604 WHIRLPOOL c94b54b35536a287ebd16b7f18634a918cba03702d38ccc70391671cce3e29e1a1ef7218bb853bad205eaa58740a3f990af80df8d71fed7f3e507f345dc358c7
 EBUILD kombu-2.4.10.ebuild 1715 SHA256 37a80da2922453deeb6c3cf390a8e06f116044480aa1f4fd5f3072f80fe2941b SHA512 d6120508d00395133937902690e8157bec9c54f8ca694f4a5ba71f98f9417ee320f7287979addbb03dc8a9858209acdb7d98cd964524f54843c10662350c8fb2 WHIRLPOOL 92595c85039176a899ea037d712f6016b03cff64fa38611fdba9009d437afa103ba1a364d823e526a1fe40c88c143d6a778e9550337b1347e31e4c591bc05c28
-EBUILD kombu-2.5.4.ebuild 1763 SHA256 6893535bf3c0bb15e307e0ed40512f9345ca0f16f7ee8ee46ee590811f9efa40 SHA512 d48cb0f0a54795dcdc115f3f6a0e0e00ad6dc61a737d2fa5f09f4591dffb33d2fc2184a7131578264be4f2715af26f8fb531065cc9332473892a4c0ce75d1c64 WHIRLPOOL 35db40af97d3fe9f4d60bf2e39fb9b3e156bf172093c186115165bdee4e163d9481a61518c65dd7bce2bac0272cdb63df0046203c0d830853242d53cf4e28c96
-MISC ChangeLog 2555 SHA256 bcf75d8c8e8fdaf0f4d60df88775584989e35b57ed4fb9a8e05f8b10732c1ea9 SHA512 927a556fe7209f3dc1a127e616265960f294f7fb1a6e5c6aaa9d789f4b64e68a1f6adf1cdb854bfe9cae1d438e3e4c7a2bed3f104bc753662581e9500200b02f WHIRLPOOL 1b1f2fdf5be24e2d65f935ec80995032dba6aae5291271f3396d2d78ec0f1fe96e3453affdee3efa0d7e542de0d6d327a2617d032d9cc70de1f0c01b9408dc43
+EBUILD kombu-2.5.4-r1.ebuild 1740 SHA256 57df7fc806327272cf6a6253e7dbad628415d82d327a643e84f0db01e2a89357 SHA512 c2072cb963f7ab6415b6a19ee87b3ae2d5b5464ce0f3dec7e93d15937722c8f311513db9ded3d5502127e90c2531bba45cc8aa3f5d384fc14687ac9919c84698 WHIRLPOOL a7b249b43826c1cad4fb033fb471bf901c32b8ec4086ec76fefccbcb0020c8e2207c14b9cc0992eb3d277df51befe3a7f4baf9026fe35ad3dd82a96ac2c1f6d8
+EBUILD kombu-2.5.4.ebuild 1737 SHA256 3c6a5bf33457365b50bccf1ff587d0a50e6205766262b2951f49889021e93142 SHA512 77e5247696a57371280b0f2ccc906ad9ce849f612ec40475d013e1e6ce3c2bb78ba8a81f34c5eb9724a346ae2f55e08fcdac33333f9ca3af678cb30d1be36b38 WHIRLPOOL f8d5baee045b9ea09c08b686b0b0ff20bd85c152b83e1829fa867bf296c166953b0cbeb5d8d386a9970f448bfabf73c6f35d803c360fcb33d2091d89a1772098
+MISC ChangeLog 2714 SHA256 c2b04e70640cc6e803bece6ffd83c5879cb359f7efcec0a766fc1a8d78d01fea SHA512 4f5c5271a26461fae11e452765bb4f3e93dccdffd8cc13db7c459029fe9827f00b427ea66c715533b7ecbe0d269af868198ee9a86be7eef46c0aeffbe9939584 WHIRLPOOL 82b77191da1b3ad01c9d970c08793052f28ca9a6ea9bfb5e26dfe37c6809b7b1145d4e61fae0cf00a9cf4de9d5326c6ef12d445be47e8417c6af3d0cca146e08
 MISC metadata.xml 442 SHA256 db2c85a2a5fc522803bb17e2bf90be7267379e3dd3c8e39d7c7b85037ca38d49 SHA512 eb393fdc027ca9963457582caec128c33beddefcf2fcb3c0367bd87d41dd7d99c5a5af523ce669d5b26d741695d86d8407642e5b8144ccbddb238d84ca646e1d WHIRLPOOL 02dc4dd964d585336151f31c2ba620bc277863e7b36bf1b45c8a197fd9397ef8ae0bf5f7c68b9476c4adf6bc9ecd1cc73779ba816d80110db5780ff333cf363f
diff --git a/dev-python/kombu/kombu-2.5.4-r1.ebuild b/dev-python/kombu/kombu-2.5.4-r1.ebuild
new file mode 100644
index 000000000000..e98d03990d4c
--- /dev/null
+++ b/dev-python/kombu/kombu-2.5.4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.4-r1.ebuild,v 1.1 2013/01/23 09:31:55 iksaif Exp $
+
+EAPI="4"
+
+PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
+PYTHON_DEPEND="*:2.7"
+RESTRICT_PYTHON_ABIS="2.[56]"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils
+
+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 test"
+
+RDEPEND=">=dev-python/anyjson-0.3.3
+	amqplib? ( >=dev-python/amqplib-1.0.2 )
+	>=dev-python/py-amqp-1.0.6"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose-cover3
+	dev-python/mock
+	dev-python/simplejson
+	dev-python/anyjson
+	dev-python/redis-py
+	dev-python/pymongo
+	dev-python/msgpack )
+	doc? ( dev-python/sphinx
+	dev-python/django
+	dev-python/beanstalkc
+	dev-python/couchdb-python )
+	dev-python/setuptools"
+
+src_compile() {
+	distutils_src_compile
+
+	local SPHINXBUILD
+	if use doc; then
+		if python2.7 -c "import django.conf" &> /dev/null; then
+			SPHINXBUILD="sphinx-build-2.7"
+		else
+			die "kombu docs failed installation"
+		fi
+		einfo "building docs for kombu with python2.7"
+		PYTHONPATH="${S}" emake -C docs html SPHINXBUILD="${SPHINXBUILD}"
+	fi
+}
+
+src_test() {
+	testing() {
+		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use examples; then
+		docompress -x usr/share/doc/${P}/examples/
+		insinto usr/share/doc/${PF}/
+		doins -r examples/
+	fi
+	use doc && dohtml -r docs/.build/html/
+}
diff --git a/dev-python/kombu/kombu-2.5.4.ebuild b/dev-python/kombu/kombu-2.5.4.ebuild
index 9914a04e2189..2dbd3ebc844a 100644
--- a/dev-python/kombu/kombu-2.5.4.ebuild
+++ b/dev-python/kombu/kombu-2.5.4.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/kombu/kombu-2.5.4.ebuild,v 1.1 2013/01/08 22:07:41 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.4.ebuild,v 1.2 2013/01/23 09:31:55 iksaif Exp $
 
 EAPI="4"
 
@@ -27,7 +27,6 @@ RDEPEND=">=dev-python/anyjson-0.3.3
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose-cover3
 	dev-python/mock
-	virtual/python-unittest2
 	dev-python/simplejson
 	dev-python/anyjson
 	dev-python/redis-py