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

Package-Manager: portage-2.1.3_rc6

4 files changed, 138 insertions, 5 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/Manifest b/dev-python/docutils/Manifest
index 7967e98f78cd..ac7ff1b0c45e 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50docutils-0.4-gentoo.el 275 RMD160 d017df7483e086d71f18800002f285b1a90be08c SHA1 5f02490db2dfc432c90bf5b0b8c9898ef2707ac5 SHA256 cbfccc2cf7f9b9dc00a0007fac424a5c634e083cfd29c0441becea75a9d92c8e
 MD5 db1120176b861cb2e4078bc45c16c3bb files/50docutils-0.4-gentoo.el 275
 RMD160 d017df7483e086d71f18800002f285b1a90be08c files/50docutils-0.4-gentoo.el 275
@@ -43,14 +46,18 @@ EBUILD docutils-0.4-r1.ebuild 3100 RMD160 ae7d284d574773af8bf5a9af529ef99b6a5d7c
 MD5 63aa4a3928b604055fe352e05e383ec2 docutils-0.4-r1.ebuild 3100
 RMD160 ae7d284d574773af8bf5a9af529ef99b6a5d7cb1 docutils-0.4-r1.ebuild 3100
 SHA256 7cf47b1f62b103f46ab339a87d2c35899635a04a90a694407089368a1113509b docutils-0.4-r1.ebuild 3100
+EBUILD docutils-0.4-r2.ebuild 2771 RMD160 fdf7cc2cff8df9cef825fa4c9f0825c2a9212cfd SHA1 583f379cc32d6d0fcf3b2faf2afb841d62189c65 SHA256 c9f89275ae764c66b8eb2778bb686c29f4630113f35bc33ab39b562aeb89ac86
+MD5 4207f216a98a788dd09a38712d99c38a docutils-0.4-r2.ebuild 2771
+RMD160 fdf7cc2cff8df9cef825fa4c9f0825c2a9212cfd docutils-0.4-r2.ebuild 2771
+SHA256 c9f89275ae764c66b8eb2778bb686c29f4630113f35bc33ab39b562aeb89ac86 docutils-0.4-r2.ebuild 2771
 EBUILD docutils-0.4.ebuild 3101 RMD160 a83f9ad65fdd9fbcf1e702f7af422e2e5465ffba SHA1 dc5f6ff9370f71ef5129a2226a2b37d3c0b358e9 SHA256 2a1d6c1032808541b9d7ddb53b17807228226b5a16d60b0fa3a8e2a604915411
 MD5 ae8135c4ab549b6f7e470ec532ed8fce docutils-0.4.ebuild 3101
 RMD160 a83f9ad65fdd9fbcf1e702f7af422e2e5465ffba docutils-0.4.ebuild 3101
 SHA256 2a1d6c1032808541b9d7ddb53b17807228226b5a16d60b0fa3a8e2a604915411 docutils-0.4.ebuild 3101
-MISC ChangeLog 9713 RMD160 e40da9174c1c492bfeace906391ad0a5ca37498a SHA1 e14fed8d7d2c8f2f8e3c35802628013007dac8dd SHA256 826bedd7119dc829abbbd4a7f18eb9e717068d5c23206d99d7469ab05eea187f
-MD5 da6d0d92ad406cdcae77ef5768e117b9 ChangeLog 9713
-RMD160 e40da9174c1c492bfeace906391ad0a5ca37498a ChangeLog 9713
-SHA256 826bedd7119dc829abbbd4a7f18eb9e717068d5c23206d99d7469ab05eea187f ChangeLog 9713
+MISC ChangeLog 10028 RMD160 0336c7e6df006c5e896fb72c86e8667e758e6079 SHA1 dc7f9f875d9f8e2409c167b140fec295e4640592 SHA256 43118c7562bde156dbffd46afec7968e629be061ec4397cb154a61a2757d59a3
+MD5 be414197efbdb29600c8f119d8c10e6d ChangeLog 10028
+RMD160 0336c7e6df006c5e896fb72c86e8667e758e6079 ChangeLog 10028
+SHA256 43118c7562bde156dbffd46afec7968e629be061ec4397cb154a61a2757d59a3 ChangeLog 10028
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -70,3 +77,13 @@ SHA256 e2e3feb3122c7e17cc0f76de3699c794d854dfd456697037e7ea4c70d989423e files/di
 MD5 cf729a67b72b0f96548289eb0f66ce7b files/digest-docutils-0.4-r1 464
 RMD160 9be20cf77a0818bd49a4fe8ebb1689a8871a2c1b files/digest-docutils-0.4-r1 464
 SHA256 0147097ebfb9b6cab51670436f16b5d41c40323cb23cc388ecd85d2b253a5c29 files/digest-docutils-0.4-r1 464
+MD5 cf729a67b72b0f96548289eb0f66ce7b files/digest-docutils-0.4-r2 464
+RMD160 9be20cf77a0818bd49a4fe8ebb1689a8871a2c1b files/digest-docutils-0.4-r2 464
+SHA256 0147097ebfb9b6cab51670436f16b5d41c40323cb23cc388ecd85d2b253a5c29 files/digest-docutils-0.4-r2 464
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGhhs6Oeoy/oIi7uwRAqhzAJoDocMSzXEeOvZTukBCsoJZpJfiVACfUiAc
+VdVqYbKUxFID4vl+W1yqqKk=
+=5/QF
+-----END PGP SIGNATURE-----
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