New version

6 files changed, 131 insertions, 16 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 59dbeb6fc0fb..04b8e072d90b 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/docutils
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.12 2004/07/20 18:23:59 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.13 2004/11/01 00:13:09 g2boojum Exp $
+
+*docutils-0.3.5 (31 Oct 2004)
+
+  31 Oct 2004; Grant Goodyear <g2boojum@gentoo.org>
+  +files/docutils-0.3.5-extramodules.patch, docutils-0.3.3-r1.ebuild,
+  +docutils-0.3.5.ebuild:
+  0.3.3-r1 is now stable on x86.
+  
+  Added 0.3.5, thanks to Stephen Boulet (bug #59140).
 
 *docutils-0.3.3-r1 (20 Jul 2004)
 
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index cc9efb9c67f9..42263199ca88 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,22 +1,25 @@
-MD5 04c871cbda622fef342b5de05af39c50 ChangeLog 2764
 MD5 2d1ab502015ee8e10c54630e0a81b262 docutils-0.3-r1.ebuild 1768
-MD5 5220160ee48c361fa93d8be1ff1e9d1f docutils-0.3.3-r1.ebuild 1895
+MD5 4ecb8f44bc66b74db8778a349f3f7db3 docutils-0.3.5.ebuild 1929
 MD5 5d333bce91f972626f0756c8520e77ff docutils-0.3_pre20030530-r3.ebuild 1540
+MD5 04c871cbda622fef342b5de05af39c50 ChangeLog 2764
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 165c8bb1860e086fbbd60c9d5be9c607 docutils-0.3.3-r1.ebuild 1894
+MD5 fded948d9eac24154eab24b2b56d15d6 files/glepstrans.py 10420
+MD5 0a2c7c1478f8b72f97b3d12534b4159e files/glepread.py 1647
+MD5 fd7797bcc6dfaac58ec5408e4e3dac99 files/docutils-0.3.3-extramodules.patch 1159
 MD5 694b883b9a8f714dc375a547cdf62b1d files/digest-docutils-0.3-r1 64
 MD5 d30e8a9c7f49c164696893c2f39f41ee files/digest-docutils-0.3.3-r1 72
-MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530-r3 73
+MD5 e3fa7c72245aae7d90beef3bf411583b files/glep_htmlwrite.py 4162
 MD5 7c025532adb8b09116980747be7ccc61 files/docutils-0.3-extramodules.patch 1155
-MD5 fd7797bcc6dfaac58ec5408e4e3dac99 files/docutils-0.3.3-extramodules.patch 1159
+MD5 9d184e504ea5367a9309b9a1691d5147 files/docutils-0.3.5-extramodules.patch 1163
+MD5 a88bbfee1135288043eeffcb178fab00 files/digest-docutils-0.3.5 124
 MD5 4787b6c5e6678d3f211ec7f8ec71aa03 files/glep.py 699
-MD5 e3fa7c72245aae7d90beef3bf411583b files/glep_htmlwrite.py 4162
-MD5 0a2c7c1478f8b72f97b3d12534b4159e files/glepread.py 1647
-MD5 fded948d9eac24154eab24b2b56d15d6 files/glepstrans.py 10420
-MD5 770e48a59980bce89ab956ab96396a7c files/glep-0.3-r1/glep.py 699
-MD5 a273d63de34b5da93a15764998c054d2 files/glep-0.3-r1/glep_htmlwrite.py 4168
-MD5 d6fc669e125324930e72f2421779a5c2 files/glep-0.3-r1/glepread.py 1647
+MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530-r3 73
 MD5 52f6ec87bfa6c5c8ec86c85e2a2ed58a files/glep-0.3-r1/glepstrans.py 10428
-MD5 8a92d518608c84c83ce14ac840f96834 files/glep-0.3.3/glep.py 699
-MD5 bacb84b99614ef28729cb5adf4763242 files/glep-0.3.3/glep_htmlwrite.py 3246
-MD5 f3c575d69568fafe2159283355e7efc0 files/glep-0.3.3/glepread.py 1833
+MD5 d6fc669e125324930e72f2421779a5c2 files/glep-0.3-r1/glepread.py 1647
+MD5 a273d63de34b5da93a15764998c054d2 files/glep-0.3-r1/glep_htmlwrite.py 4168
+MD5 770e48a59980bce89ab956ab96396a7c files/glep-0.3-r1/glep.py 699
 MD5 bba4f5a38311f907d4ddb4a5514099ea files/glep-0.3.3/glepstrans.py 10898
+MD5 f3c575d69568fafe2159283355e7efc0 files/glep-0.3.3/glepread.py 1833
+MD5 bacb84b99614ef28729cb5adf4763242 files/glep-0.3.3/glep_htmlwrite.py 3246
+MD5 8a92d518608c84c83ce14ac840f96834 files/glep-0.3.3/glep.py 699
diff --git a/dev-python/docutils/docutils-0.3.3-r1.ebuild b/dev-python/docutils/docutils-0.3.3-r1.ebuild
index 8a0085bc7854..e0e22173abd7 100644
--- a/dev-python/docutils/docutils-0.3.3-r1.ebuild
+++ b/dev-python/docutils/docutils-0.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.3-r1.ebuild,v 1.2 2004/09/03 16:54:47 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.3-r1.ebuild,v 1.3 2004/11/01 00:13:09 g2boojum Exp $
 
 inherit distutils eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/docutils/${P}-alpha.tar.gz"
 
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
-KEYWORDS="~x86 ppc ~alpha"
+KEYWORDS="x86 ppc ~alpha"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.1"
diff --git a/dev-python/docutils/docutils-0.3.5.ebuild b/dev-python/docutils/docutils-0.3.5.ebuild
new file mode 100644
index 000000000000..e9629a8a441b
--- /dev/null
+++ b/dev-python/docutils/docutils-0.3.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.5.ebuild,v 1.1 2004/11/01 00:13:09 g2boojum Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc."
+HOMEPAGE="http://docutils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz
+		 glep? ( mirror://gentoo/glep-${PV}.tbz2 )"
+
+LICENSE="public-domain PYTHON BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha"
+IUSE="glep"
+
+DEPEND=">=dev-lang/python-2.1"
+
+GLEP_SRC=${WORKDIR}/glep-${PV}
+
+src_unpack() {
+	unpack ${A}
+	# simplified algorithm to select installing optparse and textwrap
+	epatch ${FILESDIR}/${P}-extramodules.patch
+}
+
+src_compile() {
+	distutils_src_compile
+
+	# Generate html docs from reStructured text sources
+	PYTHONPATH=${S}/build/lib ${python} \
+		tools/buildhtml.py --config=tools/docutils.conf
+}
+
+
+install_txt_doc() {
+	local doc=${1}
+	local dir="txt/$(dirname ${doc})"
+	docinto ${dir}
+	dodoc ${doc}
+}
+
+src_install() {
+	mydoc="MANIFEST.in *.txt"
+	distutils_src_install
+	# Tools
+	cd ${S}/tools
+	for tool in *.py
+	do
+		newbin ${tool} docutils-${tool}
+	done
+	# Docs
+	cd ${S}
+	dohtml -r docs spec tools
+	for doc in $(find docs spec tools -name '*.txt')
+	do
+		install_txt_doc $doc
+	done
+
+	# installing Gentoo GLEP tools. Uses versioned GLEP distribution
+	distutils_python_version
+	newbin ${GLEP_SRC}/glep.py docutils-glep.py || die "newbin failed"
+	insinto /usr/lib/python${PYVER}/site-packages/docutils/readers
+	newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
+	insinto /usr/lib/python${PYVER}/site-packages/docutils/transforms
+	newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
+	insinto /usr/lib/python${PYVER}/site-packages/docutils/writers
+	newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py || die "newins writer failed"
+}
diff --git a/dev-python/docutils/files/digest-docutils-0.3.5 b/dev-python/docutils/files/digest-docutils-0.3.5
new file mode 100644
index 000000000000..ad85a3f40029
--- /dev/null
+++ b/dev-python/docutils/files/digest-docutils-0.3.5
@@ -0,0 +1,2 @@
+MD5 b49007d4fb3a24305cc8f30313684925 docutils-0.3.5.tar.gz 596691
+MD5 779e3dd86942a6dc9aff1937abd98075 glep-0.3.5.tbz2 5096
diff --git a/dev-python/docutils/files/docutils-0.3.5-extramodules.patch b/dev-python/docutils/files/docutils-0.3.5-extramodules.patch
new file mode 100644
index 000000000000..d4f0f60d2e32
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.3.5-extramodules.patch
@@ -0,0 +1,32 @@
+--- docutils-0.3.5/setup.py	2004-07-29 16:57:28.000000000 +0200
++++ docutils-0.3.5/setup.py.new	2004-09-23 10:06:06.263010624 +0200
+@@ -82,20 +82,15 @@
+ 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.
++   # so we use a simple rule, 'optparse' and 'textwrap' are not installed
++   # for >=python-2.3
++
++   pyver = sys.version_info
++   if pyver[0] == 2 and pyver[1] > 2:
++      return ["roman"]
++   else:
++      return ["optparse","textwrap","roman"]
+ 
+ class dual_build_py(build_py):
+