Add patch to respect system keyboard layout. #460796

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

4 files changed, 291 insertions, 2 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 4b59cce07363..0cff4cf2b95b 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.120 2013/02/09 16:22:33 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.121 2013/04/03 22:14:52 naota Exp $
+
+*ibus-1.5.1-r2 (03 Apr 2013)
+
+  03 Apr 2013; Naohiro Aota <naota@gentoo.org>
+  +files/ibus-1.5.1-use-system-keyboard-layout.patch, +ibus-1.5.1-r2.ebuild:
+  Add patch to respect system keyboard layout. #460796
 
 *ibus-1.5.1-r1 (09 Feb 2013)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 2860d144d1b1..0ebe01416c59 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ibus-1.4.0-machine-id-fallback.patch 750 SHA256 ad1b7538e324a29fd779d7545860e06f22904974bae931fa3cda045ae74af8ed SHA512 7ed7d36ad3bd369d68aa628a364a6b78421489834d70bb76cbb9f8630b69d0bf58b6cf88c409ebbc100201054efd956aa0199d3395f396bf8932e96159f8d221 WHIRLPOOL 4e8495e611f92b0321c11c6343dcabfe5652e4c1e7613b4f315b8a72d88b58c76a1eec31960bbb709fcf639bf5b26890c53d4de44a6e25e1d0e02d050b2d9b0a
 AUX ibus-1.4.1-gir.patch 482 SHA256 802581c7c4293dd34c5fda9143d8b46d6a2e65dda82836643fbb4122f1b5b275 SHA512 bec6b63bc5e518fa83c077684365354df9402e70ed7b9c7757b56cd778e0f64b9fa391a7cc6c3e22a2197e6389c58232c3748616758f98bd477f665912674f0c WHIRLPOOL 9261329877eb1221c63eb6568b0e075bc8e7fe188164e06ccfa3ece8ad0c190ff31a2ee5e528550b9c3ad65416a72ceae90ec53d17470c9d54e8a63ffd1c21d1
 AUX ibus-1.4.1-libxslt-1.1.27.patch 3413 SHA256 47c0135a406e450676a06e7d6de24b99a972134f9217bb174bea7b5c3e6737c9 SHA512 983e01eec74eaba037d3cde1dc3485615984ab953d4edeffcf2f1e6eefa833055780a381b772fb296f6d625cc0d94bec75e430f7d72b7e23a5cfae03b0e661fb WHIRLPOOL 8b4385f35aef20fb3489c6a45ab1f4ac9f71abacea9f47acc13fcafbe130c5d74db1522dcbabb541254ea8505009dbe438cf0c5022989ca3dd05811497ccb9b9
 AUX ibus-1.4.1-no-gconf.patch 1002 SHA256 7f136de585b41d4ae47e1d9cb58a982f8ab70dc142eb579702e60f67f7f093f2 SHA512 168fefe6d5bb5efdf5e6212ca2ac72ab8a58789cf813c0c280dbbc3788cb70a0d344f9d837e8903b04fed57cdfa98e36f7ca40961b405b969554c384e783a6dd WHIRLPOOL 1fb6f44d7cb24aeaf215c0064bf527af19cd4cf8b0fd767f8ed939103ba3ed1904fd70c591f8f533ec4cc1bc6b6313faf5de7387ec703259639306458fff5206
 AUX ibus-1.5.1-queue-events.patch 13061 SHA256 5ccadbd28e76138f7dfe23fcc87e73d1ba434eae7b0b281172a3921e954e1577 SHA512 e9c0726ff2ff75704cc25af239e59683cf40a9068945f4953e3eb8529bf82ea662917e51bb56aaa3f2cf32966e8824607ad42f187d80a19eec5703f2b76561ae WHIRLPOOL 3ac69997b6f345d34e6e6065a35d064faeb81d51ef2e06d5748a4fee8144ee6a21d6c25738c48a56954ceed6fe2f2ba7bda6f7da5d15a65c1e671812fe490596
 AUX ibus-1.5.1-setup.patch 951 SHA256 9bd2e40af53c165ce5ecee4fdf65fda4b2b754f12302e53cb54a35628eae9b2e SHA512 72f2a3235f679d4c1b541ae7eb4a64c93c01f62f1440b0533d59ea2d1b31afdcf1d9c1965e9200a20dcf2248edf360d14e62df549b0ff4790f49cf1cfaccc1e1 WHIRLPOOL 406a55d81335a62ea6fdfb9d9738265da551188cefd8465fd4d3ccf58c1116a0f43e90aab0926ee88f603fb7a3c4b6d66d5483585533f755c9671e6bbbd8a674
+AUX ibus-1.5.1-use-system-keyboard-layout.patch 3265 SHA256 2b5f28ac04dcb5225f6c26717e7692d2b47bddffd9658dff29b418b0519d5053 SHA512 dfbe7afa955c33edc0735e915f0205fb745ae1354479d345e8493b32e2e5b71e1f92e0d1239a625cc7288db136859b89a1eb7c5d73453fbe8dbea0e4272e5dc2 WHIRLPOOL 320af37e567560822ba5e5ab0451acde3d461459e0a79095117307d9318418374539ac92de79ba02aa823ce7ae745a85fa5a263df614309ee414985346488574
 AUX ibus-gconf-2.m4.patch 1707 SHA256 40c54a970779f4586161f45ebd245c9db71b46ced0d7deda22f47de851c02954 SHA512 5310d371ae53c31551824e01c9fc3ee815b64c5595c778b956f807973be57ba26efa72977b3f3798347ecf25551f7da95f11bb545def761968b96edd81575985 WHIRLPOOL 74337f038a655689911c0fa3d219747b64c440453d62a1c9597f7cd9e8b45f6b3119e81e8daa8f7dd0eff4a74f2e78bef8ed16ea3c41ebad5cb10b0c7b2d9952
 DIST ibus-1.4.1.tar.gz 1479412 SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6 SHA512 465f5d099ca60612e9d28c77da6a8da2435cc50c3f2f9b93c4c9258d18bb963d85b84ed9d7f9c58e90dc07a4898dc9668a6e2a3484b69074a1777761389ba468 WHIRLPOOL 800e68481202dfd6f4cef0de692f4fa3ceb9e570d34b632f9547605a9ed9688be75a69402ff5df3df71fed12f463502d6e8041862dd065e725e6fa16ec968bcf
 DIST ibus-1.4.2.tar.gz 1489482 SHA256 2418d9960d177c0ce7d3dc5ef8ab75cfc00e30f5e2c730b7d82f4f22666a04d7 SHA512 0070f7d0a4bc6510692851f60e06e487f75fdbe47f50a2371f62dd06b89f20950161b5f1bb91e025dd8dced654d9e90eb910bb5be8e8923869e96e5048f8316d WHIRLPOOL c480ef6fabfe24f2350a0222945860e3b890b32373e159032cc4a9bb1a1df2ad22b6ce11fb9845c5ebacdb7662b9dd26bffb7dd8f6d366551e9ec226e2b14d8d
@@ -13,6 +17,24 @@ EBUILD ibus-1.4.1.ebuild 4018 SHA256 1a03a32ccd2614a24a9fb30a4bc225c50a31005e162
 EBUILD ibus-1.4.2.ebuild 3388 SHA256 d48e09f5233209764a4f927c4d5345a4b886c3d7459e7cb7771bb21b777a7a7f SHA512 dbb20f61ffd58b88e7637b8a6b6daae72344a3c4e67605cb975d3e2a5327befdc29b8052e6f472f12bccb267842bd9ed21a61cf3d34d9f5cc49a33d7c8d1e9e3 WHIRLPOOL 5f7fca4a64a2022a101bc7791dd4053d660fc82156768096bc8bb0332e87c68d83bb7ac63ab4b9626a3f3e73f896891cafd72a07d3c3a083cc53bf2404ea16ce
 EBUILD ibus-1.4.99.20121006.ebuild 4420 SHA256 180bb06a9bb23e7b3686a987f41f768a040c04ebe316e2d674fb5055b6d3cc6c SHA512 e45a6574b3bd32e00c0fb595472351092d027119ae524b78eeac4ffe9ea0ff70012df73253ef4566501d30d1089f34b53e7fa7e01ad73ffc800db3ed53932114 WHIRLPOOL 97e71f1ee15f8f222bb03243bd8635f2a3e5825c4136d6426f42d7f0f421119baeb2977fd9c01adb453e1c5b5cfb94994402fb99f6a167d79d00d767dd5bef19
 EBUILD ibus-1.5.1-r1.ebuild 4577 SHA256 033e9361147e752153290c8354a641653b6c1a2be09c960ace2728b6a857c1e6 SHA512 5cf8d534be46651f5d12f516911e96928fb2ec6ff60935f81b3f0118df4a4c6c35c3855e1ba95076e7d868cf7511e995ec81c8451410bbc811918fbb75ae9f31 WHIRLPOOL 87eb14f8b709aecb5728d6004c9cb34c19164edf7f1f22a57e79852493b5af36c19ccd2a9135e743109d4dcf8d0b0bcf60d2ef2b78da46bb1c4124fd21b7ee63
+EBUILD ibus-1.5.1-r2.ebuild 4691 SHA256 9d73340d429658fe7b1a3d796b85635054e0c63e743e191f30a98824a48f3c63 SHA512 757914ee29aa175d1de21ace194f1e87a7da2c833797ca8cf5d75d114e8b2f430fb661581ff26f88133240df6b7f1413052988761bf324edba201e42fe775632 WHIRLPOOL 6fd572454f9792ef1b749a08bdddc4618a3ae79257af54d803598edbd3628cba3f73aac030ad83b65c94135de2e26f94528c082b7c6eb17f9dc1f551c5571a22
 EBUILD ibus-1.5.1.ebuild 4413 SHA256 2ee0742ec4c74f5c180e28a76c2b204a2383a11bd518cb0f9e0a6a5a4f433c24 SHA512 e416bf01c40ab88ca95b5848f57b02afd71bd4524c3197308e8a67dc1e2f977ab533e9c40cbd80e98663ac2bc0f90131e0151263fd2654b60a59ff3bdc0e5455 WHIRLPOOL 844e07ff24166c172b20bfa6c6d8d7cee89b26322ffbea1b3f36d922ab8a0497511ced6ab73cf841b86aade5751bb76d83c6683c3501e5010e4da33967c83a45
-MISC ChangeLog 19344 SHA256 071de468ad207012ef7b58a2beb75c485cc44eef512c9dd53920184acec642dd SHA512 7367630608d642763140fb782dfcb422f12f98afbb2001e73d43e31e2104dbaaf478da81fa5e01b94b34dec4d3b055cdf7c8e1b2429a2f772e72173a109245cd WHIRLPOOL 29e13fea6a3742f383ad83407476d83b8f2469c12e587e2f81e2621cddc65566f31be3614e4269aa253fd33774179b583a7f331ee13ed9ec341d698c5f930940
+MISC ChangeLog 19554 SHA256 65316c3aa1b7306ae624516641949a3b9e2a319190b5a0f64b726069ba4da9f2 SHA512 1292ead86d45e947dba8088721b20946b928123ba5e29029fb9a25956838c9ac5801b6628dfae016a04339c3e3688bef7a2fad75c3c4994bbc221d376f26378f WHIRLPOOL 08dff49f00d3f8a474e25ac405199ef008e9ebc2e80b63d0dabdfb71d157144f59e88cca24d61a75b2c4c5839bdd479dd1943bde40214b6f6c7261ae6668736f
 MISC metadata.xml 874 SHA256 b4601d52556db214f080e217b8ba86b0a9f9eda360fbb334d2a32f7399f432d3 SHA512 1c4ff452971777a3c64ba53b4c013aa92b8962f1e62f3ead43468da88fa8bc5e330226cfd2c5cc6e9fa0ab94b756dfff43bb0086cceea8a622a22c5dfec8cf6d WHIRLPOOL f1891ef7eb11b751d8550bc7f26d1233b1c0e589f27dc838f94242174b11501f0296c165bbdba5e005064837a079fd433aefcaab9ffe4713acdd012821425e07
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRXKnjAAoJEDYO1FT4VRUUdgMP/itJzL1uXbzhcon+ZFeqPFu8
+H1SNOCy1uM6BBkupNCjGto1GA11IQ1U9fOjEfg5ugUpqOfAu/nu71fgk+P5TRm+B
+bSd51voDXOABQ32phwJ3Bn8SsMzpkPUtq4PiHoSkt2+AqS7Qh1uk+Oq/lNrQ9IhU
+MPvfmfH1/TYDwHboPYZE28yGUVculumfpxm+Xg+p77T7L/qIlkAj6woY+/m5mgk8
+y96gMFkyYEwdSn3WlhG+H+Qu9092/Gzg6ErywQeA/m33J+5cErDsRS9JbIMBIaw3
+qPAYI16lPhOYO4lqCz3AokIcfL34ghfZwzmd7sd/v/gvDhbteVJ+c5tMWeLeh4Ta
+MLyvqJkkTbHFMETjtug3NRO/k9KZ6IiOyK0nfTN5d8E1pA+zdUzRqABqTyCcN9F8
+yJAWSdVL2hUPYcRL6PjcYSENdseHpe0dy7mwl8fc5qJCA1u4mvKMupuHnGUwKJyf
+L5OjBOO++UCA5nibwozYBDJDoc/agfya0ElPenQuVyBPz3U6i8fwELilrO/DmNTJ
+DZihRo7H7iDbov7MoSBQ/jMJDdf0QV4zwTslKiyVSFzocWgaaC4mCpmZNbykASR1
+jOdvCkLSZAvkMNmdQidfFRu1PviUTBnOGa1zqVYEGZ7pXRFKHursnJmYvCWK5Ggx
+V4LYectdiiTNk9M+svQs
+=t+BW
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/files/ibus-1.5.1-use-system-keyboard-layout.patch b/app-i18n/ibus/files/ibus-1.5.1-use-system-keyboard-layout.patch
new file mode 100644
index 000000000000..56d99a0b9478
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.5.1-use-system-keyboard-layout.patch
@@ -0,0 +1,85 @@
+diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
+index dbb6da8..54ccb4c 100644
+--- a/data/ibus.schemas.in
++++ b/data/ibus.schemas.in
+@@ -224,7 +224,7 @@
+       <applyto>/desktop/ibus/general/use_system_keyboard_layout</applyto>
+       <owner>ibus</owner>
+       <type>bool</type>
+-      <default>true</default>
++      <default>false</default>
+       <locale name="C">
+         <short>Use system keyboard layout</short>
+ 	    <long>Use system keyboard (XKB) layout</long>
+diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
+index 24e6b2e..18ef5c0 100644
+--- a/ui/gtk3/panel.vala
++++ b/ui/gtk3/panel.vala
+@@ -48,6 +48,7 @@ class Panel : IBus.PanelService {
+     private Gtk.AboutDialog m_about_dialog;
+     private Gtk.CssProvider m_css_provider;
+     private int m_switcher_delay_time = 400;
++    private bool m_use_system_keyboard_layout = false;
+     private const string ACCELERATOR_SWITCH_IME_FOREWARD = "<Control>space";
+ 
+     private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
+@@ -265,6 +266,22 @@ class Panel : IBus.PanelService {
+         }
+     }
+ 
++    private void set_use_system_keyboard_layout(Variant? variant) {
++        Variant var_use_system_kbd_layout = variant;
++
++        if (var_use_system_kbd_layout == null) {
++            var_use_system_kbd_layout = m_config.get_value(
++                    "general",
++                    "use_system_keyboard_layout");
++        }
++
++        if (var_use_system_kbd_layout == null) {
++            return;
++        }
++
++        m_use_system_keyboard_layout = var_use_system_kbd_layout.get_boolean();
++    }
++
+     public void set_config(IBus.Config config) {
+         if (m_config != null) {
+             m_config.value_changed.disconnect(config_value_changed_cb);
+@@ -278,9 +295,13 @@ class Panel : IBus.PanelService {
+             m_config.watch("general", "preload_engines");
+             m_config.watch("general", "engines_order");
+             m_config.watch("general", "switcher_delay_time");
++            m_config.watch("general", "use_system_keyboard_layout");
+             m_config.watch("general/hotkey", "triggers");
+             m_config.watch("panel", "custom_font");
+             m_config.watch("panel", "use_custom_font");
++            // Update m_use_system_keyboard_layout before update_engines()
++            // is called.
++            set_use_system_keyboard_layout(null);
+             update_engines(m_config.get_value("general", "preload_engines"),
+                            m_config.get_value("general", "engines_order"));
+             unbind_switch_shortcut();
+@@ -352,7 +373,9 @@ class Panel : IBus.PanelService {
+             return;
+         }
+         // set xkb layout
+-        exec_setxkbmap(engine);
++        if (!m_use_system_keyboard_layout) {
++            exec_setxkbmap(engine);
++        }
+     }
+ 
+     private void config_value_changed_cb(IBus.Config config,
+@@ -380,6 +403,11 @@ class Panel : IBus.PanelService {
+             set_switcher_delay_time(variant);
+             return;
+         }
++
++        if (section == "general" && name == "use_system_keyboard_layout") {
++            set_use_system_keyboard_layout(variant);
++            return;
++        }
+     }
+ 
+     private void handle_engine_switch(Gdk.Event event, bool revert) {
diff --git a/app-i18n/ibus/ibus-1.5.1-r2.ebuild b/app-i18n/ibus/ibus-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..59a65b0cd51f
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.1-r2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.1-r2.ebuild,v 1.1 2013/04/03 22:14:52 naota Exp $
+
+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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+# USE=vala is temporaly removed due to fix patch:
+# ${P}-use-system-keyboard-layout.patch
+IUSE="dconf deprecated +gconf gtk +gtk3 +introspection nls +python test +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_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
+	vala_src_prepare
+	epatch "${FILESDIR}"/${P}-setup.patch \
+		"${FILESDIR}"/${P}-queue-events.patch \
+		"${FILESDIR}"/${P}-use-system-keyboard-layout.patch
+	cp "${S}"/client/gtk2/ibusimcontext.c "${S}"/client/gtk3/ibusimcontext.c || die
+}
+
+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 X xim) \
+		--enable-vala \
+		${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
+}