kombu 2.2.6 version bump.

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

5 files changed, 76 insertions, 51 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index 20ab4fa6f032..fb7f7076013d 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/kombu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.2 2012/06/29 15:45:50 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.3 2012/07/17 15:01:53 iksaif Exp $
+
+*kombu-2.2.6 (17 Jul 2012)
+
+  17 Jul 2012; Corentin Chary <iksaif@gentoo.org> +kombu-2.2.6.ebuild,
+  -kombu-2.1.8.ebuild, metadata.xml:
+  kombu 2.2.6 version bump.
 
 *kombu-2.2.0 (29 Jun 2012)
 
@@ -13,4 +19,3 @@
   +files/kombu-2.1.1-add-assertIsInstance-with-unittest.patch,
   +kombu-2.1.8.ebuild, +metadata.xml:
   New ebuild for kombu.
-
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 158b53c4130f..0a8940853e4a 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,7 +1,7 @@
 AUX kombu-2.1.1-add-assertIsInstance-with-unittest.patch 467 SHA256 a38902c382dbf9b062751f69bf1cabe0807144c597c1c3ccb770f48618e9852c SHA512 cc4764547a267b7573a0f6b58ee5cd6b7967f688d4dadf6a082cfe4a257f0b6f0ad645a50e1887727d14b0b61487b0b888c5f6f6782c2cac1663cc668d49a24a WHIRLPOOL 0a8a94eb5e2a951f932548f47777017d8e9543bbfc1dc97351e750ab7a620f79f13b67d783eeb16d28eb3d54b7c2fda6b65c753e6226e91ec738dabb8262f23b
-DIST kombu-2.1.8.tar.gz 273195 SHA256 6012931f1a5724b52b0e535d462f81c47c2d152b5dae5fa43843d306dbcf3dc8 SHA512 befaf4fc65d69e49f7ed9606c5fd289ef99c5558edb93c20e82b3cf90602bea593ac2b17819605ee3051c845cac812f2c03fbf39b43370b41c02b7eafe38d545 WHIRLPOOL b804f4707167362126b96bf5e67d4cbbe601d0a54d94d045d6f7295c532c70742a61b8b0cff48224fa9d0c9b7137de4b19ede977d202b3f33c5290163ea8f4ae
 DIST kombu-2.2.0.tar.gz 280467 SHA256 e21449772441ce12b61bc3fa3ce0c8959a0f566354115cfcabede8b00b439d58 SHA512 8cd1e5e5002db08a20b1388c0ce1be42548aa239fea1d3b7868ea03da3ccc0d7c75b40af3bae849669c432b1f9c6f1cbdbefc5b0b37029b87de64ab4b41e3f4a WHIRLPOOL 9207b3ed0b793b424209e6116fcb54c067704a9ed6710bff7ca8e7c0d8a8c0b20af1aa547568aa9fa24e216f17c5266530e55e4a9f941e98c1bf5a2fb3c04181
-EBUILD kombu-2.1.8.ebuild 1263 SHA256 6290271dd36145d4ca446d1b3e197d7a98fb73c374eef0849823eecdea5d19ba SHA512 158015e82e9d66d7727a98514b4384ad0ec7dcfe4e5141d664455d89871fb8d89ad7125937b6a437599d6d3bb965e4e4337781f55aaa0751d19ee4e70dad410e WHIRLPOOL 73f7a0b76a7b8a741ef424b5c1111b89050ad3641b02c208753e3b34ec1e9a6293df2d7aab3b5cb7af74892f51a27d980c76db6b46b9ae3b357c3ce9fbb2a2be
+DIST kombu-2.2.6.tar.gz 285888 SHA256 ff20487a3f322e9acc435d8435879fb65e8f087d597e28395987b5db660935a1 SHA512 52392bf3060681643a74133f255fdd5238806a7453be7ec02549b818e587c2462def0ebe535f114902ec8bef682d45c8e6e19596afb04431b5bd6db89af039a0 WHIRLPOOL a6ebcaa8af2cf927d1b25a5b112df0c9daad4d5fa959ef52b637992c06c1a601f063809b646d0c128c2dcee30c8e6b49c66a392011e385cfa296d81b42df85f3
 EBUILD kombu-2.2.0.ebuild 1413 SHA256 eeb7abf2603bd5b8fe2953b44dfb6f22b667d34b8be04683d6934991bdf96c3f SHA512 f557a8d23da178bf478d140400450a8343720183c1ae56724b100e0b8d8dd938c584957e3f05679f93cbea80e093d4ce68d4796e276380b80f55b2a2d6491903 WHIRLPOOL 384d26f8cde1db847040248dc25e2569ec2b7c79f7a7ec1d1f1d81e44a0f0c2fdf3659cc2afbcddeca75b856a75d328f5bbea8987483cbbe706cfe7ccc826a17
-MISC ChangeLog 566 SHA256 6a1f1e7af78aecec7924e9f455bb76c43098bbbfe30c03c111e9fb4cb61f575b SHA512 0d998e32e09d0412b32a8286b5d29d8978d448a9e91f9982982c49cdfcfc7c2295a41d3197a8f76eca771cda132659b19668a5e92dc573020a6e28dd4447980a WHIRLPOOL 0652b1bf713d1ce893ead0e7d2bc6afa26ed8b158cbfe9db6454ae23c2f1eca39c162d4136ad5adcc1aa02d409a000c989d8c355e68e671eb6f73a3a45eceede
-MISC metadata.xml 322 SHA256 cd84f928f17906da10f8ab88cf4c7816a91e205dfb8cb005b6abe055eb8cabfd SHA512 642a6ceb741c8485d77e4361f2c8b54cc3d01c62e788a2431481d23323c526a0418368ec7392f9749b783a8567d0d83690c5565e83463e23140653f8d044826a WHIRLPOOL 6dde4c65b215fe97144984abb41c685d921076ae91b93bcd059f8b23be41b326ca3a91ad1ae4333cb4d4afb08102781e2393c63c096a1c4fe6acd7da60d6b410
+EBUILD kombu-2.2.6.ebuild 1467 SHA256 c1b63e5b1b10511a54083cc5a204a653bea433e0702e673786c96cd6a57d2a90 SHA512 feedbba9432fbea543791523793b965b73c5c8af7770cc24902e7ca0b6dab4e35fcb564375f89f0478023c68d4e3c4eec54aaeddf9263e6d01948afbc724fb99 WHIRLPOOL c85e6e727ebef83800b36defe82aa222b0a22bff4bbc43bbb4596583878f23cc3870a2d4ce7c8f2ce7b05a55da591c8427bf761596033aa08eee5479fccbd28d
+MISC ChangeLog 730 SHA256 fb138f5e0da4a8b2e5098ca6c0c32762a340578d0dc8174a8d2d2d416edb692a SHA512 efbd5b109b137e5a0a20a9c49cae13b14e4936955a4c9b94061accb06ff46dbcdeaf1aa04514fde4afc80d5cec742de1bfc95244909c31f7774a1356d24aa2b4 WHIRLPOOL a95461c9b2b304597041b484019966df07b5d8eff4ea31df74757d2a2b7420fa9dc22e756881fe346bbf22d628f60f7d5b998e69cb089a571a1ba951d2a3f44b
+MISC metadata.xml 374 SHA256 d9e8e1c0078fef43de27867f490457b1e43953d73e38c5bfcada7b798b754463 SHA512 001b8178c44cb7f838331829e77cbabfa0cecdabe8d84e5dcf240e3ed27eceb19e47685e99a9301848d315666ba7238f8990dbb1067f731e9dceeaa2a6608220 WHIRLPOOL 27a4d2e6d310f811a892367f109aed7a9f4ca0f052161956ec6d1eef3570f31d30fd4aabe2b16bae2ede04a081273cb8c1f07bb96f361f9afcea9b6875242b62
diff --git a/dev-python/kombu/kombu-2.1.8.ebuild b/dev-python/kombu/kombu-2.1.8.ebuild
deleted file mode 100644
index 639a7f355717..000000000000
--- a/dev-python/kombu/kombu-2.1.8.ebuild
+++ /dev/null
@@ -1,45 +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/kombu/kombu-2.1.8.ebuild,v 1.1 2012/05/30 06:37:19 iksaif Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="*:2.5"
-RESTRICT_PYTHON_ABIS="2.4"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://github.com/ask/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/anyjson-0.3.1
-	>=dev-python/amqplib-1.0"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose-cover3 dev-python/mock )
-	dev-python/setuptools"
-
-# If you want to test all transports you also need to depend on:
-# redis, pymongo, couchdb, pika-0.5.2, beanstalkc, kombu-sqlalchemy, django (python2),
-# django-kombu (python2), boto, PyYAML-3.09, etc... it's a mess !
-# Also check setup.py and requirements/ for jython and pypy specific dependencies
-
-src_prepare() {
-	if use test; then
-		epatch "${FILESDIR}/${PN}-2.1.1-add-assertIsInstance-with-unittest.patch"
-	fi
-}
-
-src_test() {
-		testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/kombu/tests
-		}
-		python_execute_function testing
-}
diff --git a/dev-python/kombu/kombu-2.2.6.ebuild b/dev-python/kombu/kombu-2.2.6.ebuild
new file mode 100644
index 000000000000..473e11435d6e
--- /dev/null
+++ b/dev-python/kombu/kombu-2.2.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.2.6.ebuild,v 1.1 2012/07/17 15:01:52 iksaif Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="*:2.5"
+RESTRICT_PYTHON_ABIS="2.4"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils eutils
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="http://pypi.python.org/pypi/kombu https://github.com/ask/kombu"
+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/anyjson-0.3.3
+	>=dev-python/amqplib-1.0"
+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/beanstalkc
+	dev-python/couchdb-python )
+	dev-python/setuptools"
+
+src_prepare() {
+	if use test; then
+		epatch "${FILESDIR}/${PN}-2.1.1-add-assertIsInstance-with-unittest.patch"
+	fi
+}
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+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/${P}/
+		doins -r examples/
+	fi
+	use doc && dohtml -r docs/.build/html/
+}
diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml
index 6f2225625652..1ccd03a32fb4 100644
--- a/dev-python/kombu/metadata.xml
+++ b/dev-python/kombu/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">kombu</remote-id>
+		<remote-id type="github">celery/kombu</remote-id>
 	</upstream>
 </pkgmetadata>