Port 2.6 ebuild to SUPPORT_PYTHON_ABIS. Use EAPI 2. Add missing setuptools

RDEPEND. Drop use of deprecated python functions.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

4 files changed, 80 insertions, 70 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index f3c150ea1934..0e0a0ad03776 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.134 2010/02/17 04:28:22 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.135 2010/03/05 22:30:45 dirtyepic Exp $
+
+  05 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r2.ebuild,
+  wxpython-2.8.10.1.ebuild:
+  Port 2.6 ebuild to SUPPORT_PYTHON_ABIS. Use EAPI 2. Add missing setuptools
+  RDEPEND. Drop use of deprecated python functions.
 
   17 Feb 2010; Ryan Hill <dirtyepic@gentoo.org>
   -files/wxpython-2.8.8-wxversion-scripts.patch,
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 2fa82fda9876..b2e8ab0cc5fe 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -11,14 +11,14 @@ DIST wxPython-docs-2.8.10.1.tar.bz2 2331639 RMD160 c1eadac650401895ae32739b316cd
 DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 RMD160 86084386383904972df15aa65ca26d1ad1a28a5d SHA1 eedef5ef87824b28a6fe4d338420cf6249ac1f2f SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8
 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f
-EBUILD wxpython-2.6.4.0-r2.ebuild 3496 RMD160 e2311eca456d563af27f652fcba6a9467109dd3e SHA1 c12e6707f17cea848af5347cddc947269fca8732 SHA256 3dd2915486e0a3ae4a23410ce925947fe9c954b9c914a9aa3254c407501fcebd
-EBUILD wxpython-2.8.10.1.ebuild 5471 RMD160 5e3db2a64d977aace910882a377bfcd614a88e1f SHA1 014ad6dc5e9b368999493c68e7ce817ac41b30f7 SHA256 1f57b0fc1facd8f1e9149f6b361f29a136f52b0c2ec5d3537721af5332f70759
-MISC ChangeLog 25033 RMD160 d79bc9bdeac8287121860c759b7b0cb901475760 SHA1 e7fe077cda9e3e760202551a0bf987757dd0102a SHA256 60599108b7fbde224ba42c3f7eef7d36149e9416603c5bfaa188a94e9861de45
+EBUILD wxpython-2.6.4.0-r2.ebuild 3512 RMD160 9a8fbc312007eb6909c28a85682f6a5adbcd69c4 SHA1 3c71c0331adff6f28430c2feac81c67af36a5fca SHA256 3e7bb60c971654b2347ea2f4d4a081ebde37b229bebae2ba74b3d4df5d20bba9
+EBUILD wxpython-2.8.10.1.ebuild 5349 RMD160 af2d9355347bfdbd31ee0b3b5b42dcfc40bab652 SHA1 5267b0409eea4e0cce6086b45d9f83bbc59edee2 SHA256 9903f1fe3e0a31ffb32f84e17f634b6c7ad395c32aff621931a07bbb734866a9
+MISC ChangeLog 25267 RMD160 52632f3ef4f6ecc537fef2c9557dffe99e0cc622 SHA1 b91e31415408c5b4a59c90796389b8466c070e39 SHA256 c603bb817685eb9659f53ce5ffd1515084d82ba09451a6c12fcff283edeef2ea
 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkt7cO8ACgkQiqiDRvmkBmKtfQCgqJf/lOoQpifnzAJR9mA0n3++
-Tv8An2b0HZ1oCvY8I42ZM9BF8PnqJwFe
-=wmXr
+iEYEARECAAYFAkuRhrIACgkQiqiDRvmkBmLjIwCg1P5T1jY8i6vErt1JaPuRjCiy
+IcIAoO2AabONxAU1ZAUgp6KIQtvi0bjk
+=KfBM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild b/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
index 8b57be3278d4..b6fa6a3d60ef 100644
--- a/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
+++ b/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild,v 1.9 2009/01/24 14:45:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild,v 1.10 2010/03/05 22:30:45 dirtyepic Exp $
 
-EAPI=1
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit alternatives eutils multilib python wxwidgets flag-o-matic
-
-# Note, we don't use distutils.eclass because it doesn't seem to play nice with
-# need-wxwidgets
+inherit alternatives eutils fdo-mime python flag-o-matic python wxwidgets
 
 MY_P="${P/wxpython-/wxPython-src-}"
+
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
 HOMEPAGE="http://www.wxpython.org/"
 SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2"
@@ -19,8 +18,9 @@ SLOT="2.6"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="opengl unicode"
 
-RDEPEND=">=dev-lang/python-2.1
-	>=x11-libs/wxGTK-${PV}:2.6
+RDEPEND="
+	dev-python/setuptools
+	>=x11-libs/wxGTK-${PV}:2.6[opengl?]
 	>=x11-libs/gtk+-2.0
 	>=x11-libs/pango-1.2
 	>=dev-libs/glib-2.0
@@ -33,17 +33,19 @@ RDEPEND=">=dev-lang/python-2.1
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_P}/wxPython/"
+PYTHON_DEPEND="2"
+RESTRICT_PYTHON_ABIS="3*"
+
+S="${WORKDIR}/${MY_P}/wxPython"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
 	epatch "${FILESDIR}"/scripts-multiver-2.6.1.0.diff
+
+	python_copy_sources
 }
 
-src_compile() {
-	local mypyconf
+src_configure() {
 	WX_GTK_VER="2.6"
 
 	if use unicode; then
@@ -52,11 +54,8 @@ src_compile() {
 		need-wxwidgets ansi
 	fi
 
-	use opengl && check_wxuse opengl
-
 	append-flags -fno-strict-aliasing
 
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
 	use opengl \
 		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
 		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
@@ -65,53 +64,58 @@ src_compile() {
 		&& mypyconf="${mypyconf} UNICODE=1" \
 		|| mypyconf="${mypyconf} UNICODE=0"
 
-	mypyconf="${mypyconf} WXPORT=gtk2"
+	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG} WXPORT=gtk2"
+}
 
-	python setup.py ${mypyconf} build || die "setup.py build failed"
+src_compile() {
+	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}"
-	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-	use unicode \
-		&& mypyconf="${mypyconf} UNICODE=1" \
-		|| mypyconf="${mypyconf} UNICODE=0"
-
-	mypyconf="${mypyconf} WXPORT=gtk2"
-
-	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
 
-	for dir in "${D}"/${site_pkgs}/wx-${SLOT}-gtk2-{ansi,unicode}; do
-		if [[ -d ${dir} ]]; then
-			cp -R "${D}"/${site_pkgs}/wxaddons/ "${dir}"
-			wxaddons_copied=1
-		fi
-	done
-
-	[[ ${wxaddons_copied} ]] && rm -rf "${D}"/${site_pkgs}/wxaddons/
+	rename_files() {
+		for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
+			mv "${file}" "${file}-${SLOT}"
+		done
+
+		for dir in "${D}$(python_get_sitedir)"/wx-${SLOT}-gtk2-{ansi,unicode}; do
+			if [[ -d ${dir} ]]; then
+				cp -R "${D}$(python_get_sitedir)"/wxaddons/ "${dir}"
+				wxaddons_copied=1
+			fi
+		done
+
+		[[ ${wxaddons_copied} ]] && rm -rf "${D}$(python_get_sitedir)"/wxaddons/
+	}
+	python_execute_function -q rename_files
 }
 
 pkg_postinst() {
-	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
+	fdo-mime_desktop_database_update
 
-	python_mod_optimize ${size_pkgs}
+	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 -q create_symlinks
 
-	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]"
+	use unicode && wxchar=unicode || wxchar=ansi
+	python_mod_optimize wx-${SLOT}-gtk2-${wxchar} wxversion.py
 
 	echo
 	elog "Gentoo uses the Multi-version method for SLOT'ing."
@@ -123,11 +127,13 @@ pkg_postinst() {
 
 pkg_postrm() {
 	python_mod_cleanup
-
-	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
-
-	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]"
+	fdo-mime_desktop_database_update
+
+	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 -q create_symlinks
 }
diff --git a/dev-python/wxpython/wxpython-2.8.10.1.ebuild b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
index bde095341c99..c9c1356e6a06 100644
--- a/dev-python/wxpython/wxpython-2.8.10.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.11 2010/01/25 13:34:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.12 2010/03/05 22:30:45 dirtyepic Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
@@ -25,7 +25,6 @@ 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
 	>=x11-libs/pango-1.2
 	>=dev-libs/glib-2.0
@@ -38,6 +37,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+PYTHON_DEPEND="2:2.4"
 RESTRICT_PYTHON_ABIS="3*"
 
 S="${WORKDIR}/${MY_P}/wxPython"
@@ -139,7 +139,7 @@ pkg_postinst() {
 		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_execute_function -q create_symlinks
 
 	python_mod_optimize wx-${SLOT}-gtk2-unicode wxversion.py
 
@@ -173,12 +173,11 @@ pkg_postinst() {
 
 pkg_postrm() {
 	python_mod_cleanup
-
 	fdo-mime_desktop_database_update
 
 	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_execute_function -q create_symlinks
 }