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

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

11 files changed, 66 insertions, 288 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/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
 }