Set SUPPORT_PYTHON_ABIS. Add missing dependency on dev-python/setuptools.

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

3 files changed, 52 insertions, 45 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index a1e62a8ee145..4e075856b767 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.122 2009/05/18 03:21:16 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.123 2009/08/29 19:52:14 arfrever Exp $
+
+  29 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  wxpython-2.8.10.1.ebuild:
+  Set SUPPORT_PYTHON_ABIS. Add missing dependency on dev-python/setuptools.
 
 *wxpython-2.8.10.1 (18 May 2009)
 
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 47733ae9b260..fe51c6873ee2 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX scripts-multiver-2.6.1.0.diff 3373 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 SHA1 1191dc7b4dd560dfc0843c44d823c0971dabd70c SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084
 AUX wxpy-config.py 3265 RMD160 c090972f980b4380c113b1c6e7328dd2b5565194 SHA1 5947fa3cdd4bb8689ae822c0079b4b12652cf329 SHA256 1097d2b169f3c97f149032f5f647e1920d89288dc91981ad85b2d3ae28baf8ef
 AUX wxpython-2.8-cache-writable.patch 538 RMD160 1d627cfae8a819850d6f6807b6547b138e63e5a0 SHA1 e6c4e5732f2a3792bea50a9ff51d233569ca490e SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429
@@ -23,16 +20,9 @@ DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab26
 DIST wxPython-src-2.8.9.1.tar.bz2 27969655 RMD160 2b193c867a028985f8ead4084a9c1f024a1d37c6 SHA1 7359af790d58082330c867f5c10f51b6382d9a35 SHA256 584bc8a90e413409c20d1aff05bf547809fc2b57b74c5aba60fc3a2a98a0e7fa
 DIST wxPython-src-2.8.9.2.tar.bz2 29370216 RMD160 93a9bd35b59e16674375b1431e24d47b58a824d2 SHA1 a0d58d8b9606d04a35b9853da15eb7dfb08d5637 SHA256 0683ef245d7c121dea7f16f08f0d2cd77348d588e6831cc3bc88cf23dc6029b5
 EBUILD wxpython-2.6.4.0-r2.ebuild 3496 RMD160 e2311eca456d563af27f652fcba6a9467109dd3e SHA1 c12e6707f17cea848af5347cddc947269fca8732 SHA256 3dd2915486e0a3ae4a23410ce925947fe9c954b9c914a9aa3254c407501fcebd
-EBUILD wxpython-2.8.10.1.ebuild 5058 RMD160 c895a28a3dd91665216894a6dbdb73880cc3d59e SHA1 85cb08d4b269e5d7d05ee4a2c8745a8061de4503 SHA256 6660c01c6a49816a6fd06e9b493da7638b835079f266f324665344db4505c045
+EBUILD wxpython-2.8.10.1.ebuild 5397 RMD160 d9635ce5ea84958dd1ca34bf61d49a26e99288db SHA1 ccd3cf2770fc0a5a62495bec3ae2cda75d55b5e8 SHA256 a7529704eaf8ef2d695a3640cfc29c3d86b47ce6753378e39a868678742f09c0
 EBUILD wxpython-2.8.9.1-r2.ebuild 3216 RMD160 81c085fb7b5db38d1ef8c2e2e43c83ddd1c22283 SHA1 bf719fe89f16927f854c13e2ac7336be5e881acb SHA256 42748d9f85f50d767875e0199cfbb553c4b1382293b07584ea695a3ac35752da
 EBUILD wxpython-2.8.9.1-r3.ebuild 4685 RMD160 9f51a2fd4fbee353486487abb432c0c8a1eed144 SHA1 75bf0a1345df4b8a1d15cbf5b0ae2d6e86e32544 SHA256 74eb85c5194df02157eaa2cf544adb5f4dee9f01a0097a31e61c889df3a15d71
 EBUILD wxpython-2.8.9.2.ebuild 4987 RMD160 b4d736425671002221c13a35e193fec8b2c225e5 SHA1 10fbb799fb24784522eee65acfef7f29aab420ac SHA256 719b20ad74d1751e357ecc36c0200ad9f8be3a4db1b01d5af13248ca5db30c1b
-MISC ChangeLog 23409 RMD160 6128e03dc1b89c968c9c28b72f1b7c61eb9396d7 SHA1 3befe3483806bd0ed2f95474b0b2d5003a40f1a1 SHA256 016ef122386e915d259d10295f22f9643246da7ec537e9b001dfaf58a04f15c3
+MISC ChangeLog 23586 RMD160 c4b26d62f1257bdaa101255cf7f3a0a93270fd61 SHA1 3759416df5af2fbe0a6832c1373f4a386127c4a5 SHA256 90976e4111ba864c328caadd7b585bbc2463a8ed78d6a273129216dc796be845
 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoQ1LgACgkQiqiDRvmkBmJd5wCg3GDWuykWd+fiFwYShDAuk+hs
-wEYAoL6wOezoZ8KkPcvIgN6RT1xoIuai
-=lDOt
------END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/wxpython-2.8.10.1.ebuild b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
index 70fb92541d3b..8094fd01cc2e 100644
--- a/dev-python/wxpython/wxpython-2.8.10.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.1 2009/05/18 03:21:16 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.2 2009/08/29 19:52:14 arfrever Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit alternatives eutils multilib python wxwidgets flag-o-matic fdo-mime
+inherit alternatives eutils fdo-mime flag-o-matic multilib python wxwidgets
 
 MY_P="${P/wxpython-/wxPython-src-}"
 
@@ -19,9 +20,10 @@ SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2
 LICENSE="wxWinLL-3"
 SLOT="2.8"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo opengl doc examples"
+IUSE="cairo doc examples opengl"
 
 RDEPEND="
+	dev-python/setuptools
 	>=x11-libs/wxGTK-${PV}:2.8[opengl?]
 	>=dev-lang/python-2.4
 	>=x11-libs/gtk+-2.4
@@ -36,7 +38,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_P}/wxPython/"
+RESTRICT_PYTHON_ABIS="3*"
+
+S="${WORKDIR}/${MY_P}/wxPython"
 DOC_S="${WORKDIR}/wxPython-${PV}"
 
 src_prepare() {
@@ -55,6 +59,8 @@ src_prepare() {
 		cd "${DOC_S}"
 		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
 	fi
+
+	python_copy_sources
 }
 
 src_configure() {
@@ -63,36 +69,45 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+		&& mypyconf+=" BUILD_GLCANVAS=1" \
+		|| mypyconf+=" BUILD_GLCANVAS=0"
 
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
-	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
+	mypyconf+=" WX_CONFIG=${WX_CONFIG}"
+	mypyconf+=" WXPORT=gtk2 UNICODE=1"
 }
 
 src_compile() {
-	python setup.py ${mypyconf} build || die "setup.py build failed"
+	building() {
+		"$(PYTHON)" setup.py ${mypyconf} build
+	}
+	python_execute_function -s building
 }
 
 src_install() {
 	local mypyconf
-	python_version
-	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
 
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
+	mypyconf+=" WX_CONFIG=${WX_CONFIG}"
 	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+		&& mypyconf+=" BUILD_GLCANVAS=1" \
+		|| mypyconf+=" BUILD_GLCANVAS=0"
 
-	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
+	mypyconf+=" WXPORT=gtk2 UNICODE=1"
 
-	python setup.py ${mypyconf} install --root="${D}" \
-		--install-purelib ${site_pkgs} || die "setup.py install failed"
+	installation() {
+		"$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib $(python_get_sitedir)
+	}
+	python_execute_function -s installation
 
 	# Collision protection.
-	for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth}; do
+	for file in "${D}"/usr/bin/*; do
 		mv "${file}" "${file}-${SLOT}"
 	done
+	rename_files() {
+		for file in "${D}$(python_get_sitedir)/"wx{version.*,.pth}; do
+			mv "${file}" "${file}-${SLOT}"
+		done
+	}
+	python_execute_function -q rename_files
 
 	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
 
@@ -118,16 +133,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
-
-	python_mod_optimize ${site_pkgs}
-
 	fdo-mime_desktop_database_update
 
-	alternatives_auto_makesym \
-		"${site_pkgs}/wx.pth" "${site_pkgs}/wx.pth-[0-9].[0-9]"
-	alternatives_auto_makesym \
-		"${site_pkgs}/wxversion.py" "${site_pkgs}/wxversion.py-[0-9].[0-9]"
+	create_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
+		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
+	}
+	python_execute_function --action-message 'Updating symlinks with Python ${PYTHON_ABI}' create_symlinks
+
+	python_mod_optimize wx-${SLOT}-gtk2-unicode wxversion.py
 
 	echo
 	elog "Gentoo uses the Multi-version method for SLOT'ing."
@@ -160,12 +174,11 @@ pkg_postinst() {
 pkg_postrm() {
 	python_mod_cleanup
 
-	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
-
 	fdo-mime_desktop_database_update
 
-	alternatives_auto_makesym \
-		"${site_pkgs}/wx.pth" "${site_pkgs}/wx.pth-[0-9].[0-9]"
-	alternatives_auto_makesym \
-		"${site_pkgs}/wxversion.py" "${site_pkgs}/wxversion.py-[0-9].[0-9]"
+	create_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
+		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
+	}
+	python_execute_function --action-message 'Updating symlinks with Python ${PYTHON_ABI}' create_symlinks
 }