Version bump with a patch for buildhtml.py. Move GLEP support to dev-python/docutils-glep.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 123 insertions, 7 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 2ee4c30aa2bb..996422127b81 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/docutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.163 2012/12/17 19:56:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.164 2012/12/31 12:16:18 mgorny Exp $
+
+*docutils-0.10 (31 Dec 2012)
+
+  31 Dec 2012; Michał Górny <mgorny@gentoo.org> +docutils-0.10.ebuild,
+  +files/docutils-0.10-optparser.patch:
+  Version bump with a patch for buildhtml.py. Move GLEP support to dev-python
+  /docutils-glep.
 
   17 Dec 2012; Michał Górny <mgorny@gentoo.org> docutils-0.9.1-r1.ebuild:
   Bump to EAPI=5 to make Paludis happy, bug #447524.
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 2327fc545c36..ab9301abd0e5 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX docutils-0.10-optparser.patch 1240 SHA256 55d4fcc33459da92026dfff1c9549bd955d243a43e8f456a7af2e9389bcd4998 SHA512 2ae6acadbd490efcf6dfb4caa46bd6db8535d2f4c5349071e5a98828bc4c2bfb4a8b64565cf014b9c945076e7f55b4950317a24d0ccdfd108ee427bfb8e84f55 WHIRLPOOL 68a48a462bf65dc7a249233f60d7671ba6fa3d33ba6531c6269dc090935fde5f0fd37526d5314723ef9878f47ffee4eb6ff946ea10e909edc7a21b50dcc0d1d5
 AUX docutils-0.6-extra_modules.patch 828 SHA256 782351307ed68162399e51b0fe6412d931a791e5e9b7f454ea345b9ba8260133 SHA512 e7afc9c1f54def98c7f54c090a4bf324d6fb0a0920150a14e355853acfed2767c477bcab84459642615323b64a6037f0d76c848cf8669ecc55e13e1db7d8fb08 WHIRLPOOL 99b9fe9dda398241c48d79e0ef9eedb5b4df2348866414a67b94d71c0cacbd4a2c65e7af1c38646369cf5d2c76b45704451f2813058a1e459727dd2a3c833569
 AUX docutils-0.7-encoding.patch 3388 SHA256 0931282e6c19701d5d36da541cd26864fc0cafe2dd2f4d9fe95181f601842eca SHA512 9d0548a915ba797617a83623c541b4a9ce8691fa433fc5081b02324fcc91c610b931ace95c0b53a27ccb3732bd0546af4226d9e62a20020620c7e3baaf58d293 WHIRLPOOL 74f42dd12c3f526c7a048cf99dc031c09e1219311de2bdc3fb323f91ccc5f18e276dc35f21f68465705cb2528a1a79c9194c119ab6cb06ac8325f2805b230c45
 AUX docutils-0.7-python-3.2-configparser.patch 1708 SHA256 06938cdb53da6a41c5d07a1afeab386f202d12787a22cb1d1a46fa01200eb5d9 SHA512 766f1ba4f1af444a23a2305f72e1de6b350a6dcfd424861c4fd0130bc70de35b7f870870e4f307cf84d02c0806b363c5f81ea9a0111b64c28d755b47ae841fab WHIRLPOOL 9b38ccf58af9047169c0bf7ade454c21451e1d40dc6d3abe90dd39776b044ff363c2160b41a194607c8c9f51b16944dfc5c1b83b05f5e2e979ab6fd11418a87e
 AUX docutils-0.7-python-3.2-xml.etree.ElementTree.patch 447 SHA256 0aeceb109ea15aedf3b805e186d1a5253e1a6a36ed8973aea0c9c7ed353c054e SHA512 50e80a9e821dfd3e682a4b2040d45ad65150f0d09cfdb6ce317156ee1db2e743dbf726757130bfafefbbcf8dead9b7e66b4819752319f1f394ec27367cab56fc WHIRLPOOL ed8d623d044110c2ea4cc8a79ae0c7b74ad92f364afb033da268fa5b3c52bbcda3fa1faed92bf3ad854e14b73dca2a47192391d5c74096e2f06acddd6edcb61d
+DIST docutils-0.10.tar.gz 1602552 SHA256 370624e61b6773da2f2fb17cc2a4eaea4bb596c3585d13f75ff193c1c738603e SHA512 255474d4d9efc427ecb2123939af64475335c1f2af2f1b398a0c540693629f6ce6b105fb45f6ef962800948e2844b5140ecc6b81218e3c8619d14c9c7f2705c4 WHIRLPOOL 7e25c5b9206f019acc9131a0b5baf05fd21d042d121e2c472a8d908cc668346e26572d6db6546200dc9b85fb9b8a462e3ada59eb9c760f9915efaa510ffe74fa
 DIST docutils-0.8.1.tar.gz 1499832 SHA256 5a3b776518257a59fefaf48ef1e0635bc1179f8cafb02a9cc84c9644bb25df71 SHA512 61d09a3a07ca8c53aa830415066bd3d78ba6f9493f5ceb8351ba04967157494079a84ff0bc242145460a83f3980b09961b128aa3421d4614651066f23639635a WHIRLPOOL a16872c190cd854a8ffb111ed1f9dd6d8ad4bdd3732c34173628b37ac9214b27706136f411f43421adf6935c6aa3dcdf178bf41b17ae80d750b0492fa0d6ea1c
 DIST docutils-0.9.1.tar.gz 1541437 SHA256 e89f187dbbc6674f839239c89fec44af9f18809b66a8a55a41b57b9ee2356994 SHA512 ac1158c562533796f26d4bc451cc9cd371f7fad60d190aa43c763d53a15c2b7656962e7ef72248439896a5fd759c53f6aee14b08bca2292542e944fa9bb044e9 WHIRLPOOL 6b197c1e96a218d9a3a2116ea6e68cae22130c77025fe6e6942f698a918b96579a9216daf23e01cb1c54c7d52ddcc4a3e8ec1b8279ae7be7e3044e044e14c039
 DIST docutils-0.9.tar.gz 1534138 SHA256 ff49bf77e9135490a73740d884b418ab8b982ad16ee52cfe796d059c592ea245 SHA512 ce015d79093e8fa0e14851c5f122a2c2d38981c82358bb1a9219271af2d12bf3219abbeed362114342ebd5a7173e0bf4a3686987c70bb950c72c2ffa3fed2440 WHIRLPOOL b33d34a5de0adb7e77a3c053b3cd800152e1bcdac1006aac5b7450465844d176a2a7e9b6e41507343bcfc747aba9316f01df661f84555d5a9bc28a42db202320
 DIST glep-0.4-r1.tbz2 4667 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3 WHIRLPOOL 277cdf4a7fe70990864a4f0fd592561bcf5edc1de8d4830da96c75093d47d8d64214b95ac5ae7960670a8520650a5e23355df248f61bddcd9cd5dc23cab0fe19
+EBUILD docutils-0.10.ebuild 2179 SHA256 710760626daf30de20a55b194cee5d0f933d045274746e16632d5ef190d2234c SHA512 7030d3f4ec5c4bfe25916699da770fcbb0fe533854b1be574cfa1dd72baefc70a77c2a051b7ea877c00f7db90d2a5cd3bac42083c968f09817ac6dfdfb8d5d9d WHIRLPOOL 0a1e5e961b47e2c620abee0c25e96e844e543a0643b0e8a69e8a56d929a4a9c56fe81bb8d9a3932f96f0a8450f748611ce15f6a0e6b4352c2343ba91671656f7
 EBUILD docutils-0.8.1.ebuild 4480 SHA256 d5dc8b07a95adb229c02290374ed4c82ac79f0557535bdb47fafd41c2af7fd7f SHA512 96739bae1783582ec62d5546189559c3d88ece05c44fcfb5ec0272f8655f89266501c880ddb55b4b0d5b331a3daab82fda8700bfa8be5abcda4aecd0570a47d5 WHIRLPOOL 0234d2259a4d1cffc251294fd7119515dfa057d8800804336104eb45c433c51bc591789961b54f5ea92fc8bcf87b9a75697cf676ed386170845560f6ad9ba4e2
 EBUILD docutils-0.9.1-r1.ebuild 2788 SHA256 5823952d158fec92af8c689ae892759dc197da5569df78fbbc5afd151c4f92d4 SHA512 b735df488d0ae54b5f86fd487e3f84ff7414f99407a9e86b26020b44cf978a63d205b900ad8fd7a923aa4d8aee13f3a068d4beb5368196b9d1dd3a46d38c1529 WHIRLPOOL ef719dba4930738d430eb5dc28c28581e30de59e500b4307137bc6c7d912ba56be3652eb7b5ea50dd820a059ad07ccbc58ec28353a14b9f31ec7b6399f4964a0
 EBUILD docutils-0.9.1.ebuild 3597 SHA256 f0f65506c49c23eae7b79bc4546ee3bbbda0691aeaf6b44e1768e25888901114 SHA512 bb093956b65f8b5bcde72292784f3be4f578356297a03bb2ba65f1fcb7015712dbab5e332f5be7427d6cdb6f22ba6c7c0e073d4a307c7f6115d261694432ef5e WHIRLPOOL fe0ce2582fcfc86cd6c713c5fd5f4b3550e53dd034ad1816938ed30610b8be4d2853200afce130b6e0648371d59d45d61812ddb1eeaf1edfd7aa61d309c2ba13
 EBUILD docutils-0.9.ebuild 4104 SHA256 866a488bc9bb1683358e9726d005a0580a77683833dccb2e3e9f7649f8fdd6ce SHA512 ee9cc41c56fcc1e41074ed7642525601debace25186c9a44781737999dc01c58d56f7e0b02f8cb31b49dbf13e749bc16ed4a2bccb561ff3b99667a227523f696 WHIRLPOOL b6bc09b2c75f8b3d621b8fdfc76a276a34b9cfffd7c48e8898ba56ea9919fd89baacfa0f6c3f4efc3bbf88573d3126d45bbf2b914b07910700ee17c9994a2009
-MISC ChangeLog 23225 SHA256 866139363d60fa5795e6b9bb5c79c61758a96a1166d834752f5b76e2ea00c03f SHA512 13d6af7955517342db52fee77abae18f66075ea4d505d4ec1de609a911975a2f81f8c71b2a75314a577d8133206aec37c1dc19af43e78d69fd657a5bc71cbe68 WHIRLPOOL 3736952255a36a0e9579769ef965dfb894da677272032016f12b3e66537e2837bd4fd9f6a40c5403e47928e6861636d46fd34957b2afd14ee64895bd20b5e0fe
+MISC ChangeLog 23465 SHA256 7e2a420dd236d0ad41b2e1b244c7ca5afab4c6e38d2b94cb3c0862a47f5646d9 SHA512 17a3678c6b39d0d3989efa73141ce2ab69cd09a64fb6feb4c0f60f89b9d7420e79de3030504e47c040c30435486638c9ec481f4cacd1a42a2f2c4c6c974bca84 WHIRLPOOL 824a1845c1d9d2b2be7d5a6fef4eba279c209d333a5ae2fdec485272c9295f55e2ed197da9a09947740aeb3fb2c58487ac17dd3dd86c2eaf5d6aa52746075c89
 MISC metadata.xml 224 SHA256 0bb6bfd1577f4800009497c7813935f712ae6a44dbbdec1a903e79eaa5f21755 SHA512 84a00eb058c5f923404a2ede0df0a2ef9a1b4143a2f7d7b8ddfd5b68c8342dc68e89b5042e603a93b756e8e69cb92a5a32e6aa9ced869d30de1e41c874e080f3 WHIRLPOOL 9392f13e54a9fa3df0396729edecc43709acb478f2d67add1f0b3aeeb16c902fac3d970dcacab9be6ae1094f8700848d790acb260e288440ca80f9be8d0ae0b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDPeNIACgkQfXuS5UK5QB2I0QP9Gc17EbpM9QNOaGNojtzwrIMe
-cSXWBGlE8rA523PmK7KZ31s3EXAOxNHyvvQBMSpDR53GjmHsQyeov9PK9DqNX5vg
-y4ITvRNlnZrKfCpNQWMdYB9uzfWuMxfabpu6cKNOT1sVTABSL4OWbtJt40gzzGK8
-GHaSIFrWpZKz4jx9wLs=
-=AxPR
+iJwEAQEIAAYFAlDhgiUACgkQfXuS5UK5QB1G3gQAm3J6Gc0WqvspBhPuw7s6OFmP
+64Gh9NHLn85+++aOkj9dRRIFoQIS7t0YSkrNjgrRVz0vBaY87argSU0LwiQvohhP
++KPe6zLmzktMC4oBA4rg+Jb9SxnstbZtBYtOwvID0dTeGAMim3ZBwJdwLoXvq1eV
+wFHbAtYp3WBNahirWL0=
+=fsUo
 -----END PGP SIGNATURE-----
diff --git a/dev-python/docutils/docutils-0.10.ebuild b/dev-python/docutils/docutils-0.10.ebuild
new file mode 100644
index 000000000000..5f6ad64129c1
--- /dev/null
+++ b/dev-python/docutils/docutils-0.10.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.10.ebuild,v 1.1 2012/12/31 12:16:18 mgorny Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_8,1_9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ http://pypi.python.org/pypi/docutils"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="glep"
+
+DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/docutils-glep[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	# fix buildhtml.py option parsing
+	"${FILESDIR}"/${P}-optparser.patch
+)
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${PYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+python_test() {
+	local tests=test
+	[[ ${EPYTHON} == python3* ]] && tests=test3
+
+	cp -r -l ${tests} "${BUILD_DIR}"/test || die
+	ln -s "${S}"/docs "${BUILD_DIR}"/ || die
+	"${PYTHON}" "${BUILD_DIR}"/test/alltests.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/docutils/files/docutils-0.10-optparser.patch b/dev-python/docutils/files/docutils-0.10-optparser.patch
new file mode 100644
index 000000000000..a65fbde71ce0
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.10-optparser.patch
@@ -0,0 +1,34 @@
+Patch by Arfrever
+http://sourceforge.net/tracker/?func=detail&aid=3598893&group_id=38414&atid=422030
+
+Index: docutils/frontend.py
+===================================================================
+--- docutils/frontend.py	(revision 7578)
++++ docutils/frontend.py	(working copy)
+@@ -158,7 +158,7 @@
+ 
+ def validate_colon_separated_string_list(
+     setting, value, option_parser, config_parser=None, config_section=None):
+-    if isinstance(value, unicode):
++    if isinstance(value, basestring):
+         value = value.split(':')
+     else:
+         last = value.pop()
+@@ -171,7 +171,7 @@
+     """
+     # `value` is already a list when  given as command line option
+     # and "action" is "append"
+-    if isinstance(value, unicode):
++    if isinstance(value, basestring):
+         value = [value]
+     # this function is called for every option added to `value`
+     # -> split the last item and apped the result:
+@@ -731,7 +731,7 @@
+         """Wrapper around sys.stderr catching en-/decoding errors"""
+ 
+     def read(self, filenames, option_parser):
+-        if type(filenames) in (str, unicode):
++        if isinstance(filenames, basestring):
+             filenames = [filenames]
+         for filename in filenames:
+             try: