Version bumped from Tokyo, Japan.

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

3 files changed, 51 insertions, 17 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 4687dae014fb..41dc0d278425 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.80 2011/02/25 17:50:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.81 2011/03/12 05:24:23 matsuu Exp $
+
+*ibus-1.3.99.20110228 (12 Mar 2011)
+
+  12 Mar 2011; MATSUU Takuto <matsuu@gentoo.org> -ibus-1.3.99.20101118.ebuild,
+  +ibus-1.3.99.20110228.ebuild:
+  Version bumped. Removed old version.
 
   25 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> ibus-1.3.9.ebuild:
   ppc/ppc64 stable wrt 344337
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index c0a2d3db3d49..27433a7deffe 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,10 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7a2cbbf3 SHA1 8c603844fff37194e835832a7606d240163abb9c SHA256 41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
 DIST ibus-1.3.9.tar.gz 1380081 RMD160 8cf8712d29369bb1934c0d9d66ce5f15953a60d0 SHA1 3eaa95bd2a86c9fae23fdc80dd70d27f0efb7138 SHA256 b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d
 DIST ibus-1.3.99.20101118.tar.gz 1320315 RMD160 4f5b437a123811fc5e30eabcf39459e02ddfc3c9 SHA1 0d21016e51f7ec3b0fd2871dff64d31b2dc53ec4 SHA256 3cb4b4f36fae19271ae9d4fa50d19392f7f8ee28736b28a0b69edfa37b0ba173
+DIST ibus-1.3.99.20110228.tar.gz 1348307 RMD160 06226d2a417fe8127736e83eb6cebf3b63e4043a SHA1 50b862bd93268da3d70572bb1bf07fbec4138d26 SHA256 9f2e8dd5be08ddd75b36e87ec3f354a8009b9e16a43908d5601e6a92e7907354
 EBUILD ibus-1.2.0.20100111.ebuild 2608 RMD160 d2cf4b4ae5c2ab0647a7478e1dde3be1725ed838 SHA1 94a39dac22d9193cad081a3cbb75c91a56c191f9 SHA256 1629726b9ea4c3f1cf4588bdf98c0f738619ccd06264117403282e8900d1dc39
 EBUILD ibus-1.3.9-r1.ebuild 3458 RMD160 2f75ad4a0765071ee69031a3993dfd3239cf6829 SHA1 9196809f8d5ab4d5d2520775ab57f5d22490d05f SHA256 9af6cb41b0e58f6901ecf5a973f54ec35d07cf17d5e325f16a17b5035981761b
 EBUILD ibus-1.3.9.ebuild 3232 RMD160 23f7846ab7b1d87462821c073b10f44e520e2906 SHA1 764b1df48cc2b203f446db9b683961d7fa7610e3 SHA256 ac7745a3e279dc0a2ab6b5669eb4b28d9b6bf3c3d889498622fc845e755e1203
 EBUILD ibus-1.3.99.20101118-r1.ebuild 3468 RMD160 020d98db9e7a33bfb96dc4b35c51400831bfe210 SHA1 8834f6dbf7be1196d35d1b635f8b3f25ccd70a82 SHA256 61867deb8ac6a4e2bca8deb90e012d5c0b8b1059408778562929cbcd24bcfea4
-EBUILD ibus-1.3.99.20101118.ebuild 3243 RMD160 7e0049a1dbf3952e5efab9d13eb7fac4574fb4b5 SHA1 70c99329aa0b1f5395baa8f71e58f10f8fdb30b7 SHA256 0a472cbff71df76a373a6d82445986688b3f3ffa4dba149239ef88323c96c0e4
-MISC ChangeLog 13014 RMD160 ee5318a1d0f7def011eb6fe9c69c32deda521edb SHA1 06a87dde4350de37eca7bd5c881fc3e6443bba3c SHA256 7f54db02331dfc19890b64cbc9cc22f73482f44b546ca40a1e7fdff4cd03449a
+EBUILD ibus-1.3.99.20110228.ebuild 3464 RMD160 8ca2288cf9950818c26b61fe2c09f86096d97329 SHA1 a9876c1d10c6d3f635a0d537544ca9ec8349d75a SHA256 4960492343f2ee6725521bda0a0828b1b1ab49b61d1c406c943b3416bd65cdae
+MISC ChangeLog 13198 RMD160 7728f117bcda9a9f5cc835118838087f030b7929 SHA1 ad12bdfe0e4754aeafafd917fc11d4859fbc8e2a SHA256 a9daddf5e30d9de3d2457ec0453bfc8d6f453ddfa0f542ba263008bed1f06b44
 MISC metadata.xml 671 RMD160 a430d2733dbeb0c98d42b3a432cfadafb5f8c87a SHA1 bfc77eafdea87e34b5ae48e6a6652508c4a70204 SHA256 4184635ca1b44311db6031a7f00c5679582289862be1a550a4faf4dd9d5e6e59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNewOSAAoJECaGw+YFKA1pHgIP/iuLbFLtBJE78ihR9Jo1KbXb
+zjaWQpuPeOhKcCmZ5TcAZ8KBtWmOJdIg1smbX//Jg2XTFQF5MDGsjluk2PYg1nkF
+B/IBTjbSkq3R71dZoEYju8gYagKKdpb46zK1wzFxs6qhBVXxw4WZERcCvW1bij5S
+ThsESr6hFAOyYvJqFLklR/TeMNY19bT8lJvLwldPvwk9a5kQZ11xyhZn/a0jaAn5
+V9xwPvuhPi4d8aJfb7SSjoFWFWuz0DjGIf9wUN4TjyzeA3oNQ1SYLe0t6hgDvb1+
+XtIKdthhGeB+aOadJmJmBPiYNq2SiXmqNaUCuLRhfbARs//G+tcWSnlmfwLH+fgp
+uPBYWgCeZZ+RvHxOPsB0UsRI33qmv84JM/xl2gj9S7AYW1m2J3F3DQ23AuIGlzkd
+0hy+bt/iUqo7e/q7VU01tRmpY3/HTm2Nf0cNlRyY1mweS+NdBWo/hBLLMjep2P+T
+e3H8ITgFG66XpjASosFY139i65YQaw0btb8cV4PNaEAGCJdYb/R+gb4KkiO6g6ZO
+rPVfiIblAp2WoLqGTevM01EjA807LdSdqgMBfRXBDS9mx3BsUQBvft6/E1HR5BYV
+I68qklAKs2hcHy6vzOEvTjexrc3LBcFj7F39TOb3oUCrjLD8MbSZfSMSgDB33fbd
+g5uwP/YBhwwMV9r3HGid
+=/rmt
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.3.99.20101118.ebuild b/app-i18n/ibus/ibus-1.3.99.20110228.ebuild
index 0aae9b0aeb4c..57de80e32e5d 100644
--- a/app-i18n/ibus/ibus-1.3.99.20101118.ebuild
+++ b/app-i18n/ibus/ibus-1.3.99.20110228.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20101118.ebuild,v 1.4 2011/02/13 19:15:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20110228.ebuild,v 1.1 2011/03/12 05:24:23 matsuu Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
 inherit confutils eutils gnome2-utils multilib python
 
@@ -51,12 +51,13 @@ RDEPEND="${RDEPEND}
 RESTRICT="test"
 
 update_gtk_immodules() {
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		GTK2_CONFDIR="/etc/gtk-2.0"
-		# An arch specific config directory is used on multilib systems
-		has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
-		mkdir -p "${ROOT}${GTK2_CONFDIR}"
-		gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+	local GTK2_CONFDIR="/etc/gtk-2.0"
+	# An arch specific config directory is used on multilib systems
+	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
 }
 
@@ -91,13 +92,25 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf || die
+
 	# bug 289547
 	keepdir /usr/share/ibus/{engine,icons} || die
 
 	dodoc AUTHORS ChangeLog NEWS README || die
 }
 
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && update_gtk_immodules
+	use python && python_mod_optimize /usr/share/${PN}
+	gnome2_icon_cache_update
 
 	elog "To use ibus, you should:"
 	elog "1. Get input engines from sunrise overlay."
@@ -115,16 +128,10 @@ pkg_postinst() {
 	elog "   export GTK_IM_MODULE=\"ibus\""
 	elog "   export QT_IM_MODULE=\"xim\""
 	elog "   ibus-daemon -d -x"
-
-	use gtk && update_gtk_immodules
-
-	use python && python_mod_optimize /usr/share/${PN}
-	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	use gtk && update_gtk_immodules
-
 	use python && python_mod_cleanup /usr/share/${PN}
 	gnome2_icon_cache_update
 }