Python 2.5 test fix bug 172557. Thanks Ali Polatel <polatel@gmail.com>. Also removed non-existent spec dir from dodoc

Package-Manager: portage-2.1.2.3

5 files changed, 175 insertions, 19 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 28a78cc6c54c..88f89ecf813c 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.60 2007/03/30 19:07:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.61 2007/04/04 18:28:41 pythonhead Exp $
+
+  04 Apr 2007; Rob Cakebread <pythonhead@gentoo.org>
+  +files/docutils-0.4-python-2.5-fix.patch, docutils-0.4.ebuild,
+  docutils-0.4-r1.ebuild:
+  Python 2.5 test fix bug 172557. Thanks Ali Polatel <polatel@gmail.com>. Also
+  removed non-existent spec dir from dodoc
 
   30 Mar 2007; Fabian Groffen <grobian@gentoo.org> docutils-0.3.5.ebuild,
   docutils-0.3.7.ebuild, docutils-0.3.9.ebuild, docutils-0.4.ebuild,
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index b870d236da6b..ddfd0042afc2 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
@@ -14,6 +17,10 @@ AUX docutils-0.3.7-extramodules.patch 1163 RMD160 4d7c0f935816f631b87cf58dbf228d
 MD5 4be747a533a3ba63b1cad7ced8b8ba04 files/docutils-0.3.7-extramodules.patch 1163
 RMD160 4d7c0f935816f631b87cf58dbf228de931102e4f files/docutils-0.3.7-extramodules.patch 1163
 SHA256 c375dc4d7228c051a6dc6dd586fea7789703fb4d3b7c8c5bad4375f0a9e74aaa files/docutils-0.3.7-extramodules.patch 1163
+AUX docutils-0.4-python-2.5-fix.patch 4672 RMD160 19c140fcdd530cdf78116cd781e6a626101ea027 SHA1 295091e82a2a28017f5ecdc07cbb02e2d35a3004 SHA256 f77c60951e3af465fa2f328dfc1a6a64c4715730a871fd7b7bf836973b65bed4
+MD5 e1b81d7519cb890ca0d8e92a72d097fa files/docutils-0.4-python-2.5-fix.patch 4672
+RMD160 19c140fcdd530cdf78116cd781e6a626101ea027 files/docutils-0.4-python-2.5-fix.patch 4672
+SHA256 f77c60951e3af465fa2f328dfc1a6a64c4715730a871fd7b7bf836973b65bed4 files/docutils-0.4-python-2.5-fix.patch 4672
 DIST docutils-0.3.5.tar.gz 596691 RMD160 73edfdc60cfc934007c01604b99627dcf68d59b7 SHA1 cb74779c1862d3180d104e3574e35c036438e071 SHA256 45c53691e6ba7e96f60dfa6f93c012749d7d8068489419ef608766ad7f1a340f
 DIST docutils-0.3.7.tar.gz 625719 RMD160 34e1b8e6a19cfefe1e097108bcedaff11f9fdb80 SHA1 49e67c5448a4dcb544dc2128b0b6f93808813190 SHA256 a7a81c71caa36b4576f33f8ab2acb62e9fdf868345e8215f1d1b19d83fd7beb4
 DIST docutils-0.3.9.tar.gz 692056 RMD160 df815925bb2183a673ee21c1dd6c9deecabdb74b SHA1 95babefbc4c89d1b88f57017353bb5835853daa9 SHA256 6b3cbd9b0fae3e2a7c7855e84a8cf9a5237fc2f52a946cbc669ccf7a72e6d1ab
@@ -35,18 +42,18 @@ EBUILD docutils-0.3.9.ebuild 2562 RMD160 2d29a245ee2d88261f6fe5639d9e4af13282a7e
 MD5 ad674a61af737d67cff597b5754e8bb6 docutils-0.3.9.ebuild 2562
 RMD160 2d29a245ee2d88261f6fe5639d9e4af13282a7ef docutils-0.3.9.ebuild 2562
 SHA256 7501319c14d361b9d5fbb4e710c2ed1b985e6c7ee28ff26c28e078feeb7cb6cb docutils-0.3.9.ebuild 2562
-EBUILD docutils-0.4-r1.ebuild 3024 RMD160 1e4d622feb1edd931b90150cb77043ca18302261 SHA1 9923e89594edeaf2834fe9ca687b0e15fdcb9e0c SHA256 f8a6fd25e343e330e83905f0d02056e392d8ed733ac7d3f93f7d8baf839a912d
-MD5 25041c39339721501374a5e01bfc143b docutils-0.4-r1.ebuild 3024
-RMD160 1e4d622feb1edd931b90150cb77043ca18302261 docutils-0.4-r1.ebuild 3024
-SHA256 f8a6fd25e343e330e83905f0d02056e392d8ed733ac7d3f93f7d8baf839a912d docutils-0.4-r1.ebuild 3024
-EBUILD docutils-0.4.ebuild 3021 RMD160 c06e46b2f1cdac68d2dc04ab11a8cc33b8e92c89 SHA1 68139c4e11a238cada40acc53764fe75c93539f7 SHA256 a489d74f50d7a1b7bfc68006bc6bae68baed08c3edb71cccceba2f3fc51f6180
-MD5 83a05b7d7823143cff30b8c04d01407a docutils-0.4.ebuild 3021
-RMD160 c06e46b2f1cdac68d2dc04ab11a8cc33b8e92c89 docutils-0.4.ebuild 3021
-SHA256 a489d74f50d7a1b7bfc68006bc6bae68baed08c3edb71cccceba2f3fc51f6180 docutils-0.4.ebuild 3021
-MISC ChangeLog 9354 RMD160 2e92ef1c7b4908b20087477f5de3d50d7ee7aa04 SHA1 98c42e2f84ff24684e84e8298f8e18a2b98948ce SHA256 52f78d035c0c21b7a957d6b65c8ac0aed06001a0cf03c17a5d61ec093efc50a1
-MD5 19521866ca305ca5ea88a50b70df4611 ChangeLog 9354
-RMD160 2e92ef1c7b4908b20087477f5de3d50d7ee7aa04 ChangeLog 9354
-SHA256 52f78d035c0c21b7a957d6b65c8ac0aed06001a0cf03c17a5d61ec093efc50a1 ChangeLog 9354
+EBUILD docutils-0.4-r1.ebuild 3104 RMD160 ab9651e2793831edb6bc5e6c70250acee753c1ae SHA1 db8d5e324a68a7fb211f756e8591c6aa1912c275 SHA256 004474c64c06d6267ed8eaf38997c33ac4faabe17eb699ef5a4ca8d14a9e9b30
+MD5 dcc8f428f2a54493b0682cbbfc359b56 docutils-0.4-r1.ebuild 3104
+RMD160 ab9651e2793831edb6bc5e6c70250acee753c1ae docutils-0.4-r1.ebuild 3104
+SHA256 004474c64c06d6267ed8eaf38997c33ac4faabe17eb699ef5a4ca8d14a9e9b30 docutils-0.4-r1.ebuild 3104
+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 9624 RMD160 cb4c1f1921208fe1468190d1c7f0a2eead7b1f9f SHA1 5fd7cd7bf237c371b7bd1554ee6d4e3f7f5312ed SHA256 2eda35751680b46e17c3b4fa07b6a03aa5b800ee289a30ff052781ea5a371502
+MD5 79a1a0a5fa63ba932aead1467fd16c14 ChangeLog 9624
+RMD160 cb4c1f1921208fe1468190d1c7f0a2eead7b1f9f ChangeLog 9624
+SHA256 2eda35751680b46e17c3b4fa07b6a03aa5b800ee289a30ff052781ea5a371502 ChangeLog 9624
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -66,3 +73,10 @@ 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGE+5p96cFzIajWwkRAvcOAJ904a4QjfEKZ5BpVIC86koobTfKBgCgz9TY
+2DvdRC6mdg+ZmwZvfk99x5Q=
+=JkFL
+-----END PGP SIGNATURE-----
diff --git a/dev-python/docutils/docutils-0.4-r1.ebuild b/dev-python/docutils/docutils-0.4-r1.ebuild
index ae5c1283a1d3..4fdce2a70d22 100644
--- a/dev-python/docutils/docutils-0.4-r1.ebuild
+++ b/dev-python/docutils/docutils-0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.3 2007/03/30 19:07:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r1.ebuild,v 1.4 2007/04/04 18:28:41 pythonhead Exp $
 
 inherit distutils eutils elisp-common multilib
 
@@ -27,6 +27,8 @@ src_unpack() {
 	# 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() {
@@ -81,11 +83,11 @@ src_install() {
 	done
 	# Docs
 	cd ${S}
-	dohtml -r docs spec tools
+	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 spec tools -name '*.txt')
+	for doc in $(find docs tools -name '*.txt')
 	do
 		install_txt_doc $doc
 	done
diff --git a/dev-python/docutils/docutils-0.4.ebuild b/dev-python/docutils/docutils-0.4.ebuild
index 297ee431c208..cdcda975a769 100644
--- a/dev-python/docutils/docutils-0.4.ebuild
+++ b/dev-python/docutils/docutils-0.4.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.13 2007/03/30 19:07:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4.ebuild,v 1.14 2007/04/04 18:28:41 pythonhead Exp $
 
 inherit distutils eutils elisp-common multilib
 
@@ -27,6 +27,8 @@ src_unpack() {
 	# 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() {
@@ -81,11 +83,11 @@ src_install() {
 	done
 	# Docs
 	cd ${S}
-	dohtml -r docs spec tools
+	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 spec tools -name '*.txt')
+	for doc in $(find docs tools -name '*.txt')
 	do
 		install_txt_doc $doc
 	done
diff --git a/dev-python/docutils/files/docutils-0.4-python-2.5-fix.patch b/dev-python/docutils/files/docutils-0.4-python-2.5-fix.patch
new file mode 100644
index 000000000000..5bc0f6a7fbef
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.4-python-2.5-fix.patch
@@ -0,0 +1,132 @@
+Index: test/alltests.py
+===================================================================
+--- test/alltests.py	(revision 4628)
++++ test/alltests.py	(revision 4631)
+@@ -19,21 +19,10 @@
+ 
+ import sys
+ import os
+-from types import UnicodeType
+ import DocutilsTestSupport              # must be imported before docutils
+ import docutils
+ 
+ 
+-def new_exception_str(self):
+-    for i in self.args:
+-        if isinstance(i, UnicodeType):
+-            raise RuntimeError('Error (unicode): %r' % (self.args,))
+-    return old_exception_str(self)
+-
+-old_exception_str = Exception.__str__
+-Exception.__str__ = new_exception_str
+-
+-
+ class Tee:
+ 
+     """Write to a file and a stream (default: stdout) simultaneously."""
+Index: test/test_parsers/test_rst/test_directives/test_images.py
+===================================================================
+--- test/test_parsers/test_rst/test_directives/test_images.py	(revision 4628)
++++ test/test_parsers/test_rst/test_directives/test_images.py	(revision 4631)
+@@ -245,11 +245,11 @@
+         <paragraph>
+             Error in "image" directive:
+             invalid option value: (option: "scale"; value: 'fifty')
+-            invalid literal for int(): fifty.
++            %s.
+         <literal_block xml:space="preserve">
+             .. image:: picture.png
+                :scale: fifty
+-"""],
++""" % DocutilsTestSupport.exception_data('int("fifty")')[1][0]],
+ ["""\
+ .. image:: picture.png
+    :scale: 50
+Index: test/test_parsers/test_rst/test_directives/test_contents.py
+===================================================================
+--- test/test_parsers/test_rst/test_directives/test_contents.py	(revision 4628)
++++ test/test_parsers/test_rst/test_directives/test_contents.py	(revision 4631)
+@@ -151,11 +151,11 @@
+         <paragraph>
+             Error in "contents" directive:
+             invalid option value: (option: "depth"; value: 'two')
+-            invalid literal for int(): two.
++            %s.
+         <literal_block xml:space="preserve">
+             .. contents::
+                :depth: two
+-"""],
++""" % DocutilsTestSupport.exception_data('int("two")')[1][0]],
+ ["""\
+ .. contents::
+    :width: 2
+Index: test/test_parsers/test_rst/test_directives/test_tables.py
+===================================================================
+--- test/test_parsers/test_rst/test_directives/test_tables.py	(revision 4628)
++++ test/test_parsers/test_rst/test_directives/test_tables.py	(revision 4631)
+@@ -34,6 +34,16 @@
+ else:
+     unichr_exception_string = str(unichr_exception)
+ 
++null_bytes_code = """
++import csv
++import cStringIO
++csv_data = open('%s', 'rb').read().decode('latin-1')
++csv_file = cStringIO.StringIO(csv_data)
++reader = csv.reader(csv_file)
++reader.next()
++""" % utf_16_csv
++null_bytes_exception = DocutilsTestSupport.exception_data(null_bytes_code)[1][0]
++
+ totest = {}
+ 
+ totest['table'] = [
+@@ -549,7 +559,7 @@
+         <paragraph>
+             Error in "csv-table" directive:
+             invalid option value: (option: "widths"; value: '10,y,z')
+-            invalid literal for int(): y.
++            %s.
+         <literal_block xml:space="preserve">
+             .. csv-table:: bad column widths
+                :widths: 10,y,z
+@@ -565,7 +575,7 @@
+                :widths: 0 0 0
+             \n\
+                some, csv, data
+-"""],
++""" % DocutilsTestSupport.exception_data('int("y")')[1][0]],
+ ["""\
+ .. csv-table:: good delimiter
+    :delim: /
+@@ -734,14 +744,14 @@
+     <system_message level="3" line="1" source="test data" type="ERROR">
+         <paragraph>
+             Error with CSV data in "csv-table" directive:
+-            string with NUL bytes
++            %s
+         <literal_block xml:space="preserve">
+             .. csv-table:: bad encoding
+                :file: %s
+                :encoding: latin-1
+     <paragraph>
+         (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
+-""" % utf_16_csv],
++""" % (null_bytes_exception, utf_16_csv)],
+ ["""\
+ .. csv-table:: good encoding
+    :file: %s
+Index: docutils/parsers/rst/directives/tables.py
+===================================================================
+--- docutils/parsers/rst/directives/tables.py	(revision 4628)
++++ docutils/parsers/rst/directives/tables.py	(revision 4631)
+@@ -259,7 +259,8 @@
+ 
+ def parse_csv_data_into_rows(csv_data, dialect, source, options):
+     # csv.py doesn't do Unicode; encode temporarily as UTF-8
+-    csv_reader = csv.reader([line.encode('utf-8') for line in csv_data],
++    csv_reader = csv.reader([(line.encode('utf-8') + '\n')
++                             for line in csv_data],
+                             dialect=dialect)
+     rows = []
+     max_cols = 0