Drop old. Quoting.

Package-Manager: portage-2.1.4.1

10 files changed, 37 insertions, 478 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 6fbd7eff3c65..5c02ee97f1dd 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/docutils
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.78 2008/01/02 06:17:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.79 2008/02/04 15:28:03 hawking Exp $
+
+  04 Feb 2008; Ali Polatel <hawking@gentoo.org>
+  -files/docutils-0.3.5-extramodules.patch, -docutils-0.3.5.ebuild,
+  docutils-0.3.7.ebuild, -docutils-0.3.9.ebuild, -docutils-0.4.ebuild,
+  -docutils-0.4-r1.ebuild, docutils-0.4-r2.ebuild, docutils-0.4-r3.ebuild:
+  Drop old. Quoting.
 
   02 Jan 2008; Jeroen Roovers <jer@gentoo.org> docutils-0.4-r3.ebuild:
   Stable for HPPA (bug #203582).
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index c8627e9808d6..486f7d862754 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,23 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50docutils-0.4-gentoo.el 275 RMD160 d017df7483e086d71f18800002f285b1a90be08c SHA1 5f02490db2dfc432c90bf5b0b8c9898ef2707ac5 SHA256 cbfccc2cf7f9b9dc00a0007fac424a5c634e083cfd29c0441becea75a9d92c8e
 AUX 50docutils-gentoo.el 280 RMD160 d7a7c56fc93d93e2c0ca725c13a539b2d42489bf SHA1 872989d6c309a75a1612d217d3981555727f552c SHA256 18ead83f20f4de845dbd027b9d6845b3bb7d98933791b8c12b46528625d841cd
-AUX docutils-0.3.5-extramodules.patch 1163 RMD160 5d420446b752204a71e98f2a82f72d40265783f2 SHA1 4ec343601615c98b8250db584454096e1feda693 SHA256 adc28a387a90b11771bd784452331da1b6a3ffed16c6ee2d1cc4899d63a5ba57
 AUX docutils-0.3.7-extramodules.patch 1163 RMD160 4d7c0f935816f631b87cf58dbf228de931102e4f SHA1 2886d52101f12a6b6b04e75b2a4223b68c953af0 SHA256 c375dc4d7228c051a6dc6dd586fea7789703fb4d3b7c8c5bad4375f0a9e74aaa
 AUX docutils-0.4-python-2.5-fix.patch 4672 RMD160 19c140fcdd530cdf78116cd781e6a626101ea027 SHA1 295091e82a2a28017f5ecdc07cbb02e2d35a3004 SHA256 f77c60951e3af465fa2f328dfc1a6a64c4715730a871fd7b7bf836973b65bed4
-DIST docutils-0.3.5.tar.gz 596691 RMD160 73edfdc60cfc934007c01604b99627dcf68d59b7 SHA1 cb74779c1862d3180d104e3574e35c036438e071 SHA256 45c53691e6ba7e96f60dfa6f93c012749d7d8068489419ef608766ad7f1a340f
 DIST docutils-0.3.7.tar.gz 625719 RMD160 34e1b8e6a19cfefe1e097108bcedaff11f9fdb80 SHA1 49e67c5448a4dcb544dc2128b0b6f93808813190 SHA256 a7a81c71caa36b4576f33f8ab2acb62e9fdf868345e8215f1d1b19d83fd7beb4
-DIST docutils-0.3.9.tar.gz 692056 RMD160 df815925bb2183a673ee21c1dd6c9deecabdb74b SHA1 95babefbc4c89d1b88f57017353bb5835853daa9 SHA256 6b3cbd9b0fae3e2a7c7855e84a8cf9a5237fc2f52a946cbc669ccf7a72e6d1ab
 DIST docutils-0.4.tar.gz 1237801 RMD160 f6a3c5bfb79ed08ce282bcaf3ded05bd2e3f95b5 SHA1 25498713e3757f5050763303fc901dc120357fb5 SHA256 b81f29e4f39540d06c7d8c0dc1a2c209816c47ce33a66ac50ee28ae38d242c0e
-DIST glep-0.3.5.tbz2 5096 RMD160 05ac4a8cee50d6835b3f536e9d936b68d0970741 SHA1 e73e668f37093841dcaa4e4b97cde2cd75823f52 SHA256 c612f7af14aaba03e1f7c8aae7879b72a1fa2ebf3e0df4070e2a96899e21c1e6
 DIST glep-0.3.7.tbz2 5055 RMD160 25bad2505ca571c6823ee6da3516c65ee3de9d6a SHA1 8bfd6789ccbf994d1c6b100bce8e7826c44b3fab SHA256 f1bd110a4360d95867d4e31c5e1e64704f0f0b700bcd5c9ba1999006b0251004
-DIST glep-0.3.9.tbz2 5077 RMD160 2bec75dbf89f73de6c94a32013fbe462a95bde91 SHA1 99fd3a82cfb1d93acb0db6c703ca07475a0049cc SHA256 fdaaa1af69c9af3d9752a2dfa9b47f67fa9732de4749b18cd887cfb8c387c224
 DIST glep-0.4-r1.tbz2 4667 RMD160 bea44f2fe567422fd42bedebdf04cb6d984478ae SHA1 123516118f8bb2c75296a125702f4bf8f3ff1959 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058
-DIST glep-0.4.tbz2 4636 RMD160 01992cc92fb23948c32e8c617d822892b5014641 SHA1 6006e43006a0c005264de49a41c33bf7299cf989 SHA256 84b7dc586f20b4c7f296dc4ca284d160ab02c61b13bedf56c1040c727fa70920
-EBUILD docutils-0.3.5.ebuild 1984 RMD160 9b1a8750b78098a60a1dd3946cab3b75e6d8c3e0 SHA1 4c6f01d819b5559fb59ca6248234bffa2ae2dc27 SHA256 fd79ef2b42d49ce8e87324a0531a06c544519bc52375fd74ce475ece8d9f6996
-EBUILD docutils-0.3.7.ebuild 2548 RMD160 fc2f05a96263c98a18b8b8b311e2fe32596c65a3 SHA1 87307aa0e70b0b475e84b748817b347a48ec5dd0 SHA256 f6a67355bf8d78599eda8d0689ae32f2e0e061743956ac1f99de157902cc7b06
-EBUILD docutils-0.3.9.ebuild 2560 RMD160 806dbd8ac7cce14a1ac05fffefe2edb06fa8cfda SHA1 8324c88292511cec3d404d7de0b491c86c918334 SHA256 c6809e08de792644212cab3e61f7f050c3098a46b84fdda40620c96f716ce98c
-EBUILD docutils-0.4-r1.ebuild 3098 RMD160 10367da24f9cd0daa1f58ac949665e422ba08aab SHA1 3c229e15e2c8b5a6f58d53508d3d270733e6aae8 SHA256 129f96cdb16b317eb228664ce62b5afdca0218a62fde3654d63bdc45ca52b550
-EBUILD docutils-0.4-r2.ebuild 2788 RMD160 49b406b506c5382282374776028c9c07fb611a7b SHA1 f51a2085aa8e3af72f616e4ecc48e5aeb715078e SHA256 d75df1c8ba3a74019f967404c4cba1df81820a5c0dcbe6f15477963f7b9dd058
-EBUILD docutils-0.4-r3.ebuild 2885 RMD160 1362fec775c72de15880a5c05139df35545ac2b3 SHA1 dddfa4fe2de4e22797f0987ca4c80ed56b4ba856 SHA256 d8e6a87d8e4c49b678115bfb0c4bdd01ba8160c0c454ce3ad6dbc9396c91aabd
-EBUILD docutils-0.4.ebuild 3096 RMD160 d54fc21f789a268a931ce79f2ecc126198476c03 SHA1 b7ff4fffecb1eec0727eb68e0e7f67f38bb78f64 SHA256 67f716349d7be8ca596d04cbe456bbb38526480e08d688e60910c550c6083bf7
-MISC ChangeLog 11826 RMD160 8c980f63ef2ee2927c1bb50f92898be689e1ab26 SHA1 9fb290661bc0b986d388b67b44e0c02988173229 SHA256 45b6c0b32dde291200a486451bd730611a305ade745b1f3e2ad1b97124af7d26
+EBUILD docutils-0.3.7.ebuild 2549 RMD160 a8170f2ae5cbeb2d0b7199aa7eb515b8e1e43071 SHA1 07b1e3b798a78d50aaeed2b65d0f29e8970ad354 SHA256 e885f03162043128a551b982f11fc8c2b5849ed629933c024135a6dc30349066
+EBUILD docutils-0.4-r2.ebuild 2792 RMD160 f15fb0b9ed84c79116dd92dde446ef54c81baf76 SHA1 7c13af15505c603463f375d4d0bd244734a204a6 SHA256 882a58e10cacefbea31583e3f49654f58d99abf1f50954e85c66d13b32fbfa71
+EBUILD docutils-0.4-r3.ebuild 2876 RMD160 8c98d778cc84cd9190b2801895a4876516607230 SHA1 08bbc17049df9d3c216bc37cf71040a97ecab95f SHA256 a7f4e644ec4adc2f1a8dfee3bb573390f42eefabb784b1864a76cd70ca28df2f
+MISC ChangeLog 12114 RMD160 6105f5236332fc85b77a56f27efcf64c698bca52 SHA1 611f6c97bcc0721f7356835ef0bc0ec0f0f3e059 SHA256 cbee8ad20ed39eb6f4651ac737d854afdfe20c78da7cfaffa3c3b077156a26de
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHpy8DQU4yORhF8iARApYEAKCoCaPnYnjKKULf7JL9xGrmJgW3RACgp1y/
++cshgOY9WXCSKqb7Q0b+Gxc=
+=f7/D
+-----END PGP SIGNATURE-----
diff --git a/dev-python/docutils/docutils-0.3.5.ebuild b/dev-python/docutils/docutils-0.3.5.ebuild
deleted file mode 100644
index 71024e1465c3..000000000000
--- a/dev-python/docutils/docutils-0.3.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 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.12 2007/07/04 19:38:17 hawking Exp $
-
-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://sourceforge/docutils/${P}.tar.gz
-		glep? ( mirror://gentoo/glep-${PV}.tbz2 )"
-
-LICENSE="public-domain PYTHON BSD"
-SLOT="0"
-KEYWORDS="alpha ~mips ppc ~sparc x86"
-IUSE="glep"
-
-DEPEND="<dev-lang/python-2.4"
-
-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() {
-	DOCS="*.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
-	if use glep
-	then
-		distutils_python_version
-		newbin ${GLEP_SRC}/glep.py docutils-glep.py || die "newbin failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/readers
-		newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/transforms
-		newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/writers
-		newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py || die "newins writer failed"
-	fi
-}
diff --git a/dev-python/docutils/docutils-0.3.7.ebuild b/dev-python/docutils/docutils-0.3.7.ebuild
index 4ca46581342e..ebc66e9b3c36 100644
--- a/dev-python/docutils/docutils-0.3.7.ebuild
+++ b/dev-python/docutils/docutils-0.3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.7.ebuild,v 1.18 2007/07/04 19:38:17 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.7.ebuild,v 1.19 2008/02/04 15:28:03 hawking Exp $
 
 inherit distutils eutils elisp-common multilib
 
@@ -23,7 +23,7 @@ GLEP_SRC=${WORKDIR}/glep-${PV}
 src_unpack() {
 	unpack ${A}
 	# simplified algorithm to select installing optparse and textwrap
-	epatch ${FILESDIR}/${P}-extramodules.patch
+	epatch "${FILESDIR}"/${P}-extramodules.patch
 }
 
 src_compile() {
@@ -45,22 +45,21 @@ install_txt_doc() {
 }
 
 src_test() {
-	cd ${S}/test
+	cd "${S}"/test
 	PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
 }
 
 src_install() {
-	cd ${S}
 	DOCS="*.txt"
 	distutils_src_install
 	# Tools
-	cd ${S}/tools
+	cd "${S}"/tools
 	for tool in *.py
 	do
 		newbin ${tool} docutils-${tool}
 	done
 	# Docs
-	cd ${S}
+	cd "${S}"
 	dohtml -r docs spec tools
 	for doc in $(find docs spec tools -name '*.txt')
 	do
@@ -82,7 +81,7 @@ src_install() {
 
 	if use emacs; then
 		elisp-install ${PN} tools/editors/emacs/*.{elc,el}
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 }
 
diff --git a/dev-python/docutils/docutils-0.3.9.ebuild b/dev-python/docutils/docutils-0.3.9.ebuild
deleted file mode 100644
index f3afa010d0cf..000000000000
--- a/dev-python/docutils/docutils-0.3.9.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.9.ebuild,v 1.14 2007/07/04 19:38:18 hawking Exp $
-
-inherit distutils eutils elisp-common multilib
-
-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="~alpha ~amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="glep emacs"
-DEPEND=">=dev-lang/python-2.3
-	emacs? ( virtual/emacs )"
-
-EMP=${PN}-0.3.7
-SITEFILE=50docutils-gentoo.el
-
-GLEP_SRC=${WORKDIR}/glep-${PV}
-
-src_unpack() {
-	unpack ${A}
-	# simplified algorithm to select installing optparse and textwrap
-	cd ${S}
-	epatch ${FILESDIR}/${EMP}-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
-	if use emacs; then
-		pushd tools/editors/emacs; elisp-compile *.el; popd
-	fi
-}
-
-install_txt_doc() {
-	local doc=${1}
-	local dir="txt/$(dirname ${doc})"
-	docinto ${dir}
-	dodoc ${doc}
-}
-
-src_test() {
-	cd ${S}/test
-	PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
-}
-
-src_install() {
-	cd ${S}
-	DOCS="*.txt"
-	distutils_src_install
-	# Tools
-	cd ${S}/tools
-	for tool in *.py
-	do
-		dobin ${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
-	if use glep
-	then
-		distutils_python_version
-		newbin ${GLEP_SRC}/glep.py docutils-glep.py || die "newbin failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/readers
-		newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/transforms
-		newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/writers
-		newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py || die "newins writer failed"
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} tools/editors/emacs/*.{elc,el}
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	distutils_pkg_postrm
-}
diff --git a/dev-python/docutils/docutils-0.4-r1.ebuild b/dev-python/docutils/docutils-0.4-r1.ebuild
deleted file mode 100644
index 37074fed6d30..000000000000
--- a/dev-python/docutils/docutils-0.4-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r1.ebuild,v 1.6 2007/07/04 19:38:17 hawking Exp $
-
-inherit distutils eutils elisp-common multilib
-
-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-${PVR}.tbz2 )"
-
-LICENSE="public-domain PYTHON BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="glep emacs"
-
-DEPEND=">=dev-lang/python-2.3
-	emacs? ( virtual/emacs )"
-
-EMP=${PN}-0.3.7
-SITEFILE=50docutils-0.4-gentoo.el
-
-GLEP_SRC=${WORKDIR}/glep-${PVR}
-
-src_unpack() {
-	unpack ${A}
-	# simplified algorithm to select installing optparse and textwrap
-	cd ${S}
-	epatch ${FILESDIR}/${EMP}-extramodules.patch
-	# Fix for Python 2.5 test (bug# 172557)
-	epatch ${FILESDIR}/${P}-python-2.5-fix.patch
-}
-
-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
-
-	# 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"
-
-	popd
-
-	# clean up after the doc building
-	rm roman.py html4css1.css
-
-	if use emacs; then
-		pushd tools/editors/emacs; elisp-compile *.el; popd
-	fi
-}
-
-install_txt_doc() {
-	local doc=${1}
-	local dir="txt/$(dirname ${doc})"
-	docinto ${dir}
-	dodoc ${doc}
-}
-
-src_test() {
-	cd ${S}/test
-	PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
-}
-
-src_install() {
-	cd ${S}
-	DOCS="*.txt"
-	distutils_src_install
-	# Tools
-	cd ${S}/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
-		distutils_python_version
-		dobin ${GLEP_SRC}/glep.py || die "newbin failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/readers
-		newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/transforms
-		newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/writers
-		doins -r ${GLEP_SRC}/glep_html || die "doins writer failed"
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} tools/editors/emacs/*.{elc,el}
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	distutils_pkg_postrm
-}
diff --git a/dev-python/docutils/docutils-0.4-r2.ebuild b/dev-python/docutils/docutils-0.4-r2.ebuild
index 88e64844ffea..29a6424842ce 100644
--- a/dev-python/docutils/docutils-0.4-r2.ebuild
+++ b/dev-python/docutils/docutils-0.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r2.ebuild,v 1.11 2007/08/25 22:28:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r2.ebuild,v 1.12 2008/02/04 15:28:03 hawking Exp $
 
 inherit distutils eutils multilib
 
@@ -25,10 +25,10 @@ GLEP_SRC=${WORKDIR}/glep-${PV}-r1
 src_unpack() {
 	unpack ${A}
 	# simplified algorithm to select installing optparse and textwrap
-	cd ${S}
-	epatch ${FILESDIR}/${EMP}-extramodules.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${EMP}-extramodules.patch
 	# Fix for Python 2.5 test (bug# 172557)
-	epatch ${FILESDIR}/${P}-python-2.5-fix.patch
+	epatch "${FILESDIR}"/${P}-python-2.5-fix.patch
 }
 
 src_compile() {
@@ -62,22 +62,21 @@ install_txt_doc() {
 }
 
 src_test() {
-	cd ${S}/test
+	cd "${S}"/test
 	PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
 }
 
 src_install() {
-	cd ${S}
 	DOCS="*.txt"
 	distutils_src_install
 	# Tools
-	cd ${S}/tools
+	cd "${S}"/tools
 	for tool in *.py
 	do
 		dobin ${tool}
 	done
 	# Docs
-	cd ${S}
+	cd "${S}"
 	dohtml -r docs tools
 	# manually install the stylesheet file
 	insinto /usr/share/doc/${PF}/html
diff --git a/dev-python/docutils/docutils-0.4-r3.ebuild b/dev-python/docutils/docutils-0.4-r3.ebuild
index 772580c79aa6..6f4aea2a5d44 100644
--- a/dev-python/docutils/docutils-0.4-r3.ebuild
+++ b/dev-python/docutils/docutils-0.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r3.ebuild,v 1.9 2008/01/10 09:35:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r3.ebuild,v 1.10 2008/02/04 15:28:03 hawking Exp $
 
 NEED_PYTHON=2.4
 
@@ -73,7 +73,6 @@ src_test() {
 }
 
 src_install() {
-	cd "${S}"
 	DOCS="*.txt"
 	distutils_src_install
 	# Tools
diff --git a/dev-python/docutils/docutils-0.4.ebuild b/dev-python/docutils/docutils-0.4.ebuild
deleted file mode 100644
index 481c5aab8402..000000000000
--- a/dev-python/docutils/docutils-0.4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4.ebuild,v 1.15 2007/07/04 19:38:17 hawking Exp $
-
-inherit distutils eutils elisp-common multilib
-
-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="~alpha amd64 arm ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="glep emacs"
-
-DEPEND=">=dev-lang/python-2.3
-	emacs? ( virtual/emacs )"
-
-EMP=${PN}-0.3.7
-SITEFILE=50docutils-0.4-gentoo.el
-
-GLEP_SRC=${WORKDIR}/glep-${PV}
-
-src_unpack() {
-	unpack ${A}
-	# simplified algorithm to select installing optparse and textwrap
-	cd ${S}
-	epatch ${FILESDIR}/${EMP}-extramodules.patch
-	# Fix for Python 2.5 test (bug# 172557)
-	epatch ${FILESDIR}/${P}-python-2.5-fix.patch
-}
-
-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
-
-	# 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"
-
-	popd
-
-	# clean up after the doc building
-	rm roman.py html4css1.css
-
-	if use emacs; then
-		pushd tools/editors/emacs; elisp-compile *.el; popd
-	fi
-}
-
-install_txt_doc() {
-	local doc=${1}
-	local dir="txt/$(dirname ${doc})"
-	docinto ${dir}
-	dodoc ${doc}
-}
-
-src_test() {
-	cd ${S}/test
-	PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
-}
-
-src_install() {
-	cd ${S}
-	DOCS="*.txt"
-	distutils_src_install
-	# Tools
-	cd ${S}/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
-		distutils_python_version
-		dobin ${GLEP_SRC}/glep.py || die "newbin failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/readers
-		newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/transforms
-		newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/writers
-		doins -r ${GLEP_SRC}/glep_html || die "doins writer failed"
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} tools/editors/emacs/*.{elc,el}
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	distutils_pkg_postrm
-}
diff --git a/dev-python/docutils/files/docutils-0.3.5-extramodules.patch b/dev-python/docutils/files/docutils-0.3.5-extramodules.patch
deleted file mode 100644
index d4f0f60d2e32..000000000000
--- a/dev-python/docutils/files/docutils-0.3.5-extramodules.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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):
-