Use query-immodules from eclass to inherit fixes and changes from there

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

12 files changed, 81 insertions, 313 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 755ead1c1834..dd7229433118 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.261 2013/04/06 02:45:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.262 2013/09/07 08:10:08 pacho Exp $
+
+  07 Sep 2013; Pacho Ramos <pacho@gentoo.org> uim-1.7.3-r1.ebuild,
+  uim-1.7.3.ebuild, uim-1.8.0-r1.ebuild, uim-1.8.0.ebuild, uim-1.8.2-r1.ebuild,
+  uim-1.8.2.ebuild, uim-1.8.3-r1.ebuild, uim-1.8.3.ebuild, uim-1.8.4-r1.ebuild,
+  uim-1.8.4.ebuild:
+  Use query-immodules from eclass to inherit fixes and changes from there
 
 *uim-1.8.2-r1 (06 Apr 2013)
 *uim-1.8.4-r1 (06 Apr 2013)
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index a655e63ece78..5e534467d95a 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -13,32 +13,22 @@ DIST uim-1.8.0.tar.bz2 6453678 SHA256 bf760f51b37e4d3a2c960357faea2ef52d1bb7ee06
 DIST uim-1.8.2.tar.bz2 6480613 SHA256 44c2003179291b3279dae7f911d638418a54910f2b99e58418acc88e10067835 SHA512 4433db6913611c753c896e89c79880b87bc55cf0888eefbc76f04e72f8b4d0bf3a97e355e9beeeb51f6dabdbeafaf575399562585b44717a660b8efac9ae80ab WHIRLPOOL 0b089785a5e0b12abbeb6edf7cb5dce162e15e1fef8ea17475511d0a95f733be616bf00dc2cebc6833dc611c31655d1ef5c5c584325ecf0160cbaf4f48a871cc
 DIST uim-1.8.3.tar.bz2 6493892 SHA256 e701e01c3b75512de9ae5b451bdb0a5f49bb444186c31cd5a1ab4fbaed4b3b6e SHA512 28e7207ada6b12ee56017a620b6ebf03ce3eb02ebceec79f43236caf0bce4c3b6508c4d4c2cc3d1705b77d1033a3b47a0c9d0d0d78005217acb4b6ce8ee6bb99 WHIRLPOOL 33acf600f7f6126a04ac2cb1139e28cf1b3e47bc409822016b20f5dce8aa5ca04c8d44ac5985bf864f0fb451748df049077e221dd2d3456f520dbd4e4352a11a
 DIST uim-1.8.4.tar.bz2 6494902 SHA256 16541b9dfe7e5b0f6c06d9b07a19e6b03de2d1dcee4669f8525e48dc552d683f SHA512 b804757f07f44212c0fbb494c2591536cdafd223fd12cce21da68c1273d14eb7156d4186eb96a3969edfc76cfb448d96cf45a9f7d59bd1dbf4c5faac754d95b7 WHIRLPOOL 5bc6a5ed58a140585089c697a54d8bdb5be52888f5c54fe46314e039094d7706814c4e43f64ce373b280e7790c8d851e5b0946ba5dcbb255c248dbd5ec28e060
-EBUILD uim-1.7.3-r1.ebuild 7730 SHA256 002b9bf62dd0e14c092e65ca554c74b808a17a2bdee031c3d6a5ca05c39b1e16 SHA512 3c7cdefe09a9e891f4d650ffe82fd122b549b60895d4553e287c9bc7f2ae6e2be8c62a74d4f421917c278363771fc1286f9092e483963c6cef2ab9de3fc6a8a1 WHIRLPOOL 7b7cee5671595665ad0ea3fb7b108f2f54740a9a389f08e36282090674f16fd0804054f070ab1ee733d4ff4142d4426488f29d8a9363ff509fd4fb7028ecaea7
-EBUILD uim-1.7.3.ebuild 7549 SHA256 02fde92ff08c883ed4c646b95963c38ab79fc413074544ba69ae5ec087b3e75e SHA512 bb73e6348606ca5928585a524e2f3d779b5db547657d993a01eb377702d84541bedbcb9fc4ed3a5cfcc4a452a8cda8b0bfc2f6ae9faedc233b07bc185bbc308e WHIRLPOOL d5377009c79b44778ee53cbc46439bc22a4ec8994a59171d67d148e17e2330bbfcb498623dda1f83093357e600361904e3b465d65ac73c04ca3d5dafd48dd550
-EBUILD uim-1.8.0-r1.ebuild 7166 SHA256 81313268b7d4fdf72f16e5f200f9fc91e89979680754ea79a1f2b45c3d87f98b SHA512 b83c2aa554bc6970f332134df426dab81011a6a69d1ad5ed3e53adf4130aac209d146209939b554ac0ae70a0cab1a1b366610e2058732cf57b895544089dc972 WHIRLPOOL 5b5cbce1492ed6f495690f22d10a423c024233043f3a19d3e15fa5466a9815ffd3893bb16d35606f6bd14b7f58024bee2af1025554a93adf2f0b14b243f2a9c4
-EBUILD uim-1.8.0.ebuild 6985 SHA256 b8c30116c615249168969b9ff7acea6c1a3b60def389b9b1d4f39b0464b828fc SHA512 d3506efad3878d03a0ec4506aebd388c31acf992fccd06ea59593ae16f43458dbab8274bd199e22bf6398ea0514ef8129083a9b8d6a22bed9088060964bd8903 WHIRLPOOL c17d070b8abc48d4bdf67a0b5a09c3d022ac8156e32498b5dfcf56faa6ec49522d98cf653e05d35223fc589e1f0403da5230b654126f36ffb206484095cd20c3
-EBUILD uim-1.8.2-r1.ebuild 7121 SHA256 46f7922d951c268f8ccaf064f6147582b2b2a366e04235a13b924e29ca545371 SHA512 4209905292cdb621ce2875843e5d7a0f645f9879d78e76f0d8830453fa0387e3158e9bf37516f50d95c5ffe4716d6c379b7b33b9b53fb00b651cdd4a7fe2394a WHIRLPOOL 71e3bd777e304ad7a6eb5c0dc24a5c8698d0bbd8f75a4dcbd48eecbb071d5e13f68e14b767fe2e1cd37a369fdbacb3a65b21dd256a42122b1a471ae07d757416
-EBUILD uim-1.8.2.ebuild 6944 SHA256 b3be5cc3b31243b6f56fd6345dbb7fda5ef65b13996544d4837a9acb21a0e80e SHA512 522357acd54c233618862fb4523ed0dcf0bb33b70b20f07a92bac56b62660200245896cfa4a2c21b2b45bb0dba5f509438b120f6463270d81b7f184d3aaf926a WHIRLPOOL 4b771946a0787766934d34a767d8fdab114071744eda3126bd7d559a5730c87756a59512310bc868ac0b7781999d6f5b2c077e4e433d9f8dd3fa4b13c50c7d14
-EBUILD uim-1.8.3-r1.ebuild 7122 SHA256 8cd490d91df38a163671b87869caba92f0845ef08b2fd9502c2fb44a0ec87808 SHA512 9c86865e51ef34b6def7d2efd483d5b399ded79c0668772a8be21a5a4b7e8305a84a004cd32ad83982414a06f536a21cb7f0b280afd18b846c4df4a796f577dd WHIRLPOOL c9d7cb8b36d7dc60a8add27092e4ef890fc7eaa2d9fa1fcccf9a531a75c2708778476d649196b0bed18bb7e64a1d64421ce6cb2b372e3aeac710f43e5c5efe49
-EBUILD uim-1.8.3.ebuild 6945 SHA256 413c1f8ae1a5e715611aa135be9a66fbdb4859d930c27b92722677ebcdfdfbd5 SHA512 f811a080e440157659e1cfa2296ff4cedb2bb40f6be51214af78eae8886016816a1dfac9e994c66f962b2b140cd1adf84a2fad263245248cd44c7d310853930a WHIRLPOOL 23b528cec8d1c8ade4ee155e5c185b97f89f8bedeedf4e720205198a3c1878dafcf3c794f459f09c023c371942956646bfeb8f2ee07e4a751a088ef4c8d7cea5
-EBUILD uim-1.8.4-r1.ebuild 7122 SHA256 b87c7bb56697425cc1c7f1632411e3ddda720aeb8c80ab1deb82a5aff3c2091d SHA512 9bfdc6f68b44c5f1ba4d4cda85014850de68cb4cc1afc5d78e7c7c1c8423c921fbb6670605547c0e083e65f8e6034616cb6894e7e9f49830aab0b6dcbbe58d13 WHIRLPOOL d4a8f9a2739457aeb7a7c29ed459f7418482b56245d507079c7ea93242d68fb0a6927dd0f62e4ab218b79cdb6f82d07a206124aef2a547e15624e902dba88248
-EBUILD uim-1.8.4.ebuild 6945 SHA256 02a0518d44b6ce6e335259e9e9e594de5074a6cc716e392a8f793c14146d23b1 SHA512 c11b279697915970a6694400a62640a0e9d7cd43f09a396711043b910e81b5350ec40cb9e48ea0f41b6634bcb8d4ec9ffe87ce98294fb6dafba8971864cbfbb7 WHIRLPOOL 3e04ecd15f835d87b9de4bbfc528dfc34c0178c3af01a980d740c0544591f3d227626c20d67eea8d95e281a137774daa70cf2caf3c5f74e5276da4ff02543953
-MISC ChangeLog 37576 SHA256 6cfb7b672d70565e7ea61e1542669d2c4e759c851811ff7f416dbb6d6ef20f29 SHA512 2d192ae2036bdc74d606e0217ff0db76d15a357be25c1ff84df433a3cb5af97e55eea3b0e75a5c865fc1befe729f866f3257c1a1a88628003ac2b85e6a971607 WHIRLPOOL 601df859215e48484060ec87fb70922573a89d05890e85b33492d99c170d7173986c3341436f837ccbd3dec6a60ebbee81f3c3a8d5ad8762f1b9b9524b7381e7
+EBUILD uim-1.7.3-r1.ebuild 6732 SHA256 9f33d20dfc87f63d94af64866ca6c7202f275448ba0cd8b5e3e0e9d272410956 SHA512 70b58bc5d28346975aa1420b48388851c18cc21cacccf4f9ff7d1a8bd938b32e8039a851afc8907206b230e7391f8a45f2cfedff451873ba3ae9e87b1f500704 WHIRLPOOL 47f89c5039e5808d2ea7bb73994608873769fed1cb25bff6bff0a2f99fdb5a53a47a1457676001028e9565a11418cda69387c8e1d64abb7c8139a29f39e9314d
+EBUILD uim-1.7.3.ebuild 6548 SHA256 69c23c3c65ab250c2f1f16102b3c57ac6f536ebd3d7fe23a3fcc22013ae0e3fc SHA512 d726b5fdbb14c46b5d95984f21d0f2ddb6ed155a87f4a6bfa6565a0a4676f9cb6739b186ea6d848cbe9654af3e8ba4561f537c3fd965a71e4abab405dd0e7ada WHIRLPOOL ab6f89ac797f8890597069e46b53e75487ee133bb88dd94abf7f8ef730c7645829341827f1be07e04ee6bf92694caba50ced8e65a5ed558612b4dcc9b31f3b63
+EBUILD uim-1.8.0-r1.ebuild 6641 SHA256 0bde1ee7475e64033e3762e05c388f0bae598859fef8450de401b8e6ce39a312 SHA512 9e70311d504199a410a29a22c831ec5401274ca9c35c89a5f726c998bb52a260a7b7350ac028f4ecfc73128a962cdedccde2449c4302a58c663dbd10035d2da5 WHIRLPOOL 5316cbf2e9440735aeddd6c472544d2927f5a445e9a4bc72e0128cbb9f865d6b00cef8def133fa153925714bef7eb542dfb0c8daeca695437e807c095df93bba
+EBUILD uim-1.8.0.ebuild 6457 SHA256 d21c3cdda5f94c06eeb9b5894a195492f013be3fc7a86dd531a2101347189a8f SHA512 8d907d6245caf7a19f071d72a62c1e9ef435c847d1ce4ac600f5f71fa76fd3938712f844d13c870295ba47d8f617c69d61642e379e61829ac7ae4a56d92433ff WHIRLPOOL 7babb044f7f6bf4cbfde48fb5f83a64d77ddd5ecba6e15fcaadf950342ee3c68d327316001d6d45be2a99ab685905ee3ed985dedc52d5a8313d143e70312545c
+EBUILD uim-1.8.2-r1.ebuild 6596 SHA256 79866a92ae9041e024c118ed80f96c97af3d04171cd9302d6defce1d84608080 SHA512 877b97de2e1ffc3f553ba108efe078f8e2d8ff31b9dd71362c0c66cf04cf559ba099ea44d602e9b6eedec0619cbf5f74117ce8a28f290a1c6a5cfaa17db534e5 WHIRLPOOL 16f0a273410503a90a4a3499080d7b8c0dc23fec89b4ff1c8788dc8f57fe6706529a6fee64e15ae79bfb8e3233aed1b57aa4362a8a83def868748fdd89b77bf2
+EBUILD uim-1.8.2.ebuild 6416 SHA256 4be9c315b3f939a6754639efaabde9780f84cffc51e051c22e136c3fdadd8b15 SHA512 6d18d5c8fc312cabd45f7b1aa1f8c5495bfb90d57a6898020ecfa2f7bdbf6f8521090ac53e9a62c9a79b8c7067b91b8f959b0e9d3f2dc8f71e3098b0179c3f7d WHIRLPOOL eeb38dd840b794c5792ba4e9e41187427c93e303cf45d1ade174c3ef4542aa6784e6c630d301ad63ae0da54904112412afd714ba05901ccac273b8edab32c3e2
+EBUILD uim-1.8.3-r1.ebuild 6597 SHA256 0ac7195505e46b026efb012659c58d686eaa62e5fdcd6a536fe6129c351fb8b3 SHA512 c44990e13e1dd36942d7292b401cf7aa9a0978d489f2821d8ab2ff4ddcecf906cb60d1e195362659df4e3c7d941f16f2f436bfa9280ff41b263b0c86ec3b95df WHIRLPOOL a05f1c3fa202581107a3642629e3004cf05e16936031f8cb0db187b304c4daa9831b6c9c45ba65f066aaf398dd23187ac3b8140701ab76326a14ba530b4d7940
+EBUILD uim-1.8.3.ebuild 6404 SHA256 48864759438d8ecfbd78aebd907f1fc550bbcc630e5cc0ad88744578630d18bf SHA512 3882816bc1917fca19aa3767a2f058cebe5c423ef51b5eefec47f2f73f0679bd43df177649f9103af6341f8b5b6f578d0816756b0909e0fd489d25ea7f295e4c WHIRLPOOL fe18d8383b65fb2806d6eda43f6d9a7f0befd88c72c4aaf3b48e81f50c524b500ba681aa60721a7bc735a914404feeaa0b9ef6b144f7dd9996d027008467ca04
+EBUILD uim-1.8.4-r1.ebuild 6597 SHA256 0b77292b4d1eba5b7bd6696879e0b6dfe3958911e095c70d26c429d2441230a9 SHA512 b2f298f9df4c5a0f783f04fedc0e17f9e27f356cab0086e59aa2f398b02f35882af48fd61ae0e5ed6c7248329976f39e10616eb43122f18e69d4cbadfcc029dd WHIRLPOOL ded85e7202cf2d7325edea4182679d33317de02bf03d2facdb691048243248786e5525bfc73d2c41eda6a3fa138c788a4a54e36b9a201b5f4d0f18838a482b35
+EBUILD uim-1.8.4.ebuild 6417 SHA256 9ba590dcce9d3a1e6583942332d56d102301fcd67ae848ac0d12fec18776629d SHA512 41594efade946b61ba9e23d9af6d8a53976ad033d6206b6b02928edee54b8d55e4bb4748f574e9de36140963d47f8ef2a48de774b4b71a88c88a9b495d18081e WHIRLPOOL 4abd141f49f91a6ba68a48e7138d32c3c7b73820eac3b00650fffc523811b13a1b0c47065c22887f3920ea45f35331dbba29e9bad062def553bb82d0a0795945
+MISC ChangeLog 37898 SHA256 7b054cb8d2d2b82d1c17f566b37c9cbefdbf86989d5f57340b688e87f59538eb SHA512 09d5ddee74bed32642f93cb643fb67c3ea5609cabaf70f9847d67a422a9000d12f09299a4c60475da2e023363f66f6b81e770704f28825795c9addafd4918b31 WHIRLPOOL 0905f2a591794392b76c3e5aa085979d84671cdbc2180774683b5fb73bd991852026be8d31ac10d0ee66932447c1c256bcafe2e135389b715d6e0c7892d6b7ac
 MISC metadata.xml 963 SHA256 f9ec0fb753307e61a6e6cc5381e41344f34fe4d774ec12d61063077e803c2a8b SHA512 07cbf037403887aee2402e27d9592e68ace684664305c215f21f480faa094faf66b7d8fdcf5977e22ced8bf19d7d88f6b5f96a8327d1c57580d1b0743cb9a5cd WHIRLPOOL 81fca7c8cea972c45b00b221b583b41bfb535ab2823f7f5d554d8c5f953d34807465797c814434149f7274f760d9718d36d8f561d21e8aba030fdb0cab600be3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRX4xOAAoJEDYO1FT4VRUU8H8QAIw1H8F5cbCNUbYK5L7TrLNt
-SkqGF2yDUJLtbFGVBKgezBZanCEr+Q/NqEBVPHOaBUG9m6I9AZpimPdW3Sb6ApEP
-QIJODE9VCXIQRQdu6LQ1izbT/nffBBVQxz8tq+xYOEpbUvKpk93XN2NzQ+p6CfQZ
-r036VvZcy6Nv6Nxs+zwNspwi+vol6aoAQMusBzm9XcjXYLFED521q+WrPoNrG5AA
-oY97cLKHjYfqGEsWqfrWl270ls7iiNRrZlev9GALDC4GtV02AF7Yscy5CC4YWvyO
-L1chz2pMXEaziT78iZkArD71xkogQAeS3ZtKJwbmWjDiySAlPDwIQ+nyM8261x0D
-ynresSLwJhz+tK66xDsf5GzeyJk2dyk7D8bAyNmXfnEF+tj8egXVwz8r+icndQIz
-2ZeS26C0ake2zFWssBiu3/8thZb19IvQ1xOg9lgvkonF9DF6YkjSo0CjC0VE5OU3
-6oaasLxw/PiGjBV68/m9ICoMcNkwPxWJtbvF37asjVNU2RQnVHvHI0lUST0BFUkJ
-zBCczU+5kx/o2zVPh2xFEIxJ7Pd/bvOq/rCxDtGg9FgACKoZcANxyM/FTu6cmsGc
-3esJcU6X9g7L0mkVK1Qklfa3f3jRwdkny5j4C2yNTMeFxexqojdUM5rVfM1wmfiq
-f8o+gH6hAIhPALnj/Rh6
-=LfGv
+iEYEAREIAAYFAlIq32IACgkQCaWpQKGI+9R5AwCaAvtqNchwd2gMlrEubEEZEzu9
+HDYAn3YsCHaKS3ABaGcLErO/7evIYGP3
+=XfR/
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/uim/uim-1.7.3-r1.ebuild b/app-i18n/uim/uim-1.7.3-r1.ebuild
index 1a3d9235e560..09e64cf2b9d6 100644
--- a/app-i18n/uim/uim-1.7.3-r1.ebuild
+++ b/app-i18n/uim/uim-1.7.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3-r1.ebuild,v 1.2 2013/09/07 08:10:08 pacho Exp $
 
 EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -92,44 +92,6 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-gnome2_query_immodules_gtk2() {
-	local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
-
-	local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
-	local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	local gtk_conf_dir=$(dirname "${gtk_conf}")
-
-	einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
-	einfo "-> ${gtk_conf}"
-
-	mkdir -p "${gtk_conf_dir}"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "gtk_query_immodules: cannot create temporary file"
-		return 1
-	fi
-
-	if ${query_exec} > "${tmp_file}"; then
-		cat "${tmp_file}" > "${gtk_conf}" || \
-			ewarn "Failed to write to ${gtk_conf}"
-	else
-		ewarn "Cannot update gtk.immodules, file generation failed"
-	fi
-	rm "${tmp_file}"
-}
-
-update_gtk_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		gnome2_query_immodules_gtk2
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 pkg_setup() {
 	strip-linguas fr ja ko
 	if [[ -z "${LINGUAS}" ]]; then
@@ -272,8 +234,8 @@ pkg_postinst() {
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
 
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -286,7 +248,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
 }
diff --git a/app-i18n/uim/uim-1.7.3.ebuild b/app-i18n/uim/uim-1.7.3.ebuild
index ddaa59edb11b..58f4b6e610c4 100644
--- a/app-i18n/uim/uim-1.7.3.ebuild
+++ b/app-i18n/uim/uim-1.7.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3.ebuild,v 1.11 2013/03/02 19:29:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3.ebuild,v 1.12 2013/09/07 08:10:08 pacho Exp $
 
 EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -92,44 +92,6 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-gnome2_query_immodules_gtk2() {
-	local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
-
-	local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
-	local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	local gtk_conf_dir=$(dirname "${gtk_conf}")
-
-	einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
-	einfo "-> ${gtk_conf}"
-
-	mkdir -p "${gtk_conf_dir}"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "gtk_query_immodules: cannot create temporary file"
-		return 1
-	fi
-
-	if ${query_exec} > "${tmp_file}"; then
-		cat "${tmp_file}" > "${gtk_conf}" || \
-			ewarn "Failed to write to ${gtk_conf}"
-	else
-		ewarn "Cannot update gtk.immodules, file generation failed"
-	fi
-	rm "${tmp_file}"
-}
-
-update_gtk_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		gnome2_query_immodules_gtk2
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
@@ -263,8 +225,8 @@ pkg_postinst() {
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
 
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk2
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -277,7 +239,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
 }
diff --git a/app-i18n/uim/uim-1.8.0-r1.ebuild b/app-i18n/uim/uim-1.8.0-r1.ebuild
index 5d8f27c87734..22bea804756d 100644
--- a/app-i18n/uim/uim-1.8.0-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0-r1.ebuild,v 1.2 2013/09/07 08:10:08 pacho Exp $
 
 EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -92,25 +92,6 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 pkg_setup() {
 	strip-linguas fr ja ko
 	if [[ -z "${LINGUAS}" ]]; then
@@ -250,8 +231,8 @@ pkg_postinst() {
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
 
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -264,7 +245,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
 }
diff --git a/app-i18n/uim/uim-1.8.0.ebuild b/app-i18n/uim/uim-1.8.0.ebuild
index d3502c733303..ad98cee7d103 100644
--- a/app-i18n/uim/uim-1.8.0.ebuild
+++ b/app-i18n/uim/uim-1.8.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0.ebuild,v 1.10 2013/03/02 19:29:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0.ebuild,v 1.11 2013/09/07 08:10:08 pacho Exp $
 
 EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -92,25 +92,6 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
@@ -241,8 +222,8 @@ pkg_postinst() {
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
 
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -255,7 +236,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
 }
diff --git a/app-i18n/uim/uim-1.8.2-r1.ebuild b/app-i18n/uim/uim-1.8.2-r1.ebuild
index bc324a7e2828..859c1178baa6 100644
--- a/app-i18n/uim/uim-1.8.2-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.2-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.2-r1.ebuild,v 1.2 2013/09/07 08:10:08 pacho Exp $
 
 EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -92,25 +92,6 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 pkg_setup() {
 	strip-linguas fr ja ko
 	if [[ -z "${LINGUAS}" ]]; then
@@ -249,8 +230,8 @@ pkg_postinst() {
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
 
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -263,7 +244,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
 }
diff --git a/app-i18n/uim/uim-1.8.2.ebuild b/app-i18n/uim/uim-1.8.2.ebuild
index 6a3ab9b8c159..d462898a2a31 100644
--- a/app-i18n/uim/uim-1.8.2.ebuild
+++ b/app-i18n/uim/uim-1.8.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.2.ebuild,v 1.2 2013/03/02 19:29:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.2.ebuild,v 1.3 2013/09/07 08:10:08 pacho Exp $
 
 EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -92,25 +92,6 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
@@ -240,8 +221,8 @@ pkg_postinst() {
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
 
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -254,7 +235,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
 }
diff --git a/app-i18n/uim/uim-1.8.3-r1.ebuild b/app-i18n/uim/uim-1.8.3-r1.ebuild
index 8ecbf16d85db..1c28320406db 100644
--- a/app-i18n/uim/uim-1.8.3-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.3-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.3-r1.ebuild,v 1.2 2013/09/07 08:10:08 pacho Exp $
 
 EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -92,25 +92,6 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 pkg_setup() {
 	strip-linguas fr ja ko
 	if [[ -z "${LINGUAS}" ]]; then
@@ -249,8 +230,8 @@ pkg_postinst() {
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
 
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -263,7 +244,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
 }
diff --git a/app-i18n/uim/uim-1.8.3.ebuild b/app-i18n/uim/uim-1.8.3.ebuild
index 92571f5427bb..9e4f46b946e8 100644
--- a/app-i18n/uim/uim-1.8.3.ebuild
+++ b/app-i18n/uim/uim-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.3.ebuild,v 1.2 2013/03/02 19:29:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.3.ebuild,v 1.3 2013/09/07 08:10:08 pacho Exp $
 
 EAPI="4"
 inherit autotools eutils multilib elisp-common flag-o-matic
@@ -92,25 +92,6 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
@@ -240,8 +221,8 @@ pkg_postinst() {
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
 
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -254,7 +235,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
 }
diff --git a/app-i18n/uim/uim-1.8.4-r1.ebuild b/app-i18n/uim/uim-1.8.4-r1.ebuild
index 4e778e51ff13..63d521900cda 100644
--- a/app-i18n/uim/uim-1.8.4-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.4-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.4-r1.ebuild,v 1.2 2013/09/07 08:10:08 pacho Exp $
 
 EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -92,25 +92,6 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 pkg_setup() {
 	strip-linguas fr ja ko
 	if [[ -z "${LINGUAS}" ]]; then
@@ -249,8 +230,8 @@ pkg_postinst() {
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
 
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -263,7 +244,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
 }
diff --git a/app-i18n/uim/uim-1.8.4.ebuild b/app-i18n/uim/uim-1.8.4.ebuild
index 4ff223c965d7..1eead6b0cf73 100644
--- a/app-i18n/uim/uim-1.8.4.ebuild
+++ b/app-i18n/uim/uim-1.8.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.4.ebuild,v 1.2 2013/03/02 19:29:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.4.ebuild,v 1.3 2013/09/07 08:10:08 pacho Exp $
 
 EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -92,25 +92,6 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
@@ -240,8 +221,8 @@ pkg_postinst() {
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
 
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -254,7 +235,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
 }