Synchronize ebuilds. Use distutils.eclass. Patch by Arfrever.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 81 insertions, 95 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 3735c330eb87..de0e1cf02542 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.154 2012/01/06 21:25:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.155 2012/01/06 23:04:17 hwoarang Exp $
+
+  06 Jan 2012; Markos Chandras <hwoarang@gentoo.org> wxpython-2.8.12.1.ebuild,
+  wxpython-2.9.1.1.ebuild:
+  Synchronize ebuilds. Use distutils.eclass. Patch by Arfrever.
 
   06 Jan 2012; Markos Chandras <hwoarang@gentoo.org> wxpython-2.8.12.1.ebuild,
   wxpython-2.9.1.1.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 6bc13ab28842..bff62423b411 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -22,24 +22,24 @@ DIST wxPython-src-2.8.12.1.tar.bz2 31311482 RMD160 94eae06087bdd930e21bf90cc6672
 DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a
 EBUILD wxpython-2.8.11.0.ebuild 5459 RMD160 4b097238379f7b06abedf4a64fac4e9437645f10 SHA1 d2727f3f4b3ef143813914d45d2045289d094367 SHA256 2b247905e294a59b83a6ec7f4468cfb2f8340a9190c6fd727cdf3e8c23661771
 EBUILD wxpython-2.8.12.0.ebuild 5479 RMD160 c8a5a72d867d8ac066021fa54ddd87e63fc7aa1f SHA1 5996ddf034bc6663ee142bd2b14150b0c3500654 SHA256 5665683612d6f812f7aedb3a7002d725a20879fb5e5825d4b75b0ef2628b0d3f
-EBUILD wxpython-2.8.12.1.ebuild 5457 RMD160 3930a8f77c33e52cc47bac517cd82d383d3ac3f2 SHA1 65d14c30db83a5737657db88b6d8ea2378ccbd2b SHA256 0d9513c1927b9baed21e097a49a14a9e63695f07932391ff6fa2c68057914efd
-EBUILD wxpython-2.9.1.1.ebuild 4938 RMD160 5a3cafd2df11899446aa89afa0fda29e4c498627 SHA1 703b5ab1c43d4f036a818897b8f648b11b31cbad SHA256 12dab6d9e3faa6797a4c567c799a9da33af3467442112ce56ce71886940e4828
-MISC ChangeLog 28005 RMD160 697ec6cda879bc711cc4f716938d7308ce7fe230 SHA1 d329aa3441c8b5fde553c76dbf76599a9f2b153b SHA256 c6b234968d0bf65f1c9cc4add08e9c0c2767024e76a7b8306abae270f1a8a19a
+EBUILD wxpython-2.8.12.1.ebuild 5119 RMD160 aee27493730fb008f099c74a5ed50252f593885b SHA1 cdfe69a1094dcfcdee34f13cc22c0752e20b6880 SHA256 686addd14f60eaa6a93d28f25f49166022e1ad149c5d7e8a5d98a3da3f7c554e
+EBUILD wxpython-2.9.1.1.ebuild 4537 RMD160 c086b8b121d070e0249ec38096a2715783f855b8 SHA1 a099376a76ae5467c950b68d73b0ddd19f016f8d SHA256 bb6e10e32c9d0c47270748a4f9026ae5901c5060b181cfc25eea88fed5b66f72
+MISC ChangeLog 28176 RMD160 1922c86fb7f2e5a4cc6cc3a947e0ef2c60db61af SHA1 87e57d8ffd319547003209002eac86ab2c8f6706 SHA256 bca2cc0aabe73773fbdb131e0ebd9977791687c6866a411e6f279c5ddbccecd7
 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPB2a7AAoJEPqDWhW0r/LCwioP/jTl9SF1HXEFp/M95lYJh3O+
-JQUiAiibxac5NvNDB5lOzzUfsEEyYCsmxOXJmkUo0WzuITdDcV6hJ+k6pvybj7mq
-AS7CZRkqDc4HzgJzRyeFN9Rka6LHTlg/FifUGBGCib/JlrJd+z9/aT8s2Pwc1HhM
-AfoMPyJncDOTVf1sZIT2kpaBrj+1w7n2GoOBpn75ZGYWHMsuBzS3udZ/YvU1dH3j
-sMAQgx99LmSwJVU+dEip/cgTI8zc6ShyvSd75y89K2EfjUE1j9TUDLs3Yw0Hl277
-N1SmYYxQ45Zep3xuWFLq1La4gFo1AK2QadZLn+Vw1F0UWWR7NUrGJ52zhKxL/c5n
-2IIuylg28DVXCSeI/DeP7P09ZvbhnP4ZdV+RxY+M+T/YXCuGmPAEIVSu/vbiMtc1
-CRAQ7KoY5DJGn+xr+TZ8EwbFcque27fuuSp1faplP0O729Yd/dDASh6fM1FJRUPc
-zk6uWfmCcNKsaRf7nFUZn1leYroSN2m6wVX4yNHOvW/nz/B54GVNOFpx4xsW0hX6
-WEk07sBJyzALcvMesS44sEE41KHX8eU1gH+Ry3y5EVyWl8BH+SXHZBCH/lBdbtP1
-1EQw62bQGR4TcSeryUues6fPgDgtRQWLsOk7vjGgIaKg4V2OWElBBSjdHBu5i7u1
-9yO2cR+MEYQouE8cq+pd
-=iomE
+iQIcBAEBCgAGBQJPB330AAoJEPqDWhW0r/LCYNAQAIhMNBX6hCcn8gxz0RERAXkI
+hiQwOJX8WNecKwsjZ76Xoe+rhzLqtfIXwV36+ZJN7DoiRhNEfFOr0TafZk1yaSq8
+SVCUZVzAWwE083X/iysyr041+Hl4MXUt5N5ST75y6A+6WuBfo+01p90y4sIX7Wkg
+kKtl1DdHVmXEJCaOKm53OGoQM3HZrF+kwtfTUgcCIuQbQtQDq0gOWrGhMV91Og70
+mqWNc7l8Zf3Uc3MSGV/OmXeE2vVwop6pIjooscFGi0SgwgNz99+C851swgZzzav2
+31MgMAhE8An526+ofiHZAhbRRsNWcRdbDIaWN2RpSTavDklseY4ipVSky1zqrwDr
+Wbn5EI4uGz0oZkPgXzJQcWEnitQu2Z9UXqzUgLNpWmyWSEuRF9BEe7lXR0HdpuV9
+knRw+8W9jRpFPgq1s8vQRUgXGr4r39rLvmVkxhjhQ05PWEcuusMZqgImwEV0njz+
+iV6WaVTjtIPEG6EXCaINVzpNDrdrS5XGwapXLwf8s8W7/8xg5dANeQmbkLvE8P6s
+5HbfdKRL2FQPeL1dshbxZ1DFyep55BN+ltWEw6qFeqhZFaxaG8V8hzHCeEGTWU0B
+KzX80eLXLCsSZ92pqxyI444qqysWFo6xqIJe69eD/m5OsYnufA7Sk/gLoKlcYawa
+i3j+s+Xi/vROqqw1Db+l
+=eU4r
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/wxpython-2.8.12.1.ebuild b/dev-python/wxpython/wxpython-2.8.12.1.ebuild
index 929a022501b5..1dddfcc77d27 100644
--- a/dev-python/wxpython/wxpython-2.8.12.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v 1.2 2012/01/06 21:25:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v 1.3 2012/01/06 23:04:17 hwoarang Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ WX_GTK_VER="2.8"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit alternatives eutils fdo-mime flag-o-matic python wxwidgets
+inherit alternatives distutils eutils fdo-mime wxwidgets
 
 MY_P="${P/wxpython-/wxPython-src-}"
 
@@ -25,7 +25,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="cairo doc examples opengl"
 
 RDEPEND="
-	>=x11-libs/wxGTK-${PV}:2.8[opengl?,tiff,X]
+	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
 	dev-libs/glib:2
 	dev-python/setuptools
 	media-libs/libpng:0
@@ -42,6 +42,11 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}/wxPython"
 DOC_S="${WORKDIR}/wxPython-${PV}"
 
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
+
+PYTHON_MODULES="wx-${SLOT}-gtk2-unicode wxversion.py"
+
 src_prepare() {
 	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
 
@@ -65,42 +70,28 @@ src_prepare() {
 src_configure() {
 	need-wxwidgets unicode
 
-	append-flags -fno-strict-aliasing
-
-	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
-	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
+	DISTUTILS_GLOBAL_OPTIONS=(
+		"* WX_CONFIG=${WX_CONFIG}"
+		"* WXPORT=gtk2"
+		"* UNICODE=1"
+		"* BUILD_GLCANVAS=$(use opengl && echo 1 || echo 0)"
+	)
 }
 
-src_compile() {
-	building() {
-		"$(PYTHON)" setup.py ${mypyconf} build
-	}
-	python_execute_function -s building
+distutils_src_install_post_hook() {
+	# Collision protection.
+	local file
+	for file in "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/bin/"*; do
+		mv "${file}" "${file}-${SLOT}"
+	done
 }
 
 src_install() {
-	local docdir file mypyconf
-
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
-	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
-	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
+	local docdir file
 
-	installation() {
-		"$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib $(python_get_sitedir)
-	}
-	python_execute_function -s installation
+	distutils_src_install
 
 	# Collision protection.
-	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}" || return 1
@@ -144,7 +135,7 @@ pkg_postinst() {
 	}
 	python_execute_function -q create_symlinks
 
-	python_mod_optimize wx-${SLOT}-gtk2-unicode wxversion.py
+	distutils_pkg_postinst
 
 	echo
 	elog "Gentoo uses the Multi-version method for SLOT'ing."
@@ -175,7 +166,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup wx-${SLOT}-gtk2-unicode wxversion.py
+	distutils_pkg_postrm
 	fdo-mime_desktop_database_update
 
 	create_symlinks() {
diff --git a/dev-python/wxpython/wxpython-2.9.1.1.ebuild b/dev-python/wxpython/wxpython-2.9.1.1.ebuild
index 87ffceb9b515..a0103ebacdc9 100644
--- a/dev-python/wxpython/wxpython-2.9.1.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.9.1.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.1.1.ebuild,v 1.4 2012/01/06 21:25:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.1.1.ebuild,v 1.5 2012/01/06 23:04:17 hwoarang Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2"
 WX_GTK_VER="2.9"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit alternatives eutils fdo-mime flag-o-matic python wxwidgets
+inherit alternatives distutils eutils fdo-mime wxwidgets
 
 MY_P="${P/wxpython-/wxPython-src-}"
 
@@ -23,16 +23,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="cairo examples opengl"
 
 RDEPEND="
-	dev-python/setuptools
 	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
-	>=x11-libs/gtk+-2.4:2
-	>=x11-libs/pango-1.2
 	dev-libs/glib:2
-	media-libs/libpng
+	dev-python/setuptools
+	media-libs/libpng:0
+	media-libs/tiff:0
 	virtual/jpeg
-	media-libs/tiff
+	x11-libs/gtk+:2
+	x11-libs/pango[X]
 	cairo?	( >=dev-python/pycairo-1.8.4 )
-	opengl?	( >=dev-python/pyopengl-2.0.0.44 )"
+	opengl?	( dev-python/pyopengl )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -40,6 +40,11 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}/wxPython"
 DOC_S="${WORKDIR}/wxPython-${PV}"
 
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
+
+PYTHON_MODNAME="wx-2.9.1-gtk2 wxversion.py"
+
 src_prepare() {
 	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
 
@@ -58,46 +63,32 @@ src_prepare() {
 src_configure() {
 	need-wxwidgets unicode
 
-	append-flags -fno-strict-aliasing
-
-	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
-	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
+	DISTUTILS_GLOBAL_OPTIONS=(
+		"* WX_CONFIG=${WX_CONFIG}"
+		"* WXPORT=gtk2"
+		"* UNICODE=1"
+		"* BUILD_GLCANVAS=$(use opengl && echo 1 || echo 0)"
+	)
 }
 
-src_compile() {
-	building() {
-		"$(PYTHON)" setup.py ${mypyconf} build
-	}
-	python_execute_function -s building
+distutils_src_install_post_hook() {
+	# Collision protection.
+	local file
+	for file in "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/bin/"*; do
+		mv "${file}" "${file}-${SLOT}"
+	done
 }
 
 src_install() {
-	local file mypyconf
-
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
-	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+	local file x
 
-	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
-
-	installation() {
-		"$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib $(python_get_sitedir)
-	}
-	python_execute_function -s installation
+	distutils_src_install
 
 	# this should be temporary
 	dobin "${S}"/scripts/pyslices || die
 	dobin "${S}"/scripts/pysliceshell || die
 
 	# Collision protection.
-	for file in "${D}"/usr/bin/*; do
-		mv "${file}" "${file}-${SLOT}" || die
-	done
 	rename_files() {
 		for file in "${D}$(python_get_sitedir)/"wx{version.*,.pth}; do
 			mv "${file}" "${file}-${SLOT}" || return 1
@@ -109,16 +100,16 @@ src_install() {
 
 	insinto /usr/share/applications
 	for x in {Py{AlaMode,Crust,Shell,Slices{,Shell}},XRCed}; do
-		newins "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop || die
+		newins "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop
 	done
 	insinto /usr/share/pixmaps
-	newins "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png || die
-	newins "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png || die
-	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png || die
+	newins "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png
+	newins "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png
+	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
 
 	if use examples; then
-		dodir /usr/share/doc/${PF}/demo || die
-		dodir /usr/share/doc/${PF}/samples || die
+		dodir /usr/share/doc/${PF}/demo
+		dodir /usr/share/doc/${PF}/samples
 		cp -R "${DOC_S}"/demo/* "${D}"/usr/share/doc/${PF}/demo/ || die
 		cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/ || die
 	fi
@@ -133,7 +124,7 @@ pkg_postinst() {
 	}
 	python_execute_function -q create_symlinks
 
-	python_mod_optimize wx-2.9.1-gtk2 wxversion.py
+	distutils_pkg_postinst
 
 	echo
 	elog "Gentoo uses the Multi-version method for SLOT'ing."
@@ -156,7 +147,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup wx-2.9.1-gtk2 wxversion.py
+	distutils_pkg_postrm
 	fdo-mime_desktop_database_update
 
 	create_symlinks() {