3 files changed, 99 insertions, 7 deletions
diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index df92580a2a13..8f4ce1f3251c 100644
--- a/dev-python/sphinx/ChangeLog
+++ b/dev-python/sphinx/ChangeLog
@@ -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.101 2012/03/29 10:41:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.102 2012/03/31 19:55:28 floppym Exp $
+
+*sphinx-1.1.3-r1 (31 Mar 2012)
+
+  31 Mar 2012; Mike Gilbert <floppym@gentoo.org> +sphinx-1.1.3-r1.ebuild:
+  Make sphinx-build wrapper respect EPYTHON. Ported from Progress.
 
   29 Mar 2012; Agostino Sarubbo <ago@gentoo.org> sphinx-1.1.2.ebuild:
   Stable for amd64, wrt bug #410115
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index e6eead251da0..a8d8171ed933 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST Sphinx-1.0.7.tar.gz 2285875 RMD160 e3c622dec2a971158bfe8bc7faee493f722199c8 SHA1 b231438a51a84d53679a226ab2036ec62bb14fd5 SHA256 80d62f3f7913c3322bf279ec26bfb12c1ce70404b00f4c87dc3ac190d150b0ab
 DIST Sphinx-1.1.2.tar.gz 2624636 RMD160 0cf4f8d799b239d54248b9abf8b40680086b7320 SHA1 92f422474e43345ab69dedceeedfd7d18c55da2d SHA256 cf66ee61eef61b7c478907282bddcdd5e04eebd69a00a2bb93881427938fe688
 DIST Sphinx-1.1.3.tar.gz 2632059 RMD160 5d4fe35a3d22d31965692d427421fde02b508a38 SHA1 6beb30f18ffac3de7689b7fd63e9a8a7d9c8df3a SHA256 34dc95b70a2b07a61b5d61034c34b05f82514aab54ad27adedb49cee911bb8e9
 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.ebuild 2639 RMD160 bc5eb476ba962b79fc420b68336b4b443d4b23ee SHA1 ec2867b1f493ae2dd0e44d828dddfceb23583ebe SHA256 bf5676a31c413f535545d9ce812010ce333f11e3eb14b44375ca879df2d9f21d
-MISC ChangeLog 12295 RMD160 d000587462ec954af6f80f2005d190f3ed1e0a3e SHA1 03d16d99183989a9ca0548cdc7dfc2dd4115c58e SHA256 39e3f6a206dfd5e1576418d2fc68243bd6ca5e18cf0d421fa9f651c01c0de09d
+MISC ChangeLog 12473 RMD160 2d43310743b1c3ae6ede06067c81385bb59716f4 SHA1 80bf67c10f026d81ef4a147663aa5d1f0726da42 SHA256 235f4dad55d2a77495118f8d2a34d24f44ef610aa61c6408adb8fc3ca9435354
 MISC metadata.xml 410 RMD160 acf3a54f1d85f83f1159eb2db443de711355623e SHA1 de7ae70d1e4b73cbc6b1b0a9b5d618ab7a3ff199 SHA256 ec32db3e710de4837b3b3f6077a1577fe318faf0b00976a972d4e269d7bd3367
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk93TMgACgkQ/ejvha5XGaM5pwCeJD4kxDn4h7ZPQyB5oa/vDh1M
-NyYAoLylxwkQlnh08xuvIE/fOKOB3pdu
-=FXBE
+iF4EAREIAAYFAk93YTUACgkQC77qH+pIQ6Re9QEAoPVEPnPU+2Z0vSpDwDSNSH/P
+UactfnaLxtoOEY5wAgoBAIHy7OxbcFjk3Z8hFOXq9NzDP+5g3lVOs++j0GPFMVQW
+=qT91
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinx/sphinx-1.1.3-r1.ebuild b/dev-python/sphinx/sphinx-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..33264bdbe857
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.1.3-r1.ebuild
@@ -0,0 +1,86 @@
+# 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-r1.ebuild,v 1.1 2012/03/31 19:55:28 floppym Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+DISTUTILS_SRC_TEST="nosetests"
+
+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_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_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
+}