Version bump, bug #51422.

6 files changed, 126 insertions, 15 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index c6aa8a747eb7..11a669dd4039 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/docutils
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.9 2004/03/27 10:37:52 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.10 2004/06/12 21:08:12 kloeri Exp $
+
+*docutils-0.3.3 (12 Jun 2004)
+
+  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +files/docutils-0.3.3-extramodules.patch, +docutils-0.3.3.ebuild:
+  Version bump, bug #51422.
 
   27 Mar 2004; David Holm <dholm@gentoo.org> docutils-0.3-r1.ebuild:
   Added to ~ppc.
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 6ac9fbd21eee..cd5509d27618 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,15 +1,18 @@
-MD5 d6fc669e125324930e72f2421779a5c2 files/glep-0.3-r1/glepread.py 1647
-MD5 770e48a59980bce89ab956ab96396a7c files/glep-0.3-r1/glep.py 699
-MD5 a273d63de34b5da93a15764998c054d2 files/glep-0.3-r1/glep_htmlwrite.py 4168
-MD5 52f6ec87bfa6c5c8ec86c85e2a2ed58a files/glep-0.3-r1/glepstrans.py 10428
-MD5 694b883b9a8f714dc375a547cdf62b1d files/digest-docutils-0.3-r1 64
-MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530-r3 73
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 bd44152b4440c05c7565649436834b36 docutils-0.3-r1.ebuild 1776
+MD5 34b286636024f0fb3b1031da68b637cc ChangeLog 2453
+MD5 5d16e793310c6f88d5416c86cdb79575 docutils-0.3.3.ebuild 1788
+MD5 4f08aa3890239785d3fbac7f4f36967b docutils-0.3_pre20030530-r3.ebuild 1541
+MD5 fded948d9eac24154eab24b2b56d15d6 files/glepstrans.py 10420
 MD5 7c025532adb8b09116980747be7ccc61 files/docutils-0.3-extramodules.patch 1155
+MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530-r3 73
+MD5 d30e8a9c7f49c164696893c2f39f41ee files/digest-docutils-0.3.3 72
 MD5 4787b6c5e6678d3f211ec7f8ec71aa03 files/glep.py 699
-MD5 e3fa7c72245aae7d90beef3bf411583b files/glep_htmlwrite.py 4162
+MD5 694b883b9a8f714dc375a547cdf62b1d files/digest-docutils-0.3-r1 64
 MD5 0a2c7c1478f8b72f97b3d12534b4159e files/glepread.py 1647
-MD5 fded948d9eac24154eab24b2b56d15d6 files/glepstrans.py 10420
-MD5 6b2c6325e6edff080959b4d1ec0b1268 ChangeLog 2272
-MD5 bd44152b4440c05c7565649436834b36 docutils-0.3-r1.ebuild 1776
-MD5 830985a2766095e1f0bf53f606ffb34a docutils-0.3_pre20030530-r3.ebuild 1544
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 fd7797bcc6dfaac58ec5408e4e3dac99 files/docutils-0.3.3-extramodules.patch 1159
+MD5 e3fa7c72245aae7d90beef3bf411583b files/glep_htmlwrite.py 4162
+MD5 52f6ec87bfa6c5c8ec86c85e2a2ed58a files/glep-0.3-r1/glepstrans.py 10428
+MD5 770e48a59980bce89ab956ab96396a7c files/glep-0.3-r1/glep.py 699
+MD5 d6fc669e125324930e72f2421779a5c2 files/glep-0.3-r1/glepread.py 1647
+MD5 a273d63de34b5da93a15764998c054d2 files/glep-0.3-r1/glep_htmlwrite.py 4168
diff --git a/dev-python/docutils/docutils-0.3.3.ebuild b/dev-python/docutils/docutils-0.3.3.ebuild
new file mode 100644
index 000000000000..c54dd10f4158
--- /dev/null
+++ b/dev-python/docutils/docutils-0.3.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.3.ebuild,v 1.1 2004/06/12 21:08:12 kloeri 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}-alpha.tar.gz"
+
+LICENSE="public-domain PYTHON BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.1"
+
+# GLEP version
+GLEP_SRC=${FILESDIR}/glep-${PVR}
+
+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
+	insinto /usr/lib/python${PYVER}/site-packages/docutils/readers
+	newins ${GLEP_SRC}/glepread.py glep.py
+	insinto /usr/lib/python${PYVER}/site-packages/docutils/transforms
+	newins ${GLEP_SRC}/glepstrans.py gleps.py
+	insinto /usr/lib/python${PYVER}/site-packages/docutils/writers
+	newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py
+}
diff --git a/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild b/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild
index 9e5b66799b4b..e936166f6682 100644
--- a/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild
+++ b/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild,v 1.4 2003/09/08 07:16:26 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild,v 1.5 2004/06/12 21:08:12 kloeri Exp $
 
 DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc."
 HOMEPAGE="http://docutils.sourceforge.net/"
diff --git a/dev-python/docutils/files/digest-docutils-0.3.3 b/dev-python/docutils/files/digest-docutils-0.3.3
new file mode 100644
index 000000000000..6fd639a7f34c
--- /dev/null
+++ b/dev-python/docutils/files/digest-docutils-0.3.3
@@ -0,0 +1 @@
+MD5 e2ee36b7e878cb53fcee564aaba1f067 docutils-0.3.3-alpha.tar.gz 539340
diff --git a/dev-python/docutils/files/docutils-0.3.3-extramodules.patch b/dev-python/docutils/files/docutils-0.3.3-extramodules.patch
new file mode 100644
index 000000000000..49d49df3dc29
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.3.3-extramodules.patch
@@ -0,0 +1,32 @@
+--- docutils-0.3.3/setup.py	2003-06-25 02:47:04.000000000 +0100
++++ docutils-0.3.3/setup.py.new	2003-07-08 00:21:59.000000000 +0100
+@@ -78,20 +78,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):
+