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

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

3 files changed, 74 insertions, 12 deletions

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
+}