Set SUPPORT_PYTHON_ABIS.

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

3 files changed, 31 insertions, 26 deletions

diff --git a/dev-python/qscintilla-python/ChangeLog b/dev-python/qscintilla-python/ChangeLog
index 6be7df393161..e26de151259c 100644
--- a/dev-python/qscintilla-python/ChangeLog
+++ b/dev-python/qscintilla-python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/qscintilla-python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.35 2009/07/02 20:31:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.36 2009/08/02 05:32:25 arfrever Exp $
+
+  02 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  qscintilla-python-2.4.ebuild:
+  Set SUPPORT_PYTHON_ABIS.
 
   02 Jul 2009; Markus Meier <maekke@gentoo.org>
   qscintilla-python-2.3.2-r2.ebuild:
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 7c59a2e6a5e3..86355d0d580c 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qscintilla-gcc44.patch 511 RMD160 a252aa4527ace184c292b347aff5c6352d86e14e SHA1 8f5128bcc97446c9a58d8a68f25cacba8ad4805d SHA256 2d1e39b59705c04c21e7298d443846d1ff4bf6dbddace3c7381a664abcca5120
 AUX qscintilla-python-2.2-nostrip.patch 644 RMD160 a725e026786ca07e770167d865d4042eb801eee5 SHA1 b7ef91aaf17486b1a16531c6ed4885b226ff4515 SHA256 860ec3a86e16723866200893587b442bfbddd727be8642b21de30535cc98cfd3
 AUX qscintilla-python-2.4-nostrip.patch 633 RMD160 6c7156bdcf97e9bd7da0803265792e5d9afbaee5 SHA1 cf74f92f08d4b7b496601b8c1aa43db533740d08 SHA256 bf283ad3d1244db249b691b7f578571c1bb01afa870d470602b1a77840a73714
@@ -9,13 +6,6 @@ DIST QScintilla-gpl-2.4.tar.gz 2304554 RMD160 19e5d5c331705c217c5192b1fcac5d2989
 EBUILD qscintilla-python-2.3.2-r1.ebuild 1264 RMD160 5e576bbacc7f7f8225933cadba3c06901444e9b2 SHA1 07d27ebd1210223a303cce1d161b5c5163e79be5 SHA256 e2c3f3e936447085d4e69a11697bb4e5e390b2f2df8c26dc0143d3a80eb8c591
 EBUILD qscintilla-python-2.3.2-r2.ebuild 1305 RMD160 1c90ba3839e46617cbb87f68b4a44049876e71d2 SHA1 0ba1e94a372300b7b37e06816e1cb2f32c384380 SHA256 5449407e437bbfbcd82d897be10b1b03bf1e0b666eefdd0462293a0b6a5dc020
 EBUILD qscintilla-python-2.3.2.ebuild 1650 RMD160 64dd4e48873f09056093b7704c41bfa4682103f4 SHA1 0e9b34954fde400768ad0f1ae94a7b46c936a7b2 SHA256 36ac908186c83791fd3e8f527fc8c34c59c82616371929d964fcb8c13a8e6e97
-EBUILD qscintilla-python-2.4.ebuild 1445 RMD160 d5c7c2201ebb5cba2c89beb0a36f26be51ecfedf SHA1 03bcf47f70547a8b83a5ef5d6687ce6810f24adf SHA256 72957793eca2ba67e28b64013b0fa9174f44930a3ab2be9dd54ed0be7a183197
-MISC ChangeLog 5140 RMD160 7e64426e05db9f047af760ebb27b639b1bb96899 SHA1 af108c9ac2225340b1e837a38099d5efc207fe56 SHA256 82972455b15e41f48a25b899926df9c4a657679b9365bd4826159753dd430f12
+EBUILD qscintilla-python-2.4.ebuild 1611 RMD160 b28917b074ab9a747ba5b09a53acbd7f7d52118b SHA1 c06b0ecb4fca5dec4385acb85f0ffb1afeb7e331 SHA256 7ceb0c19599715af1ebd07c03d858e4afa80b6a6caba7460d8b6839bde054031
+MISC ChangeLog 5275 RMD160 9de60e26cf01c0ffa0609ca9c3ad2d6a8a4c2a47 SHA1 2e46e5ae2682f060e772f789872e466a1a38c1f5 SHA256 963b467daf3d73635d57f0d3f70f4e2097af104f649b8bfca51b247ddb0ae915
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpNGVAACgkQkKaRLQcq0GIaUwCgrNVpr7yiEnkd9m6GfSCqmJNV
-aaEAnjHLm2Ewb6kplKtcS2xp6Lf3G1WP
-=cKXX
------END PGP SIGNATURE-----
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild
index 486c1caf7cdc..c141d64951f0 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.4.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/qscintilla-python/qscintilla-python-2.4.ebuild,v 1.3 2009/06/26 22:09:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild,v 1.4 2009/08/02 05:32:25 arfrever Exp $
 
 EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
 inherit eutils multilib python toolchain-funcs
 
@@ -27,26 +28,36 @@ S="${WORKDIR}/${MY_P}/Python"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.4-nostrip.patch"
+
+	python_copy_sources
 }
 
 src_configure() {
-	python_version
-
-	local myconf="${python} configure.py
-			--destdir=$(python_get_sitedir)/PyQt$(use qt4 && echo 4)
-			-n /usr/include
-			-o /usr/$(get_libdir)
-			-p $(use qt4 && echo 4 || echo 3)
-			$(use debug && echo '--debug')"
-	echo ${myconf}
-	${myconf} || die "configuration failed"
+	configure_package() {
+		local myconf="$(get_python) configure.py
+				--destdir=$(python_get_sitedir)/PyQt$(use qt4 && echo 4)
+				-n /usr/include
+				-o /usr/$(get_libdir)
+				-p $(use qt4 && echo 4 || echo 3)
+				$(use debug && echo '--debug')"
+		echo ${myconf}
+		${myconf}
+	}
+	python_execute_function -s configure_package
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "emake failed"
+	build_package() {
+		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)"
+	}
+	python_execute_function -s build_package
 }
 
 src_install() {
 	python_need_rebuild
-	emake DESTDIR="${D}" install || die "emake install failed"
+
+	install_package() {
+		emake DESTDIR="${D}" install
+	}
+	python_execute_function -s install_package
 }