Revision bump to fix access violations in packages generating docs using sphinx (bug #266015).

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 78 insertions, 13 deletions

diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 57e38fd29041..880397db9f46 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -1,10 +1,13 @@
 AUX nose-0.10.0-tests-nonetwork.patch 1127 RMD160 17d928c8f05676d653ed2ab9022d5c63e7929b8c SHA1 f79a86c8b1d42f8d6dd079e22caee4621315c44c SHA256 1eccfdde4ef59292e1bb517a28556c35ea4b899ab29b92cff4ea968219db3168
+AUX nose-0.11.0-disable_intersphinx.patch 757 RMD160 39dbaa638161f1638bef09c260a8a5d2d4d9d072 SHA1 a1c70879aa82f628c25123f8479f38d39e7f68df SHA256 28d8092b512a2df6c857eed7ecf88b70cd072326b5a705698922669a83304f50
 AUX nose-0.9.3-tests-nonetwork.patch 1073 RMD160 42166ba47fc916e50c913d6d062b7cb21c1c7ede SHA1 14e952c1ac472f7c3e8975e3c09c5316ec3189ee SHA256 b9191506e0f7875cda28e62ee26c90963b2a464d18df98d40350f4cdd6772f60
 DIST nose-0.10.3.tar.gz 271775 RMD160 ab06299c7106a1b318799cae5ac60be2e924ce2d SHA1 31a47c2b59d0cb513ca5ef8476a94c9194a34ff7 SHA256 78c15d680ed7165673487b71d434cf22f801085bcf8b20e9f4984dee03b30b52
 DIST nose-0.10.4.tar.gz 284311 RMD160 0a855579c2401f7a353d915b5ce21a7aa3dd5197 SHA1 e0235c0d4dad211357c073df2376f1d9775d342c SHA256 0c76fd1f8ef4a888cad8da3f0b426406dee030070bb2845316eabf1d8f4a1d36
+DIST nose-0.11.0.tar.gz 249789 RMD160 6256559220989b0d96778ee1e48393f701b9ae8b SHA1 d3a30a8cab3eacf5376b2f67fbd490072052cea6 SHA256 e527ec4671a721816dc614516b07aa52e47036091af6b75ee81fd109d63beb45
 DIST nose-0.9.3.tar.gz 141603 RMD160 5419cb1f9750e4c13780b7ad0735ef1350b2beb8 SHA1 de05448508c9a227e7da885d50744410615d96de SHA256 3093e91694e6bfab7b3d4aa58e1c6cd1550d83d932db4f3ab3ad8c28c7b78da8
 EBUILD nose-0.10.3.ebuild 1268 RMD160 cff5063ac12de3eded731c319f4cf231752942a1 SHA1 020f07f286a427e4dcc9c87bafdf128b7b67c3d0 SHA256 9de7c52459932482c030c828375b69ba5615b2c11a747e9152f062ab1ff44e1b
 EBUILD nose-0.10.4.ebuild 1279 RMD160 9911b5974e30cc0309270ee03d4f2d4b27976d4e SHA1 5b5bdb4a6633f268b9c349f765954f311ed82012 SHA256 30521aaf5e1b3c85226f72cec6c85065ad441e1c767a129c4ac74dcf4117cae3
+EBUILD nose-0.11.0.ebuild 1566 RMD160 42db58ffee1898e2693a9d10ee8dfea549b218ca SHA1 5e1a8a7b646ac6fcd2bc09e6a92f41dd61bd8262 SHA256 c0c42495cf515d537c3cffc84b768be3272f9af13647af082cb9ccd163203b45
 EBUILD nose-0.9.3-r1.ebuild 1365 RMD160 b0c5af624871260cb5257c7a8440005ad9e6e931 SHA1 a2d5ab6788ff81835aab873c7742ba7e99b05885 SHA256 48d7f9da2f5bb3b75a077d692168f4d73b3bf7ab21e1f7daba3fae954bf3d066
-MISC ChangeLog 3876 RMD160 026200778f02c58d1f382031cf39ec9c69739928 SHA1 b4f6d2b94ea1395819dbcaab6e9ab7c449f6de88 SHA256 938a79406f463534779dfdded24f6569a2b2708b4811ff5ca79282fb33c02ff9
+MISC ChangeLog 4058 RMD160 309ec0e3f98e7584365b79553162d6764d91a0a2 SHA1 26c094eaf5672e882d087dd3b630b59a69c699c7 SHA256 57f768169a69ca8fe7ae6b8b24aa6c33a62b8d88690132b04893c77c63da4ff2
 MISC metadata.xml 260 RMD160 9b94655ec2ecf067468e018cc1e59301d32438fe SHA1 85b2103b36cf8b9d8d7ed6d158f3ad09fb878dfa SHA256 4c805a4ea3fadc43fdc844aa0e0fb43bbea5bd057a2d6d144407e73eb3a445ea
diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index 18aaedda2c0c..ef961b5d1264 100644
--- a/dev-python/sphinx/ChangeLog
+++ b/dev-python/sphinx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/sphinx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.13 2009/04/15 21:09:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.14 2009/05/13 08:57:51 dev-zero Exp $
+
+*sphinx-0.6.1-r1 (13 May 2009)
+
+  13 May 2009; Tiziano Müller <dev-zero@gentoo.org>
+  +sphinx-0.6.1-r1.ebuild:
+  Revision bump to fix access violations in packages generating docs using
+  sphinx (bug #266015).
 
   15 Apr 2009; Markus Meier <maekke@gentoo.org> sphinx-0.5.2.ebuild:
   amd64/x86 stable, bug #261887
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 32f7761090cf..135e4544ef84 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST Sphinx-0.5.2.tar.gz 730502 RMD160 549afe6cb791047aa15a898da12642e834a8c444 SHA1 85eb437fc5fff0b0ecf2bc684f431e6d4220188b SHA256 0f5bdfa3dd2cfe90ddb00d22d0afa19eaba6c1d808f3efbe03dea903dcbd8500
 DIST Sphinx-0.6.1.tar.gz 962113 RMD160 b385f4772548d241fcfae281d7a3a020d32c2579 SHA1 08d465a42523624e22d59f51f862ba1d497b2850 SHA256 ab8d795d243b8c6899636ba409d2e09d4fecfe73700ed18f22da74b8351104f5
 EBUILD sphinx-0.5.2.ebuild 1118 RMD160 a97e77fdd3668a5480a4a0437ac6940ab9efd055 SHA1 661ae034a1b11d17b98768ea53409534f262eb83 SHA256 560fd99c2ab1fe3549c6cd8038e8cc5b8355983a87747ab46c3a729a796773f8
+EBUILD sphinx-0.6.1-r1.ebuild 1629 RMD160 aa644e91805a7f3cd56b0a0da59378b0c02a10c3 SHA1 89af561fe92948da503b00a0bcf2194ce745cc9a SHA256 eda325e2884c751e50af1cffdfb8827e7755002b152e87c192a48b0afc2595d9
 EBUILD sphinx-0.6.1.ebuild 1104 RMD160 07d51df989751705d6285775aea53c51dbfd5009 SHA1 2d4da3345ae2a8f17279366794d8272a4f944086 SHA256 c63cbed14c3a39a3eb7478eb05ac153aae468ba4072af82253ab74bce7e375b4
-MISC ChangeLog 2092 RMD160 7d6d5d3f51d1aff7867a648c602de34c6816428b SHA1 0948a1897ab177cbb0eefd118b1055323e8b2506 SHA256 219611738fe160cf2040b7b581e93680ac8b2aacc91014fb9752c1de13bd13de
+MISC ChangeLog 2306 RMD160 a729aab9398d46674fde4feca0cda40e112c97d3 SHA1 0875d886f84afe189ebd96538eea287eefa2fb2c SHA256 b17a1014291168ee777124a70de388dbc3fa4ef64b6c7278d6fb374fb41d498f
 MISC metadata.xml 351 RMD160 a039846d5551a68ce6babb384726d5f2aed7ed48 SHA1 4827404c8a432524f89c5c6882c8f723d9ceee23 SHA256 c3304c774eac6a8ed5a1dbfd42c2e52540cfd76aa441ac4be4b94240410bd4dd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAknmTSMACgkQkKaRLQcq0GKQnACfaGQ7JFj0uXpED8fgHOSy65/D
-6r4An1fGJ3TuNYWTGqGb8u/Y+NEbOPj1
-=XfvC
------END PGP SIGNATURE-----
diff --git a/dev-python/sphinx/sphinx-0.6.1-r1.ebuild b/dev-python/sphinx/sphinx-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..cb10dd3dc78c
--- /dev/null
+++ b/dev-python/sphinx/sphinx-0.6.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-0.6.1-r1.ebuild,v 1.1 2009/05/13 08:57:51 dev-zero Exp $
+
+inherit distutils multilib
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool to create documentation for Python projects"
+HOMEPAGE="http://sphinx.pocoo.org/"
+SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/pygments-0.8
+	>=dev-python/jinja2-2.1
+	>=dev-python/docutils-0.4"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	test? ( dev-python/nose )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	DOCS="CHANGES"
+	distutils_src_compile
+
+	if use doc ; then
+		cd doc
+		PYTHONPATH="../" emake \
+			SPHINXBUILD="${python} ../sphinx-build.py" \
+			html || die "making docs failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc ; then
+		dohtml -A txt -r doc/_build/html/* || die
+	fi
+}
+
+src_test() {
+	PYTHONPATH="./build/lib" "${python}" tests/run.py || die "Tests failed"
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	# Generating the Grammar pickle to avoid on the fly generation causing sandbox violations (bug #266015)
+	"${python}" \
+		-c "from sphinx.pycode.pgen2.driver import load_grammar ; load_grammar('${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/sphinx/pycode/Grammar.txt')" \
+		|| die "generating grammar pickle failed"
+}
+
+pkg_postrm() {
+	rm "${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/sphinx/pycode"/Grammar*.pickle
+	distutils_pkg_postrm
+}