Fix circular emacs / eselect / docutils dependency, bug #183242.

(Portage version: 2.1.3_rc6)

3 files changed, 117 insertions, 1 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 3415054c26ca..e251d564598d 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/docutils
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.62 2007/04/16 07:24:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.63 2007/06/30 08:58:31 ulm Exp $
+
+*docutils-0.4-r2 (30 Jun 2007)
+
+  30 Jun 2007; Ulrich Mueller <ulm@gentoo.org> +docutils-0.4-r2.ebuild:
+  Emacs support files split off and moved to app-emacs/rst. This fixes the
+  circular emacs / eselect / docutils dependency, bug #183242. Dropped
+  arm/s390/sh/~sparc-fbsd; to be re-added following rst keywording.
 
   16 Apr 2007; Markus Rothe <corsair@gentoo.org> docutils-0.4-r1.ebuild:
   Stable on ppc64
diff --git a/dev-python/docutils/docutils-0.4-r2.ebuild b/dev-python/docutils/docutils-0.4-r2.ebuild
new file mode 100644
index 000000000000..803371b9adf2
--- /dev/null
+++ b/dev-python/docutils/docutils-0.4-r2.ebuild
@@ -0,0 +1,103 @@
+# 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-r2.ebuild,v 1.1 2007/06/30 08:58:31 ulm 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}-r1.tbz2 )"
+
+LICENSE="public-domain PYTHON BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="glep emacs"
+
+DEPEND=">=dev-lang/python-2.3"
+# Emacs support is in PDEPEND to avoid a dependency cycle (bug #183242)
+PDEPEND="emacs? ( >=app-emacs/rst-0.4 )"
+
+EMP=${PN}-0.3.7
+
+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
+	# 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
+}
+
+
+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 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
+}
diff --git a/dev-python/docutils/files/digest-docutils-0.4-r2 b/dev-python/docutils/files/digest-docutils-0.4-r2
new file mode 100644
index 000000000000..ba5bd5405ff8
--- /dev/null
+++ b/dev-python/docutils/files/digest-docutils-0.4-r2
@@ -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 da03775225027791807e28aab57e1732 glep-0.4-r1.tbz2 4667
+RMD160 bea44f2fe567422fd42bedebdf04cb6d984478ae glep-0.4-r1.tbz2 4667
+SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058 glep-0.4-r1.tbz2 4667