gentoo resync : 15.09.2018

14 files changed, 1081 insertions, 127 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index f1f6b36c5002..7cb29422e364 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index b1ddcbcd8dae..e01bd430dbe0 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -5,6 +5,6 @@ DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
 EBUILD ibus-1.5.12.ebuild 3678 BLAKE2B 8b08b4f6cf2c188d387c43741f0e430749ba003dd7693ce4b70e36c21d5c046f8f0be82ecc2401df577603f7c074d99904d6dfc3aa60f1327157e835563779a7 SHA512 178fdf0169e444161b598ee800a99328060ec7a28a6cd73ca2c26ddce10372072faabe63234d2a9b7c0e31b758cdf7f533c508f05491be80a9ae130f466a5679
 EBUILD ibus-1.5.16.ebuild 3959 BLAKE2B 7a8872f49d619d6079915884ff25ee90a74653fa4614c61043d34414989cafebe122cedc65d72999b2eaca668f0ab0d76484d6ef177e419a3e284476430bb1ff SHA512 b664b04cc0010f3e6da17f7e2dfd5f10ba2241def9a807d5da176c8b1f0eb14a066dd9df6af3b750f06f3b476d867a30b18e32ce85ab1b4efa44274132b75e96
-EBUILD ibus-1.5.18.ebuild 4219 BLAKE2B a67fed784151eb78502f9df4b5ac683812debd9ed7e501f54ff38d3e511196c04b0903c25461f062c0c9d6b9bccd986bbf0629090cfbf138058ff93194c0b251 SHA512 518482fc4c27dee7a820fe53659a06e833ab922bcaaffcfb3e62e60b06686590b43a0a718d2e3b337dff60fe4178dcec0958eaef60df32f03e09161a8ef0e9e5
+EBUILD ibus-1.5.18.ebuild 4218 BLAKE2B 6372729abd56ca1faceb32232fd419c7dadf0e4c46ad90bfb100087f500fe09597be0b0e9e4511b1c4cd04d334c72ef3c95e174354d0d44fa8e285c509838696 SHA512 b125534a7f697908dd1b2e71a2bf98a82ff579af2beff77e37c8cc5c4452230d2a4cc213b6f2eb389c9a6e53237dd3e2d27ff9bbee75d564b213e36e21f1463e
 EBUILD ibus-1.5.19.ebuild 4340 BLAKE2B 2550c7270052bdcdedf645f7698f3e972bc3e22c4456e976e9a161678e8e96ddeddbb6bfba13b8db976538d3f97f3c860773320f3d790c03a726979bdd3b1c41 SHA512 14f9d43bd461806e4bc0fe116ea3c983c691975e8285bba5d919d3c0cf52d4f3e41fb58f749866cc0f5d674e9db6e26aee9da77e431d5b11c29169228b0a7b7a
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 1da9fda2462f..927ddd72824e 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 55675dafd68a..624f1b65fe73 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,9 +1,5 @@
-DIST poedit-2.0.6.tar.gz 2511777 BLAKE2B f28e8940310e80ee15fc70f10492e061097f88b62938f8a85194170fd107100c739dbfd1c1cf12516e6fe3d2a9b282986a4368615cf8fcb2ac889075fe64cc6b SHA512 e7beceeb4cd9e4e0269666d634e48622f175a7788219288ba6349a5b15f8360a929018480372e3eecb664d7d2e3093d6788640651696323d6dda0f0780aa5cd2
-DIST poedit-2.0.7.tar.gz 2558220 BLAKE2B e4a958e516a5c4b56331b6f9f37d9fa627072a4a161f17b9e809df86af7ab86130c704b9f41d081a86dbc2dc3b24acf62615e843b73f78874c42730bd46f9b55 SHA512 7b8b41b5f55252b1845c452edbdad56dc841c507c4fb7a24267bd2af8490610f5f3eb72f31ed4d062fdaef939ef4ecd9c30ddc85a5dad3a792ac5857567dac71
 DIST poedit-2.0.9.tar.gz 2567156 BLAKE2B 29e616256a19430cb3efd3db5d6c2cc450155009e30ee056f6be712bac9e631e5aa20b0758262e9fbe00937eedf6ac777cd8e7407a3060f04503e3fa4d9cd6d0 SHA512 9981339ae0c3f11f972ed2f25e0c96e5c0cc0210771cc44d163e219c32eb951fa4180c8a03acdd7f0232a5e4b535f3202dda703b57ccfb02773eb24e6a1eb02d
 DIST poedit-2.1.1.tar.gz 2722379 BLAKE2B 3e5102ab9b2b6b6701abd3f44dab846d6989e5abdbcadf924cf7032d725fa1b405425cefa37eb0230d3de68ea0c60ec05e7bfe84f906cdec0230d8c1284f5779 SHA512 0b5e13c3e59c9bde78b95b45aa8765c16c03d12ca9fbabe4448e409ff4cd627676d1b77c011c75a54dc0e10acda23ceb49ca063e76a29154344dc5fdb9e5f8a8
-EBUILD poedit-2.0.6.ebuild 1273 BLAKE2B 9f2a627317290fb4ac7acb8b80f29297ec20c2a8c31b8f38bf995f461e7518bc767d49fed66c5953d2dbe4ffbe5dd1c981189601aaed8516ce7059aa372f9f7c SHA512 97cbb993e0b2583277d2ba88accf36e4bcf4b113d95b87140d80b3c07b705a0f38eb85721b81e1aced2b27e24ec6905308a916d3caa6b2ab7ad494957adcc0a5
-EBUILD poedit-2.0.7.ebuild 1278 BLAKE2B 345e579a3447a333c4633cee6f1742f64082549aeef84dcbcb32407e219a7edd68aeef53d883ae6269a464b6e6a41cd124d6403fce8645c7f95c44a55da34ada SHA512 c1b7cddd4c5051e142bf1e663cf4df22543f16168ab4413fcba9a56ec9c1ef5ec507d462dd46e773bd92d89e1a9c51ebe0d9ed536cc4b111cfd6314f67993e84
 EBUILD poedit-2.0.9.ebuild 1365 BLAKE2B 93c8532afa34a886b753b01bb86636c990bc417cff101cb6371c4811bb61dd4f1ec628e624122d60c8cccad1a07c9c234991cd592208ed065f1e512793dfdffb SHA512 8b4752f34950dc08d11ab5caa016c7d8809a8f1cc3852a52b5686ae82bee93c2c84b7a6591863d2965d7c703760514a0832d2384a079753a1a3c7aadd1cd5ec9
-EBUILD poedit-2.1.1.ebuild 1396 BLAKE2B 0d06059500fde6a51bde8921f34f92d8831183eb9171639be4baa4324578bf121db69f04e093c2c841328c5aee5f50144873a33f9f52c28fa1bc755caa450350 SHA512 ac7960ebf68c7d0e795c7c805745122c3cfa84a8c348e2024892dc5f52d3103585cbed94a644fda1ad6691e69a2429ab8b9dbf75859fd92bd9cd31b463f654c9
+EBUILD poedit-2.1.1.ebuild 1392 BLAKE2B 746b4b8fd49d164255dc827724c60c4ec20d8f1c8caa3d36759e7021cde82190c1477b541b7d00085fe12d36154b9c1fa8fa36e43b4feec9c19941a0b30165bb SHA512 c7a5e305fbef1ff5eeb84bd6ef83b9f4a6cad0869c19dc165ac97aac97ce04fea99fe4f429e1ef22c67318a8f49b1dda5687b7b3c611fd05a96bc6a3ed5d3c9f
 MISC metadata.xml 611 BLAKE2B 7eda7aaa83b70b383879068c765a142c5e18bb79865a88c325c0a4ab8aa7f6ca00b197030f7a73baa4bbcb87dbb14097dd218d30dd6475705552500d6d0fb4f7 SHA512 96dfc2db0caf0915cca3997cff6fc021a3c196f4b7a5b9f2007c6284d9dfecfc66c1d5e0f44928a98810f6a23a7d5c6fc9db2ee3b24ce7ff7b9cb42afafd5f2f
diff --git a/app-i18n/poedit/poedit-2.0.6.ebuild b/app-i18n/poedit/poedit-2.0.6.ebuild
deleted file mode 100644
index abf88a2c2dec..000000000000
--- a/app-i18n/poedit/poedit-2.0.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0-gtk3
-
-PLOCALES="an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
-
-inherit gnome2-utils l10n wxwidgets xdg
-
-DESCRIPTION="GUI gettext translations editor"
-HOMEPAGE="https://poedit.net"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
-	app-text/gtkspell:3
-	x11-libs/gtk+:3
-	>=dev-cpp/lucene++-3.0.5
-	dev-libs/boost:=[nls]
-	dev-libs/icu:=
-	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
-		rm "locales/${1}.mo" || die
-	}
-	l10n_find_plocales_changes 'locales' '' '.mo'
-	l10n_for_each_disabled_locale_do my_rm_loc
-
-	setup-wxwidgets
-	xdg_src_prepare
-}
-
-src_configure() {
-	econf --without-cpprest --without-cld2
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/poedit/poedit-2.0.7.ebuild b/app-i18n/poedit/poedit-2.0.7.ebuild
deleted file mode 100644
index b5857296a23e..000000000000
--- a/app-i18n/poedit/poedit-2.0.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0-gtk3
-
-PLOCALES="an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
-
-inherit gnome2-utils l10n wxwidgets xdg
-
-DESCRIPTION="GUI gettext translations editor"
-HOMEPAGE="https://poedit.net"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	app-text/gtkspell:3
-	x11-libs/gtk+:3
-	>=dev-cpp/lucene++-3.0.5
-	dev-libs/boost:=[nls]
-	dev-libs/icu:=
-	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
-		rm "locales/${1}.mo" || die
-	}
-	l10n_find_plocales_changes 'locales' '' '.mo'
-	l10n_for_each_disabled_locale_do my_rm_loc
-
-	setup-wxwidgets
-	xdg_src_prepare
-}
-
-src_configure() {
-	econf --without-cpprest --without-cld2
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/poedit/poedit-2.1.1.ebuild b/app-i18n/poedit/poedit-2.1.1.ebuild
index 2f30b7de1dc4..7e8aac1ca7b4 100644
--- a/app-i18n/poedit/poedit-2.1.1.ebuild
+++ b/app-i18n/poedit/poedit-2.1.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GUI gettext translations editor"
 HOMEPAGE="https://poedit.net"
 SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/app-i18n/scim-anthy/Manifest b/app-i18n/scim-anthy/Manifest
index 9f4798285aff..0c4d30712cc9 100644
--- a/app-i18n/scim-anthy/Manifest
+++ b/app-i18n/scim-anthy/Manifest
@@ -1,4 +1,5 @@
+AUX scim-anthy-1.2.7-gtk2_build.patch 24547 BLAKE2B 22b20c7b34e83a9392fe89a2484d994364e12b5618fd7fac0e19af3c8988c1b3acbfe31872f98308c1c201d4e5c1ea598597bc15e04e77e54cfb2fedea7d9e4d SHA512 2814481606429228891cda1c70ed53b4014d2e192f6ab7859d5033a9353ab02dea044291ec8e5667853ac6db2da19f06c4a42ce6fe27d11110a5b0f6ee56bd0e
 DIST scim-anthy-1.2.7-patches.tar.xz 11236 BLAKE2B 5db168479db59bdd1a9a9561af8635e370a338620f4c4cb1676a707c60c0140e2ddd6517896ff5d8a90cd0fe9e2fe25eea7dca693c02e765fb6b8a584f9f409c SHA512 ff265547ea78912b3cb2519793fc7159d466da6bbd3cd47f63a67731207c46ba8932a5384899ffbe517bb3d91f14ee282906ee287025ae64ccee7636dd633f08
 DIST scim-anthy-1.2.7.tar.gz 680942 BLAKE2B 9f2b33d53e5ed14c806dcae50a73d3bb234ec74b820651b09ccf0e3b78924bb0331ec4f5b93f9b0bcb2429bf528f9ddc35d0cda9b3a4d30780f083493945c963 SHA512 4ece2e458b204a68392ed676134ff45f1e193fda00d5ffb219c4e947f7f069a0221b279f110bf4093a22e57c41cb1555c6be4d42bea1c9e848af06ad8e0bc2da
-EBUILD scim-anthy-1.2.7-r1.ebuild 1035 BLAKE2B 818e88c8c0f9c0b9a01c02565e5911675d33631aa7cc90b2f5e6c6e9fc3db668605c20d707557512946dc3ffa294cca8174bd566bc6bd4bb2df169e1522b1406 SHA512 da6d7f66f8e565a3bdfa28963227092880a063cfcf911bdedd338539e21dcf7813e5e71e679084ea8bf595edb77b54512d9b9fb70943e2df594791e412503891
+EBUILD scim-anthy-1.2.7-r1.ebuild 1096 BLAKE2B d9e107bcc922d19c22c3cda58ecf6b592154dfcd76cd81190929dbd0552c800ca4b68dc484750ab0ef6527f52a65de2b88fb0707d46a147d35166b2bb55ab58a SHA512 1029842a4f895c65a91ee8d44aedb48ab92879d25afcdae763bb0204a71f95d1d7ebba67e338892ef00e31c5ac1694ef733a3ebfa228168730532ee1e6008b01
 MISC metadata.xml 505 BLAKE2B 811e271383ea3c8f7f3ef772c8b97a395682e3f40c948d6ac09e9aed18b96e7ad0943a4e11e5e2f9fdd5615d86aaf3e5977975d02e5f6c2342d1fee3b563d3f4 SHA512 85aba6ffa284906fc8732242f5efe3563483930dd625871d670840c558f99e04e509080d0ff804746db8d5a3da9210680bab223dd78bcae79cc2ebcde622114b
diff --git a/app-i18n/scim-anthy/files/scim-anthy-1.2.7-gtk2_build.patch b/app-i18n/scim-anthy/files/scim-anthy-1.2.7-gtk2_build.patch
new file mode 100644
index 000000000000..3ab4f3d7d90d
--- /dev/null
+++ b/app-i18n/scim-anthy/files/scim-anthy-1.2.7-gtk2_build.patch
@@ -0,0 +1,1065 @@
+diff -ru a/src/scim_anthy_prefs.cpp b/src/scim_anthy_prefs.cpp
+--- a/src/scim_anthy_prefs.cpp	2008-04-24 11:49:53.000000000 +0800
++++ b/src/scim_anthy_prefs.cpp	2018-05-31 09:31:40.289517678 +0800
+@@ -36,7 +36,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CLOSE_CAND_WIN_ON_SELECT,
+@@ -46,7 +46,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_LEARN_ON_MANUAL_COMMIT,
+@@ -56,7 +56,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_LEARN_ON_AUTO_COMMIT,
+@@ -66,7 +66,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_ROMAJI_HALF_SYMBOL,
+@@ -76,7 +76,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_ROMAJI_HALF_NUMBER,
+@@ -86,7 +86,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT,
+@@ -95,7 +95,7 @@
+         N_("A_llow spliting romaji on editing preedit string"),
+         NULL,
+         N_("If this check is enabled, you can delete each letter."),
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE,
+@@ -104,7 +104,7 @@
+         N_("_Entering the pseudo ASCII input mode with capital letters."),
+         NULL,
+         N_("If this check is enabled, capital letters will becomes a trigger to enter the pseudo ASCII input mode."),
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR,
+@@ -113,7 +113,7 @@
+         N_("Insert a _blank with a blank key."),
+         NULL,
+         N_("If this check is enabled, a blank key will works to insert a blank when entering the pseudo ASCII input mode."),
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_PREDICT_ON_INPUT,
+@@ -122,7 +122,7 @@
+         N_("_Show predicted candidates while inputting letters"),
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_USE_DIRECT_KEY_ON_PREDICT,
+@@ -131,7 +131,7 @@
+         N_("Use _direct select keys while predicting"),
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SHOW_INPUT_MODE_LABEL,
+@@ -141,7 +141,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SHOW_CONVERSION_MODE_LABEL,
+@@ -151,7 +151,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SHOW_TYPING_METHOD_LABEL,
+@@ -161,7 +161,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL,
+@@ -171,7 +171,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL,
+@@ -181,7 +181,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL,
+@@ -191,7 +191,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL,
+@@ -201,7 +201,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL,
+@@ -211,7 +211,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -221,7 +221,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -237,7 +237,7 @@
+         NULL,
+         N_("Specify the number of candidates to show in a page of the candidates window."),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_N_TRIGGERS_TO_SHOW_CAND_WIN,
+@@ -250,7 +250,7 @@
+         N_("The number of times to press a conversion key until show the candidates window."
+            "Specify 0 to never show it."),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_NICOLA_TIME,
+@@ -262,7 +262,7 @@
+         NULL,
+         N_("Time to regard as simultaneous key pressing."),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -273,7 +273,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -287,7 +287,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_TYPING_METHOD,
+@@ -297,7 +297,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONVERSION_MODE,
+@@ -307,7 +307,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_PERIOD_STYLE,
+@@ -317,7 +317,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SYMBOL_STYLE,
+@@ -327,7 +327,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SPACE_TYPE,
+@@ -337,7 +337,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_TEN_KEY_TYPE,
+@@ -347,7 +347,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD,
+@@ -357,7 +357,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_BEHAVIOR_ON_FOCUS_OUT,
+@@ -367,7 +367,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_LEFT_THUMB_SHIFT_KEY,
+@@ -377,7 +377,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_RIGHT_THUMB_SHIFT_KEY,
+@@ -387,7 +387,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_COMMIT_REVERSE_LEARN_KEY,
+@@ -398,7 +398,7 @@
+         N_("The key events to commit the preedit string "
+            "with reversing the preference of learning. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_COMMIT_FIRST_SEGMENT_REVERSE_LEARN_KEY,
+@@ -409,7 +409,7 @@
+         N_("The key events to commit the first segment "
+            "with reversing the preference of learning. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_COMMIT_SELECTED_SEGMENT_REVERSE_LEARN_KEY,
+@@ -420,7 +420,7 @@
+         N_("The key events to commit the selected segment "
+            "with reversing the preference of learning. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_DICT_ENCODING,
+@@ -433,7 +433,7 @@
+            "but it depends on the implementation of your operating system "
+            "and actual encoding of your dictionary."),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_DICT_ADMIN_COMMAND,
+@@ -443,7 +443,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_ADD_WORD_COMMAND,
+@@ -453,7 +453,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_PREEDIT_STYLE,
+@@ -463,7 +463,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONVERSION_STYLE,
+@@ -473,7 +473,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECTED_SEGMENT_STYLE,
+@@ -483,7 +483,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -493,7 +493,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -507,7 +507,7 @@
+         N_("Select toggle on/off keys"),
+         N_("The key events to toggle on/off Japanese mode. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CIRCLE_INPUT_MODE_KEY,
+@@ -517,7 +517,7 @@
+         N_("Select circle input mode keys"),
+         N_("The key events to circle input mode. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CIRCLE_KANA_MODE_KEY,
+@@ -527,7 +527,7 @@
+         N_("Select circle kana mode keys"),
+         N_("The key events to circle kana mode. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_LATIN_MODE_KEY,
+@@ -537,7 +537,7 @@
+         N_("Select Latin mode keys"),
+         N_("The key events to switch input mode to Latin. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_WIDE_LATIN_MODE_KEY,
+@@ -547,7 +547,7 @@
+         N_("Select wide Latin mode keys"),
+         N_("The key events to switch input mode to wide Latin. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_HIRAGANA_MODE_KEY,
+@@ -557,7 +557,7 @@
+         N_("Select hiragana mode keys"),
+         N_("The key events to switch input mode to hiragana. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_KATAKANA_MODE_KEY,
+@@ -567,7 +567,7 @@
+         N_("Select katakana mode keys"),
+         N_("The key events to switch input mode to katakana. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_HALF_KATAKANA_MODE_KEY,
+@@ -577,7 +577,7 @@
+         N_("Select half katakana mode keys"),
+         N_("The key events to switch input mode to half katakana. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CANCEL_PSEUDO_ASCII_MODE_KEY,
+@@ -587,7 +587,7 @@
+         N_("Select pseudo ASCII mode cancel key"),
+         N_("The key events to cancel the pseudo ASCII mode."),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CIRCLE_TYPING_METHOD_KEY,
+@@ -597,7 +597,7 @@
+         N_("Select circle typing method keys"),
+         N_("The key events to circle typing method. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -607,7 +607,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -621,7 +621,7 @@
+         N_("Select inserting space keys"),
+         N_("The key events to insert a space. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_INSERT_ALT_SPACE_KEY,
+@@ -631,7 +631,7 @@
+         N_("Select inserting alternative space keys"),
+         N_("The key events to insert a alternative space. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_INSERT_HALF_SPACE_KEY,
+@@ -641,7 +641,7 @@
+         N_("Select inserting half width space keys"),
+         N_("The key events to insert a half width space. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_INSERT_WIDE_SPACE_KEY,
+@@ -651,7 +651,7 @@
+         N_("Select inserting wide space keys"),
+         N_("The key events to insert a wide space. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_BACKSPACE_KEY,
+@@ -661,7 +661,7 @@
+         N_("Select backspace keys"),
+         N_("The key events to delete a character before caret. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_DELETE_KEY,
+@@ -671,7 +671,7 @@
+         N_("Select delete keys"),
+         N_("The key events to delete a character after caret. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_COMMIT_KEY,
+@@ -681,7 +681,7 @@
+         N_("Select commit keys"),
+         N_("The key events to commit the preedit string. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONVERT_KEY,
+@@ -691,7 +691,7 @@
+         N_("Select convert keys"),
+         N_("The key events to convert the preedit string to kanji. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_PREDICT_KEY,
+@@ -701,7 +701,7 @@
+         N_("Select predict keys"),
+         N_("The key events to predict a word or sentence from already inserted text. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CANCEL_KEY,
+@@ -711,7 +711,7 @@
+         N_("Select cancel keys"),
+         N_("The key events to cancel preediting or converting. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CANCEL_ALL_KEY,
+@@ -721,7 +721,7 @@
+         N_("Select cancel all keys"),
+         N_("The key events to return to initial state. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_RECONVERT_KEY,
+@@ -731,7 +731,7 @@
+         N_("Select reconvert keys"),
+         N_("The key events to reconvert the commited string in selection. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_DO_NOTHING_KEY,
+@@ -742,7 +742,7 @@
+         N_("The key events to eat and do nothing anymore. "
+            "For example, it can be used to disable space key completely."),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -752,7 +752,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -766,7 +766,7 @@
+         N_("Select move caret to first keys"),
+         N_("The key events to move the caret to the first of preedit string. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_MOVE_CARET_LAST_KEY,
+@@ -776,7 +776,7 @@
+         N_("Select move caret to last keys"),
+         N_("The key events to move the caret to the last of the preedit string. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_MOVE_CARET_FORWARD_KEY,
+@@ -786,7 +786,7 @@
+         N_("Select move caret forward keys"),
+         N_("The key events to move the caret forward. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_MOVE_CARET_BACKWARD_KEY,
+@@ -796,7 +796,7 @@
+         N_("Select move caret backward keys"),
+         N_("The key events to move the caret backward. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -806,7 +806,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -820,7 +820,7 @@
+         N_("Select keys to select the first segment"),
+         N_("The key events to select the first segment. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_LAST_SEGMENT_KEY,
+@@ -830,7 +830,7 @@
+         N_("Select keys to select the last segment"),
+         N_("The key events to select the the last segment. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_NEXT_SEGMENT_KEY,
+@@ -840,7 +840,7 @@
+         N_("Select keys to select the next segment"),
+         N_("The key events to select the next segment. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_PREV_SEGMENT_KEY,
+@@ -850,7 +850,7 @@
+         N_("Select keys to select the previous segment"),
+         N_("The key events to select the previous segment. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SHRINK_SEGMENT_KEY,
+@@ -860,7 +860,7 @@
+         N_("Select keys to shrink the segment"),
+         N_("The key events to shrink the selected segment. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_EXPAND_SEGMENT_KEY,
+@@ -870,7 +870,7 @@
+         N_("Select keys to expand the segment"),
+         N_("The key events to expand the selected segment. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_COMMIT_FIRST_SEGMENT_KEY,
+@@ -880,7 +880,7 @@
+         N_("Select keys to commit the first segment"),
+         N_("The key events to commit the first segment. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_COMMIT_SELECTED_SEGMENT_KEY,
+@@ -890,7 +890,7 @@
+         N_("Select keys to commit the selected segment"),
+         N_("The key events to commit the selected segment. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -900,7 +900,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -914,7 +914,7 @@
+         N_("Select the first candidate keys"),
+         N_("The key events to select the first candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_LAST_CANDIDATE_KEY,
+@@ -924,7 +924,7 @@
+         N_("Select the last candidate keys"),
+         N_("The key events to the select last candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_NEXT_CANDIDATE_KEY,
+@@ -934,7 +934,7 @@
+         N_("Select the next candidate keys"),
+         N_("The key events to select the next candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_PREV_CANDIDATE_KEY,
+@@ -944,7 +944,7 @@
+         N_("Select the previous candidate keys"),
+         N_("The key events to select the previous candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CANDIDATES_PAGE_UP_KEY,
+@@ -954,7 +954,7 @@
+         N_("Select page up candidates keys"),
+         N_("The key events to switch candidates page up. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CANDIDATES_PAGE_DOWN_KEY,
+@@ -964,7 +964,7 @@
+         N_("Select page down candidates keys"),
+         N_("The key events to switch candidates page down. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -974,7 +974,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -988,7 +988,7 @@
+         N_("Select keys to select 1st candidate"),
+         N_("The key events to select the 1st candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_2_KEY,
+@@ -998,7 +998,7 @@
+         N_("Select keys to select 2nd candidate"),
+         N_("The key events to select the 2nd candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_3_KEY,
+@@ -1008,7 +1008,7 @@
+         N_("Select keys to select 3rd candidate"),
+         N_("The key events to select the 3rd candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_4_KEY,
+@@ -1018,7 +1018,7 @@
+         N_("Select keys to select 4th candidate"),
+         N_("The key events to select the 4th candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_5_KEY,
+@@ -1028,7 +1028,7 @@
+         N_("Select keys to select 5th candidate"),
+         N_("The key events to select the 5th candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_6_KEY,
+@@ -1038,7 +1038,7 @@
+         N_("Select keys to select 6th candidate"),
+         N_("The key events to select the 6th candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_7_KEY,
+@@ -1048,7 +1048,7 @@
+         N_("Select keys to select 7th candidate"),
+         N_("The key events to select the 7th candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_8_KEY,
+@@ -1058,7 +1058,7 @@
+         N_("Select keys to select 8th candidate"),
+         N_("The key events to select the 8th candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_9_KEY,
+@@ -1068,7 +1068,7 @@
+         N_("Select keys to select 9th candidate"),
+         N_("The key events to select the 9th candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_10_KEY,
+@@ -1078,7 +1078,7 @@
+         N_("Select keys to select 10th candidate"),
+         N_("The key events to select the 10th candidate. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -1088,7 +1088,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -1102,7 +1102,7 @@
+         N_("Select keys to convert character type forward"),
+         N_("Rotate character type forward."),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONV_CHAR_TYPE_BACKWARD_KEY,
+@@ -1112,7 +1112,7 @@
+         N_("Select keys to convert character type backward"),
+         N_("Rotate character type backward."),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONV_TO_HIRAGANA_KEY,
+@@ -1122,7 +1122,7 @@
+         N_("Select keys to convert to hiragana"),
+         N_("The key events to convert the preedit string to hiragana. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONV_TO_KATAKANA_KEY,
+@@ -1132,7 +1132,7 @@
+         N_("Select keys to convert to katakana"),
+         N_("The key events to convert the preedit string to katakana. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONV_TO_HALF_KEY,
+@@ -1142,7 +1142,7 @@
+         N_("Select keys to convert to half width"),
+         N_("The key events to convert the preedit string to half width. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONV_TO_HALF_KATAKANA_KEY,
+@@ -1152,7 +1152,7 @@
+         N_("Select keys to convert to half width katakana"),
+         N_("The key events to convert the preedit string to half width katakana. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONV_TO_WIDE_LATIN_KEY,
+@@ -1162,7 +1162,7 @@
+         N_("Select keys to convert to wide latin"),
+         N_("The key events to convert the preedit string to wide latin. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONV_TO_LATIN_KEY,
+@@ -1172,7 +1172,7 @@
+         N_("Select keys to convert to latin"),
+         N_("The key events to convert the preedit string to latin. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -1182,7 +1182,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -1196,7 +1196,7 @@
+         N_("Select edit dictionary keys"),
+         N_("The key events to launch dictionary administration tool. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_ADD_WORD_KEY,
+@@ -1206,7 +1206,7 @@
+         N_("Select add a word keys"),
+         N_("The key events to launch the tool to add a word. "),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -1216,7 +1216,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
+@@ -1233,7 +1233,7 @@
+         N_("The color of preediting text"),
+         N_("The color of preediting text"),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_CONVERSION_FG_COLOR,
+@@ -1246,7 +1246,7 @@
+         N_("The color of conversion text"),
+         N_("The color of conversion text"),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         SCIM_ANTHY_CONFIG_SELECTED_SEGMENT_FG_COLOR,
+@@ -1259,7 +1259,7 @@
+         N_("The color of selected segment text"),
+         N_("The color of selected segment text in the conversion text"),
+         NULL,
+-        false,
++        NULL,
+     },
+     {
+         NULL,
+@@ -1272,7 +1272,7 @@
+         NULL,
+         NULL,
+         NULL,
+-        false,
++        NULL,
+     },
+ };
+ 
diff --git a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
index d309c2f3be9e..f901ad56c278 100644
--- a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
+++ b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit autotools eutils
 
@@ -26,8 +26,12 @@ DEPEND="${DEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	default
+
 	if use gtk3; then
 		EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" epatch
+	else
+		epatch "${FILESDIR}/${P}-gtk2_build.patch"
 	fi
 
 	eautoreconf
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index a2d5c47478ce..7919dd055d60 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,5 +1,5 @@
 DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
 DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
 EBUILD unicode-cldr-31.0.1.ebuild 496 BLAKE2B 8df1bcb6bbc05a9177c20aab6337a752e65d21ac11993aaa85a48025f5e196eb151a09dd3525ee76ffdae1710c0ff399fe6428dbada25ae89d83f64300b445ff SHA512 93ba56c3abf39bc27c7d825c63255fcea2c1c2d942b3984fd5a98cd911399f5ac4002e1e89972ca5495e9787cba266d0ce82f4d83ff9699d4c33bce90a02a880
-EBUILD unicode-cldr-33.0.ebuild 712 BLAKE2B c9a76341b750bf9a78d6ec87ca0209b2399750573a74c363f5291d569b5e2a84eb178ea04461d7b2f79805ac074d11e12a71e48e65a4487822889c75b6d45a56 SHA512 5c896d1523b417048b078c9ecd4ce0f25a3b4fb0f4e0d9f10be5f7141f40e7f935fd5c20a5e9e0dd12ec493b84466090006182a62794038ffa3c7255c6fc56a1
+EBUILD unicode-cldr-33.0.ebuild 711 BLAKE2B 3b80883ca9a18a625587fc42aa852e83038106c82bedaf4ded438137caec69ea0a1ae67e5dc85fed41fd5efdefe9367c22761db1c8fc8c2405da319a29d462ad SHA512 5c77c27011c3d5a03d3d2adfeeefdc21801b38b6de85d199bea396001e550f35dbea21411fd6bbd86f7a57023ff33ebc0981650e7f851151073a71e41d90e8cb
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
index 3c0f240713cc..276665ee3e26 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
@@ -13,7 +13,7 @@ fi
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 97387024f562..8e13a01398a8 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -8,6 +8,6 @@ DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d246
 DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
 DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
 DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
-EBUILD unicode-emoji-11.0.ebuild 1026 BLAKE2B 7125e4548a20712cf1db24d0762d8b92759fd9ded3fafae3d0487271c46474b6d9d6f7a19d2fd22ad3fa890a56305316551f73235c13540e40c65c8baa174b47 SHA512 5cd02574626e9720fbf16ee3482a028779fd5bea79cdf74d8594b495a5297edb01206e9a67f43b2f84a73da906d1d8a1c3382bedeb9ece290bc7224fb75b99c1
+EBUILD unicode-emoji-11.0.ebuild 1025 BLAKE2B 98c6e475ed8a881e9d3958fe49468e409376cf50d74de20bf3ed9d61c67f3b035b3894551632b06bc040ce836b40cb2e8a052ef28cf323b3baa20a9b62d4fff9 SHA512 f828fc3dd9fd43856a327fd352fbf5f6e34d678f17b90f9c211a48a54bc6e1823961e5c0ca3a5478754c29b31c99e42f1ff8c53f9f73015c291e073feb2d3787
 EBUILD unicode-emoji-5.0.ebuild 880 BLAKE2B 08d91ce21e632d7a1befe8be1ca4495ece3e56d38d9bf2f062d086ebe10c0b8db89d021ddde659f0c1a383edfae80bdc5becbcd0ca37c7edc158c1d93ef8775a SHA512 b23eae90ba1df31c6965028ebc6d9b0f3064cfdb16f1069a7774e20ea61780bc4b4c086113f45aaa7e5aa00c4501782ed01972186cb5b753b61d9b33dbc328c5
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
index 6df09e50e43f..299080677561 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""