Add patch to deal with >=ibus-1.4.99. #453506

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

4 files changed, 54 insertions, 7 deletions

diff --git a/app-i18n/ibus-fbterm/ChangeLog b/app-i18n/ibus-fbterm/ChangeLog
index 262c9128b276..0693dae1dc54 100644
--- a/app-i18n/ibus-fbterm/ChangeLog
+++ b/app-i18n/ibus-fbterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/ibus-fbterm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-fbterm/ChangeLog,v 1.1 2012/06/22 00:09:45 naota Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-fbterm/ChangeLog,v 1.2 2013/01/24 22:50:14 naota Exp $
+
+  24 Jan 2013; Naohiro Aota <naota@gentoo.org>
+  +files/ibus-fbterm-0.9.1-ibus-1.4.99.patch, ibus-fbterm-0.9.1.ebuild:
+  Add patch to deal with >=ibus-1.4.99. #453506
 
 *ibus-fbterm-0.9.1 (22 Jun 2012)
 
@@ -8,4 +12,3 @@
   +files/ibus-fbterm-0.9.1-ibus-1.4.1.patch, +ibus-fbterm-0.9.1.ebuild,
   +metadata.xml:
   New package app-i18n/ibus-fbterm.
-
diff --git a/app-i18n/ibus-fbterm/Manifest b/app-i18n/ibus-fbterm/Manifest
index 4cad2307ff66..7eb40f11bc6e 100644
--- a/app-i18n/ibus-fbterm/Manifest
+++ b/app-i18n/ibus-fbterm/Manifest
@@ -1,5 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ibus-fbterm-0.9.1-ibus-1.4.1.patch 1028 SHA256 b40f29eef22d0e9fa44768246a1be6a28c26281167c678bd783d1b526c096c14 SHA512 53ce01e0d4f6e6f7199187fd9ab164991af99693b4326ff0163b1b3a8b65eed06778c6b0f0420d9b40be2eaacea6e7bc80511c8810c05d559fccb741da9a7c0e WHIRLPOOL 6b577b3b91c5e5f048a6deeda11e4303c586ad7f47dd2fedbff4e598013d667b5796bee8afb127134fe91f5536c6e0358b81c79b8623b40026bc7b48bcfb4483
+AUX ibus-fbterm-0.9.1-ibus-1.4.99.patch 529 SHA256 e388643f32a40782fde251aa54fc93cffbbb67ee2accef0ed32c6aa3e5d24f43 SHA512 c5394ed98892106fa6f2133ba0c358278dff40d794daa5f1137011d261137eff63455b24866e212baeab6b0c405b2a3b23f7a9a991135c40e5abbe0dee2d0f63 WHIRLPOOL ad9052044547b456b8ede24f38820df5525d6981870b6e0ac3e3c48a6a43f91249b839e57cca04a2eedc8139ad49f0385e6a804f6295767dc10859a8dbff337c
 DIST ibus-fbterm-0.9.1.tar.gz 106808 SHA256 98437db4d5d15bbdca3e4b0a08f1bd1be544a305aa1d0f65fedb81b871da2e7c SHA512 7f5bbb0ebf5ad12f3bdccb7966cb1ff7f40f8ebfb94a5767e0382ef5eee24f22021a428ac8073e987c43f32d67cfb7922ffe63666d88dcbd56cfdbcd36f3156f WHIRLPOOL 110e38beadfd64e75b6a40b9885b8aa1dec30771aeaff5dcd4c0f7403d24faa63b6a72d6a3fe79ec3fc1eb09e0f5963dee85664d41849ce3d723e4996ef6ebff
-EBUILD ibus-fbterm-0.9.1.ebuild 635 SHA256 091b7f955cf14659dc22811627bdd5b0d9acb0bab1a1306511191522eb37450f SHA512 0cea00e019a6b5f0d6bd5629d28b4263b9190fddd694bd71645be54c0e6e0b267f99d0e65d694d935429b38a27f80f94ffb0ac6c869554598aa5e89bbb573219 WHIRLPOOL a733df9ba4ced56aa71ebaf65929a06367476f9508eccfe1c716841187a022ef84d5d48964b3827459abb42e91b4fa0615206579918576ca1c2b2e0515132c0b
-MISC ChangeLog 419 SHA256 2942dfa503ba0f31c62115321b10827ac8544bf3078b140d935d47893d446595 SHA512 7a9dbfce3c52e8227d6dfa6ffb30269c4f38a8e4729f12df61f274dc9035031f514ad4f050bdb6e2f5f7b2a77d0429a316eaefa6087923cba6b1427ea50b7eb1 WHIRLPOOL b55d3608959c254a6e11eafd4034ad69e9b3441a7e1931fd01edff77f62becbd252a9bcb61b2f045e90ff7fed1833b117d40deff7b1d8205d3f0a0483c1622b4
+EBUILD ibus-fbterm-0.9.1.ebuild 673 SHA256 efe354f73d33124bbdc9a1cba86e3865d17612a8c8121c4b46a1c18953ad241e SHA512 634707f45ad2ba4080a5eaa4b062acd62adecc280cf23a29eb6687720fa0481a3eacbe7fab983fef9cc338d6893282ae2b277e2744cc0704e1a5def2494c26fd WHIRLPOOL f16c75191053539198522e0c07ace707b0b9d70a05270ac67d254b1c7ad04cc65b06e49bc13355a24fd2d8ec0a0b488e9286f0552bec6c889f76b34a904583ec
+MISC ChangeLog 586 SHA256 74aa6ce8cb5242f72bfddc7ea8689e5487d00b2f411e3cd2d20ea0f6a298a5fe SHA512 f158367b9e9db52cc25287b12406b70a1d242aba0c0231108fea9a6bea1d7c57f0eeb8784c82c0eb4a07105f09059ff22470df48ed1a1d538ded7b8053198697 WHIRLPOOL 129e7f505bf7b295e1738983282f3ad2a517bc2c077af3847553158f7337bef7fb2231459d55686733836bda2619a21c733a7cffc5273cd1fc2835b7da6ae443
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRAbqxAAoJEDYO1FT4VRUUFnoP/3+CIJEd5sLSDxpcGHEPoysj
+8AuTpHeiPmqRGpqnqGyYsKhSnm5yOrF7Je9fxV//uPbc737BfNFTx7o0bVh9fpKj
++rpqUA0OMtcAFgCdRbMB12GfioHSdHwycHABonvuxTbANNpOxKhuAEjDVE0kch17
+AWSBSwNN5R2+dZVGKHQixE1FzEl1RcPEOyahQIZAuUh+y/NVlMcNb2lvjbECAEJZ
+PCjphVtCiOMGw77l1ffrK2AkR/TS3i/210XJDyBCFpKx30QtXrC/VO2IzTkkGJt2
+q1RgTYuAHpzIqU6GLizqDDh8TtWS/O4kBHA+Q3ExoFeJYSpqAWIQQ1L2l+JGGKmm
+XmVTcIICHyxnWvQR7zxuWca3GXUB/+DGAsZfA/TzJ41cT0cygBDCOsZ6KUNE0kIA
+knzefJ+XImeBZgDLViwIXgiupkhnIjYE1T+XP7lqKprNt5eQpkG/NzfNYpiFVj4N
+2BEPHBID7dVXNFTncKbU6r2APfwYBUtn4C5h5Ec75sbs0F8XKZO4vyKjcwdjZLHj
+cx98ouU8ZcGRTMUMMexnwuKKWuNbYjWH9zd9xAHVOe6brqb2oQUQ8/DSJvOI6lXM
+fQ0GSyor/gFGKZ5U7i066YrKeBWOEmFfdJx5PLb317ZKksITLjDdiUCCs5NPsSUn
+0tOhVNd8XkE6jf2/+gvf
+=nKdL
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-fbterm/files/ibus-fbterm-0.9.1-ibus-1.4.99.patch b/app-i18n/ibus-fbterm/files/ibus-fbterm-0.9.1-ibus-1.4.99.patch
new file mode 100644
index 000000000000..6cf858659049
--- /dev/null
+++ b/app-i18n/ibus-fbterm/files/ibus-fbterm-0.9.1-ibus-1.4.99.patch
@@ -0,0 +1,22 @@
+diff --git a/src/ibus-fbterm.c b/src/ibus-fbterm.c
+index ffb7401..b4ddb64 100644
+--- a/src/ibus-fbterm.c
++++ b/src/ibus-fbterm.c
+@@ -119,13 +119,17 @@ static void im_active()
+ 	debug("im active\n");
+ 	modifier_state = 0;
+ 	init_keycode_state();
++#if ! IBUS_CHECK_VERSION(1, 4, 99)
+ 	ibus_input_context_enable(ibus_ctx);
++#endif
+ }
+ 
+ static void im_deactive()
+ {
+ 	debug("im deactive\n");
++#if ! IBUS_CHECK_VERSION(1, 4, 99)
+ 	ibus_input_context_disable(ibus_ctx);
++#endif
+ 
+ 	auxiliary_text_win.w = 0;
+ 	lookup_table_win.w = 0;
diff --git a/app-i18n/ibus-fbterm/ibus-fbterm-0.9.1.ebuild b/app-i18n/ibus-fbterm/ibus-fbterm-0.9.1.ebuild
index 55b3496685b5..ec37a7db0e95 100644
--- a/app-i18n/ibus-fbterm/ibus-fbterm-0.9.1.ebuild
+++ b/app-i18n/ibus-fbterm/ibus-fbterm-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# 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/ibus-fbterm/ibus-fbterm-0.9.1.ebuild,v 1.1 2012/06/22 00:09:45 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-fbterm/ibus-fbterm-0.9.1.ebuild,v 1.2 2013/01/24 22:50:14 naota Exp $
 
 EAPI="4"
 inherit autotools-utils
@@ -21,4 +21,5 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ibus-1.4.1.patch
+	"${FILESDIR}"/${P}-ibus-1.4.99.patch
 )