diff options
| -rw-r--r-- | dev-python/docutils/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-python/docutils/Manifest | 25 | ||||
| -rw-r--r-- | dev-python/docutils/docutils-0.3-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/docutils/docutils-0.3.3-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/docutils/docutils-0.3.5.ebuild | 6 | ||||
| -rw-r--r-- | dev-python/docutils/docutils-0.3.7.ebuild | 77 | ||||
| -rw-r--r-- | dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/docutils/files/digest-docutils-0.3.7 | 2 | ||||
| -rw-r--r-- | dev-python/docutils/files/docutils-0.3.7-extramodules.patch | 32 |
9 files changed, 148 insertions, 16 deletions
diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog index 75a9b8d4d40d..b2f52db5248b 100644 --- a/dev-python/docutils/ChangeLog +++ b/dev-python/docutils/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-python/docutils # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.22 2005/02/19 06:19:11 gongloo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.23 2005/03/14 19:38:08 pythonhead Exp $ + +*docutils-0.3.7 (14 Mar 2005) + + 14 Mar 2005; Rob Cakebread <pythonhead@gentoo.org> + +files/docutils-0.3.7-extramodules.patch, docutils-0.3-r1.ebuild, + docutils-0.3.3-r1.ebuild, docutils-0.3.5.ebuild, +docutils-0.3.7.ebuild, + docutils-0.3_pre20030530-r3.ebuild: + Fixed python 2.4 DEPENDs. Added src_test to 0.3.7. Marked 0.3.5 x86 bug# 79635 19 Feb 2005; <gongloo@gentoo.org> docutils-0.3.5.ebuild: Stable on ppc-macos. diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest index c05957e7ffc5..b03c832b192f 100644 --- a/dev-python/docutils/Manifest +++ b/dev-python/docutils/Manifest @@ -1,20 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 1bb75841c00a96ff62b668a48e5fc699 ChangeLog 3694 -MD5 0d9c2cc34a0b1ac517179248191c375c docutils-0.3-r1.ebuild 1765 -MD5 5776613102667a55c5f9bfffec903905 docutils-0.3.3-r1.ebuild 1905 -MD5 2db37b6ef1fe57fb346ea2d04043fe47 docutils-0.3_pre20030530-r3.ebuild 1537 +MD5 01b1656db189b9bfca9413655ddbe9a6 docutils-0.3-r1.ebuild 1764 +MD5 f9eb00a08b12381f3af73aab7363cc21 docutils-0.3_pre20030530-r3.ebuild 1536 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 -MD5 ae668fc36f27157d2fc69b5a339d3cf3 docutils-0.3.5.ebuild 1967 +MD5 51cb3b530b64636ee27620cc46485f5c docutils-0.3.5.ebuild 1965 +MD5 efd11dad15be4db36af57f6c64853739 docutils-0.3.3-r1.ebuild 1904 +MD5 87d28960dded2328292dcf628621742e docutils-0.3.7.ebuild 1945 MD5 694b883b9a8f714dc375a547cdf62b1d files/digest-docutils-0.3-r1 64 -MD5 d30e8a9c7f49c164696893c2f39f41ee files/digest-docutils-0.3.3-r1 72 MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530-r3 73 MD5 7c025532adb8b09116980747be7ccc61 files/docutils-0.3-extramodules.patch 1155 -MD5 fd7797bcc6dfaac58ec5408e4e3dac99 files/docutils-0.3.3-extramodules.patch 1159 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 d30e8a9c7f49c164696893c2f39f41ee files/digest-docutils-0.3.3-r1 72 +MD5 fd7797bcc6dfaac58ec5408e4e3dac99 files/docutils-0.3.3-extramodules.patch 1159 MD5 a88bbfee1135288043eeffcb178fab00 files/digest-docutils-0.3.5 124 MD5 9d184e504ea5367a9309b9a1691d5147 files/docutils-0.3.5-extramodules.patch 1163 +MD5 4be747a533a3ba63b1cad7ced8b8ba04 files/docutils-0.3.7-extramodules.patch 1163 +MD5 90906547cd2223248f6619d44b7fb688 files/digest-docutils-0.3.7 124 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 @@ -23,3 +29,10 @@ MD5 f3c575d69568fafe2159283355e7efc0 files/glep-0.3.3/glepread.py 1833 MD5 8a92d518608c84c83ce14ac840f96834 files/glep-0.3.3/glep.py 699 MD5 bacb84b99614ef28729cb5adf4763242 files/glep-0.3.3/glep_htmlwrite.py 3246 MD5 bba4f5a38311f907d4ddb4a5514099ea files/glep-0.3.3/glepstrans.py 10898 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.0 (GNU/Linux) + +iD8DBQFCNefNz2gxt1z4IGYRAkhJAJ9e1PtNm2eOYCCMq/m77uQuIrajiACeMJ0R +m9RaRQO/4/6op6oI6GjDySc= +=Hlfz +-----END PGP SIGNATURE----- diff --git a/dev-python/docutils/docutils-0.3-r1.ebuild b/dev-python/docutils/docutils-0.3-r1.ebuild index d7ecf6f5fc05..de74fbb2d8f4 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-2005 Gentoo Foundation # 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.9 2005/01/09 23:50:29 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3-r1.ebuild,v 1.10 2005/03/14 19:38:08 pythonhead Exp $ inherit distutils eutils @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="x86 ppc" IUSE="" -DEPEND=">=dev-lang/python-2.1" +DEPEND="<dev-lang/python-2.4" # GLEP version GLEP_SRC=${FILESDIR}/glep-${PVR} diff --git a/dev-python/docutils/docutils-0.3.3-r1.ebuild b/dev-python/docutils/docutils-0.3.3-r1.ebuild index e4db5b65d546..4acaa060412e 100644 --- a/dev-python/docutils/docutils-0.3.3-r1.ebuild +++ b/dev-python/docutils/docutils-0.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.3-r1.ebuild,v 1.7 2005/01/09 23:50:29 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.3-r1.ebuild,v 1.8 2005/03/14 19:38:08 pythonhead Exp $ inherit distutils eutils @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="x86 ppc ~alpha ~amd64 ~sparc" IUSE="" -DEPEND=">=dev-lang/python-2.1" +DEPEND="<dev-lang/python-2.4" # GLEP version GLEP_SRC=${FILESDIR}/glep-${PV} diff --git a/dev-python/docutils/docutils-0.3.5.ebuild b/dev-python/docutils/docutils-0.3.5.ebuild index 33b4c12cef4f..cc4028f54210 100644 --- a/dev-python/docutils/docutils-0.3.5.ebuild +++ b/dev-python/docutils/docutils-0.3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.5 2005/02/19 06:19:11 gongloo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.5.ebuild,v 1.6 2005/03/14 19:38:08 pythonhead Exp $ inherit distutils eutils @@ -11,10 +11,10 @@ SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz LICENSE="public-domain PYTHON BSD" SLOT="0" -KEYWORDS="~x86 ~ppc ~alpha ~sparc ppc-macos" +KEYWORDS="x86 ~ppc ~alpha ~sparc ppc-macos" IUSE="glep" -DEPEND=">=dev-lang/python-2.1" +DEPEND="<dev-lang/python-2.4" GLEP_SRC=${WORKDIR}/glep-${PV} diff --git a/dev-python/docutils/docutils-0.3.7.ebuild b/dev-python/docutils/docutils-0.3.7.ebuild new file mode 100644 index 000000000000..774defe18926 --- /dev/null +++ b/dev-python/docutils/docutils-0.3.7.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2005 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.1 2005/03/14 19:38:08 pythonhead Exp $ + +inherit distutils eutils + +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="~x86 ~ppc ~alpha ~sparc ~ppc-macos" +IUSE="glep" +DEPEND=">=dev-lang/python-2.2" + +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_test() { + cd ${S}/test + ./alltests.py || die "alltests.py failed" +} + +src_install() { + cd ${S} + 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 + + # 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/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 + newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py || die "newins writer failed" + fi +} diff --git a/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild b/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild index d7e90f65c5e4..1ffd651b63fe 100644 --- a/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild +++ b/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild,v 1.8 2005/01/09 23:50:29 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild,v 1.9 2005/03/14 19:38:08 pythonhead Exp $ DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc." HOMEPAGE="http://docutils.sourceforge.net/" @@ -13,7 +13,7 @@ IUSE="" inherit distutils -DEPEND=">=dev-lang/python-2.1" +DEPEND="<dev-lang/python-2.4" S=${WORKDIR}/${PN} src_compile() { diff --git a/dev-python/docutils/files/digest-docutils-0.3.7 b/dev-python/docutils/files/digest-docutils-0.3.7 new file mode 100644 index 000000000000..394e2d08763c --- /dev/null +++ b/dev-python/docutils/files/digest-docutils-0.3.7 @@ -0,0 +1,2 @@ +MD5 fdd192d62bf5aebac6258a7ae8af5123 docutils-0.3.7.tar.gz 625719 +MD5 e129dda1ed953ef15fd54c7bc466b5a1 glep-0.3.7.tbz2 5055 diff --git a/dev-python/docutils/files/docutils-0.3.7-extramodules.patch b/dev-python/docutils/files/docutils-0.3.7-extramodules.patch new file mode 100644 index 000000000000..f5701d681cbe --- /dev/null +++ b/dev-python/docutils/files/docutils-0.3.7-extramodules.patch @@ -0,0 +1,32 @@ +--- docutils-0.3.7/setup.py 2004-07-29 16:57:28.000000000 +0200 ++++ docutils-0.3.7/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): + |