[gentoo-commits] proj/gnome:master commit in: app-i18n/ibus/

[gentoo-commits] proj/gnome:master commit in: app-i18n/ibus/

[Nirbheek Chauhan]

commit:     3bf5e5178493c9e79309f5d484ba104b70bb60ab
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  9 00:10:31 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Sep  9 00:37:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3bf5e517

Add app-i18n/ibus-1.4.99.20120822

---
 app-i18n/ibus/ibus-1.4.99.20120822.ebuild |  145 +++++++++++++++++++++++++++++
 1 files changed, 145 insertions(+), 0 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.4.99.20120822.ebuild b/app-i18n/ibus/ibus-1.4.99.20120822.ebuild
new file mode 100644
index 0000000..dc7bf8b
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.4.99.20120822.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.2.ebuild,v 1.1 2012/08/29 10:30:59 naota Exp $
+
+EAPI="4"
+PYTHON_DEPEND="gui? 2:2.5"
+
+inherit eutils gnome2-utils multilib python virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dconf doc +gconf gtk gtk3 +introspection nls +gui +python-library test vala +X"
+REQUIRED_USE="|| ( gtk gtk3 X ) gui? ( gtk3 )" #342903
+
+COMMON_DEPEND=">=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+
+	dconf? ( >=gnome-base/dconf-0.13.4 )
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )"
+RDEPEND="${COMMON_DEPEND}
+	gui? (
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gtk+:3[introspection] )
+	python-library? (
+		dev-python/pygtk:2
+		>=dev-python/dbus-python-0.83 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( dev-lang/vala )"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+
+# ibus-config test fails
+# ERROR:ibus-config.c:302:change_and_test: assertion failed (data->section == expected_section): (NULL == "test/s1")
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	if use python-library || use gui; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_configure() {
+	local python valac
+	if use python-library || use gui; then
+		# We cannot call $(PYTHON) if we haven't called python_pkg_setup
+		python="PYTHON=$(PYTHON)"
+	fi
+	if use vala; then
+		vala="VALAC=$(type -P valac-0.18) VAPIGEN=$(type -P vapigen-0.18)"
+	fi
+	econf \
+		$(use_enable dconf) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable doc gtk-doc-html) \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable gtk3 setup) \
+		$(use_enable nls) \
+		$(use_enable python-library) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable X xim) \
+		"${python}" \
+		"${vala}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	#use python-library && python_mod_optimize /usr/share/${PN}
+	gnome2_icon_cache_update
+
+	elog "To use ibus, you should:"
+	elog "1. Get input engines from sunrise overlay."
+	elog "   Run \"emerge -s ibus-\" in your favorite terminal"
+	elog "   for a list of packages we already have."
+	elog
+	elog "2. Setup ibus:"
+	elog
+	elog "   $ ibus-setup"
+	elog
+	elog "3. Set the following in your user startup scripts"
+	elog "   such as .xinitrc, .xsession or .xprofile:"
+	elog
+	elog "   export XMODIFIERS=\"@im=ibus\""
+	elog "   export GTK_IM_MODULE=\"ibus\""
+	elog "   export QT_IM_MODULE=\"xim\""
+	elog "   ibus-daemon -d -x"
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immmodules_gtk2
+	use gtk3 && gnome2_query_immmodules_gtk3
+	#use python && python_mod_cleanup /usr/share/${PN}
+	gnome2_icon_cache_update
+}

[gentoo-commits] proj/gnome:master commit in: app-i18n/ibus/

[Nirbheek Chauhan]

commit:     b8dce82813725c9d12a5b47e2356b1c5779794db
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 23:26:23 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:53:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b8dce828

app-i18n/ibus: fix missing function

---
 app-i18n/ibus/ibus-1.4.99.20120822.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.4.99.20120822.ebuild b/app-i18n/ibus/ibus-1.4.99.20120822.ebuild
index dc7bf8b..29f2f8a 100644
--- a/app-i18n/ibus/ibus-1.4.99.20120822.ebuild
+++ b/app-i18n/ibus/ibus-1.4.99.20120822.ebuild
@@ -114,8 +114,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immmodules_gtk2
+	use gtk3 && gnome2_query_immmodules_gtk3
 	#use python-library && python_mod_optimize /usr/share/${PN}
 	gnome2_icon_cache_update
 

[gentoo-commits] proj/gnome:master commit in: app-i18n/ibus/

[Alexandre Rostovtsev]

commit:     80987c4b18e09c653a9456f7d2bc56d9ea1d8dea
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 10 05:01:18 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Oct 10 05:14:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=80987c4b

app-i18n/ibus: 1.4.99.20120822 → 1.4.99.20121006 and reorganize USE flags

We want a single USE flag for python due to python.eclass limitations.
Let's call it "python" for simplicity.
USE="python deprecated" will install the deprecated ibus python library.
USE="python gtk3" will install /usr/bin/ibus-setup which uses gtk3 and
gobject-introspection.
Since ibus-setup uses gtk3 for its gui, we enable gtk3 by default.

Since gtk-doc documentation is always installed anyway, we can drop
the useless doc USE flag.

Also, port vala code to vala.eclass, and fix .pyo/.pyc cleaning.

---
 ...20120822.ebuild => ibus-1.4.99.20121006.ebuild} |   88 +++++++++++---------
 1 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.4.99.20120822.ebuild b/app-i18n/ibus/ibus-1.4.99.20121006.ebuild
similarity index 61%
rename from app-i18n/ibus/ibus-1.4.99.20120822.ebuild
rename to app-i18n/ibus/ibus-1.4.99.20121006.ebuild
index 29f2f8a..d1dad30 100644
--- a/app-i18n/ibus/ibus-1.4.99.20120822.ebuild
+++ b/app-i18n/ibus/ibus-1.4.99.20121006.ebuild
@@ -1,11 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.2.ebuild,v 1.1 2012/08/29 10:30:59 naota Exp $
+# $Header: $
 
-EAPI="4"
-PYTHON_DEPEND="gui? 2:2.5"
+EAPI=4
+PYTHON_DEPEND="python? 2:2.5"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
 
-inherit eutils gnome2-utils multilib python virtualx
+inherit eutils gnome2-utils multilib python vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -14,8 +18,10 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dconf doc +gconf gtk gtk3 +introspection nls +gui +python-library test vala +X"
-REQUIRED_USE="|| ( gtk gtk3 X ) gui? ( gtk3 )" #342903
+IUSE="dconf deprecated +gconf gtk +gtk3 +introspection nls +python test vala +X"
+REQUIRED_USE="|| ( gtk gtk3 X )
+	deprecated? ( python )
+	python? ( || ( deprecated ( gtk3 introspection ) ) )" #342903
 
 COMMON_DEPEND=">=dev-libs/glib-2.26:2
 	gnome-base/librsvg:2
@@ -32,63 +38,67 @@ COMMON_DEPEND=">=dev-libs/glib-2.26:2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
 	nls? ( virtual/libintl )"
 RDEPEND="${COMMON_DEPEND}
-	gui? (
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gtk+:3[introspection] )
-	python-library? (
-		dev-python/pygtk:2
-		>=dev-python/dbus-python-0.83 )"
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
 	dev-util/intltool
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
 	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( dev-lang/vala )"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
+	vala? ( $(vala_depend) )"
 
-# ibus-config test fails
-# ERROR:ibus-config.c:302:change_and_test: assertion failed (data->section == expected_section): (NULL == "test/s1")
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
 RESTRICT="test"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	if use python-library || use gui; then
+	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
 	fi
 }
 
+src_prepare() {
+	use python && python_clean_py-compile_files
+	use vala && vala_src_prepare
+}
+
 src_configure() {
-	local python valac
-	if use python-library || use gui; then
+	local python_conf
+	if use python; then
 		# We cannot call $(PYTHON) if we haven't called python_pkg_setup
-		python="PYTHON=$(PYTHON)"
-	fi
-	if use vala; then
-		vala="VALAC=$(type -P valac-0.18) VAPIGEN=$(type -P vapigen-0.18)"
+		python_conf="PYTHON=$(PYTHON)
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
 	fi
 	econf \
 		$(use_enable dconf) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-html) \
 		$(use_enable introspection) \
 		$(use_enable gconf) \
 		$(use_enable gtk gtk2) \
 		$(use_enable gtk xim) \
 		$(use_enable gtk3) \
 		$(use_enable gtk3 ui) \
-		$(use_enable gtk3 setup) \
 		$(use_enable nls) \
-		$(use_enable python-library) \
 		$(use_enable test tests) \
 		$(use_enable vala) \
 		$(use_enable X xim) \
-		"${python}" \
-		"${vala}"
+		${python_conf}
 }
 
 src_test() {
@@ -114,9 +124,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immmodules_gtk2
-	use gtk3 && gnome2_query_immmodules_gtk3
-	#use python-library && python_mod_optimize /usr/share/${PN}
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use deprecated && python_mod_optimize ${PN}
+	use python && use gtk3 && python_mod_optimize /usr/share/${PN}
 	gnome2_icon_cache_update
 
 	elog "To use ibus, you should:"
@@ -138,8 +149,9 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && gnome2_query_immmodules_gtk2
-	use gtk3 && gnome2_query_immmodules_gtk3
-	#use python && python_mod_cleanup /usr/share/${PN}
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use deprecated && python_mod_cleanup ${PN}
+	use python && use gtk3 && python_mod_cleanup /usr/share/${PN}
 	gnome2_icon_cache_update
 }

[gentoo-commits] proj/gnome:master commit in: app-i18n/ibus/

[Alexandre Rostovtsev]

commit:     a438aeeb5d2bf8890e1ae9ffde5d21890f192c30
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 12:47:16 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 12:47:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a438aeeb

app-i18n/ibus: fix dconf sandbox violations (#437794)

Run "dconf update" in pkg_postinst/postrm, not in src_install, to avoid
sandbox violations when FEATURES=-userpriv. Thanks to Michael Hampicke
for reporting (bug #437794 comment #3).

---
 app-i18n/ibus/ibus-1.4.99.20121006.ebuild |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.4.99.20121006.ebuild b/app-i18n/ibus/ibus-1.4.99.20121006.ebuild
index d1dad30..6cd93d6 100644
--- a/app-i18n/ibus/ibus-1.4.99.20121006.ebuild
+++ b/app-i18n/ibus/ibus-1.4.99.20121006.ebuild
@@ -72,6 +72,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/$(NULL)/' \
+		-i data/dconf/Makefile.{am,in} || die
 	use python && python_clean_py-compile_files
 	use vala && vala_src_prepare
 }
@@ -123,6 +126,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	if use dconf; then
+		ebegin "Updating dconf system databases"
+		dconf update
+		eend $?
+	fi
 	use gconf && gnome2_gconf_install
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
@@ -149,6 +157,11 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	if use dconf; then
+		ebegin "Updating dconf system databases"
+		dconf update
+		eend $?
+	fi
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 	use deprecated && python_mod_cleanup ${PN}

[gentoo-commits] proj/gnome:master commit in: app-i18n/ibus/

[Alexandre Rostovtsev]

commit:     f098a7b0e6c3906535d8cedef9e2110284367cf1
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 09:06:06 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 09:06:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f098a7b0

app-i18n/ibus: now in gx86

---
 app-i18n/ibus/ibus-1.4.99.20121006.ebuild |  170 -----------------------------
 1 files changed, 0 insertions(+), 170 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.4.99.20121006.ebuild b/app-i18n/ibus/ibus-1.4.99.20121006.ebuild
deleted file mode 100644
index 6cd93d6..0000000
--- a/app-i18n/ibus/ibus-1.4.99.20121006.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.5"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-
-inherit eutils gnome2-utils multilib python vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dconf deprecated +gconf gtk +gtk3 +introspection nls +python test vala +X"
-REQUIRED_USE="|| ( gtk gtk3 X )
-	deprecated? ( python )
-	python? ( || ( deprecated ( gtk3 introspection ) ) )" #342903
-
-COMMON_DEPEND=">=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-
-	dconf? ( >=gnome-base/dconf-0.13.4 )
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )"
-RDEPEND="${COMMON_DEPEND}
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/$(NULL)/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use python && python_clean_py-compile_files
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		# We cannot call $(PYTHON) if we haven't called python_pkg_setup
-		python_conf="PYTHON=$(PYTHON)
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		$(use_enable dconf) \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_enable X xim) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use dconf; then
-		ebegin "Updating dconf system databases"
-		dconf update
-		eend $?
-	fi
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use deprecated && python_mod_optimize ${PN}
-	use python && use gtk3 && python_mod_optimize /usr/share/${PN}
-	gnome2_icon_cache_update
-
-	elog "To use ibus, you should:"
-	elog "1. Get input engines from sunrise overlay."
-	elog "   Run \"emerge -s ibus-\" in your favorite terminal"
-	elog "   for a list of packages we already have."
-	elog
-	elog "2. Setup ibus:"
-	elog
-	elog "   $ ibus-setup"
-	elog
-	elog "3. Set the following in your user startup scripts"
-	elog "   such as .xinitrc, .xsession or .xprofile:"
-	elog
-	elog "   export XMODIFIERS=\"@im=ibus\""
-	elog "   export GTK_IM_MODULE=\"ibus\""
-	elog "   export QT_IM_MODULE=\"xim\""
-	elog "   ibus-daemon -d -x"
-}
-
-pkg_postrm() {
-	if use dconf; then
-		ebegin "Updating dconf system databases"
-		dconf update
-		eend $?
-	fi
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use deprecated && python_mod_cleanup ${PN}
-	use python && use gtk3 && python_mod_cleanup /usr/share/${PN}
-	gnome2_icon_cache_update
-}