Set SUPPORT_PYTHON_ABIS.

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

3 files changed, 32 insertions, 26 deletions

diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog
index 3d6e55d4b629..7512eefcae49 100644
--- a/dev-python/pygame/ChangeLog
+++ b/dev-python/pygame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygame
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.62 2009/09/03 12:28:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.63 2009/09/04 04:47:23 arfrever Exp $
+
+  04 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pygame-1.9.1.ebuild:
+  Set SUPPORT_PYTHON_ABIS.
 
 *pygame-1.9.1 (03 Sep 2009)
 
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 16458b002d1e..bd4e0c346dd2 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -8,6 +8,6 @@ EBUILD pygame-1.7.1.ebuild 1361 RMD160 4741f4e1e0db4e34a39cd523fb51b06a30b6fdab
 EBUILD pygame-1.8.0.ebuild 1543 RMD160 90d76d78005c25e3204fc38cb437e9a3e201b739 SHA1 f38ae8c95487f35ada5aff31b2f75f888187e457 SHA256 41e8b74cdec5ae73ba3970189350ef120ecc75ec2980638a840b00a14db5f2a8
 EBUILD pygame-1.8.1-r1.ebuild 1462 RMD160 9b7ef7f7e0004f586d7464cd172bf0f9ae8dd6aa SHA1 9ba0a8f44d28e18f1b3316879a363a68ce7d15ee SHA256 7961efab54dc169019b9fc4a63a8326957f504cb66031ebfab6b9065154518ff
 EBUILD pygame-1.8.1.ebuild 1535 RMD160 a3ac0f75c21c72abf98d32c6041feefbb4efd1cb SHA1 1f236f8cf7c5b8efbc4a5e91ac241275e2a5f467 SHA256 3b0df44b69d39798b0ca25e7d6474a489692b2e1b8529a5175ad80cfcf286db3
-EBUILD pygame-1.9.1.ebuild 1516 RMD160 e71c5ada7097def7a29f4e42e40ddfbdfdf4e506 SHA1 e3928c4819cc2bb6e993faace33bcd676a2fa171 SHA256 310c8255e9c1ceae7cafc5fe4ee8295a861b753e82b0e77255468536a618e06a
-MISC ChangeLog 7999 RMD160 a84307335a9e7f58fc6ec97887ac3306662fc4bb SHA1 80525e3bd2bbcb27fabfe2501e654e0fda7e1eb8 SHA256 daa4f450769f027a4fdf9e26b34ba20ff57d417523a82c930722ceccd8a8aac2
+EBUILD pygame-1.9.1.ebuild 1562 RMD160 b9533bc563ad2074339e84b6d8c0a272edb76b49 SHA1 3dbcda41fd3b1b1876e87ddc50639c808af03aa8 SHA256 6038486c18f94d28fe49228c8dce93a7d14098426c2c49a8157a80e305540764
+MISC ChangeLog 8124 RMD160 7cbf39252e9fafc5aa94899848a86ccee5311f2c SHA1 b30b0f61b3f33d0ad60504af4d0621a29a15ad45 SHA256 e9c6bb79985517375fe017e475f61c7b3db524f2d16e95fe8f46d6cc72e15987
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/pygame/pygame-1.9.1.ebuild b/dev-python/pygame/pygame-1.9.1.ebuild
index a04760c00238..bd54bd6f707f 100644
--- a/dev-python/pygame/pygame-1.9.1.ebuild
+++ b/dev-python/pygame/pygame-1.9.1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.1.ebuild,v 1.1 2009/09/03 12:28:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.1.ebuild,v 1.2 2009/09/04 04:47:23 arfrever Exp $
 
 EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit distutils multilib eutils
+inherit distutils eutils multilib
 
 DESCRIPTION="python bindings to sdl and other libs that facilitate game production"
 HOMEPAGE="http://www.pygame.org/"
@@ -21,24 +22,40 @@ RDEPEND=">=media-libs/libsdl-1.2.5[X?]
 	>=media-libs/sdl-mixer-1.2.4
 	dev-python/numpy
 	>=media-libs/smpeg-0.4.4-r1"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${P}release
+S="${WORKDIR}/${P}release"
+
+DOCS="WHATSNEW"
 
 src_prepare() {
+	distutils_src_prepare
 	epatch "${FILESDIR}/config.patch"
 }
 
-src_compile() {
+src_configure() {
 	python config.py -auto
 	sed -i -e 's:X11R6/lib:lib64:g' Setup
 	use X || sed -i -e 's:scrap :#scrap :' Setup
-	distutils_src_compile
+}
+
+src_test() {
+	# Skip tests that depend on DISPLAY being set. Bug #223055.
+	SKIP_TESTS="display_test image__save_gl_surface_test movie_test"
+
+	local test
+	for test in ${SKIP_TESTS}; do
+		einfo "Removing test: ${test}"
+		rm -fr "${S}/test/${test}.py"
+	done
+
+	testing() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" run_tests.py
+	}
+	python_execute_function testing
 }
 
 src_install() {
-	DOCS=WHATSNEW
 	distutils_src_install
 
 	if use doc; then
@@ -48,18 +65,3 @@ src_install() {
 		doins -r "${S}/examples"
 	fi
 }
-
-src_test() {
-	python_version
-
-	#Skip tests that depend on DISPLAY being set. Bug #223055
-	SKIP_TESTS="display_test image__save_gl_surface_test movie_test"
-
-	for test_ in $SKIP_TESTS
-	do
-		einfo "Removing test: ${test_}"
-		rm -rf "${S}/test/${test_}.py"
-	done
-
-	PYTHONPATH="$(ls -d build/lib.*)" "${python}" run_tests.py || die "tests failed"
-}