Set SUPPORT_PYTHON_ABIS.

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

3 files changed, 75 insertions, 48 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 117514400b45..412ded9458d9 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.75 2009/07/31 07:09:45 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.76 2009/08/02 05:17:58 arfrever Exp $
+
+  02 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  PyQt4-4.5.4.ebuild:
+  Set SUPPORT_PYTHON_ABIS.
 
 *PyQt4-4.5.4 (31 Jul 2009)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 41222f134738..3e5e4a258a4b 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -8,6 +8,6 @@ DIST PyQt-x11-gpl-4.5.4.tar.gz 6970552 RMD160 0f7a48edb65116c8fb23357f66d164ff1f
 EBUILD PyQt4-4.4.4-r2.ebuild 2057 RMD160 c53d76a3cc8a0b39b167ee0f95b375d10ec64bcb SHA1 cd4c7d73f4be8fd082a8ebd95ab29ea2a4482f9c SHA256 62846add2eeae19473391d0c5fa172dd3f227b3f65d830854cb04667dd9d57c7
 EBUILD PyQt4-4.4.4-r5.ebuild 3017 RMD160 c24de59cc3495ab1216eb546684a94bcded224ae SHA1 257df1054de3026db18166f7b72bc0a00875b001 SHA256 36d7007749c13f9db29f119e4421253e26ff8f45d1f04d6ddd773b1c61c96abf
 EBUILD PyQt4-4.5.2.ebuild 3173 RMD160 8dc1fe362621b1f1eaa04769bea19f4643c2af95 SHA1 94f78aabbe3f9bf08753270ff4fb5af2c25f2bc5 SHA256 c92953611c34214330a63891d3d9a8cdfa9ae09978960e45d20cabc0650d680d
-EBUILD PyQt4-4.5.4.ebuild 3170 RMD160 121e94fb7835ca610b9071bcd754b865b201cac2 SHA1 6aece6f8501bd4ed65e540fb3d4e5ee1a2103b9f SHA256 b2fdb63a28889c4eb852073ec1d7f82223b15fea9c49cfa046bd2fa12802ea9f
-MISC ChangeLog 10170 RMD160 6ad618a54b3b500b4e1442821c105cb44d108047 SHA1 9a38ef2405c68d9338b9873324e2140a92c42f6e SHA256 05978647d22d49171871d4f91e3477762322d7cf1274acd1fb764086f97707fb
+EBUILD PyQt4-4.5.4.ebuild 3497 RMD160 68630d3db012882f22c267a66c5ae93a11491695 SHA1 f87ada47f337f7bf192b3d66fb971feb7ec966a3 SHA256 0cdd853220f660302281595a2de52122e166d6eda84bb1c284b6e93996767660
+MISC ChangeLog 10296 RMD160 97b24a2cb3fb9cb99ed045c6f87abaf23e22d5d2 SHA1 f6ebed92fc4dbafdc8526f3183559260f355c2e6 SHA256 15cf7fdff98907508522323ff6b7e30e59fd398a41be6268e4896cf3f71ad5a7
 MISC metadata.xml 859 RMD160 3da7dcc5dc212af8ed4f98e73c561f2365081c98 SHA1 f607feed53689fa15b62d474d6763bc674fbcb2a SHA256 00475be82d27e0e1dab95eafcea3751ae70ee39b53a268063772d76752556d8b
diff --git a/dev-python/PyQt4/PyQt4-4.5.4.ebuild b/dev-python/PyQt4/PyQt4-4.5.4.ebuild
index e34e4f4f1695..752f487d7c20 100644
--- a/dev-python/PyQt4/PyQt4-4.5.4.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.5.4.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/PyQt4/PyQt4-4.5.4.ebuild,v 1.1 2009/07/31 07:09:45 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.4.ebuild,v 1.2 2009/08/02 05:17:58 arfrever Exp $
 
 EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit distutils python qt4
+inherit python qt4
 
 MY_P=PyQt-x11-gpl-${PV}
 QTVER="4.5.1"
@@ -56,56 +57,70 @@ src_prepare() {
 	fi
 	qt4_src_prepare
 
-	# Remove this code after removing Python 2 from the tree.
-	python_version
-	if [[ "${PYVER:0:1}" == "3" ]]; then
-		rm -fr pyuic/uic/port_v2
-	else
-		rm -fr pyuic/uic/port_v3
-	fi
+	python_copy_sources
+
+	prepare_package() {
+		if [[ "${PYTHON_ABI:0:1}" == "3" ]]; then
+			rm -fr pyuic/uic/port_v2
+		else
+			rm -fr pyuic/uic/port_v3
+		fi
+	}
+	python_execute_function -s prepare_package
 }
 
 src_configure() {
-	distutils_python_version
-
-	local myconf="${python} configure.py
-			--confirm-license
-			--bindir=/usr/bin
-			--destdir=$(python_get_sitedir)
-			--sipdir=/usr/share/sip
-			$(use debug && echo '--debug')
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtTest
-			--enable=QtXml
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtDesigner)
-			$(pyqt4_use_enable assistant QtAssistant)
-			$(pyqt4_use_enable assistant QtHelp)
-			$(pyqt4_use_enable opengl QtOpenGL)
-			$(pyqt4_use_enable phonon)
-			$(pyqt4_use_enable sql QtSql)
-			$(pyqt4_use_enable svg QtSvg)
-			$(pyqt4_use_enable webkit QtWebKit)
-			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)"
-	echo ${myconf}
-	${myconf} || die "configuration failed"
-
-	# Fix insecure runpath
-	if use X ; then
-		for pkg in QtDesigner QtGui QtCore; do
-			sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}/qpy/${pkg}::" \
-				"${S}"/${pkg}/Makefile || die "failed to fix rpath issues"
-		done
-	fi
+	configure_package() {
+		local myconf="$(get_python) configure.py
+				--confirm-license
+				--bindir=/usr/bin
+				--destdir=$(python_get_sitedir)
+				--sipdir=/usr/share/sip
+				$(use debug && echo '--debug')
+				--enable=QtCore
+				--enable=QtNetwork
+				--enable=QtScript
+				--enable=QtTest
+				--enable=QtXml
+				$(pyqt4_use_enable X QtGui)
+				$(pyqt4_use_enable X QtDesigner)
+				$(pyqt4_use_enable assistant QtAssistant)
+				$(pyqt4_use_enable assistant QtHelp)
+				$(pyqt4_use_enable opengl QtOpenGL)
+				$(pyqt4_use_enable phonon)
+				$(pyqt4_use_enable sql QtSql)
+				$(pyqt4_use_enable svg QtSvg)
+				$(pyqt4_use_enable webkit QtWebKit)
+				$(pyqt4_use_enable xmlpatterns QtXmlPatterns)"
+		echo ${myconf}
+		${myconf} || exit 1
+
+		# Fix insecure runpath.
+		if use X ; then
+			for pkg in QtDesigner QtGui QtCore; do
+				sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}-${PYTHON_ABI}/qpy/${pkg}::" ${pkg}/Makefile || die "failed to fix rpath issues"
+			done
+		fi
+	}
+	python_execute_function -s configure_package
+}
+
+src_compile() {
+	build_package() {
+		emake
+	}
+	python_execute_function -s build_package
 }
 
 src_install() {
 	python_need_rebuild
-	# INSTALL_ROOT is needed for the QtDesigner module,
-	# the other Makefiles use DESTDIR.
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install || die "installation failed"
+
+	install_package() {
+		# INSTALL_ROOT is needed for the QtDesigner module,
+		# the other Makefiles use DESTDIR.
+		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	}
+	python_execute_function -s install_package
 
 	dodoc ChangeLog NEWS THANKS || die
 
@@ -118,3 +133,11 @@ src_install() {
 		doins -r examples || die
 	fi
 }
+
+pkg_postinst() {
+	python_mod_optimize PyQt4
+}
+
+pkg_postrm() {
+	python_mod_cleanup PyQt4
+}