Set SUPPORT_PYTHON_ABIS. Fix tests (bug #264439).

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

4 files changed, 58 insertions, 10 deletions

diff --git a/dev-python/python-bibtex/ChangeLog b/dev-python/python-bibtex/ChangeLog
index 5d2a44191f1c..233b3ef5e635 100644
--- a/dev-python/python-bibtex/ChangeLog
+++ b/dev-python/python-bibtex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/python-bibtex
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-bibtex/ChangeLog,v 1.20 2008/08/12 11:45:33 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-bibtex/ChangeLog,v 1.21 2010/03/27 18:55:08 arfrever Exp $
+
+  27 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  python-bibtex-1.2.4.ebuild, +files/python-bibtex-1.2.4-fix_tests.patch:
+  Set SUPPORT_PYTHON_ABIS. Fix tests (bug #264439).
 
   12 Aug 2008; Raúl Porcel <armin76@gentoo.org> python-bibtex-1.2.4.ebuild:
   ia64/x86 stable wrt #233593
diff --git a/dev-python/python-bibtex/Manifest b/dev-python/python-bibtex/Manifest
index f7c297ada8b6..38b096e7b7c4 100644
--- a/dev-python/python-bibtex/Manifest
+++ b/dev-python/python-bibtex/Manifest
@@ -1,6 +1,5 @@
-DIST python-bibtex-1.2.3.tar.gz 56646 RMD160 198564fb0757c24bbc1634cc01b14a2a76d38eda SHA1 ec97f36556dbbcb4885b86a0c1fef9015fa76256 SHA256 a419a10ae7bc265e500a0d5b6a7bdf68fb8b50616e613a7d137f7e71cc99ffa2
+AUX python-bibtex-1.2.4-fix_tests.patch 861 RMD160 98b9303b41688c422a63b5556f1f6b7181338752 SHA1 1a8efbd031f6087abf18c6446ee02d8f39c84a36 SHA256 a188073fcd38740a62bcae16c27bb3926fca90f82687fb07330d2a8aa0c33032
 DIST python-bibtex-1.2.4.tar.gz 57057 RMD160 2ba97290b3d7d0ef6614326ba2cab0504026548e SHA1 f5379d40a873fea1f6f148764d62ec66750b3418 SHA256 0df2e9cec2219aa08133972956d97eb9d641ac2e1e6a115fdded122ae18a1f7a
-EBUILD python-bibtex-1.2.3.ebuild 625 RMD160 c0deb722f666bfde8c66aca60dc00c65103f436d SHA1 2c1e6fad4be07d190696589ded255eb57e2b5a58 SHA256 1829bbe7dcf5ea7e45e7309869c1db9563abb40819eff1279c676ee49855f8d5
-EBUILD python-bibtex-1.2.4.ebuild 628 RMD160 942c5ae9dc135c42afa94805f1f3efe3156513d8 SHA1 66a006fbd28e012ff61ec5d5ffacdbd369c978f0 SHA256 f2b5ea02bbfb36d496c22293ffe5d1d95158ef02367fa3051f42511a9c283619
-MISC ChangeLog 2933 RMD160 c9b04595170d2f337da5891601689643069c55f0 SHA1 fec8e71cb1b9f5d163204fd5b819af99fdf0e30d SHA256 479cbd3dde7f5dc639dffe9370869db5aa96e410f45837c7d2f16a756b04ab30
+EBUILD python-bibtex-1.2.4.ebuild 951 RMD160 e479dba8bf489eb717ba0caa5c210ab969e44191 SHA1 991b98c241f3b95fc8efc3d907769a18978b5998 SHA256 bc3c933ebb394a37ac3728272cb65733c35e0d27f268ed4afd88bc8f3d2e6aa6
+MISC ChangeLog 3134 RMD160 04e87d2c850f4f90dbe0baab02ea0fc51fa6a104 SHA1 218ad40dd2f05ee39b3d01f492ada6c4a2f46ab9 SHA256 b6ea856d67f279caf6eb097169a32845a59d70079df33dca78835401e8257bd9
 MISC metadata.xml 176 RMD160 1c2fd05b56e8a7b7069922fd6d48d5dc6be33846 SHA1 82a96ace08fd9ab9f0d56f26552fef5fe0d0a211 SHA256 349f5675f53c5b30c08da19b6f7a2d03957284ef6da92838c3fba8c3bdfedc6a
diff --git a/dev-python/python-bibtex/files/python-bibtex-1.2.4-fix_tests.patch b/dev-python/python-bibtex/files/python-bibtex-1.2.4-fix_tests.patch
new file mode 100644
index 000000000000..f9816817b777
--- /dev/null
+++ b/dev-python/python-bibtex/files/python-bibtex-1.2.4-fix_tests.patch
@@ -0,0 +1,28 @@
+--- testsuite.py
++++ testsuite.py
+@@ -4,6 +4,7 @@
+ 
+ import sys, os
+ 
++ParserError = "ParserError"
+ 
+ def check_recode ():
+     try:
+@@ -65,7 +66,7 @@
+ 
+             valid = result.readline ().strip ()
+             
+-            if obtained != valid:
++            if eval(obtained) != eval(valid):
+                 sys.stderr.write ('error: %s: line %d: unexpected result:\n' % (
+                     filename, line))
+                 sys.stderr.write ('error: %s: line %d:    obtained %s\n' % (
+@@ -117,7 +118,7 @@
+ 
+             valid = result.readline ().strip ()
+             
+-            if obtained != valid:
++            if eval(obtained) != eval(valid):
+                 sys.stderr.write ('error: %s: line %d: unexpected result:\n' % (
+                     filename, line))
+                 sys.stderr.write ('error: %s: line %d:    obtained %s\n' % (
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.4.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.4.ebuild
index 50eb294774fe..40c2cb00d3a4 100644
--- a/dev-python/python-bibtex/python-bibtex-1.2.4.ebuild
+++ b/dev-python/python-bibtex/python-bibtex-1.2.4.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-bibtex/python-bibtex-1.2.4.ebuild,v 1.6 2008/08/12 11:45:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-bibtex/python-bibtex-1.2.4.ebuild,v 1.7 2010/03/27 18:55:08 arfrever Exp $
 
-inherit distutils
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
 
 DESCRIPTION="A Python extension to parse BibTeX files"
 HOMEPAGE="http://pybliographer.org/"
@@ -17,7 +21,20 @@ RDEPEND=">=dev-libs/glib-2
 	>=app-text/recode-3.6-r1"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_prepare() {
+	distutils_src_prepare
+
+	epatch "${FILESDIR}/${P}-fix_tests.patch"
+
+	# Disable tests during installation.
+	sed -e "/self.run_command ('check')/d" -i setup.py
+}
 
 src_test() {
-	"${python}" setup.py check || die "tests failed"
+	testing() {
+		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" check
+	}
+	python_execute_function testing
 }