Use distutils.eclass, use Python 2 (bug #316985).

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

3 files changed, 42 insertions, 21 deletions

diff --git a/x11-apps/fusion-icon/ChangeLog b/x11-apps/fusion-icon/ChangeLog
index 7227e2b9acec..d4af5a819027 100644
--- a/x11-apps/fusion-icon/ChangeLog
+++ b/x11-apps/fusion-icon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/fusion-icon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fusion-icon/ChangeLog,v 1.7 2011/04/05 05:31:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fusion-icon/ChangeLog,v 1.8 2011/04/18 21:58:54 arfrever Exp $
+
+  18 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  fusion-icon-0.1-r1.ebuild:
+  Use distutils.eclass, use Python 2 (bug #316985).
 
   05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> fusion-icon-0.1-r1.ebuild:
   Depend on dev-lang/python because virtual/python will go away, bug 358849.
diff --git a/x11-apps/fusion-icon/Manifest b/x11-apps/fusion-icon/Manifest
index 7591a2fe1ecc..951a34ad1fb1 100644
--- a/x11-apps/fusion-icon/Manifest
+++ b/x11-apps/fusion-icon/Manifest
@@ -2,13 +2,23 @@
 Hash: SHA1
 
 DIST fusion-icon-0.1.tar.gz 30508 RMD160 037db986658d112f9c1ed2030e21941dd6748fa4 SHA1 a59d770c9bd3ad28da40648f6a7bfaaf4a1d1a81 SHA256 2e6757fd4fb8ed7d1640fcabfbe10a39f36cf41504eda0dd13605db70273fe79
-EBUILD fusion-icon-0.1-r1.ebuild 1162 RMD160 7c5ce698e878dda8f5f098337a22e61311c7b981 SHA1 faa8bca821a8dda2b4944187a69d30e96b840d09 SHA256 da81c9adf9550e4358d8c84650458f0247c45fc29f93db6be77e3b0ae035b485
-MISC ChangeLog 1517 RMD160 bb99dfa8cf376a25209fedfe35a890179eebb3bf SHA1 38b398a5cefea028311e40b03079023311c9a5c4 SHA256 5c1663307c0e288707b5d1c2fdf25fe47b8a16220e84dba1083c2ad6e37397d6
+EBUILD fusion-icon-0.1-r1.ebuild 1191 RMD160 99c02453678607f9b747889cfe4a91422cabc695 SHA1 4e445814d698314fb3137cb0ee2bbb61941ca5af SHA256 8c01f979aeed811f4357f199a986e171ac302748fb416f02531862dcddb5cdb1
+MISC ChangeLog 1677 RMD160 b0b3623bed76067e06acdd28ccc98007d6738869 SHA1 2d453e64ec1e7ca1103e0dce5779e6fa78ebd576 SHA256 5b161308c22608f3dd6b20bf33622a8a153e51068ab552e290ad12ab1b3512dc
 MISC metadata.xml 250 RMD160 6da86a77a3ced1a732da0b67523fde6c7eaf0070 SHA1 9ff437c939f71081dc68d7a540a5694f6d5618f6 SHA256 a058d216394b2fa94c85fbacc52889f48102f22aad3a916879cc816f8e6f8f8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2aqWkACgkQOeoy/oIi7uzvNACbBr6l5axI4x/dPRfSg1VwxDm0
-6N0An0LiTku0W1NBoA0sm/mQwYphstMn
-=Ta2U
+iQIcBAEBAgAGBQJNrLQnAAoJENgZr6v6gHY0NwIP/j4L9lWufuI8A5ooqp1DTK8p
+qSgo7zT07J5AWGe9a0CWsVQc0AfSNdszWxA73IIBTo6rTXLttk/vYcV3o+IhJyMK
+xhTh+4spowL1Y8a4MCvxrEyHqT8XgE+ch1kjhSNxvgfT80wy+cDF7+yp06Sry92v
+41Hxr5rhf3neE8UHuXTBxxt6WI7CC7Q+AdjoJT0Ag+RlXi1IuozdxJFtp1ad4pf1
+HVqP1/2cc5OGPfMbK1zbcMAljTMNmdcK/dUDtOwjk25uf+xRkW0XIKweaCccIu91
+li4Ef1fYW3BP1FHjCzCrHcSxjW6BTC0YiQ3R2pl5ZeHfR8TErGFeTZmPkD5i3yLJ
+kD/+CxONNAlsXAF64TCoHpV9SVVUf+iEji4dkbFkUeRgMCyR3v0X6P18ruMJspxl
+px+VYzgc+InHvKIDk0dPxXsM+j+AiNQmab/j1wItAqY1zFETgJi9j/v4EsAfbrsp
+K1RShPOd9dqVGUcjMbNSTT6RzkoEFGMSgwdfudrhZ7bcwcOzAFeYyu/66gI18Mr3
+nxRKDcbz1if8F6H2p1Otq8J9yY8YXsxaLUXMh8/1C+ONT9x+JyAk4445iaEYcfRq
+/fSwB2Zv/zt+4mJjKzbzmt0HgYEtqB3dGXMG4AcmIeBipRiB0kxjB8c/Qt49Xk7j
+uEPShtrGtUjgQ0VIvPpS
+=ZUGq
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r1.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r1.ebuild
index bf56c3a6f8ec..9a1dcfc3a545 100644
--- a/x11-apps/fusion-icon/fusion-icon-0.1-r1.ebuild
+++ b/x11-apps/fusion-icon/fusion-icon-0.1-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fusion-icon/fusion-icon-0.1-r1.ebuild,v 1.3 2011/04/05 05:31:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fusion-icon/fusion-icon-0.1-r1.ebuild,v 1.4 2011/04/18 21:58:54 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 
-inherit gnome2-utils python
+inherit distutils gnome2-utils
 
 MINIMUM_COMPIZ_RELEASE=0.6.0
 
@@ -19,30 +20,36 @@ IUSE="gtk qt4"
 
 RDEPEND="
 	>=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE}
-	dev-lang/python
 	>=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE}
-	gtk? ( >=dev-python/pygtk-2.10 )
+	x11-apps/xvinfo
+	gtk? ( >=dev-python/pygtk-2.10:2 )
 	qt4? ( dev-python/PyQt4[X] )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19
-	x11-apps/xvinfo"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
+PYTHON_MODNAME="FusionIcon"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_install() {
-	use gtk && interfaces="${interfaces} gtk"
-	use qt4 && interfaces="${interfaces} qt4"
-	emake "interfaces=${interfaces}" DESTDIR="${D}" install || die "emake install failed"
+	distutils_src_install
+
+	use gtk || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_gtk"
+	use qt4 || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_qt4"
 }
 
 pkg_postinst() {
-	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/FusionIcon
+	distutils_pkg_postinst
 
 	use gtk && gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/FusionIcon
+	distutils_pkg_postrm
+
+	use gtk && gnome2_icon_cache_update
 }