Version bump.

Package-Manager: portage-14469-svn/cvs/Linux x86_64

4 files changed, 162 insertions, 12 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 7f19094d327b..229b137024eb 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/docutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.94 2009/09/20 19:01:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.95 2009/10/01 22:47:22 arfrever Exp $
+
+*docutils-0.6_pre6148 (02 Oct 2009)
+
+  01 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +docutils-0.6_pre6148.ebuild, +files/docutils-0.6-extra_modules.patch:
+  Version bump.
 
   20 Sep 2009; Ulrich Mueller <ulm@gentoo.org> docutils-0.5.ebuild,
   docutils-0.5-r1.ebuild:
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 1dae6912003e..f5540afbef81 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX docutils-0.3.7-extramodules.patch 1163 RMD160 4d7c0f935816f631b87cf58dbf228de931102e4f SHA1 2886d52101f12a6b6b04e75b2a4223b68c953af0 SHA256 c375dc4d7228c051a6dc6dd586fea7789703fb4d3b7c8c5bad4375f0a9e74aaa
 AUX docutils-0.5-test_node_class_names-python-2.6.patch 533 RMD160 5fa8c2010e79217a0a108e4b1abbe9395e2660ce SHA1 b867020da19157be143123cf7ad84d22eee87460 SHA256 57049d19bee982b79d2bde4c6571f2a38c121b841443cda902f90d3fdd97f081
+AUX docutils-0.6-extra_modules.patch 828 RMD160 d17b6dec432f879e6d387c20f87a207ecf069653 SHA1 0b5a2165e50f9f6876811a12c0c833e8f168e3e2 SHA256 782351307ed68162399e51b0fe6412d931a791e5e9b7f454ea345b9ba8260133
 DIST docutils-0.5.tar.gz 1271981 RMD160 3e8dfd2923528bbeac0ca33ccfe6f576c74f1886 SHA1 70ca2dd94969ddf76217e5fe907b0b23f16cc199 SHA256 747cf984edfca0575addbb42453274a1bdd98ec7780bd37a883dc8b2a66a610e
+DIST docutils-0.6_pre6148.tar.bz2 1226155 RMD160 fbcd066dfba917f69a08a861a7eb0fdd8628688a SHA1 9b6b35482b9fa58ffc6f704e82565a23440b45f2 SHA256 1af80ead516a854142de29e5a49fae063aa83fdd5d8bb7d16c2f355c36f03709
 DIST glep-0.4-r1.tbz2 4667 RMD160 bea44f2fe567422fd42bedebdf04cb6d984478ae SHA1 123516118f8bb2c75296a125702f4bf8f3ff1959 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058
 EBUILD docutils-0.5-r1.ebuild 3164 RMD160 231afd26eadcf9796304a2e066a7acecef27dbae SHA1 684f0bf34ff2f0ac0ba591b7fd3e4e0a023102f7 SHA256 61088c0e327033e0c61a317d88e79789f5f3ba7e1e71dc425b1a90527a2a93c3
 EBUILD docutils-0.5.ebuild 2874 RMD160 555494f496bc1138bdea9aa33af43f3062131fbf SHA1 3d7133f6f24e8c280208de5c7aa3fe62f1668fab SHA256 8ca2a5e9b4b30e51d970af183d945547dad4bd0b166766dd4a326bf2540c8bc7
-MISC ChangeLog 14091 RMD160 83f76337607ae82c25e6764ded460f55a646bd5b SHA1 98b2b09a0c783fe2dcccf2f19722ef03deb878cf SHA256 cb55a65f7116cd0c2bbf8a387cc20e331256342c7e625c09d83b61da569c9373
+EBUILD docutils-0.6_pre6148.ebuild 3463 RMD160 060eb497acb55c61ed17a461976eb407cd14743b SHA1 870974a6bf7d8b4064811d1f60fce2f6b1ac5b15 SHA256 a788b2004c0bdcd5eac7074fd52e6c2be3acd1b57c525ae60589b728b440021b
+MISC ChangeLog 14296 RMD160 cbc3d209f39ffa7649fe2f382e4267d096721b9a SHA1 c0fe55e03ddf8735729058c78859626d0c3f7a54 SHA256 3d57d17f8e215932500ab71c42a62457e4dcc68fb911622184127fa825d0dba0
 MISC metadata.xml 224 RMD160 37a2cf5db0ab817c0e2a1127e9cc4278bf88c904 SHA1 e2c1b45b839624cbc4bd949c8458d50dec01e7cb SHA256 0bb6bfd1577f4800009497c7813935f712ae6a44dbbdec1a903e79eaa5f21755
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iEYEARECAAYFAkq2fIsACgkQOeoy/oIi7uzb0wCg2NlR4J8Wt0vWWtt/JQy3I3ie
-mx0AoMuYHc+UyPWyU/kXImrlf5ywqldG
-=7myw
------END PGP SIGNATURE-----
diff --git a/dev-python/docutils/docutils-0.6_pre6148.ebuild b/dev-python/docutils/docutils-0.6_pre6148.ebuild
new file mode 100644
index 000000000000..8b41034a2f97
--- /dev/null
+++ b/dev-python/docutils/docutils-0.6_pre6148.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.6_pre6148.ebuild,v 1.1 2009/10/01 22:47:22 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils multilib
+
+DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc..."
+HOMEPAGE="http://docutils.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )"
+#mirror://sourceforge/docutils/${P}.tar.gz
+
+LICENSE="public-domain PYTHON BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="glep emacs"
+
+DEPEND="dev-python/setuptools"
+RDEPEND=""
+# Emacs support is in PDEPEND to avoid a dependency cycle (bug #183242)
+PDEPEND="emacs? ( || ( >=app-emacs/rst-0.4 >=virtual/emacs-23 ) )"
+
+GLEP_SRC="${WORKDIR}/glep-0.4-r1"
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+src_prepare() {
+	# Delete internal copies of optparse and textwrap modules.
+	rm -f extras/{optparse.py,textwrap.py}
+	# Fix installation of extra modules.
+	epatch "${FILESDIR}/${PN}-0.6-extra_modules.patch"
+
+	sed -e "s/from distutils.core/from setuptools/" -i setup.py || die "sed setup.py failed"
+
+	# Fix tests.
+	sed -e "/sys\.exit(result)/d" -i test/alltests.py || die "sed test/alltests.py failed"
+
+	python_copy_sources --no-link
+}
+
+src_compile() {
+	distutils_src_compile
+
+	# Generate html docs from reStructured text sources.
+
+	# make roman.py available for the doc building process
+	ln -s extras/roman.py
+
+	pushd tools > /dev/null
+
+	# Place html4css1.css in base directory. This makes sure the
+	# generated reference to it is correct.
+	cp ../docutils/writers/html4css1/html4css1.css ..
+
+	PYTHONPATH=.. ${python} ./buildhtml.py --stylesheet-path=../html4css1.css --traceback .. || die "buildhtml.py failed"
+
+	popd > /dev/null
+
+	# clean up after the doc building
+	rm roman.py html4css1.css
+}
+
+install_txt_doc() {
+	local doc=${1}
+	local dir="txt/$(dirname ${doc})"
+	docinto ${dir}
+	dodoc ${doc}
+}
+
+src_test() {
+	testing() {
+		# Tests are broken with Python 3.
+		[[ "${PYTHON_ABI:0:1}" == "3" ]] && return
+
+		pushd test > /dev/null
+		PYTHONPATH="../build/lib" ./alltests.py || return 1
+		popd > /dev/null
+	}
+	python_execute_function -s testing
+}
+
+src_install() {
+	DOCS="*.txt"
+	distutils_src_install
+
+	# Tools
+	cd tools
+	for tool in *.py; do
+		dobin ${tool}
+	done
+
+	# Docs
+	cd "${S}"
+	dohtml -r docs tools
+	# Manually install the stylesheet file
+	insinto /usr/share/doc/${PF}/html
+	doins docutils/writers/html4css1/html4css1.css
+	for doc in $(find docs tools -name '*.txt'); do
+		install_txt_doc $doc
+	done
+
+	# installing Gentoo GLEP tools. Uses versioned GLEP distribution
+	if use glep; then
+		dobin ${GLEP_SRC}/glep.py || die "newbin failed"
+
+		installation_of_glep_tools() {
+			insinto $(python_get_sitedir)/docutils/readers
+			newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
+			insinto $(python_get_sitedir)/docutils/transforms
+			newins ${GLEP_SRC}/glepstrans.py gleps.py || die "newins transform failed"
+			insinto $(python_get_sitedir)/docutils/writers
+			doins -r ${GLEP_SRC}/glep_html || die "doins writer failed"
+		}
+		python_execute_function --action-message 'Installation of GLEP tools with Python ${PYTHON_ABI}...' installation_of_glep_tools
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize docutils roman.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}
diff --git a/dev-python/docutils/files/docutils-0.6-extra_modules.patch b/dev-python/docutils/files/docutils-0.6-extra_modules.patch
new file mode 100644
index 000000000000..ca5de4b7fc4e
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.6-extra_modules.patch
@@ -0,0 +1,24 @@
+--- setup.py
++++ setup.py
+@@ -182,19 +182,8 @@
+ List of (module name, minimum __version__ string, [attribute names])."""
+ 
+ def get_extras():
+-    extras = []
+-    for module_name, version, attributes in extra_modules:
+-        try:
+-            module = __import__(module_name)
+-            if version and module.__version__ < version:
+-                raise ValueError
+-            for attribute in attributes or []:
+-                getattr(module, attribute)
+-            print ('"%s" module already present; ignoring extras/%s.py.'
+-                   % (module_name, module_name))
+-        except (ImportError, AttributeError, ValueError):
+-            extras.append(module_name)
+-    return extras
++    # Old method does not work for upgrading/downgrading docutils.
++    return ["roman"]
+ 
+ 
+ if __name__ == '__main__' :