kombu 2.2.6 version bump.

(Portage version: 2.1.11.7/cvs/Linux x86_64)

4 files changed, 72 insertions, 47 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/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>