diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-04-18 21:58:54 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-04-18 21:58:54 +0000 |
| commit | d7e6a866f6c69d7d4541824ab50dc3b8d9e9ee8f (patch) | |
| tree | 106e6a2a87ebf65e9b9d4b6df3c4c32615c54f2d /x11-apps | |
| parent | x86 stable per bug 363873 (diff) | |
| download | gentoo-2-d7e6a866f6c69d7d4541824ab50dc3b8d9e9ee8f.tar.gz gentoo-2-d7e6a866f6c69d7d4541824ab50dc3b8d9e9ee8f.tar.bz2 gentoo-2-d7e6a866f6c69d7d4541824ab50dc3b8d9e9ee8f.zip | |
Use distutils.eclass, use Python 2 (bug #316985).
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/fusion-icon/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/fusion-icon/fusion-icon-0.1-r1.ebuild | 37 |
2 files changed, 27 insertions, 16 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/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 } |