GLEP fixes and numerous cleanings thanks to Ben Cornett (bug #17026)

6 files changed, 56 insertions, 25 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 75cd2d75f313..d7aa72e118e3 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/docutils
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.4 2003/06/04 14:39:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.5 2003/06/04 19:39:20 g2boojum Exp $
+
+*docutils-0.3_pre20030530-r3 (04 Jun 2003)
+
+  04 Jun 2003; Grant Goodyear <grant@grantgoodyear.org>
+  docutils-0.3_pre20030530-r2.ebuild, docutils-0.3_pre20030530-r3.ebuild,
+  files/glep_htmlwrite.py, files/glepstrans.py:
+  Numerous cleanings of the ebuild, entirely due to Ben Cornett
+  (whose bug I failed to look at before writing my ebuild).  I also updated
+  the Gentoo GLEP tools slightly so that they point to the new home
+  of GLEP: www.gentoo.org/proj/en/glep.
 
 *docutils-0.3_pre20030530-r2 (04 Jun 2003)
 
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 1cac4b0c0fa9..58a782eddd21 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,12 +1,9 @@
-MD5 a9b4629b940c02a3c6426f3c680570e9 docutils-0.3_pre20030530-r2.ebuild 1110
-MD5 adccd3b64b5fdf482b4d0622bc5fd065 .docutils-0.3_pre20030530-r3.ebuild.swp 12288
 MD5 0cf03f4bdf070639a0966927180fc9ad docutils-0.3_pre20030530.ebuild 716
-MD5 c4ca6cebdde100359406564422969554 docutils-0.3_pre20030530-r3.ebuild 1641
-MD5 c9fcb3e9b174359c2edd41cbc61a59fc ChangeLog 1059
-MD5 ca8c4f8a3944b1dc54cbccfa64d4487b files/glepstrans.py 10420
+MD5 8745aa9baac7279090cb34b459f31b54 docutils-0.3_pre20030530-r3.ebuild 1544
+MD5 9d31c2fb96a776484ae62f61e0f802f0 ChangeLog 1531
+MD5 fded948d9eac24154eab24b2b56d15d6 files/glepstrans.py 10420
 MD5 0a2c7c1478f8b72f97b3d12534b4159e files/glepread.py 1647
 MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530 73
-MD5 e5e696bd333f6e63fb7f504938db30d8 files/glep_htmlwrite.py 4162
+MD5 e3fa7c72245aae7d90beef3bf411583b files/glep_htmlwrite.py 4162
 MD5 4787b6c5e6678d3f211ec7f8ec71aa03 files/glep.py 699
-MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530-r2 73
 MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530-r3 73
diff --git a/dev-python/docutils/docutils-0.3_pre20030530-r2.ebuild b/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild
index f84b217e8a45..a25abcc08199 100644
--- a/dev-python/docutils/docutils-0.3_pre20030530-r2.ebuild
+++ b/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2002 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-r2.ebuild,v 1.2 2003/06/04 14:39:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild,v 1.1 2003/06/04 19:39:20 g2boojum Exp $
 
 DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc."
 HOMEPAGE="http://docutils.sourceforge.net/"
 SRC_URI="mirror://gentoo/${P}.tgz"
 
-LICENSE="public-domain PYTHON"
+LICENSE="public-domain PYTHON BSD"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
@@ -16,16 +16,40 @@ inherit distutils
 DEPEND=">=dev-lang/python-2.1"
 S=${WORKDIR}/${PN}
 
+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
-	dodoc docs/*
-	dodir /usr/share/${PN}
-	cp -a tools test spec ${D}/usr/share/${PN}
-	pushd tools
-	dobin *.py
-	popd
-	dobin ${FILESDIR}/glep.py
+	# 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
+	# Gentoo GLEP tools
+	newbin ${FILESDIR}/glep.py docutils-glep.py
 	distutils_python_version
 	insinto /usr/lib/python${PYVER}/site-packages/docutils/readers
 	newins ${FILESDIR}/glepread.py glep.py
diff --git a/dev-python/docutils/files/digest-docutils-0.3_pre20030530-r2 b/dev-python/docutils/files/digest-docutils-0.3_pre20030530-r3
index 82fdd4ba805e..82fdd4ba805e 100644
--- a/dev-python/docutils/files/digest-docutils-0.3_pre20030530-r2
+++ b/dev-python/docutils/files/digest-docutils-0.3_pre20030530-r3
diff --git a/dev-python/docutils/files/glep_htmlwrite.py b/dev-python/docutils/files/glep_htmlwrite.py
index 460515130f47..2ac959de04bc 100644
--- a/dev-python/docutils/files/glep_htmlwrite.py
+++ b/dev-python/docutils/files/glep_htmlwrite.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.2 $
-# Date: $Date: 2003/06/01 14:00:11 $
+# Revision: $Revision: 1.3 $
+# Date: $Date: 2003/06/04 19:39:20 $
 # Copyright: This module has been placed in the public domain.
 
 """
@@ -69,7 +69,7 @@ class Writer(html4css1.Writer):
         if pyhome == '..':
             subs['pepindex'] = '.'
         else:
-            subs['pepindex'] = pyhome + '/glep/'
+            subs['pepindex'] = 'http://www.gentoo.org/proj/en/glep'
         index = self.document.first_child_matching_class(nodes.field_list)
         header = self.document[index]
         pepnum = header[0][1].astext()
diff --git a/dev-python/docutils/files/glepstrans.py b/dev-python/docutils/files/glepstrans.py
index 394376ad1927..1c2f5e0f562b 100644
--- a/dev-python/docutils/files/glepstrans.py
+++ b/dev-python/docutils/files/glepstrans.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2003/06/01 03:57:44 $
+# Revision: $Revision: 1.2 $
+# Date: $Date: 2003/06/04 19:39:20 $
 # Copyright: This module has been placed in the public domain.
 
 """
@@ -33,8 +33,8 @@ class Headers(Transform):
     default_priority = 360
 
     pep_url = 'glep-%04d.html'
-    pep_cvs_url = ('http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/python/'
-                   'python/nondist/peps/pep-%04d.txt')
+    pep_cvs_url = ('http://cvs.gentoo.org/cgi-bin/viewcvs.cgi/gentoo/'
+                   'xml/htdocs/proj/en/glep/glep-%04d.txt')
     rcs_keyword_substitutions = (
           (re.compile(r'\$' r'RCSfile: (.+),v \$$', re.IGNORECASE), r'\1'),
           (re.compile(r'\$[a-zA-Z]+: (.+) \$$'), r'\1'),)
@@ -127,7 +127,7 @@ class Headers(Transform):
                     para[:] = [nodes.reference('', date, refuri=cvs_url)]
             elif name == 'content-type':
                 pep_type = para.astext()
-                uri = self.pep_url % 12
+                uri = self.pep_url % 2
                 para[:] = [nodes.reference('', pep_type, refuri=uri)]
             elif name == 'version' and len(body):
                 utils.clean_rcs_keywords(para, self.rcs_keyword_substitutions)