diff options
Diffstat (limited to 'dev-python/docutils')
| -rw-r--r-- | dev-python/docutils/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/docutils/Manifest | 8 | ||||
| -rw-r--r-- | dev-python/docutils/docutils-0.5-r1.ebuild | 122 | ||||
| -rw-r--r-- | dev-python/docutils/docutils-0.7_pre6334.ebuild | 118 | ||||
| -rw-r--r-- | dev-python/docutils/files/docutils-0.3.7-extramodules.patch | 32 | ||||
| -rw-r--r-- | dev-python/docutils/files/docutils-0.5-test_node_class_names-python-2.6.patch | 13 |
6 files changed, 8 insertions, 293 deletions
diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog index 6974eb23e927..5c64e8239fad 100644 --- a/dev-python/docutils/ChangeLog +++ b/dev-python/docutils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/docutils # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.119 2010/08/23 07:48:35 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.120 2010/08/23 07:52:51 djc Exp $ + + 23 Aug 2010; Dirkjan Ochtman <djc@gentoo.org> + -files/docutils-0.3.7-extramodules.patch, -docutils-0.5-r1.ebuild, + -files/docutils-0.5-test_node_class_names-python-2.6.patch, + -docutils-0.7_pre6334.ebuild: + Clean out old cruft. 23 Aug 2010; Dirkjan Ochtman <djc@gentoo.org> docutils-0.7.ebuild: Fix bug 333361: installation on Python 3 bombs out with decoding error. diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest index 9f5c6a2bb9c0..b35bfb40732a 100644 --- a/dev-python/docutils/Manifest +++ b/dev-python/docutils/Manifest @@ -1,14 +1,8 @@ -AUX docutils-0.3.7-extramodules.patch 1163 RMD160 4d7c0f935816f631b87cf58dbf228de931102e4f SHA1 2886d52101f12a6b6b04e75b2a4223b68c953af0 SHA256 c375dc4d7228c051a6dc6dd586fea7789703fb4d3b7c8c5bad4375f0a9e74aaa -AUX docutils-0.5-test_node_class_names-python-2.6.patch 533 RMD160 5fa8c2010e79217a0a108e4b1abbe9395e2660ce SHA1 b867020da19157be143123cf7ad84d22eee87460 SHA256 57049d19bee982b79d2bde4c6571f2a38c121b841443cda902f90d3fdd97f081 AUX docutils-0.6-extra_modules.patch 828 RMD160 d17b6dec432f879e6d387c20f87a207ecf069653 SHA1 0b5a2165e50f9f6876811a12c0c833e8f168e3e2 SHA256 782351307ed68162399e51b0fe6412d931a791e5e9b7f454ea345b9ba8260133 -DIST docutils-0.5.tar.gz 1271981 RMD160 3e8dfd2923528bbeac0ca33ccfe6f576c74f1886 SHA1 70ca2dd94969ddf76217e5fe907b0b23f16cc199 SHA256 747cf984edfca0575addbb42453274a1bdd98ec7780bd37a883dc8b2a66a610e DIST docutils-0.6.tar.gz 1368354 RMD160 627665526f25d93277b977c6bfdb1b3f0554d69a SHA1 1b3bfc3bdf285c208dd0c29427fd6b096569aa92 SHA256 04aa91bd644169b23ed02d692f407a2a4e326fbfec9754bce7662fcf59c917f2 DIST docutils-0.7.tar.gz 1404131 RMD160 73c832860405c3cba655c92aacccca1582c8f905 SHA1 e82988f826844ef8d8bf28fa286a19de211349cd SHA256 cd8dc8e131813af9f4f1963f719611cccf23749dcf703f944bb4ac434393ea03 -DIST docutils-0.7_pre6334.tar.bz2 1229262 RMD160 cf7a7b806b0996881557147f86153e18d80161e7 SHA1 4ee9b87376782c8f53a55ffb0f0bf831c1d30d52 SHA256 242102ee0b6f79dc5098df01de0cba2469fe6a72851ea046b580bda34b069d38 DIST glep-0.4-r1.tbz2 4667 RMD160 bea44f2fe567422fd42bedebdf04cb6d984478ae SHA1 123516118f8bb2c75296a125702f4bf8f3ff1959 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058 -EBUILD docutils-0.5-r1.ebuild 3282 RMD160 2f4e89df1597866bb2abb5d5ce75d2a05f23ec64 SHA1 173bdf0c1625e1ec760db5ea3040cf11ff8fed79 SHA256 d9f23f5b275951b5bec987cd0a1abaa67c411579be5b4adc68abdfe1d34f4a40 EBUILD docutils-0.6.ebuild 3616 RMD160 b697f7e98c6b2bd0241135c109c6c68a3d9d6b5e SHA1 9836e95fc73acbf3ca3be39ff4158506c12ac7ff SHA256 98cc1b242ba6f52a717e714e4a0b18d3b1c5e4f05336835853786534fc07345e EBUILD docutils-0.7.ebuild 4730 RMD160 0ca35d8e9107190d70bac0a51a980d1cea676d38 SHA1 5504ae4a64c17a202089077a698b736c95cec7bb SHA256 7a91bf9546ad64048174b488fe7941b92f69cee14e9c0a117232b3bccc8dbc33 -EBUILD docutils-0.7_pre6334.ebuild 4082 RMD160 b29d09c720ae6ce4135830b57c4c2e52934f3853 SHA1 f60a49434b6701599889fc60190273d330a5fcf7 SHA256 a8677be137942ef33139282a5905b82ec96b50d9df722c03af4d06d1aa4c717e -MISC ChangeLog 17132 RMD160 27fc937e94aa098118b7445ab41e4a520bc10872 SHA1 bb9c45490cf0dd79dc9e243976054540133686d2 SHA256 755f096bb375be78b2c37c377074f27e3fb12dd90b360353c247f4fe0d4c0070 +MISC ChangeLog 17367 RMD160 5c79bc2d8187f04bc17e4a1595e907c4ad523dd1 SHA1 56a9aa61d71f1d674ddab56041beb4a3244d4979 SHA256 7ea86dd726b0783bb6b59eee7e4b80e9bfd64303167f3528bd1e34d68ec45363 MISC metadata.xml 224 RMD160 37a2cf5db0ab817c0e2a1127e9cc4278bf88c904 SHA1 e2c1b45b839624cbc4bd949c8458d50dec01e7cb SHA256 0bb6bfd1577f4800009497c7813935f712ae6a44dbbdec1a903e79eaa5f21755 diff --git a/dev-python/docutils/docutils-0.5-r1.ebuild b/dev-python/docutils/docutils-0.5-r1.ebuild deleted file mode 100644 index f05d25193428..000000000000 --- a/dev-python/docutils/docutils-0.5-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5-r1.ebuild,v 1.11 2010/02/06 15:58:17 arfrever Exp $ - -EAPI="2" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" - -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-0.4-r1.tbz2 )" - -LICENSE="public-domain PYTHON BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="glep emacs" - -DEPEND="dev-python/setuptools" -RDEPEND="" -# Emacs support is in PDEPEND to avoid a dependency cycle (bug #183242) -PDEPEND="emacs? ( || ( >=app-emacs/rst-0.4 >=virtual/emacs-23 ) )" -RESTRICT_PYTHON_ABIS="3.*" - -EMP="${PN}-0.3.7" - -GLEP_SRC="${WORKDIR}/glep-0.4-r1" - -src_prepare() { - epatch "${FILESDIR}/${P}-test_node_class_names-python-2.6.patch" - - # simplified algorithm to select installing optparse and textwrap - epatch "${FILESDIR}/${EMP}-extramodules.patch" - - sed -i \ - -e 's/from distutils.core/from setuptools/' \ - setup.py || die "sed failed" -} - -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 > /dev/null - - # Place html4css1.css in base directory. This makes sure the - # generated reference to it is correct. - cp ../docutils/writers/html4css1/html4css1.css .. - - PYTHONPATH=.. "$(PYTHON -f)" ./buildhtml.py --stylesheet-path=../html4css1.css --traceback .. || die "buildhtml.py failed" - - popd > /dev/null - - # clean up after the doc building - rm roman.py html4css1.css -} - -src_test() { - cd test - - testing() { - PYTHONPATH="../build-${PYTHON_ABI}/lib" ./alltests.py - } - python_execute_function testing -} - -install_txt_doc() { - local doc="${1}" - local dir="txt/$(dirname ${doc})" - docinto "${dir}" - dodoc "${doc}" -} - -src_install() { - DOCS="*.txt" - distutils_src_install - - # Tools - cd 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 - dobin ${GLEP_SRC}/glep.py || die "dobin failed" - - installation_of_glep_tools() { - insinto $(python_get_sitedir)/docutils/readers - newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed" - insinto $(python_get_sitedir)/docutils/transforms - newins ${GLEP_SRC}/glepstrans.py gleps.py || die "newins transform failed" - insinto $(python_get_sitedir)/docutils/writers - doins -r ${GLEP_SRC}/glep_html || die "doins writer failed" - } - python_execute_function --action-message 'Installation of GLEP tools with Python ${PYTHON_ABI}...' installation_of_glep_tools - fi -} - -pkg_postinst() { - python_mod_optimize docutils roman.py -} - -pkg_postrm() { - python_mod_cleanup docutils roman.py -} diff --git a/dev-python/docutils/docutils-0.7_pre6334.ebuild b/dev-python/docutils/docutils-0.7_pre6334.ebuild deleted file mode 100644 index db94483be791..000000000000 --- a/dev-python/docutils/docutils-0.7_pre6334.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.7_pre6334.ebuild,v 1.1 2010/06/02 18:20:41 arfrever Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils eutils - -DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc..." -HOMEPAGE="http://docutils.sourceforge.net/ http://pypi.python.org/pypi/docutils" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )" -#mirror://sourceforge/docutils/${P}.tar.gz - -LICENSE="public-domain PYTHON BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="glep emacs" - -DEPEND="dev-python/setuptools" -RDEPEND="" -# Emacs support is in PDEPEND to avoid a dependency cycle (bug #183242) -PDEPEND="emacs? ( || ( >=app-emacs/rst-0.4 >=virtual/emacs-23 ) )" - -DOCS="*.txt" - -GLEP_SRC="${WORKDIR}/glep-0.4-r1" - -src_prepare() { - # Delete internal copies of optparse and textwrap modules. - rm -f extras/{optparse.py,textwrap.py} - # Fix installation of extra modules. - epatch "${FILESDIR}/${PN}-0.6-extra_modules.patch" - - sed -e "s/from distutils.core/from setuptools/" -i setup.py || die "sed setup.py failed" -} - -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 - - # Place html4css1.css in base directory. This makes sure the - # generated reference to it is correct. - cp docutils/writers/html4css1/html4css1.css . - - pushd tools > /dev/null - - echo PYTHONPATH="../build-$(PYTHON -f --ABI)/lib" "$(PYTHON -f)" $([[ -f ../build-$(PYTHON -f --ABI)/lib/tools/buildhtml.py ]] && echo ../build-$(PYTHON -f --ABI)/lib/tools/buildhtml.py || echo ../tools/buildhtml.py) --stylesheet-path=../html4css1.css --traceback .. - PYTHONPATH="../build-$(PYTHON -f --ABI)/lib" "$(PYTHON -f)" $([[ -f ../build-$(PYTHON -f --ABI)/lib/tools/buildhtml.py ]] && echo ../build-$(PYTHON -f --ABI)/lib/tools/buildhtml.py || echo ../tools/buildhtml.py) --stylesheet-path=../html4css1.css --traceback .. || die "buildhtml.py failed" - - popd > /dev/null - - # Clean up after the doc building. - rm roman.py html4css1.css -} - -src_test() { - testing() { - echo PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $([[ -f build-${PYTHON_ABI}/lib/test/alltests.py ]] && echo build-${PYTHON_ABI}/lib/test/alltests.py || echo test/alltests.py) - PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $([[ -f build-${PYTHON_ABI}/lib/test/alltests.py ]] && echo build-${PYTHON_ABI}/lib/test/alltests.py || echo test/alltests.py) - } - python_execute_function testing -} - -install_txt_doc() { - local doc="${1}" - local dir="txt/$(dirname ${doc})" - docinto "${dir}" - dodoc "${doc}" -} - -src_install() { - distutils_src_install - - # Tools - cd 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 - dobin ${GLEP_SRC}/glep.py || die "dobin failed" - - installation_of_glep_tools() { - insinto $(python_get_sitedir)/docutils/readers - newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed" - insinto $(python_get_sitedir)/docutils/transforms - newins ${GLEP_SRC}/glepstrans.py gleps.py || die "newins transform failed" - insinto $(python_get_sitedir)/docutils/writers - doins -r ${GLEP_SRC}/glep_html || die "doins writer failed" - } - python_execute_function --action-message 'Installation of GLEP tools with $(python_get_implementation) $(python_get_version)...' installation_of_glep_tools - fi -} - -pkg_postinst() { - python_mod_optimize docutils roman.py -} - -pkg_postrm() { - python_mod_cleanup docutils roman.py -} diff --git a/dev-python/docutils/files/docutils-0.3.7-extramodules.patch b/dev-python/docutils/files/docutils-0.3.7-extramodules.patch deleted file mode 100644 index f5701d681cbe..000000000000 --- a/dev-python/docutils/files/docutils-0.3.7-extramodules.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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): - diff --git a/dev-python/docutils/files/docutils-0.5-test_node_class_names-python-2.6.patch b/dev-python/docutils/files/docutils-0.5-test_node_class_names-python-2.6.patch deleted file mode 100644 index b55e392def58..000000000000 --- a/dev-python/docutils/files/docutils-0.5-test_node_class_names-python-2.6.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://svn.berlios.de/viewcvs/docutils?view=rev&revision=5599 - ---- trunk/docutils/test/test_nodes.py -+++ trunk/docutils/test/test_nodes.py -@@ -175,7 +175,7 @@ - node_class_names = [] - for x in dir(nodes): - c = getattr(nodes, x) -- if isinstance(c, ClassType) and issubclass(c, nodes.Node) \ -+ if isinstance(c, (type, ClassType)) and issubclass(c, nodes.Node) \ - and len(c.__bases__) > 1: - node_class_names.append(x) - node_class_names.sort() |