Bump to 2.4.7.

(Portage version: 2.1.11.22/cvs/Linux x86_64)

3 files changed, 13 insertions, 69 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index 18587b90440b..654d94a7b8b7 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.7 2012/08/31 21:02:39 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.8 2012/09/28 10:04:10 iksaif Exp $
+
+*kombu-2.4.7 (28 Sep 2012)
+
+  28 Sep 2012; Corentin Chary <iksaif@gentoo.org> +kombu-2.4.7.ebuild,
+  -kombu-2.3.2.ebuild, -kombu-2.4.3.ebuild:
+  Bump to 2.4.7.
 
 *kombu-2.4.5 (31 Aug 2012)
 
diff --git a/dev-python/kombu/kombu-2.4.3.ebuild b/dev-python/kombu/kombu-2.4.3.ebuild
deleted file mode 100644
index 213232c6799a..000000000000
--- a/dev-python/kombu/kombu-2.4.3.ebuild
+++ /dev/null
@@ -1,64 +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.4.3.ebuild,v 1.1 2012/08/30 06:55:43 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/kombu-2.3.2.ebuild b/dev-python/kombu/kombu-2.4.7.ebuild
index 1bd1730aeb14..16bffe3e5015 100644
--- a/dev-python/kombu/kombu-2.3.2.ebuild
+++ b/dev-python/kombu/kombu-2.4.7.ebuild
@@ -1,11 +1,12 @@
 # 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.3.2.ebuild,v 1.1 2012/08/14 07:22:17 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.7.ebuild,v 1.1 2012/09/28 10:04:10 iksaif Exp $
 
 EAPI="4"
 
-PYTHON_DEPEND="*:2.5"
-RESTRICT_PYTHON_ABIS="2.4"
+PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
+PYTHON_DEPEND="*:2.7"
+RESTRICT_PYTHON_ABIS="2.[4-6]"
 SUPPORT_PYTHON_ABIS="1"
 DISTUTILS_SRC_TEST="nosetests"
 
@@ -21,10 +22,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/anyjson-0.3.3
-	>=dev-python/amqplib-1.0"
+	>=dev-python/amqplib-1.0.2"
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose-cover3
 	dev-python/mock
+	>=dev-python/unittest2-0.5.0
 	dev-python/simplejson
 	dev-python/anyjson
 	dev-python/redis-py