Unrestrict python 3 and make the tests work.

Package-Manager: portage-2.2.0_alpha98/cvs/Linux x86_64

3 files changed, 123 insertions, 5 deletions

diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index 8f4ce1f3251c..c28d8750fded 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.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)
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index a8d8171ed933..ca57e838ca0b 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -7,13 +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.ebuild 2639 RMD160 bc5eb476ba962b79fc420b68336b4b443d4b23ee SHA1 ec2867b1f493ae2dd0e44d828dddfceb23583ebe SHA256 bf5676a31c413f535545d9ce812010ce333f11e3eb14b44375ca879df2d9f21d
-MISC ChangeLog 12473 RMD160 2d43310743b1c3ae6ede06067c81385bb59716f4 SHA1 80bf67c10f026d81ef4a147663aa5d1f0726da42 SHA256 235f4dad55d2a77495118f8d2a34d24f44ef610aa61c6408adb8fc3ca9435354
+MISC ChangeLog 12627 RMD160 7f7b184761c5d9eeccb56aeb32408a0821243797 SHA1 835cddd6b554570f2e63ab626663f4b3464c9cfe SHA256 142255ccaa75250a7394bb5074e36af715df94839b234701a3c381b752b7138e
 MISC metadata.xml 410 RMD160 acf3a54f1d85f83f1159eb2db443de711355623e SHA1 de7ae70d1e4b73cbc6b1b0a9b5d618ab7a3ff199 SHA256 ec32db3e710de4837b3b3f6077a1577fe318faf0b00976a972d4e269d7bd3367
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk93YTUACgkQC77qH+pIQ6Re9QEAoPVEPnPU+2Z0vSpDwDSNSH/P
-UactfnaLxtoOEY5wAgoBAIHy7OxbcFjk3Z8hFOXq9NzDP+5g3lVOs++j0GPFMVQW
-=qT91
+iF4EAREIAAYFAk953Q0ACgkQC77qH+pIQ6QZKgEAiSNXgp2/o6QJTCJNGGt2NCv8
+RRNaN7ea5fLLg5oT/GgA/2ipEpWEZ/HsKKt8jJJS8NEkQid7qGXwexqoVMgHWFAI
+=iQ9b
 -----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
new file mode 100644
index 000000000000..55e7cd66e241
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.1.3-r2.ebuild
@@ -0,0 +1,112 @@
+# 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
+}