override mantainer due to bug inactivity after 1 year, standardize to gnome2_query_immodules_gtk2, fix bug #413519

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key ADC916E5)

4 files changed, 22 insertions, 37 deletions

diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index 7c3d2aa90633..b39f712a8832 100644
--- a/app-i18n/im-ja/ChangeLog
+++ b/app-i18n/im-ja/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/im-ja
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.68 2012/07/18 06:34:22 naota Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.69 2013/04/21 10:24:27 lxnay Exp $
+
+  21 Apr 2013; Fabio Erculiani <lxnay@gentoo.org> im-ja-1.5.ebuild,
+  im-ja-1.5-r1.ebuild, im-ja-1.5-r2.ebuild:
+  override mantainer due to bug inactivity after 1 year, standardize to
+  gnome2_query_immodules_gtk2, fix bug #413519
 
   18 Jul 2012; Naohiro Aota <naota@gentoo.org> +files/im-ja-1.5-pofiles.patch,
   im-ja-1.5-r2.ebuild:
diff --git a/app-i18n/im-ja/im-ja-1.5-r1.ebuild b/app-i18n/im-ja/im-ja-1.5-r1.ebuild
index 4d0f059878cb..130a6bd22ddf 100644
--- a/app-i18n/im-ja/im-ja-1.5-r1.ebuild
+++ b/app-i18n/im-ja/im-ja-1.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5-r1.ebuild,v 1.4 2012/05/03 19:24:28 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5-r1.ebuild,v 1.5 2013/04/21 10:24:27 lxnay Exp $
 
 EAPI="1"
 
-inherit autotools gnome2 eutils multilib
+inherit autotools gnome2 gnome2-utils eutils multilib
 
 DESCRIPTION="A Japanese input module for GTK2 and XIM"
 HOMEPAGE="http://im-ja.sourceforge.net/"
@@ -67,9 +67,7 @@ src_compile() {
 }
 
 pkg_postinst() {
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	fi
+	gnome2_query_immodules_gtk2
 	gnome2_pkg_postinst
 	elog
 	elog "This version of im-ja comes with experimental XIM support."
@@ -82,8 +80,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	fi
+	gnome2_query_immodules_gtk2
 	gnome2_pkg_postrm
 }
diff --git a/app-i18n/im-ja/im-ja-1.5-r2.ebuild b/app-i18n/im-ja/im-ja-1.5-r2.ebuild
index de6a573168b1..4efae85fa40b 100644
--- a/app-i18n/im-ja/im-ja-1.5-r2.ebuild
+++ b/app-i18n/im-ja/im-ja-1.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5-r2.ebuild,v 1.8 2012/07/18 06:34:22 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5-r2.ebuild,v 1.9 2013/04/21 10:24:27 lxnay Exp $
 
 EAPI="3"
-inherit autotools gnome2 eutils multilib
+inherit autotools gnome2 gnome2-utils eutils multilib
 
 DESCRIPTION="A Japanese input module for GTK2 and XIM"
 HOMEPAGE="http://im-ja.sourceforge.net/"
@@ -42,16 +42,6 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS README ChangeLog TODO"
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
-	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
-}
-
 src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch" \
 		"${FILESDIR}"/${P}-pofiles.patch
@@ -83,8 +73,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	update_gtk_immodules
-
+	gnome2_query_immodules_gtk2
 	gnome2_pkg_postinst
 	elog
 	elog "This version of im-ja comes with experimental XIM support."
@@ -97,7 +86,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	update_gtk_immodules
-
+	gnome2_query_immodules_gtk2
 	gnome2_pkg_postrm
 }
diff --git a/app-i18n/im-ja/im-ja-1.5.ebuild b/app-i18n/im-ja/im-ja-1.5.ebuild
index 5f0c907cb952..eb4724be3bdb 100644
--- a/app-i18n/im-ja/im-ja-1.5.ebuild
+++ b/app-i18n/im-ja/im-ja-1.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5.ebuild,v 1.14 2012/05/03 19:24:28 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5.ebuild,v 1.15 2013/04/21 10:24:27 lxnay Exp $
 
 EAPI="1"
 
-inherit gnome2 eutils
+inherit gnome2 gnome2-utils eutils
 
 DESCRIPTION="A Japanese input module for GTK2 and XIM"
 HOMEPAGE="http://im-ja.sourceforge.net/"
@@ -64,9 +64,7 @@ src_compile() {
 }
 
 pkg_postinst() {
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > "${ROOT}/$(get_gtk_confdir)/gtk.immodules"
-	fi
+	gnome2_query_immodules_gtk2
 	gnome2_pkg_postinst
 	elog
 	elog "This version of im-ja comes with experimental XIM support."
@@ -79,8 +77,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > "${ROOT}/$(get_gtk_confdir)/gtk.immodules"
-	fi
+	gnome2_query_immodules_gtk2
 	gnome2_pkg_postrm
 }