Revision bump wrt bug 405459

Package-Manager: portage-2.1.10.48/cvs/Linux x86_64

4 files changed, 65 insertions, 18 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 7cb1dc7cd52a..fdca5d832367 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.37 2012/02/20 07:58:31 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.38 2012/02/24 01:49:21 qiaomuf Exp $
+
+*fcitx-4.2.0-r1 (24 Feb 2012)
+*fcitx-4.1.2-r1 (24 Feb 2012)
+
+  24 Feb 2012; Mu Qiao <qiaomuf@gentoo.org> -fcitx-4.1.2.ebuild,
+  +fcitx-4.1.2-r1.ebuild, -fcitx-4.2.0.ebuild, +fcitx-4.2.0-r1.ebuild:
+  Revision bump wrt bug 405459
 
 *fcitx-4.2.0 (20 Feb 2012)
 
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 44bfb82324ae..a3e9428a7f6d 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -10,7 +10,7 @@ EBUILD fcitx-3.6.3.ebuild 1563 RMD160 83cdd503486c77598ce10172ae1575c0884dd259 S
 EBUILD fcitx-3.6.4.ebuild 1573 RMD160 946658fe1ba68379152c07eafa47bceada90712b SHA1 9a54adca3b1bfca9a78ee6dbeffb37760386a4e8 SHA256 655d31389c09e1d09d548a68c0d33bc091f78a457a887b5579b994a828771a40
 EBUILD fcitx-4.0.0.ebuild 1427 RMD160 31a3f030da0d65d3f6dfc8ea8d773749f124a942 SHA1 1264f814ada2521e01de7130795cb21444349e87 SHA256 869d195c6a459fede2fd7138cd9dcadcea72f5370452ab8e57c21481d51ab027
 EBUILD fcitx-4.0.1.ebuild 1548 RMD160 5bf70b3f0e7a2a0332ed4d5c8eef5e09e55c4ffc SHA1 74e3c46ec6f88252df59705fcf9ac3471bc250ef SHA256 00993c64fe2af869264fb18131487b306f2e66f0bcc287c7c1e72e4d711fc030
-EBUILD fcitx-4.1.2.ebuild 1809 RMD160 f8c9e7deb892ce9f16d7611402f4b53fd0fb6952 SHA1 0e67f09bfb78055792b255a93e75479bcf41fa98 SHA256 723db77bf4f00d4c58aae80c2185b0e2a8111ff6564093deaaaa5d15707af410
-EBUILD fcitx-4.2.0.ebuild 1805 RMD160 fe9c40eb8e53960d629ab929a277829cf492c6be SHA1 5dc58fafbfce9367b684868ee0659f3635823cb1 SHA256 143870e8f2613d286fd17d7adc0bcf36e57c87cbd2e037802a78ed47061403b3
-MISC ChangeLog 5840 RMD160 135b767ca9282f3fd586fa78160c3ac67afd9100 SHA1 5dcc4f73245fa88ab8500e7ebbadf14dc5334f49 SHA256 df4f2ce95b66ced389cdac702f23ae904c1953226dbe0c06150133ef2dcccba7
+EBUILD fcitx-4.1.2-r1.ebuild 2284 RMD160 d3b3695fbf66359a25a42290f6853684975e7b69 SHA1 e45246b1f40c0fb8e87f94a4b72d8fd3e479eab2 SHA256 99a54b1b9ead6c201f45604ecf4391dfbf94e3a0d703377b0ada585bf0daf54c
+EBUILD fcitx-4.2.0-r1.ebuild 2280 RMD160 7f1a6163aa54c8a033eed0c80db4268bfffa3b65 SHA1 6108254b927668b98d7b12a185687dd635c6c079 SHA256 f64b7379a4107e17fcd446e492ba7b2e40534ac8d5b3ff21754bce9865aba9ab
+MISC ChangeLog 6069 RMD160 7a0dd1161b3aca9248a3cac82b499d1528306e99 SHA1 e6ec7b021e909d629b6f028d8910783f8f09141a SHA256 8835cd414bae81ba939e793bd6179fc06fb644860c95c0d7d6be687abd3458e8
 MISC metadata.xml 448 RMD160 22554cba014d588f3536765426c3414166120d62 SHA1 12732807d9e43918ba3a8243f4eaadfc59d9a603 SHA256 27f577d53217c8613ac4ae8ac4e99de2f95fc940affd77f64c204cb39e4535c4
diff --git a/app-i18n/fcitx/fcitx-4.1.2.ebuild b/app-i18n/fcitx/fcitx-4.1.2-r1.ebuild
index c55d8f54e68b..b5decad78fbe 100644
--- a/app-i18n/fcitx/fcitx-4.1.2.ebuild
+++ b/app-i18n/fcitx/fcitx-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.1.2.ebuild,v 1.2 2012/02/20 02:23:28 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.1.2-r1.ebuild,v 1.1 2012/02/24 01:49:21 qiaomuf Exp $
 
 EAPI="3"
 
@@ -28,6 +28,25 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	dev-util/pkgconfig"
 
+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_configure() {
 	local mycmakeargs="
 		$(cmake-utils_use_enable cairo)
@@ -51,16 +70,17 @@ src_install() {
 }
 
 pkg_postinst() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	elog
 	elog "You should export the following variables to use fcitx"
 	elog " export XMODIFIERS=\"@im=fcitx\""
 	elog " export XIM=fcitx"
 	elog " export XIM_PROGRAM=fcitx"
 	elog
-	elog "If you want to use WuBi ,ErBi or something else."
-	elog " mkdir -p ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/wbx.mb ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/erbi.mb ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/tables.conf ~/.fcitx"
-	elog
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 }
diff --git a/app-i18n/fcitx/fcitx-4.2.0.ebuild b/app-i18n/fcitx/fcitx-4.2.0-r1.ebuild
index 3175c7b9e284..b54c9996da34 100644
--- a/app-i18n/fcitx/fcitx-4.2.0.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.0.ebuild,v 1.1 2012/02/20 07:58:31 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.0-r1.ebuild,v 1.1 2012/02/24 01:49:21 qiaomuf Exp $
 
 EAPI="3"
 
@@ -28,6 +28,25 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	dev-util/pkgconfig"
 
+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_configure() {
 	local mycmakeargs="
 		$(cmake-utils_use_enable cairo)
@@ -51,16 +70,17 @@ src_install() {
 }
 
 pkg_postinst() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	elog
 	elog "You should export the following variables to use fcitx"
 	elog " export XMODIFIERS=\"@im=fcitx\""
 	elog " export XIM=fcitx"
 	elog " export XIM_PROGRAM=fcitx"
 	elog
-	elog "If you want to use WuBi ,ErBi or something else."
-	elog " mkdir -p ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/wbx.mb ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/erbi.mb ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/tables.conf ~/.fcitx"
-	elog
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 }