stable bump and cleanup

7 files changed, 12 insertions, 103 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 11ef25fc00d1..b247916c13cb 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.7 2003/07/07 23:39:10 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.8 2003/09/20 15:34:44 liquidx Exp $
+
+  20 Sep 2003; Alastair Tse <liquidx@gentoo.org> docutils-0.3-r1.ebuild,
+  docutils-0.3.ebuild, docutils-0.3_pre20030530.ebuild:
+  bumped to stable x86 and cleanups
 
 *docutils-0.3-r1 (08 Jul 2003)
 
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index f7bf8f8a7da8..5ae004baed0b 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,19 +1,15 @@
-MD5 96898c1cd94fbb3f0c3de8d00c0dc5de ChangeLog 2021
-MD5 e0d8e4223fc8707a140edc37b91f6049 docutils-0.3_pre20030530.ebuild 717
+MD5 8e9864382d5377c3f4df4f8277844d19 ChangeLog 2187
+MD5 c5d06c3ea814684770bfef1a46502fba docutils-0.3-r1.ebuild 1766
 MD5 830985a2766095e1f0bf53f606ffb34a docutils-0.3_pre20030530-r3.ebuild 1544
-MD5 440685658e8558984f5ab83b1ac49fd5 docutils-0.3.ebuild 1529
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 209971e1cdd0b9d4ed1a85d4cf4ba55a docutils-0.3-r1.ebuild 1768
-MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530 73
+MD5 694b883b9a8f714dc375a547cdf62b1d files/digest-docutils-0.3-r1 64
 MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530-r3 73
+MD5 7c025532adb8b09116980747be7ccc61 files/docutils-0.3-extramodules.patch 1155
 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 694b883b9a8f714dc375a547cdf62b1d files/digest-docutils-0.3 64
-MD5 694b883b9a8f714dc375a547cdf62b1d files/digest-docutils-0.3-r1 64
-MD5 7c025532adb8b09116980747be7ccc61 files/docutils-0.3-extramodules.patch 1155
-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 d6fc669e125324930e72f2421779a5c2 files/glep-0.3-r1/glepread.py 1647
 MD5 52f6ec87bfa6c5c8ec86c85e2a2ed58a files/glep-0.3-r1/glepstrans.py 10428
diff --git a/dev-python/docutils/docutils-0.3-r1.ebuild b/dev-python/docutils/docutils-0.3-r1.ebuild
index ccb2e6b3a737..942f3d376e8b 100644
--- a/dev-python/docutils/docutils-0.3-r1.ebuild
+++ b/dev-python/docutils/docutils-0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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-r1.ebuild,v 1.3 2003/09/08 07:16:26 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3-r1.ebuild,v 1.4 2003/09/20 15:34:44 liquidx Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz"
 
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.1"
diff --git a/dev-python/docutils/docutils-0.3.ebuild b/dev-python/docutils/docutils-0.3.ebuild
deleted file mode 100644
index b261459e0854..000000000000
--- a/dev-python/docutils/docutils-0.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.3 2003/09/08 07:16:26 msterret Exp $
-
-inherit distutils
-
-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"
-
-LICENSE="public-domain PYTHON BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.1"
-
-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
-
-	# 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
-	insinto /usr/lib/python${PYVER}/site-packages/docutils/transforms
-	newins ${FILESDIR}/glepstrans.py gleps.py
-	insinto /usr/lib/python${PYVER}/site-packages/docutils/writers
-	newins ${FILESDIR}/glep_htmlwrite.py glep_html.py
-}
-
diff --git a/dev-python/docutils/docutils-0.3_pre20030530.ebuild b/dev-python/docutils/docutils-0.3_pre20030530.ebuild
deleted file mode 100644
index c35e0eed0b38..000000000000
--- a/dev-python/docutils/docutils-0.3_pre20030530.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.5 2003/09/08 07:16:26 msterret 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"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-inherit distutils
-
-DEPEND=">=dev-lang/python-2.1"
-S=${WORKDIR}/${PN}
-
-src_install() {
-	mydoc="MANIFEST.in *.txt"
-	distutils_src_install
-	dodoc docs/*
-	dodir /usr/share/${PN}
-	cp -a tools test spec ${D}/usr/share/${PN}
-	cd tools
-	dobin *.py
-}
-
diff --git a/dev-python/docutils/files/digest-docutils-0.3 b/dev-python/docutils/files/digest-docutils-0.3
deleted file mode 100644
index bdb677fa30f3..000000000000
--- a/dev-python/docutils/files/digest-docutils-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8c78dd09610055431ac8df30312bdb9 docutils-0.3.tar.gz 485575
diff --git a/dev-python/docutils/files/digest-docutils-0.3_pre20030530 b/dev-python/docutils/files/digest-docutils-0.3_pre20030530
deleted file mode 100644
index 82fdd4ba805e..000000000000
--- a/dev-python/docutils/files/digest-docutils-0.3_pre20030530
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fe067d12639ff29d2e307d36a52fcfe0 docutils-0.3_pre20030530.tgz 460854