Version bump.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index b5781e1746a5ced378c39ffd64586f36bd9ba352..a3bf882b432340e375b2b087cc947085fea586d3 100644 (file)
--- 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.113 2010/07/06 20:24:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.114 2010/07/07 19:57:50 arfrever Exp $
+
+*docutils-0.7 (07 Jul 2010)
+
+  07 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -docutils-0.6_pre6148.ebuild, +docutils-0.7.ebuild:
+  Version bump.
 
   06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> docutils-0.6.ebuild:
   ppc64 stable wrt #318111

diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 60b4b9883aafa1833c332108210c01e8c066ae59..57ddf1f397c0971d06160daa05a01908372db9b2 100644 (file)
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -3,12 +3,12 @@ AUX docutils-0.5-test_node_class_names-python-2.6.patch 533 RMD160 5fa8c2010e792
 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.6_pre6148.tar.bz2 1226155 RMD160 fbcd066dfba917f69a08a861a7eb0fdd8628688a SHA1 9b6b35482b9fa58ffc6f704e82565a23440b45f2 SHA256 1af80ead516a854142de29e5a49fae063aa83fdd5d8bb7d16c2f355c36f03709
+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.6_pre6148.ebuild 3609 RMD160 2b0662d9ec625cb58979584afdfc5c3de3b6f87a SHA1 7e5b7e98d08a077c9726f7f92c0dce92c04e6ff1 SHA256 476694024dbe884726827452456c5c17de6ecfc28d571da2b0a2ad2f6722bc61
+EBUILD docutils-0.7.ebuild 4068 RMD160 386c45405f2ee84e66c6d2ff61bdc88e3ed27ba3 SHA1 c93f6c9ae73dccc449e08650eac37e973d4e3dde SHA256 57033deab1b2a4b271430ad741386250246c6a3820541fac2e349383c9854676
 EBUILD docutils-0.7_pre6334.ebuild 4082 RMD160 b29d09c720ae6ce4135830b57c4c2e52934f3853 SHA1 f60a49434b6701599889fc60190273d330a5fcf7 SHA256 a8677be137942ef33139282a5905b82ec96b50d9df722c03af4d06d1aa4c717e
-MISC ChangeLog 16363 RMD160 ad336158b045a8cda5dafd50de57d64215b477a2 SHA1 02e80cb3c707be88419d0d34fd4628bcddcfec8f SHA256 3c6868eee9ab81c556639e245f4676795accbe2d22c2aafd180faf6dff2989fc
+MISC ChangeLog 16535 RMD160 8ca65a849ac4747121dca30cdb5a415c41bae9cd SHA1 79f26a9f4423da2d80d1993245b4536bb2b0314d SHA256 44ead767e6a8fb32b9625332026e7f04257e4812af91d75f364fa969ace2ffad
 MISC metadata.xml 224 RMD160 37a2cf5db0ab817c0e2a1127e9cc4278bf88c904 SHA1 e2c1b45b839624cbc4bd949c8458d50dec01e7cb SHA256 0bb6bfd1577f4800009497c7813935f712ae6a44dbbdec1a903e79eaa5f21755

diff --git a/dev-python/docutils/docutils-0.7.ebuild b/dev-python/docutils/docutils-0.7.ebuild
new file mode 100644 (file)
index 0000000..a1175b3
--- /dev/null
+++ b/dev-python/docutils/docutils-0.7.ebuild
@@ -0,0 +1,120 @@
+# 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.ebuild,v 1.1 2010/07/07 19:57:50 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://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 ~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
+       local tool
+       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
+       local doc
+       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
+}