| 1 |
floppym 12/04/03 15:26:24 |
| 2 |
|
| 3 |
Modified: sphinx-1.1.3-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix generation of docs with python 3. Solution copied from Progress overlay. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/sphinx/sphinx-1.1.3-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: sphinx-1.1.3-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- sphinx-1.1.3-r2.ebuild 2 Apr 2012 17:08:23 -0000 1.1 |
| 23 |
+++ sphinx-1.1.3-r2.ebuild 3 Apr 2012 15:26:24 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
PYTHON_DEPEND="2" |
| 32 |
@@ -50,9 +50,10 @@ |
| 33 |
distutils_src_compile |
| 34 |
|
| 35 |
if use doc; then |
| 36 |
- pushd doc > /dev/null |
| 37 |
einfo "Generation of documentation" |
| 38 |
- PYTHONPATH=".." emake SPHINXBUILD="$(PYTHON -f) ../sphinx-build.py" html || die "Generation of documentation failed" |
| 39 |
+ sed -e "/import sys/a sys.path.insert(0, '${S}/build-$(PYTHON -f --ABI)/lib')" -i sphinx-build.py |
| 40 |
+ pushd doc > /dev/null |
| 41 |
+ emake SPHINXBUILD="$(PYTHON -f) ../sphinx-build.py" html || die |
| 42 |
popd > /dev/null |
| 43 |
fi |
| 44 |
} |
| 45 |
@@ -63,7 +64,6 @@ |
| 46 |
echo PYTHONPATH=lib nosetests --verbosity=1 |
| 47 |
PYTHONPATH=lib nosetests --verbosity=1 |
| 48 |
local rv=$? |
| 49 |
- rm -f lib/sphinx/pycode/Grammar*.pickle |
| 50 |
popd > /dev/null |
| 51 |
return $rv |
| 52 |
} |
| 53 |
@@ -74,6 +74,11 @@ |
| 54 |
distutils_src_install |
| 55 |
python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/sphinx-build" |
| 56 |
|
| 57 |
+ delete_grammar_pickle() { |
| 58 |
+ rm -f "${ED}$(python_get_sitedir)/sphinx/pycode/Grammar$(python_get_version -l).pickle" |
| 59 |
+ } |
| 60 |
+ python_execute_function -q delete_grammar_pickle |
| 61 |
+ |
| 62 |
if use doc; then |
| 63 |
dohtml -A txt -r doc/_build/html/* || die "Installation of documentation failed" |
| 64 |
fi |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
1.104 dev-python/sphinx/ChangeLog |
| 69 |
|
| 70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?rev=1.104&view=markup |
| 71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?rev=1.104&content-type=text/plain |
| 72 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?r1=1.103&r2=1.104 |
| 73 |
|
| 74 |
Index: ChangeLog |
| 75 |
=================================================================== |
| 76 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v |
| 77 |
retrieving revision 1.103 |
| 78 |
retrieving revision 1.104 |
| 79 |
diff -u -r1.103 -r1.104 |
| 80 |
--- ChangeLog 2 Apr 2012 17:08:23 -0000 1.103 |
| 81 |
+++ ChangeLog 3 Apr 2012 15:26:24 -0000 1.104 |
| 82 |
@@ -1,6 +1,9 @@ |
| 83 |
# ChangeLog for dev-python/sphinx |
| 84 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 85 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.103 2012/04/02 17:08:23 floppym Exp $ |
| 86 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.104 2012/04/03 15:26:24 floppym Exp $ |
| 87 |
+ |
| 88 |
+ 03 Apr 2012; Mike Gilbert <floppym@g.o> sphinx-1.1.3-r2.ebuild: |
| 89 |
+ Fix generation of docs with python 3. Solution copied from Progress overlay. |
| 90 |
|
| 91 |
*sphinx-1.1.3-r2 (02 Apr 2012) |
Archives