summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorentin Chary <iksaif@gentoo.org>2013-01-08 22:07:41 +0000
committerCorentin Chary <iksaif@gentoo.org>2013-01-08 22:07:41 +0000
commit6cb40a572917e8e009471db2365f2744fcab512a (patch)
tree267f6c40418f3ef3ace4cf852bafc11b4d265270 /dev-python
parentFix dodoc. (diff)
downloadgentoo-2-6cb40a572917e8e009471db2365f2744fcab512a.tar.gz
gentoo-2-6cb40a572917e8e009471db2365f2744fcab512a.tar.bz2
gentoo-2-6cb40a572917e8e009471db2365f2744fcab512a.zip
Bump to 2.5.4.
(Portage version: 2.1.11.33/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/kombu/ChangeLog8
-rw-r--r--dev-python/kombu/kombu-2.4.8.ebuild66
-rw-r--r--dev-python/kombu/kombu-2.5.4.ebuild (renamed from dev-python/kombu/kombu-2.4.9.ebuild)24
-rw-r--r--dev-python/kombu/metadata.xml3
4 files changed, 28 insertions, 73 deletions
diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index 603c881a38e1..7d45a0e37ed0 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.14 2013/01/06 19:40:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.15 2013/01/08 22:07:41 iksaif Exp $
+
+*kombu-2.5.4 (08 Jan 2013)
+
+ 08 Jan 2013; Corentin Chary <iksaif@gentoo.org> +kombu-2.5.4.ebuild,
+ -kombu-2.4.8.ebuild, -kombu-2.4.9.ebuild, metadata.xml:
+ Bump to 2.5.4.
06 Jan 2013; Michał Górny <mgorny@gentoo.org> kombu-2.4.10.ebuild,
kombu-2.4.8.ebuild, kombu-2.4.9.ebuild:
diff --git a/dev-python/kombu/kombu-2.4.8.ebuild b/dev-python/kombu/kombu-2.4.8.ebuild
deleted file mode 100644
index 420f4c4acc95..000000000000
--- a/dev-python/kombu/kombu-2.4.8.ebuild
+++ /dev/null
@@ -1,66 +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/kombu/kombu-2.4.8.ebuild,v 1.2 2013/01/06 19:40:16 mgorny Exp $
-
-EAPI="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"
-
-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.2"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose-cover3
- dev-python/mock
- virtual/python-unittest2
- 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.4.9.ebuild b/dev-python/kombu/kombu-2.5.4.ebuild
index fcb7044f71d5..9914a04e2189 100644
--- a/dev-python/kombu/kombu-2.4.9.ebuild
+++ b/dev-python/kombu/kombu-2.5.4.ebuild
@@ -1,12 +1,12 @@
# 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.4.9.ebuild,v 1.2 2013/01/06 19:40:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.4.ebuild,v 1.1 2013/01/08 22:07:41 iksaif Exp $
EAPI="4"
PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[4-6]"
+RESTRICT_PYTHON_ABIS="2.[56]"
SUPPORT_PYTHON_ABIS="1"
DISTUTILS_SRC_TEST="nosetests"
@@ -19,10 +19,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
+IUSE="amqplib doc examples test"
RDEPEND=">=dev-python/anyjson-0.3.3
- >=dev-python/amqplib-1.0.2"
+ amqplib? ( >=dev-python/amqplib-1.0.2 )
+ >=dev-python/py-amqp-1.0.6"
DEPEND="${RDEPEND}
test? ( dev-python/nose-cover3
dev-python/mock
@@ -33,13 +34,24 @@ DEPEND="${RDEPEND}
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
- use doc && emake -C docs html
+
+ 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() {
@@ -53,7 +65,7 @@ src_install() {
distutils_src_install
if use examples; then
docompress -x usr/share/doc/${P}/examples/
- insinto usr/share/doc/${P}/
+ insinto usr/share/doc/${PF}/
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 1ccd03a32fb4..829c25988e4d 100644
--- a/dev-python/kombu/metadata.xml
+++ b/dev-python/kombu/metadata.xml
@@ -10,4 +10,7 @@
<remote-id type="pypi">kombu</remote-id>
<remote-id type="github">celery/kombu</remote-id>
</upstream>
+ <use>
+ <flag name="amqplib">Enable amqplib support</flag>
+ </use>
</pkgmetadata>