Rebase ebuild from 0.22.0, restoring python 3 support. Use separate source directories as this makes the test suite pass in python 2. TODO: Figure out why.

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

3 files changed, 18 insertions, 32 deletions

diff --git a/dev-python/astng/ChangeLog b/dev-python/astng/ChangeLog
index 7bff2d7e0e0f..aea15fb9117f 100644
--- a/dev-python/astng/ChangeLog
+++ b/dev-python/astng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/astng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/ChangeLog,v 1.54 2012/04/19 06:45:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/ChangeLog,v 1.55 2012/04/20 01:41:33 floppym Exp $
+
+  20 Apr 2012; Mike Gilbert <floppym@gentoo.org> astng-0.23.1.ebuild:
+  Rebase ebuild from 0.22.0, restoring python 3 support. Use separate source
+  directories as this makes the test suite pass in python 2. TODO: Figure out
+  why.
 
 *astng-0.23.1 (19 Apr 2012)
 
diff --git a/dev-python/astng/Manifest b/dev-python/astng/Manifest
index de2e9ac2ee5f..b56a1221dc1c 100644
--- a/dev-python/astng/Manifest
+++ b/dev-python/astng/Manifest
@@ -10,13 +10,13 @@ EBUILD astng-0.20.3.ebuild 1932 RMD160 e25f37f7cdcc26e4adc158d23c2dcc60c8b4283a
 EBUILD astng-0.21.0.ebuild 2141 RMD160 fa5804b831b0b2b16e7470ab0f5993ada7423928 SHA1 c16d1c65302397db0340ec9e67d6bcfae8443fbd SHA256 a27f9ae3ae0def5636f7db120ed08ba370e264dbf4b79287a2b2bb081057d432
 EBUILD astng-0.21.1.ebuild 2297 RMD160 a2be0db6e88621d6bdde5227505878884cd46d70 SHA1 302ee3ca9c2b75b3640ca677bff3e7173a040a12 SHA256 97017cbc710c79c11524a811e7be13727ffc2bd536be235c0d21fe37bace3e42
 EBUILD astng-0.22.0.ebuild 1933 RMD160 462598f8b89d5a6d612fac3aba1aede9d08f2909 SHA1 b76600af6a9e51d8f906afd11d83577973d20c7e SHA256 c03e0f262188d17c99871364c4c12c9aef5ce011e86b9c2081f8f0e4bc6e82c1
-EBUILD astng-0.23.1.ebuild 2441 RMD160 fe2882e14bc4da19d50a0b0f8715c54c6452621a SHA1 fb9b59fb97a8a90cfa1dd2b661f11ff08dd49d15 SHA256 a0f958c0f64dbe8985d7e2e862410f651cf688663dd9fdd113cb2df8a529b6fc
-MISC ChangeLog 7299 RMD160 f4d58ccab18c2cd6aa0115fdcaa7d95d304b780f SHA1 d5fd1e1c25a060686599228c53f65e64ee531ccd SHA256 03dfcae1868786b69c9ace0d372175b92a805a157510047844c4feb7ccf8f041
+EBUILD astng-0.23.1.ebuild 1969 RMD160 beb1e6693ff52966167eb25e5bdf368ab84870c4 SHA1 bcea344961ba8b0e5d536ceff6fb0896880914df SHA256 0ea9ca8bc0b9f5909d6d6fc4cfe47219bbe2cd5f48d20df11610503c2e3d6648
+MISC ChangeLog 7532 RMD160 2ed30a882f66cf6384f9cf280a49a61a489f6d24 SHA1 2ec426c36cf29ac19408ef97f44e4ffa86a9f97c SHA256 40cdd97dfe0f6aedb669f14aa588417a7922a549ed677aa1018519455a79b104
 MISC metadata.xml 977 RMD160 b282dc87c0058e7da53c827ff043099a5d356eb8 SHA1 a6713710c31c6fa335bd07f747f5c8443ec2640b SHA256 5eb8114b349efc7a2c741eeea56299cd585b687515fb2ec0d37690fabf63e5a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+Qt8IACgkQC77qH+pIQ6Q5bAEAoV911woVvRZzqpgFe7UFxwav
-jUI7KoHDXEG8p3yqGXMA/Ax1oHQzbvlMHD1BtHkBX2XqRJKBlJyT1kgGHuxbLyyP
-=BhJI
+iF4EAREIAAYFAk+QvtIACgkQC77qH+pIQ6SqRwEAnFmn61pMkQcSqYCmT/gC59Rt
+GWUOLO1AlEPyAe9AvsYA/RjAn4Yv78kjIrMV+pT5gEUKXSIeetdjsTEEMYGYItPX
+=SAQf
 -----END PGP SIGNATURE-----
diff --git a/dev-python/astng/astng-0.23.1.ebuild b/dev-python/astng/astng-0.23.1.ebuild
index 236af4137055..989673cebaba 100644
--- a/dev-python/astng/astng-0.23.1.ebuild
+++ b/dev-python/astng/astng-0.23.1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.23.1.ebuild,v 1.3 2012/04/20 00:53:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.23.1.ebuild,v 1.4 2012/04/20 01:41:33 floppym Exp $
 
 EAPI="4"
-PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-PYTHON_TESTS_FAILURES_TOLERANT_ABIS="3.* *-jython"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
+PYTHON_TESTS_RESTRICTED_ABIS="3.* *-jython *-pypy-*"
 
 inherit distutils
 
@@ -23,24 +21,11 @@ IUSE="test"
 RDEPEND=">=dev-python/logilab-common-0.53.0"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
-	test? ( >=dev-python/egenix-mx-base-3.0.0 )
-	( dev-python/unittest2 )"
+	test? ( >=dev-python/egenix-mx-base-3.0.0 )"
 
 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
-}
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
 
 src_test() {
 	testing() {
@@ -50,16 +35,12 @@ 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 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