diff options
author | Mike Gilbert <floppym@gentoo.org> | 2013-02-09 17:09:19 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2013-02-09 17:09:19 +0000 |
commit | 07c2f82378fb81c9fdd326f375e56cdc9d1d9aea (patch) | |
tree | 5f823264534f18cb5feb566977dac85f0f1a141b /dev-python/kombu | |
parent | Version bump (bug #456132). (diff) | |
download | gentoo-2-07c2f82378fb81c9fdd326f375e56cdc9d1d9aea.tar.gz gentoo-2-07c2f82378fb81c9fdd326f375e56cdc9d1d9aea.tar.bz2 gentoo-2-07c2f82378fb81c9fdd326f375e56cdc9d1d9aea.zip |
Update docs building workaround to allow for python-r1 based sphinx. Bug 453976.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python/kombu')
-rw-r--r-- | dev-python/kombu/ChangeLog | 6 | ||||
-rw-r--r-- | dev-python/kombu/kombu-2.5.4-r1.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog index 80f151c9c278..a7a0d61df4c0 100644 --- a/dev-python/kombu/ChangeLog +++ b/dev-python/kombu/ChangeLog @@ -1,6 +1,10 @@ # 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.17 2013/01/26 05:27:36 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.18 2013/02/09 17:09:19 floppym Exp $ + + 09 Feb 2013; Mike Gilbert <floppym@gentoo.org> kombu-2.5.4-r1.ebuild: + Update docs building workaround to allow for python-r1 based sphinx. Bug + 453976. *kombu-1.0.4 (26 Jan 2013) diff --git a/dev-python/kombu/kombu-2.5.4-r1.ebuild b/dev-python/kombu/kombu-2.5.4-r1.ebuild index e98d03990d4c..bacc4e338186 100644 --- a/dev-python/kombu/kombu-2.5.4-r1.ebuild +++ b/dev-python/kombu/kombu-2.5.4-r1.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-r1.ebuild,v 1.1 2013/01/23 09:31:55 iksaif Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.4-r1.ebuild,v 1.2 2013/02/09 17:09:19 floppym Exp $ EAPI="4" @@ -44,12 +44,14 @@ src_compile() { local SPHINXBUILD if use doc; then if python2.7 -c "import django.conf" &> /dev/null; then - SPHINXBUILD="sphinx-build-2.7" + # This will force sphinx-build to use python2.7 + local EPYTHON=python2.7 + export EPYTHON else die "kombu docs failed installation" fi einfo "building docs for kombu with python2.7" - PYTHONPATH="${S}" emake -C docs html SPHINXBUILD="${SPHINXBUILD}" + PYTHONPATH="${S}" emake -C docs html fi } |