--- ibus-1.4.1.ebuild.old 2012-04-04 09:02:40.000000000 +0200 +++ ibus-1.4.1.ebuild 2012-04-04 09:27:12.000000000 +0200 @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.9 2012/03/28 22:10:24 vapier Exp $ EAPI=4 -PYTHON_DEPEND="python? 2:2.5" +PYTHON_DEPEND="2:2.5" inherit eutils gnome2-utils multilib python autotools @@ -14,7 +14,7 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" -IUSE="dconf doc +gconf gtk gtk3 +introspection nls +python vala X" +IUSE="dconf doc +gconf gtk gtk3 +introspection nls +libnotify vala X" REQUIRED_USE="|| ( gtk gtk3 X )" #342903 RDEPEND=">=dev-libs/glib-2.26 @@ -30,7 +30,7 @@ x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) - python? ( + libnotify? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) @@ -45,7 +45,7 @@ doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 )" RDEPEND="${RDEPEND} - python? ( + libnotify? ( dev-python/pygtk dev-python/pyxdg )" @@ -74,10 +74,8 @@ } pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi + python_set_active_version 2 + python_pkg_setup } src_prepare() { @@ -107,10 +105,10 @@ $(use_enable gtk xim) \ $(use_enable gtk3) \ $(use_enable nls) \ - $(use_enable python) \ + $(use_enable libnotify) \ $(use_enable vala) \ $(use_enable X xim) \ - PYTHON="${PYTHON}" + PYTHON="$(PYTHON)" } src_install() { @@ -133,7 +131,7 @@ use gconf && gnome2_gconf_install use gtk && update_gtk_immodules use gtk3 && update_gtk3_immodules - use python && python_mod_optimize /usr/share/${PN} + python_mod_optimize /usr/share/${PN} gnome2_icon_cache_update elog "To use ibus, you should:" @@ -157,6 +155,6 @@ pkg_postrm() { use gtk && update_gtk_immodules use gtk3 && update_gtk3_immodules - use python && python_mod_cleanup /usr/share/${PN} + python_mod_cleanup /usr/share/${PN} gnome2_icon_cache_update }