override mantainer due to bug inactivity after 1 year, standardize to gnome2_query_immodules_gtk{2,3}, fix bug #413501

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

3 files changed, 18 insertions, 51 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 1a291d03d99e..c30b7a78b01c 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.63 2013/04/15 02:21:22 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.64 2013/04/21 10:04:51 lxnay Exp $
+
+  21 Apr 2013; Fabio Erculiani <lxnay@gentoo.org> fcitx-4.2.5.ebuild,
+  fcitx-4.2.6.1.ebuild:
+  override mantainer due to bug inactivity after 1 year, standardize to
+  gnome2_query_immodules_gtk{2,3}, fix bug #413501
 
   15 Apr 2013; Naohiro Aota <naota@gentoo.org> -fcitx-4.2.1.ebuild:
   Drop old version wrt #450696
diff --git a/app-i18n/fcitx/fcitx-4.2.5.ebuild b/app-i18n/fcitx/fcitx-4.2.5.ebuild
index 5366fb8a806f..a415e218ee67 100644
--- a/app-i18n/fcitx/fcitx-4.2.5.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.5.ebuild,v 1.3 2013/03/02 19:26:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.5.ebuild,v 1.4 2013/04/21 10:04:51 lxnay Exp $
 
 EAPI=4
 
-inherit multilib cmake-utils eutils
+inherit multilib cmake-utils gnome2-utils eutils
 
 DESCRIPTION="An input method framework with extension support"
 HOMEPAGE="http://www.fcitx.org/"
@@ -52,25 +52,6 @@ DEPEND="${RDEPEND}
 	x11-libs/libxkbfile
 	x11-proto/xproto"
 
-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() {
 	cp "${DISTDIR}/pinyin.tar.gz" "${S}/data" || die "pinyin.tar.gz is not found"
 	if use table ; then
@@ -106,8 +87,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	elog
 	elog "You should export the following variables to use fcitx:"
 	elog "  export XMODIFIERS=\"@im=fcitx\""
@@ -117,6 +98,6 @@ 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
 }
diff --git a/app-i18n/fcitx/fcitx-4.2.6.1.ebuild b/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
index d1688f0327de..e20bf431777f 100644
--- a/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.6.1.ebuild,v 1.4 2013/03/02 19:26:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.6.1.ebuild,v 1.5 2013/04/21 10:04:51 lxnay Exp $
 
 EAPI=4
 
-inherit multilib cmake-utils eutils
+inherit multilib cmake-utils gnome2-utils eutils
 
 _en_dict_version=20121020  # see https://code.google.com/p/fcitx/downloads/list
 
@@ -57,25 +57,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-proto/xproto"
 
-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() {
 	cp "${DISTDIR}/pinyin.tar.gz" "${S}/data" || die "pinyin data file is not found"
 	cp "${DISTDIR}/en_dict-${_en_dict_version}.tar.gz" "${S}/data" \
@@ -119,8 +100,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	elog
 	elog "You should export the following variables to use fcitx:"
 	elog "  export XMODIFIERS=\"@im=fcitx\""
@@ -130,6 +111,6 @@ 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
 }