* [gentoo-commits] gentoo-x86 commit in dev-python/sphinx: sphinx-1.1.3-r2.ebuild ChangeLog
@ 2012-04-02 17:08 Mike Gilbert (floppym)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert (floppym) @ 2012-04-02 17:08 UTC (permalink / raw
To: gentoo-commits
floppym 12/04/02 17:08:23
Modified: ChangeLog
Added: sphinx-1.1.3-r2.ebuild
Log:
Unrestrict python 3 and make the tests work.
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64)
Revision Changes Path
1.103 dev-python/sphinx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?r1=1.102&r2=1.103
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ChangeLog 31 Mar 2012 19:55:28 -0000 1.102
+++ ChangeLog 2 Apr 2012 17:08:23 -0000 1.103
@@ -1,6 +1,11 @@
# 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.102 2012/03/31 19:55:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.103 2012/04/02 17:08:23 floppym Exp $
+
+*sphinx-1.1.3-r2 (02 Apr 2012)
+
+ 02 Apr 2012; Mike Gilbert <floppym@gentoo.org> +sphinx-1.1.3-r2.ebuild:
+ Unrestrict python 3 and make the tests work.
*sphinx-1.1.3-r1 (31 Mar 2012)
1.1 dev-python/sphinx/sphinx-1.1.3-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild?rev=1.1&content-type=text/plain
Index: sphinx-1.1.3-r2.ebuild
===================================================================
# 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 $
EAPI="4"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
DISTUTILS_SRC_TEST="nosetests"
PYTHON_TESTS_RESTRICTED_ABIS="2.5 *-pypy-*"
inherit distutils
MY_PN="Sphinx"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python documentation generator"
HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc latex"
DEPEND=">=dev-python/docutils-0.7
>=dev-python/jinja-2.3
>=dev-python/pygments-1.2
dev-python/setuptools
latex? ( dev-texlive/texlive-latexextra )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
DOCS="CHANGES"
src_prepare() {
distutils_src_prepare
prepare_tests() {
mkdir -p build-${PYTHON_ABI}
cp -r tests build-${PYTHON_ABI}/tests
if [[ $(python_get_version -l --major) == "3" ]]; then
2to3-${PYTHON_ABI} -nw --no-diffs build-${PYTHON_ABI}/tests
fi
}
use test && python_execute_function prepare_tests
}
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"
popd > /dev/null
fi
}
src_test() {
testing() {
pushd build-${PYTHON_ABI} > /dev/null
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
}
python_execute_function testing
}
src_install() {
distutils_src_install
python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/sphinx-build"
if use doc; then
dohtml -A txt -r doc/_build/html/* || die "Installation of documentation failed"
fi
}
pkg_postinst() {
distutils_pkg_postinst
# Generate the Grammar pickle to avoid sandbox violations.
generation_of_grammar_pickle() {
"$(PYTHON)" -c "import sys; sys.path.insert(0, '${EROOT}$(python_get_sitedir -b)'); from sphinx.pycode.pgen2.driver import load_grammar; load_grammar('${EROOT}$(python_get_sitedir -b)/sphinx/pycode/Grammar.txt')"
}
python_execute_function \
--action-message 'Generation of Grammar pickle with $(python_get_implementation_and_version)...' \
--failure-message 'Generation of Grammar pickle with $(python_get_implementation_and_version) failed' \
generation_of_grammar_pickle
}
pkg_postrm() {
distutils_pkg_postrm
deletion_of_grammar_pickle() {
rm -f "${EROOT}$(python_get_sitedir -b)/sphinx/pycode"/Grammar*.pickle || return 1
# Delete empty parent directories.
local dir="${EROOT}$(python_get_sitedir -b)/sphinx/pycode"
while [[ "${dir}" != "${EROOT%/}" ]]; do
rmdir "${dir}" 2> /dev/null || break
dir="${dir%/*}"
done
}
python_execute_function \
--action-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version)...' \
--failure-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version) failed' \
deletion_of_grammar_pickle
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/sphinx: sphinx-1.1.3-r2.ebuild ChangeLog
@ 2012-04-03 15:26 Mike Gilbert (floppym)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert (floppym) @ 2012-04-03 15:26 UTC (permalink / raw
To: gentoo-commits
floppym 12/04/03 15:26:24
Modified: sphinx-1.1.3-r2.ebuild ChangeLog
Log:
Fix generation of docs with python 3. Solution copied from Progress overlay.
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-python/sphinx/sphinx-1.1.3-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild?rev=1.2&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild?r1=1.1&r2=1.2
Index: sphinx-1.1.3-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sphinx-1.1.3-r2.ebuild 2 Apr 2012 17:08:23 -0000 1.1
+++ sphinx-1.1.3-r2.ebuild 3 Apr 2012 15:26:24 -0000 1.2
@@ -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 @@
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 @@
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 @@
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
1.104 dev-python/sphinx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?r1=1.103&r2=1.104
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- ChangeLog 2 Apr 2012 17:08:23 -0000 1.103
+++ ChangeLog 3 Apr 2012 15:26:24 -0000 1.104
@@ -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)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/sphinx: sphinx-1.1.3-r2.ebuild ChangeLog
@ 2012-05-01 12:00 Kacper Kowalik (xarthisius)
0 siblings, 0 replies; 3+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2012-05-01 12:00 UTC (permalink / raw
To: gentoo-commits
xarthisius 12/05/01 12:00:37
Modified: sphinx-1.1.3-r2.ebuild ChangeLog
Log:
Add dependency on app-text/dvipng required for rendering math expressions
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.3 dev-python/sphinx/sphinx-1.1.3-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild?r1=1.2&r2=1.3
Index: sphinx-1.1.3-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sphinx-1.1.3-r2.ebuild 3 Apr 2012 15:26:24 -0000 1.2
+++ sphinx-1.1.3-r2.ebuild 1 May 2012 12:00:37 -0000 1.3
@@ -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.2 2012/04/03 15:26:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild,v 1.3 2012/05/01 12:00:37 xarthisius Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -26,7 +26,10 @@
>=dev-python/jinja-2.3
>=dev-python/pygments-1.2
dev-python/setuptools
- latex? ( dev-texlive/texlive-latexextra )"
+ latex? (
+ dev-texlive/texlive-latexextra
+ app-text/dvipng
+ )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
1.110 dev-python/sphinx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?r1=1.109&r2=1.110
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ChangeLog 17 Apr 2012 21:59:32 -0000 1.109
+++ ChangeLog 1 May 2012 12:00:37 -0000 1.110
@@ -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.109 2012/04/17 21:59:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.110 2012/05/01 12:00:37 xarthisius Exp $
+
+ 01 May 2012; Kacper Kowalik <xarthisius@gentoo.org> sphinx-1.1.3-r2.ebuild:
+ Add dependency on app-text/dvipng required for rendering math expressions
17 Apr 2012; Brent Baude <ranger@gentoo.org> sphinx-1.1.2.ebuild:
Marking sphinx-1.1.2 ppc64 for bug 410115
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-01 12:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-01 12:00 [gentoo-commits] gentoo-x86 commit in dev-python/sphinx: sphinx-1.1.3-r2.ebuild ChangeLog Kacper Kowalik (xarthisius)
-- strict thread matches above, loose matches on Subject: below --
2012-04-03 15:26 Mike Gilbert (floppym)
2012-04-02 17:08 Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox