Backport upstream patch with python3 fixes

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

4 files changed, 189 insertions, 15 deletions

diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index fb4c60c4f7f0..9d4a9189d38c 100644
--- a/dev-python/sphinx/ChangeLog
+++ b/dev-python/sphinx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.110 2012/05/01 12:00:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.111 2012/05/06 12:10:06 xarthisius Exp $
+
+*sphinx-1.1.3-r3 (06 May 2012)
+
+  06 May 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/sphinx-1.1.3-python3.patch, +sphinx-1.1.3-r3.ebuild:
+  Backport upstream patch with python3 fixes
 
   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
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 8c2f3c5e9777..43515563b611 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX sphinx-1.1.3-python3.patch 1793 RMD160 fdb0382aab3e99ebdb3721d22c46cf9313d9c90e SHA1 4f8fc55329d80120a284c7b243a33feb71a55fee SHA256 f21f0f4f8b1f83660344b7b8c1512f853d579eb2938e7f6b4305008252824f46
 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
@@ -8,23 +9,24 @@ EBUILD sphinx-1.0.7.ebuild 2630 RMD160 c2eef81ec87659a3e37f63a61228c938229bdedc
 EBUILD sphinx-1.1.2.ebuild 2637 RMD160 46616452de6b4423174b53bc3397ed377debb628 SHA1 0350441eca594d10e63ab4a254e361aca7f95e1e SHA256 9b3c9e5ea5bc2e5e2b3a5dd65e8f66b78ad505c1c9dfb44883aad4acdc121cb2
 EBUILD sphinx-1.1.3-r1.ebuild 2716 RMD160 240454a281b8ec25b6ac57d82594403cc0a45823 SHA1 7fde5c55760be8289e681933237636ca8396b279 SHA256 cd454b3ff1fed2ee20d99a0522df341fc6265f85e1cf42ec45c9972ecd3af839
 EBUILD sphinx-1.1.3-r2.ebuild 3525 RMD160 8f70ca32d0480f4c92db67dcf3c3ca9df17194fd SHA1 7b3d74d2ec1ba216b31d428e431707fb3cc58144 SHA256 43b61ccc47e8ccc732546b3d051e5e4e7ff73e4e3b43f854cea6fe74c9c9949a
+EBUILD sphinx-1.1.3-r3.ebuild 3573 RMD160 23ce351e93518fe1dc1607bef542627be5627b3a SHA1 de4977b4829861d2a5038e88050cd2fe0c742061 SHA256 6c95df09acfefd419bf868ab1db98c1d6502465372ba137bea860459a5684b5e
 EBUILD sphinx-1.1.3.ebuild 2639 RMD160 bc5eb476ba962b79fc420b68336b4b443d4b23ee SHA1 ec2867b1f493ae2dd0e44d828dddfceb23583ebe SHA256 bf5676a31c413f535545d9ce812010ce333f11e3eb14b44375ca879df2d9f21d
-MISC ChangeLog 13459 RMD160 55ee5dc2e5189a8ed783f224cb219100652cbe58 SHA1 d6abf7d58bd6a899c507c3257ffd008a18bac942 SHA256 aaff4c55f68aae8f9312645ed380acd6fd40c14c7b2cf7f32a850ed38c72749a
+MISC ChangeLog 13653 RMD160 090cc838499b186cf3bf4a0980a74560666f5c16 SHA1 dab58affa8018e4d7a369e75cdebdf272e99f989 SHA256 b8dbd833d3a8c01e6b0d3ee72bf5fabf3d209e5e76a31a8050c27ccd6fc146a1
 MISC metadata.xml 410 RMD160 acf3a54f1d85f83f1159eb2db443de711355623e SHA1 de7ae70d1e4b73cbc6b1b0a9b5d618ab7a3ff199 SHA256 ec32db3e710de4837b3b3f6077a1577fe318faf0b00976a972d4e269d7bd3367
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPn9BvAAoJEF0huFKJUZL5bpIP/2uT3tgrL4j7cZJxZUXay8v6
-AfezTzWyoXWA3W0Pa3Y8iAJjnTQR/N6ICz9zOlsnw36iIGT6oGqF+zIA9zzhB4FN
-GbSoSVx63gvqJfFXfxshoH45CWztqFRwQzYshYAQCOggV2SAalOCQsScWoK8C+GB
-E+nAs9i/CExPYtS88AP0wexaMySLvIKFUc/IiE6MamQb5sgauQHZxcAbWqd/BSjb
-1MKoutJyrBUyG+Ly/CJVjoWqrJf2MGW9tBjOF1fk7WtTzWNTAehU/sAS+iyWypLK
-1LBKvmcFwA1OWRB9q/ealIEMYPPwmE/z1Ahd5Zo9w3Bdh7CTL3CK1mmPjrGr86w2
-B6UHgLhCG3sHUfvAkbolnDmQrBeB8UTTjZb2xgAn5Et6Qgg5V/mVimFZGHjictgb
-pJu/LJZNyR+3WDarRT/5SozpsB6kptv4YgffLTAa7SXTrUwKZ4N7LK9pZuedF8vI
-iyrkNFaLnaMvi0qJRbANYpDmvOcAqul4vH8fPOo3NUuR0gJn+6fG2w3pkEL2axhN
-ctt+y//QTaG4eke62NOIQIMuWn5YdNTOBlqe3/gui6ylYal6CvoA86HYvsaxQeTZ
-bdLixEYneZrP78wvxCvIGOaPc0cfxogLk+p6IGD7SNNSSMyx2ob6+p6HauVrSzuW
-/cM1f/EDCC66U9g6+yuQ
-=ib/z
+iQIcBAEBCAAGBQJPpmonAAoJEF0huFKJUZL5GwYP/2TEmuz2U1tLlBkHHkaS/aNB
+CBtUQNGgFVhdagRf27rskFN77mgehsWZo1fq0OA18NjagualoEtYjgXPJiz3RXro
+daS7CpzvHa1S0Z81orFEXsZ1oWUyK4TuTFUblOjcZxpWu9Ftxs27SFqOFKu8tCsF
+JYF5pOqhVXpktKJ+fmpvSur6xu/UjEXq+QCC5zkIRM3C9UitUnmzZU43Vwb8H1Z3
+7n9Q5arO69/8GxfXnmbg5bR+lNtu1k8xVHy15feViTEO7OxlSGkr/UkcHbTj9xCy
+VDFrvyOzuG/p8FcMR3L+5IlnQDYlER7GQ5lCS9r63Va0ZCjQg0YHmSbJCLLc2dpY
+sfHMYpGfvFkqwGL2F5UAJOaTXZKnCCqymjU1Di/Cr3XmUVQAiy5Mr/6QstYmVFns
+CRqeHN8YYsd/uejxER6mqArKFlQXilfEy3R6vPOSAU1GgOEUB1fgtKkBvkMdAU0R
+3luhOphtB7XxqnfQm6vM5ZPZHVzFAUr0SwvNXc8u/pRPVYuprpkRqvPBMA8aw3Zy
+iS0IrOqgtoF1vq15AY+Xe1utGvkL+tKovUt6gKUg+ZCmepZ6Jlw2w5F+1eQwtSoO
+lzYU9C3f33z1oBQsezj7cF8WNM9efsCC7OsTbUziE6G31KZLMG4jNSonv5XShq3y
+LS8GzNx9Kx6Ne1t90GU8
+=+nWk
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinx/files/sphinx-1.1.3-python3.patch b/dev-python/sphinx/files/sphinx-1.1.3-python3.patch
new file mode 100644
index 000000000000..4817034eb683
--- /dev/null
+++ b/dev-python/sphinx/files/sphinx-1.1.3-python3.patch
@@ -0,0 +1,45 @@
+# HG changeset patch
+# User Rob Reilink <r.reilink@science-applied.nl>
+# Date 1331657734 -3600
+# Node ID 8aba132b1337fc351fe1464f3a4b61f21f55e64e
+# Parent  4a6d33249418befdf587603fc31db58fb863fee4
+fixed encoding for hashing functions for Python 3
+
+diff -r 4a6d33249418befdf587603fc31db58fb863fee4 -r 8aba132b1337fc351fe1464f3a4b61f21f55e64e sphinx/ext/graphviz.py
+--- a/sphinx/ext/graphviz.py	Sat Mar 10 22:24:59 2012 +0100
++++ b/sphinx/ext/graphviz.py	Tue Mar 13 17:55:34 2012 +0100
+@@ -121,9 +121,11 @@
+ 
+ def render_dot(self, code, options, format, prefix='graphviz'):
+     """Render graphviz code into a PNG or PDF output file."""
+-    hashkey = code.encode('utf-8') + str(options) + \
++    hashkey = (code + str(options) + \
+               str(self.builder.config.graphviz_dot) + \
+               str(self.builder.config.graphviz_dot_args)
++              ).encode('utf-8')
++              
+     fname = '%s-%s.%s' % (prefix, sha(hashkey).hexdigest(), format)
+     if hasattr(self.builder, 'imgpath'):
+         # HTML
+diff -r 4a6d33249418befdf587603fc31db58fb863fee4 -r 8aba132b1337fc351fe1464f3a4b61f21f55e64e sphinx/ext/inheritance_diagram.py
+--- a/sphinx/ext/inheritance_diagram.py	Sat Mar 10 22:24:59 2012 +0100
++++ b/sphinx/ext/inheritance_diagram.py	Tue Mar 13 17:55:34 2012 +0100
+@@ -39,7 +39,7 @@
+ import re
+ import sys
+ import inspect
+-import __builtin__
++import __builtin__ as __builtin__ # as __builtin__ is for lib2to3 compatibility
+ try:
+     from hashlib import md5
+ except ImportError:
+@@ -314,7 +314,8 @@
+ 
+ 
+ def get_graph_hash(node):
+-    return md5(node['content'] + str(node['parts'])).hexdigest()[-10:]
++    encoded = (node['content'] + str(node['parts'])).encode('utf-8')
++    return md5(encoded).hexdigest()[-10:]
+ 
+ 
+ def html_visit_inheritance_diagram(self, node):
diff --git a/dev-python/sphinx/sphinx-1.1.3-r3.ebuild b/dev-python/sphinx/sphinx-1.1.3-r3.ebuild
new file mode 100644
index 000000000000..d34c91a2d240
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.1.3-r3.ebuild
@@ -0,0 +1,121 @@
+# 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-r3.ebuild,v 1.1 2012/05/06 12:10:06 xarthisius Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="nosetests"
+PYTHON_TESTS_RESTRICTED_ABIS="2.5 *-pypy-*"
+
+inherit eutils 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
+		app-text/dvipng
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="CHANGES"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-python3.patch
+	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
+		einfo "Generation of documentation"
+		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
+}
+
+src_test() {
+	testing() {
+		pushd build-${PYTHON_ABI} > /dev/null
+		echo PYTHONPATH=lib nosetests --verbosity=1
+		PYTHONPATH=lib nosetests --verbosity=1
+		local rv=$?
+		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"
+
+	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
+}
+
+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
+}