Fix test_node_class_names with Python 2.6.

Package-Manager: portage-13850-svn/cvs/Linux x86_64

4 files changed, 33 insertions, 9 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 4302e312ea1d..77eb8ab413d3 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/docutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.84 2009/07/20 03:53:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.85 2009/07/23 01:13:35 arfrever Exp $
+
+  23 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  docutils-0.5.ebuild,
+  +files/docutils-0.5-test_node_class_names-python-2.6.patch:
+  Fix test_node_class_names with Python 2.6.
 
   20 Jul 2009; Jeroen Roovers <jer@gentoo.org> docutils-0.5.ebuild:
   Stable for HPPA (bug #278285).
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index c627738b5d4c..feca42d6509f 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -2,6 +2,7 @@ AUX 50docutils-0.4-gentoo.el 275 RMD160 d017df7483e086d71f18800002f285b1a90be08c
 AUX 50docutils-gentoo.el 280 RMD160 d7a7c56fc93d93e2c0ca725c13a539b2d42489bf SHA1 872989d6c309a75a1612d217d3981555727f552c SHA256 18ead83f20f4de845dbd027b9d6845b3bb7d98933791b8c12b46528625d841cd
 AUX docutils-0.3.7-extramodules.patch 1163 RMD160 4d7c0f935816f631b87cf58dbf228de931102e4f SHA1 2886d52101f12a6b6b04e75b2a4223b68c953af0 SHA256 c375dc4d7228c051a6dc6dd586fea7789703fb4d3b7c8c5bad4375f0a9e74aaa
 AUX docutils-0.4-python-2.5-fix.patch 4672 RMD160 19c140fcdd530cdf78116cd781e6a626101ea027 SHA1 295091e82a2a28017f5ecdc07cbb02e2d35a3004 SHA256 f77c60951e3af465fa2f328dfc1a6a64c4715730a871fd7b7bf836973b65bed4
+AUX docutils-0.5-test_node_class_names-python-2.6.patch 533 RMD160 5fa8c2010e79217a0a108e4b1abbe9395e2660ce SHA1 b867020da19157be143123cf7ad84d22eee87460 SHA256 57049d19bee982b79d2bde4c6571f2a38c121b841443cda902f90d3fdd97f081
 DIST docutils-0.3.7.tar.gz 625719 RMD160 34e1b8e6a19cfefe1e097108bcedaff11f9fdb80 SHA1 49e67c5448a4dcb544dc2128b0b6f93808813190 SHA256 a7a81c71caa36b4576f33f8ab2acb62e9fdf868345e8215f1d1b19d83fd7beb4
 DIST docutils-0.4.tar.gz 1237801 RMD160 f6a3c5bfb79ed08ce282bcaf3ded05bd2e3f95b5 SHA1 25498713e3757f5050763303fc901dc120357fb5 SHA256 b81f29e4f39540d06c7d8c0dc1a2c209816c47ce33a66ac50ee28ae38d242c0e
 DIST docutils-0.5.tar.gz 1271981 RMD160 3e8dfd2923528bbeac0ca33ccfe6f576c74f1886 SHA1 70ca2dd94969ddf76217e5fe907b0b23f16cc199 SHA256 747cf984edfca0575addbb42453274a1bdd98ec7780bd37a883dc8b2a66a610e
@@ -10,6 +11,6 @@ DIST glep-0.4-r1.tbz2 4667 RMD160 bea44f2fe567422fd42bedebdf04cb6d984478ae SHA1
 EBUILD docutils-0.3.7.ebuild 2550 RMD160 d3dbe7aa8ba2cdbd6f503c9df94bc7f4aafe677a SHA1 5d65761de4e447bf03c9aeda6f8508e2ab7656eb SHA256 ae9e3b047a135248a4705278fe5b768c1ba4ed33674944b2091d83ae0f8e8b48
 EBUILD docutils-0.4-r2.ebuild 2793 RMD160 a81cb7e890e8c643f965c78a55b1b022f58553b9 SHA1 f96f4fa75477b7dd566901a802d32ea86e69fc69 SHA256 4ee9ca90a8a618d9e1c8b1da321a9ace9fb8600d710d80afba414a71ed9b2853
 EBUILD docutils-0.4-r3.ebuild 2893 RMD160 a353cee5c1276017c3bb20fac5edf9bffad2739f SHA1 1042ec0a6ad1cd201ad7f0a574b79a6b13560cdc SHA256 eb1d62c2ae0cc49ba29a4baa7f4e2ace8399c4d989797dc2c2a8d7f30bd4baeb
-EBUILD docutils-0.5.ebuild 2801 RMD160 803267f1f0de9054aa94b83bdf635d567fa2eb0d SHA1 bdc8378a58db09e9485a43416df009c186238968 SHA256 ab9ee1aa9e4e44e9f245ea9a9237f1332fc8adf9e3f771424a2b1f4837c240fb
-MISC ChangeLog 12707 RMD160 88f80b99022d268db502058bb1abaa471ad91adc SHA1 8ec2aed9833826ba0b7bab981f35a0f6c17da887 SHA256 8ef77e4c8cb414e60cefb41987ebdf4217b0f6f2031c88b09b0d65f714c539ca
+EBUILD docutils-0.5.ebuild 3017 RMD160 d8d14dd78d6b9186f5b6e4f1f64c7d0fbedce172 SHA1 4562545571cbb42984c8700a42f31a591e0c2cc3 SHA256 a14f4f0be1dfb1a3fd0103c1622ade737a7f7547c1293e71d11fa787af4bbe2a
+MISC ChangeLog 12916 RMD160 115a382873a6b5e098249e83c657ca7bf1c924a1 SHA1 5d76ca7717ee4d0db8702681f244b3638e130554 SHA256 97bfbee3c2ac6a813ac8dff039f82f69d41f6eaefcbde0449b4c600b85eb2ce0
 MISC metadata.xml 224 RMD160 37a2cf5db0ab817c0e2a1127e9cc4278bf88c904 SHA1 e2c1b45b839624cbc4bd949c8458d50dec01e7cb SHA256 0bb6bfd1577f4800009497c7813935f712ae6a44dbbdec1a903e79eaa5f21755
diff --git a/dev-python/docutils/docutils-0.5.ebuild b/dev-python/docutils/docutils-0.5.ebuild
index a3662934b71d..812d443714f1 100644
--- a/dev-python/docutils/docutils-0.5.ebuild
+++ b/dev-python/docutils/docutils-0.5.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5.ebuild,v 1.2 2009/07/20 03:53:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5.ebuild,v 1.3 2009/07/23 01:13:35 arfrever Exp $
 
-NEED_PYTHON=2.4
+EAPI="2"
+
+NEED_PYTHON="2.4"
 
 inherit distutils eutils multilib
 
@@ -24,10 +26,10 @@ EMP=${PN}-0.3.7
 
 GLEP_SRC=${WORKDIR}/glep-0.4-r1
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	epatch "${FILESDIR}/${P}-test_node_class_names-python-2.6.patch"
+
 	# simplified algorithm to select installing optparse and textwrap
-	cd "${S}"
 	epatch "${FILESDIR}"/${EMP}-extramodules.patch
 
 	sed -i \
@@ -67,7 +69,10 @@ install_txt_doc() {
 
 src_test() {
 	cd "${S}"/test
-	PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
+	for abi in ${ABIS_PYTHON}; do
+		echo -e "\e[1;34mTesting of ${CATEGORY}/${PF} for Python \e[31m${abi}\e[34m...\e[0m"
+		PYTHON="$(get_PYTHON ${abi})" PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
+	done
 }
 
 src_install() {
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
new file mode 100644
index 000000000000..b55e392def58
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.5-test_node_class_names-python-2.6.patch
@@ -0,0 +1,13 @@
+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()