Use PYTHON_TESTS_FAILURES_TOLERANT_ABIS. Don't directly call 2to3, since build system...

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/dev-python/astng/ChangeLog b/dev-python/astng/ChangeLog
index 919030c5452c80870f2258a7a02c726dd0dfa22e..20f3c98761b789f84c98b5c3fcb9a95a6d70d2b9 100644 (file)
--- a/dev-python/astng/ChangeLog
+++ b/dev-python/astng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/astng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/ChangeLog,v 1.52 2011/07/29 22:27:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/ChangeLog,v 1.53 2011/08/06 16:29:23 hwoarang Exp $
+
+  06 Aug 2011; Markos Chandras <hwoarang@gentoo.org> astng-0.22.0.ebuild:
+  Use PYTHON_TESTS_FAILURES_TOLERANT_ABIS. Don't directly call 2to3, since
+  build system now internally uses lib2to3. Patch by Arfrever
 
 *astng-0.22.0 (29 Jul 2011)
 

diff --git a/dev-python/astng/astng-0.22.0.ebuild b/dev-python/astng/astng-0.22.0.ebuild
index 9d7ceed1250f58fcca3daab5a0b1b4c7666ac8da..f6273bc4a62ba75a76bb098a2f594f9b2e16a02c 100644 (file)
--- a/dev-python/astng/astng-0.22.0.ebuild
+++ b/dev-python/astng/astng-0.22.0.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.22.0.ebuild,v 1.1 2011/07/29 22:27:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.22.0.ebuild,v 1.2 2011/08/06 16:29:23 hwoarang Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="3.* *-jython"
 
 inherit distutils
 
@@ -24,20 +25,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/logilab-${P}"
 
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
 PYTHON_MODNAME="logilab/astng"
 
-src_prepare() {
-       distutils_src_prepare
-
-       conversion() {
-               [[ "${PYTHON_ABI}" == 2.* ]] && return
-               find -name "*.py" ! -name "setup.py" -print | xargs 2to3-${PYTHON_ABI} -nw --no-diffs
-       }
-       python_execute_function -s conversion
-}
-
 src_test() {
        testing() {
                local tpath="${T}/test-${PYTHON_ABI}"
@@ -46,19 +35,14 @@ src_test() {
                mkdir -p "${spath}/logilab" || return 1
                cp -r "$(python_get_sitedir)/logilab/common" "${spath}/logilab" || return 1
 
-               "$(PYTHON)" setup.py install --root="${tpath}" || die "Installation for tests failed with $(python_get_implementation) $(python_get_version)"
+               "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --root="${tpath}" || die "Installation for tests failed with $(python_get_implementation_and_version)"
 
                # pytest uses tests placed relatively to the current directory.
                pushd "${spath}/logilab/astng" > /dev/null || return 1
-               if [[ "${PYTHON_ABI}" == 3.* ]]; then
-                       # Support for Python 3 is experimental. Some tests are known to fail.
-                       PYTHONPATH="${spath}" pytest -v
-               else
-                       PYTHONPATH="${spath}" pytest -v || return 1
-               fi
+               PYTHONPATH="${spath}" pytest -v || return 1
                popd > /dev/null || return 1
        }
-       python_execute_function -s testing
+       python_execute_function testing
 }
 
 src_install() {