diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-04-03 15:26:24 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-04-03 15:26:24 +0000 |
| commit | 1d86d217068697e295185f9908a7628eb9000850 (patch) | |
| tree | 7b2525a8ff079d15e6eba71d18a1efee97d95659 /dev-python/sphinx | |
| parent | Do not inline nl_object_priv by Jiri Denemark (bug #366561). (diff) | |
| download | historical-1d86d217068697e295185f9908a7628eb9000850.tar.gz historical-1d86d217068697e295185f9908a7628eb9000850.tar.bz2 historical-1d86d217068697e295185f9908a7628eb9000850.zip | |
Fix generation of docs with python 3. Solution copied from Progress overlay.
Package-Manager: portage-2.2.0_alpha98/cvs/Linux x86_64
Diffstat (limited to 'dev-python/sphinx')
| -rw-r--r-- | dev-python/sphinx/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/sphinx/Manifest | 10 | ||||
| -rw-r--r-- | dev-python/sphinx/sphinx-1.1.3-r2.ebuild | 13 |
3 files changed, 18 insertions, 10 deletions
diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog index c28d8750fded..525d98970b6c 100644 --- a/dev-python/sphinx/ChangeLog +++ b/dev-python/sphinx/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/sphinx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.103 2012/04/02 17:08:23 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.104 2012/04/03 15:26:24 floppym Exp $ + + 03 Apr 2012; Mike Gilbert <floppym@gentoo.org> sphinx-1.1.3-r2.ebuild: + Fix generation of docs with python 3. Solution copied from Progress overlay. *sphinx-1.1.3-r2 (02 Apr 2012) diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest index ca57e838ca0b..a55b35b389b1 100644 --- a/dev-python/sphinx/Manifest +++ b/dev-python/sphinx/Manifest @@ -7,14 +7,14 @@ DIST Sphinx-1.1.3.tar.gz 2632059 RMD160 5d4fe35a3d22d31965692d427421fde02b508a38 EBUILD sphinx-1.0.7.ebuild 2630 RMD160 c2eef81ec87659a3e37f63a61228c938229bdedc SHA1 e2b3aa56c38c453ebc9311c558a0dbf39b3ad432 SHA256 d91450e31fb3af868de6797f693d23ff7398844b3c3a5008e872d2191063bb1e EBUILD sphinx-1.1.2.ebuild 2638 RMD160 6367e3e78f16b669cf64ede41a118fc59ae06d62 SHA1 02060eaf906fa99d5a848081a00467e7b519b80d SHA256 1399d14d59bff6a3120991499173deed73bebade578d7e830c0f6165a0d70aab EBUILD sphinx-1.1.3-r1.ebuild 2716 RMD160 240454a281b8ec25b6ac57d82594403cc0a45823 SHA1 7fde5c55760be8289e681933237636ca8396b279 SHA256 cd454b3ff1fed2ee20d99a0522df341fc6265f85e1cf42ec45c9972ecd3af839 -EBUILD sphinx-1.1.3-r2.ebuild 3325 RMD160 ef0a916d6ce16c72658145f21f3e608a5a5449f9 SHA1 02da7df72da5aea0f2912ce1b8fac44629df0e95 SHA256 3c0a2a14bcea7c7aedc35638ec43081e4c3513ba6f31886f7d013455e9e7f1c7 +EBUILD sphinx-1.1.3-r2.ebuild 3501 RMD160 5a6af70a0a416cae0ca8786c7a7ed603a501aecc SHA1 e6218c853fcfef61fbf0c15ceea64db317a922e1 SHA256 27e90aab3f61936c2b3788e631d7b6b348046b93ed7842847c4f25b335bb269b EBUILD sphinx-1.1.3.ebuild 2639 RMD160 bc5eb476ba962b79fc420b68336b4b443d4b23ee SHA1 ec2867b1f493ae2dd0e44d828dddfceb23583ebe SHA256 bf5676a31c413f535545d9ce812010ce333f11e3eb14b44375ca879df2d9f21d -MISC ChangeLog 12627 RMD160 7f7b184761c5d9eeccb56aeb32408a0821243797 SHA1 835cddd6b554570f2e63ab626663f4b3464c9cfe SHA256 142255ccaa75250a7394bb5074e36af715df94839b234701a3c381b752b7138e +MISC ChangeLog 12780 RMD160 3fb16137020b1e239837d14286d859d3a8d338bf SHA1 12da601c20675746dd7f6c405ee959e158a32ac5 SHA256 d2294fe9914d2c4741d13e157e71777febad2e7a8c2831ade75883ac5d00ac30 MISC metadata.xml 410 RMD160 acf3a54f1d85f83f1159eb2db443de711355623e SHA1 de7ae70d1e4b73cbc6b1b0a9b5d618ab7a3ff199 SHA256 ec32db3e710de4837b3b3f6077a1577fe318faf0b00976a972d4e269d7bd3367 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk953Q0ACgkQC77qH+pIQ6QZKgEAiSNXgp2/o6QJTCJNGGt2NCv8 -RRNaN7ea5fLLg5oT/GgA/2ipEpWEZ/HsKKt8jJJS8NEkQid7qGXwexqoVMgHWFAI -=iQ9b +iF4EAREIAAYFAk97FtoACgkQC77qH+pIQ6TtHAEAmC7gUqrwALz5Wju4rbBGgsjq +LQls1peDbHnFCVolRysA+QGn057nbRqvXxwSg7i+XjT75EDCgFAFTpnyaI8KPbkw +=R1uV -----END PGP SIGNATURE----- diff --git a/dev-python/sphinx/sphinx-1.1.3-r2.ebuild b/dev-python/sphinx/sphinx-1.1.3-r2.ebuild index 55e7cd66e241..31b100595567 100644 --- a/dev-python/sphinx/sphinx-1.1.3-r2.ebuild +++ b/dev-python/sphinx/sphinx-1.1.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild,v 1.1 2012/04/02 17:08:23 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild,v 1.2 2012/04/03 15:26:24 floppym Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -50,9 +50,10 @@ src_compile() { distutils_src_compile if use doc; then - pushd doc > /dev/null einfo "Generation of documentation" - PYTHONPATH=".." emake SPHINXBUILD="$(PYTHON -f) ../sphinx-build.py" html || die "Generation of documentation failed" + sed -e "/import sys/a sys.path.insert(0, '${S}/build-$(PYTHON -f --ABI)/lib')" -i sphinx-build.py + pushd doc > /dev/null + emake SPHINXBUILD="$(PYTHON -f) ../sphinx-build.py" html || die popd > /dev/null fi } @@ -63,7 +64,6 @@ src_test() { echo PYTHONPATH=lib nosetests --verbosity=1 PYTHONPATH=lib nosetests --verbosity=1 local rv=$? - rm -f lib/sphinx/pycode/Grammar*.pickle popd > /dev/null return $rv } @@ -74,6 +74,11 @@ src_install() { distutils_src_install python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/sphinx-build" + delete_grammar_pickle() { + rm -f "${ED}$(python_get_sitedir)/sphinx/pycode/Grammar$(python_get_version -l).pickle" + } + python_execute_function -q delete_grammar_pickle + if use doc; then dohtml -A txt -r doc/_build/html/* || die "Installation of documentation failed" fi |