Set SUPPORT_PYTHON_ABIS. Improve installation (bug #295340).

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

4 files changed, 50 insertions, 54 deletions

diff --git a/dev-python/snakeoil/ChangeLog b/dev-python/snakeoil/ChangeLog
index f26dd6fd00e8..176eaffcfae0 100644
--- a/dev-python/snakeoil/ChangeLog
+++ b/dev-python/snakeoil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/snakeoil
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/ChangeLog,v 1.23 2009/11/26 10:33:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/ChangeLog,v 1.24 2009/12/05 21:22:18 arfrever Exp $
+
+  05 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  snakeoil-0.3.2.ebuild, snakeoil-0.3.3.ebuild:
+  Set SUPPORT_PYTHON_ABIS. Improve installation (bug #295340).
 
 *snakeoil-0.3.3 (26 Nov 2009)
 
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 201ce240faa0..a4cd0e086f20 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,6 +1,6 @@
 DIST snakeoil-0.3.2.tar.bz2 93153 RMD160 00a41b2ca1902f717e5b1a383241208a12324719 SHA1 2075eec91152c33dc1a4b2120105a2c5162e1d91 SHA256 1fa029a460c8e8e09ca62698fcd8e4727d7857bfb88843e9d851485eecb58b25
 DIST snakeoil-0.3.3.tar.bz2 99580 RMD160 68cb30687e8fe31680e843550e755c7422072aa4 SHA1 16ef5593682d0d2689a138c66d8b067e4d6ed9a4 SHA256 35f17409de4a3037fe574e2a9ff5db66157f4216f28990c22c959ee654449915
-EBUILD snakeoil-0.3.2.ebuild 1416 RMD160 d362bee07afbaf05e8b7a1738d42f41f70e28224 SHA1 ee8b4bc1ca4c70d49a23fe0cbc429683f680a63e SHA256 36d25a7ac8f8c2af208fd64b3b14035e5ee1b4d1c2c7ffbaf9c14c9b0253ee02
-EBUILD snakeoil-0.3.3.ebuild 1428 RMD160 3f97dd1fcc09c4229287c370d0a6e4a60d59615a SHA1 87da90db63c7b4a4f166bc23b5872eb98bef93ae SHA256 6c0c4599701b724b891c51ff82d3c1f6881af73feb7fc2dc8a864f0c3457b649
-MISC ChangeLog 2926 RMD160 0c17111ab571aec1c7b5b33d92014bc8df322700 SHA1 ff3eebf32b7f5b5f2d3aab3e22d48222f13cb779 SHA256 63a23321b8112a11d158b91dbf2d3429e1ddec1b1e82762e422655c5e361c210
+EBUILD snakeoil-0.3.2.ebuild 1354 RMD160 f3fd9999d971a249a8c8167f6357f1e676cc22a8 SHA1 3b91c5b24cc372d6aef140f6c51a8a49355f2df6 SHA256 d26de9cdc29ae5928d8d6987cbfb15212040a2f6233d6e5ed88260d53e2227f1
+EBUILD snakeoil-0.3.3.ebuild 1362 RMD160 42aefd25795411cf36551d6ff44081b5eba58ec3 SHA1 db6615cb326a5b5f360410ab13f552efcca9801d SHA256 50b61d804b80c32bc0cf6b7d64e21788078da3b7d5b065314680ff6d4816734d
+MISC ChangeLog 3112 RMD160 cec9d3a55c19d82ca973ce95c939effe7f8e7a84 SHA1 600f28437df65edd0eade4816674228a7af6e307 SHA256 5b2354fede2f568d265b083a74d7dcdfed745cfbd61478fd1fef6291f6e200f9
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/snakeoil/snakeoil-0.3.2.ebuild b/dev-python/snakeoil/snakeoil-0.3.2.ebuild
index c38fcaced6ac..4eea759075c0 100644
--- a/dev-python/snakeoil/snakeoil-0.3.2.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.3.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-0.3.2.ebuild,v 1.7 2009/04/09 02:21:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-0.3.2.ebuild,v 1.8 2009/12/05 21:22:18 arfrever Exp $
 
-NEED_PYTHON=2.4
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils
 
@@ -15,38 +16,33 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
-DOCS="AUTHORS NEWS"
 DEPEND="!<sys-apps/pkgcore-0.4.7.8"
 RDEPEND=${DEPEND}
+RESTRICT_PYTHON_ABIS="3.*"
+
+DOCS="AUTHORS NEWS"
 
-# Uses an ugly hack to install for all versions of python on the
-# system. This should be supported through the eclass at some point.
-# pkgcore needs it now to support upgrading to a different python slot.
+pkg_setup() {
+	validate_PYTHON_ABIS
 
-src_compile() {
-	local opython=${python}
-	for python in /usr/bin/python2.[4-9]; do
-		distutils_src_compile
+	# A hack to install for all versions of Python 2 in the system.
+	# pkgcore needs it to support upgrading to a different Python slot.
+	PYTHON_ABIS=""
+	local python_version
+	for python_version in /usr/bin/python2.[4-9]; do
+		PYTHON_ABIS+=" ${python_version#/usr/bin/python}"
 	done
-	python=${opython}
+	export PYTHON_ABIS="${PYTHON_ABIS# }"
 }
 
 src_test() {
-	local opython=${python} tempdir
-	for python in /usr/bin/python2.[4-9]; do
-		tempdir="${T}/tests/$(basename ${python})"
+	testing() {
+		local tempdir
+		tempdir="${T}/tests/python-${PYTHON_ABI}"
 		mkdir -p "${tempdir}" || die "tempdir creation failed"
 		cp -r "${S}" "${tempdir}" || die "test copy failed"
 		cd "${tempdir}/${P}"
-		"${python}" setup.py test || die "testing returned non zero"
-	done
-	python=${opython}
-	rm -rf "${T}/tests"
-}
-
-src_install() {
-	local opython=${python}
-	for python in /usr/bin/python2.[4-9]; do
-		distutils_src_install
-	done
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
+	}
+	python_execute_function testing
 }
diff --git a/dev-python/snakeoil/snakeoil-0.3.3.ebuild b/dev-python/snakeoil/snakeoil-0.3.3.ebuild
index 562a74104dc5..76a457c7eea2 100644
--- a/dev-python/snakeoil/snakeoil-0.3.3.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.3.3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-0.3.3.ebuild,v 1.1 2009/11/26 10:33:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-0.3.3.ebuild,v 1.2 2009/12/05 21:22:18 arfrever Exp $
 
-NEED_PYTHON=2.4
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils
 
@@ -15,38 +16,33 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DOCS="AUTHORS NEWS"
 DEPEND="!<sys-apps/pkgcore-0.4.7.8"
 RDEPEND=${DEPEND}
+RESTRICT_PYTHON_ABIS="3.*"
+
+DOCS="AUTHORS NEWS"
 
-# Uses an ugly hack to install for all versions of python on the
-# system. This should be supported through the eclass at some point.
-# pkgcore needs it now to support upgrading to a different python slot.
+pkg_setup() {
+	validate_PYTHON_ABIS
 
-src_compile() {
-	local opython=${python}
-	for python in /usr/bin/python2.[4-9]; do
-		distutils_src_compile
+	# A hack to install for all versions of Python 2 in the system.
+	# pkgcore needs it to support upgrading to a different Python slot.
+	PYTHON_ABIS=""
+	local python_version
+	for python_version in /usr/bin/python2.[4-9]; do
+		PYTHON_ABIS+=" ${python_version#/usr/bin/python}"
 	done
-	python=${opython}
+	export PYTHON_ABIS="${PYTHON_ABIS# }"
 }
 
 src_test() {
-	local opython=${python} tempdir
-	for python in /usr/bin/python2.[4-9]; do
-		tempdir="${T}/tests/$(basename ${python})"
+	testing() {
+		local tempdir
+		tempdir="${T}/tests/python-${PYTHON_ABI}"
 		mkdir -p "${tempdir}" || die "tempdir creation failed"
 		cp -r "${S}" "${tempdir}" || die "test copy failed"
 		cd "${tempdir}/${P}"
-		"${python}" setup.py test || die "testing returned non zero"
-	done
-	python=${opython}
-	rm -rf "${T}/tests"
-}
-
-src_install() {
-	local opython=${python}
-	for python in /usr/bin/python2.[4-9]; do
-		distutils_src_install
-	done
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
+	}
+	python_execute_function testing
 }