Version bump to 0.4 (closes bug #118470, thanks to Jeff Kowalczyk <jtk@yahoo.com> for reporting), with some tweaks to work more like upstream recommends and updates to the glep code.

(Portage version: 2660-svn)

5 files changed, 149 insertions, 11 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 2232a637ec40..c2a00a8e5f23 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/docutils
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.39 2006/02/09 00:22:56 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.40 2006/02/13 19:03:10 marienz Exp $
+
+*docutils-0.4 (13 Feb 2006)
+
+  13 Feb 2006; Marien Zwart <marienz@gentoo.org>
+  +files/50docutils-0.4-gentoo.el, +docutils-0.4.ebuild:
+  Version bump to 0.4 (closes bug #118470, thanks to Jeff Kowalczyk
+  <jtk@yahoo.com> for reporting), with some tweaks to work more like upstream
+  recommends and updates to the glep code.
 
   28 Jan 2006; Olivier Crête <tester@gentoo.org> docutils-0.3.7.ebuild:
   Stable on amd64
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index ae0082fbb45b..111d6491f567 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ae3d55dbeffe815dd4d1bd6ec71f4930 ChangeLog 6105
 RMD160 7fcff0259222f38200e6ca2782feae0188718711 ChangeLog 6105
 SHA256 3cec1610164652c94d95e600140537521b414913b838820deb79967431b216c8 ChangeLog 6105
@@ -22,6 +19,12 @@ SHA256 0b42aa8d739d5e56b0356cd462ca6d8abf8473a06afbf046a3b0408856a7fd4d docutils
 MD5 74a7b1584824888016191380b65cea31 docutils-0.3_pre20030530-r3.ebuild 1541
 RMD160 60b30e84d385050f14a1b2e689ab16909bc4ce54 docutils-0.3_pre20030530-r3.ebuild 1541
 SHA256 ca3b29a595b3750d03063617cc76b74000df2c4d99c2a2f179f0445de5522d08 docutils-0.3_pre20030530-r3.ebuild 1541
+MD5 798c195a15ef29e982462664613fa32f docutils-0.4.ebuild 2807
+RMD160 e67d4da98874a8830dbdcab9382118908d19cd0e docutils-0.4.ebuild 2807
+SHA256 ded4b71d3ffd02dacf3c99b0af52023f7806cc85b5189bc2595304ae3d9ac1f3 docutils-0.4.ebuild 2807
+MD5 db1120176b861cb2e4078bc45c16c3bb files/50docutils-0.4-gentoo.el 275
+RMD160 d017df7483e086d71f18800002f285b1a90be08c files/50docutils-0.4-gentoo.el 275
+SHA256 cbfccc2cf7f9b9dc00a0007fac424a5c634e083cfd29c0441becea75a9d92c8e files/50docutils-0.4-gentoo.el 275
 MD5 dac9480a7b5144f60cb48675c654f5a3 files/50docutils-gentoo.el 280
 RMD160 d7a7c56fc93d93e2c0ca725c13a539b2d42489bf files/50docutils-gentoo.el 280
 SHA256 18ead83f20f4de845dbd027b9d6845b3bb7d98933791b8c12b46528625d841cd files/50docutils-gentoo.el 280
@@ -43,6 +46,9 @@ SHA256 f0d6cfd3e7f176db49a3d9b1f925521587f246ba8279f09bcb5e69c209f22305 files/di
 MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530-r3 73
 RMD160 cbdc80126cace4451b1cbc56f774af9871a6c47e files/digest-docutils-0.3_pre20030530-r3 73
 SHA256 69f56b4875c1ef7d02227e001c36f3e528a2fe38b27bf386c2714725c0d5c99a files/digest-docutils-0.3_pre20030530-r3 73
+MD5 1dd3004476c8c1fc88936ead9bd41ddf files/digest-docutils-0.4 455
+RMD160 c3786a9bff4a748d07c80cbdcd539e2eb572188e files/digest-docutils-0.4 455
+SHA256 e2e3feb3122c7e17cc0f76de3699c794d854dfd456697037e7ea4c70d989423e files/digest-docutils-0.4 455
 MD5 7c025532adb8b09116980747be7ccc61 files/docutils-0.3-extramodules.patch 1155
 RMD160 4cd5e34d01f893fc9c2e25eaed9f7cf058162aaa files/docutils-0.3-extramodules.patch 1155
 SHA256 77438498810cd1dba21c3c817e499423b38bd54f403cf7c8a11e345200310301 files/docutils-0.3-extramodules.patch 1155
@@ -94,10 +100,3 @@ SHA256 d7921025a32bf8e56e2877ab86eda34b0215615ce43ec33159b9bcc9d33e9f3a files/gl
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6otvV3J2n04EauwRAo9tAKCCdRoLUhxr7kYcCYlAmfmr1qD9lwCg1utm
-ztdVI2LuLSrRokKjSPFDSI8=
-=jPO0
------END PGP SIGNATURE-----
diff --git a/dev-python/docutils/docutils-0.4.ebuild b/dev-python/docutils/docutils-0.4.ebuild
new file mode 100644
index 000000000000..cbfc960d7b89
--- /dev/null
+++ b/dev-python/docutils/docutils-0.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2006 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.1 2006/02/13 19:03:10 marienz Exp $
+
+inherit distutils eutils elisp-common
+
+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 ~hppa ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+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
+}
+
+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}
+	mydoc="*.txt"
+	distutils_src_install
+	# Tools
+	cd ${S}/tools
+	for tool in *.py
+	do
+		dobin ${tool}
+	done
+	# Docs
+	cd ${S}
+	dohtml -r docs spec tools
+	# manually install the stylesheet file
+	insinto /usr/share/doc/${PF}/html
+	doins docutils/writers/html4css1/html4css1.css
+	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
+		dobin ${GLEP_SRC}/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
+		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
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/docutils/files/50docutils-0.4-gentoo.el b/dev-python/docutils/files/50docutils-0.4-gentoo.el
new file mode 100644
index 000000000000..e7011c5c08fa
--- /dev/null
+++ b/dev-python/docutils/files/50docutils-0.4-gentoo.el
@@ -0,0 +1,8 @@
+
+;; site-lisp configuration for docutils
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'rst-mode "rst" "mode for editing reStructuredText documents" t)
+(setq auto-mode-alist
+      (append '(("\\.rst$" . rst-mode)
+                ("\\.rest$" . rst-mode)) auto-mode-alist))
diff --git a/dev-python/docutils/files/digest-docutils-0.4 b/dev-python/docutils/files/digest-docutils-0.4
new file mode 100644
index 000000000000..6c6a2076016e
--- /dev/null
+++ b/dev-python/docutils/files/digest-docutils-0.4
@@ -0,0 +1,6 @@
+MD5 0fe7b42bb3c2aa3680fe30f9a5fbf712 docutils-0.4.tar.gz 1237801
+RMD160 f6a3c5bfb79ed08ce282bcaf3ded05bd2e3f95b5 docutils-0.4.tar.gz 1237801
+SHA256 b81f29e4f39540d06c7d8c0dc1a2c209816c47ce33a66ac50ee28ae38d242c0e docutils-0.4.tar.gz 1237801
+MD5 543d1e9ae25682cb7f1c051a296093d0 glep-0.4.tbz2 4636
+RMD160 01992cc92fb23948c32e8c617d822892b5014641 glep-0.4.tbz2 4636
+SHA256 84b7dc586f20b4c7f296dc4ca284d160ab02c61b13bedf56c1040c727fa70920 glep-0.4.tbz2 4636