gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /app-i18n
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
82 files changed, 840 insertions, 672 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 427a1c0c63cd..da8c3477ff0f 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest
index 51dbd35eb36b..9cd88782455a 100644
--- a/app-i18n/fcitx-sunpinyin/Manifest
+++ b/app-i18n/fcitx-sunpinyin/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 BLAKE2B 1f64d96d35c6f455be15a56eb065d97a988f671d40392a3ea3e96fc53b22cf048cff61f406d0e001cc7cfe531a8dc5508ef7862c17253b409330ac2d0af52f7c SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a
-EBUILD fcitx-sunpinyin-0.4.2.ebuild 812 BLAKE2B d377f663a6dd0ee2d35b2b682b294292aedfcf9c6ad06f25b055616e47cb24fb67078cf1b9d153b4cfe73e61a91ef1d478c0ece93cfa71c12d5c737e90fed626 SHA512 d642e605b49beea06b948d106bf6e6d42fc2a4a7926e8b08b89cfd1973684edeeb2ddf4d3f90851c7c6e7fc748a1fc1368135b6d1b6f4ce12477f191b0f3e8c6
-EBUILD fcitx-sunpinyin-4.9999.ebuild 793 BLAKE2B 54a1682e876af9294daf79253aa66be155793191afa8caa1ddfd77de7a58786882f2a5d047ea641759fd38dc0e9c0d2b3b75cd3eb2b1994073817e3d6baf7706 SHA512 533804aad9a7dd27fe389b994b001b149d8df3154a1df1aeeb0fa6f23c7f04338a7d3712b82f2c2f4aa0eb451cb7fd3c44dff606fc4b6ffff69f6ca81569e141
+EBUILD fcitx-sunpinyin-0.4.2.ebuild 830 BLAKE2B fe2e82ecc1ebf52770a10cb4d5a683609b304584408d6108851c6b017da74558ec451bc8da7adf7094c2515006862a0a92d3e83303b0617047b31f99872033c0 SHA512 0317002310d21121b52331e2e1bff8dc732f9d626d03c1cced36bb82429be0adccbfa1f2d2073cf49d5d18489383629d5485364c03696457072e0f20b9f4d926
+EBUILD fcitx-sunpinyin-4.9999.ebuild 811 BLAKE2B 6ae98312e88bde2da2d6439b85ad9f9a1653aa691e459240f40824522eee67f7582d0a777461c43b3fe9d1516b51a07333896d48e65d3e0db7cfc6cf9b62369e SHA512 af403d1715e14ca877460ba2e08adef7cb8b980c234938dc7a246117cfb741d29ac991d1b3d976fd4e5af65283f43d95571ebd90a254222deb6f28cd92c27ff8
 MISC metadata.xml 454 BLAKE2B eece0c6515bdda6ec7f42b7d74152cfc63a3b85df35e7ccc0d2c829539455793907b717c7ed1cf5bc8012ef718d23ccd293bb712fb28f3eba702009c3a57de90 SHA512 4d1a4ccae3b7f553075938c4d59ea3f7eaf65e6e18969a5af3956ab120d6a88e1c5c67f5e91994498750058b54c5f26436be38599bcd22cbb03068307069e4c7
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
index 64c5adb2c758..9d24259252a4 100644
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,18 +24,19 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/sunpinyin-2.0.4_alpha:=
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-i18n/sunpinyin-data"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
index cc7a98ca63d7..3a652f5a19c5 100644
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,18 +24,19 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/sunpinyin-2.0.4_alpha:=
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-i18n/sunpinyin-data"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index 20a2d7ad3ff7..7f9a3729db94 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -2,4 +2,4 @@ DIST ibus-anthy-1.5.10.tar.gz 758528 BLAKE2B 39496f5c3a5f2038f3f81e09504e472a32d
 DIST ibus-anthy-1.5.11.tar.gz 809725 BLAKE2B b12139e208c401e3fdda0d3a184b0246d039e077b827d1aeb2da20470deeb62551026c68ba39c289e7876467147a6ba93d318d0582a9b45866c2f5a4f52e85aa SHA512 2ac85bf4ddba56e3f84c3732082b3b63a07175ea712aad2865de4f87b8c0967da303ee1edccbed0890095e8ddab10e58307a47b72ee11b51de3927fdb9e72418
 EBUILD ibus-anthy-1.5.10-r2.ebuild 1328 BLAKE2B d4a5f82c9cc64baf8c7a85ea96fd086720f5c035bbbc77775db9fb024e49bf9d881c67fcaa4e0fc3712e430bfe427c1dcd2f8d9e9a4d935bff9dfdbf5691ef4a SHA512 e40b42973bdde6c303e2efdee020fb5b30fdfcce71bd0003d25f4bfed1f5921728736252194de8dc074b3fdbc93c201053913c975ce5684f36f8bf9148b9f682
 EBUILD ibus-anthy-1.5.11-r1.ebuild 1311 BLAKE2B 7f5f22fb4b5d1c86c73ebaa93ba6d8df6c77ad8324d3321e289435b0bbdfc9824c7cf6570c96c020512d8a73e77891ea4347298ac890bafcad7149acda591f2b SHA512 16fd92d4d98914cbea997132d7727e38700ad422ebd2e0974b66f6873730be71ad330dd82719e506493e141edf9a0516869bcd5ac784f83fdfc3e5fbdd1a5f6c
-MISC metadata.xml 476 BLAKE2B 33f4115e9bafa5d3f491ea05b8395123c9cb6b844959df2ee8b2cc9609b8fd20d25cc870adc117c9e96e17f215c806d82ff138b01c2b02e2e63eb99d568ea626 SHA512 024c387b5eb01279f8803df81b1d7dc2b86969ffee5986bef75987c066cce48f7d1fe8ea35790be4fafbff2281850f2b03904f41e06bc37fc9d40537eca96c07
+MISC metadata.xml 324 BLAKE2B 23933e913b8147ddcfb4c67ac1751a3e9145c92ca0c93a190a437d11a9e20b7e668fc3f5562348ce69da05ba0a2e9eddf4f36f78efc0881ceb62b33d2e1ebf43 SHA512 2e01d285b415d6f8f114306ad24bfa756d11e83bbb0e61f21bc5a4b1c99fef92627766a0437436aaee0295401e2cd55215751e5511868eb8ce70a2affa38518c
diff --git a/app-i18n/ibus-anthy/metadata.xml b/app-i18n/ibus-anthy/metadata.xml
index 384ad03f3758..d3b3cfaef39e 100644
--- a/app-i18n/ibus-anthy/metadata.xml
+++ b/app-i18n/ibus-anthy/metadata.xml
@@ -5,10 +5,6 @@
     <email>cjk@gentoo.org</email>
     <name>Cjk</name>
   </maintainer>
-  <longdescription lang="en">
-    The Anthy engine for IBus. It provides Japanese input method from
-    <pkg>app-i18n/anthy</pkg>.
-  </longdescription>
   <upstream>
     <remote-id type="github">ibus/ibus-anthy</remote-id>
   </upstream>
diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index 5141e8672853..bc8e0e60c8d1 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -3,4 +3,4 @@ DIST ibus-chewing-1.5.1-Source.tar.gz 177044 BLAKE2B b188c7ea2c12fd1ccf64a70355d
 DIST ibus-chewing-1.6.1.tar.gz 111103 BLAKE2B c9b22b0fe4b164d02a1782479e139e04e3113299fb3ccebdba24eaa9d15964eca34d381f45f0c313bb53bc0b8c7f7b649ff4c0179c712f6d880e3d92a9d02692 SHA512 b093db79c656433614b9f72719a2b0768a30c2fb6fa066eda1e79cc9932ce1836f7f1e5611612fb44f260fe80a9baa9e18fdc9754b285e8a5f12a87c376cbd39
 EBUILD ibus-chewing-1.5.1-r1.ebuild 1448 BLAKE2B 98a4011ecca1f227dea9b9ca54c8f70434136a395b71ea66ae13e482b5b7eba6dcc32952e7830bea6b8d32088e280ec20e4fbafd3b34812c1d48804f45259235 SHA512 1920f9e0d121ed7aac0ebb6d5bf709c80df35b7f11d06e02e63ad68b46aa30a08d955236b916ad88abd30b38834e1872a8bda0b81caaadb63a6c51e3856e9a10
 EBUILD ibus-chewing-1.6.1.ebuild 1428 BLAKE2B a8f80ddb66a61814ecfceccc538d8500ab2147e95433e23915f8120cf283ebbbb81968aa5f01b49720180ebca6327f4b51416d1d7a9365db6c3bb93d8c49fe05 SHA512 280a2b71c2cbebf818b694933de93ad0b3af6dd521848b05d2f074d58d51111ab1a51011017896b670e62987dbe1ecd2c24c6268d2cd199a8951ec0c3ec35abd
-MISC metadata.xml 584 BLAKE2B 1958617545888bfe66e4540285ca910d36dd7c7cef55f63577a762ab4b1164c0320de935c6e8dab5d31c09f89f89c919bf2800a6cae65c69b5c603c31d437f6f SHA512 ea88b32df0e2ecca5f472339a7602ddf65523cb186a7a372bfab762803db50020369b4cb1ba457bad3e364e3ef867c2ce2f0e485525b55693860aa2ecee595e9
+MISC metadata.xml 424 BLAKE2B bef1892ba0f1960bc383473a2338e7c8e78d92cf310a38d581d2f30542b47713384e099654c184dc5bcf18d6e349305d34dbdf8e2a7f5814dc8d5846c7a2db82 SHA512 83929143681626845cf93d959bb6d81ee4ad084ea5c5c3f6fed7d8bff713d59a2bddc04cfa76ef3644db71d4278cc317ba8e752902c6f1d2220e0cdd2e029248
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
index e44e996ccd57..d41c94261402 100644
--- a/app-i18n/ibus-chewing/metadata.xml
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -5,10 +5,6 @@
     <email>cjk@gentoo.org</email>
     <name>Cjk</name>
   </maintainer>
-  <longdescription lang="en">
-    The Chewing engine for IBus. It provides a Chinese input method from
-    <pkg>app-i18n/libchewing</pkg>.
-  </longdescription>
   <use>
     <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
   </use>
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 36c06a89af65..a8e1c0248848 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4
-EBUILD ibus-hangul-1.5.3-r1.ebuild 1001 BLAKE2B 7d007bf60bb77d245c2121e987e72e87037527b60060dc89bbb23b500c9fc0d06d0c6005a16207fc7a2cb01d321a34f0d3b17e07b9a086ed664ac51a43865c06 SHA512 d400092fc0c62f43064227fca1d815a4ea19b66588c92d3294f3dda9465b59fff8997ea2a70f47df3230fd13e4defe0c990a777a896a0d81e0484a9e95cde5c4
-MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
+DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
+EBUILD ibus-hangul-1.5.3-r1.ebuild 1002 BLAKE2B 41dc55336a59298475ad06ad3cf631a8c17b207fb394a7c8deff57ab5b973abb212f5b4e8c1723aa3278ed078be35faf5d00b7bae9aeceacccada1fddb9e6a57 SHA512 175ba4d2830ad9ad328cb41f47c6017196b89d4c32d354b200d9e1973504aface6dbfab24830b5b4f39f7e37564519f3ee624aa42a14698f7a410b888e55b7a8
+EBUILD ibus-hangul-1.5.4.ebuild 1004 BLAKE2B 5f4ccf4cf6bc6dafb654c3163382914dc922ca686a5e701d2fef5e427e20a4d4188b92887283037a0d23319766cd88a346ff8897d7e92c490c5ed6d5b8c82e51 SHA512 56a8dcbf69dafb7b189e0ea4821568a64f0f74a56a6e0ccec3b95ba9d14552a5b53d0769cd4467fe0a28d4d14d469f5b223f06221607ff05d4b684a208dd44fc
+MISC metadata.xml 320 BLAKE2B 1b7a03c3eb5ec719b5e6fae06a8189708e68e43d2e9ec26550d6ddf0d4d5a744ad0a7beab4a5952fa9b1284abfb8c723aedc068a0651d3c5cc314c97cd0f6e4a SHA512 8db6cca378e45fd7d112e23a23a3c50f3f4e6da485ddd2e7831c45a64d7df8f8b9d8867c29bdaf924d08f4a6baad563022c4517dec4989c2a37d26719372b8f3
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
index 6d04d1fec63d..660ec8f332e9 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Korean Hangul engine for IBus"
 HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
 SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
new file mode 100644
index 000000000000..1c7692b697c0
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Korean Hangul engine for IBus"
+HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
+SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-python=${EPYTHON}
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-hangul/metadata.xml b/app-i18n/ibus-hangul/metadata.xml
index 13995a6450cd..23e099644a68 100644
--- a/app-i18n/ibus-hangul/metadata.xml
+++ b/app-i18n/ibus-hangul/metadata.xml
@@ -5,10 +5,6 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<longdescription lang="en">
-		The Hangul engine for IBus. It provides Korean input method from
-		<pkg>app-i18n/libhangul</pkg>.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">libhangul/ibus-hangul</remote-id>
 	</upstream>
diff --git a/app-i18n/ibus-input-pad/Manifest b/app-i18n/ibus-input-pad/Manifest
index 97445bc32fe5..2b8aa286a416 100644
--- a/app-i18n/ibus-input-pad/Manifest
+++ b/app-i18n/ibus-input-pad/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-input-pad-1.4.99.20140916.tar.gz 415453 BLAKE2B 43e9ac935bec1008d41aa3d71965e63e01c388cbf2d208520df8b6ebf99af6cd6c7d128612b9917234fa0958ff5c8d5edf99ca0e6f3f21da8da4e7b863b4774a SHA512 6b03dff097d06ff7b51393ce49c04faa169152c5b02d2cfbcbfab480a00920bdeb7f5e6ebfed19bdee792fe9b52e0aacda0ff629fccff24523f000d8915c56ba
 EBUILD ibus-input-pad-1.4.99_pre20140916.ebuild 587 BLAKE2B 098348e90a135beb49225a3dabc475212349bf18aea27239c0d0145bf4a5b8001aaafbd49e9cbb11563f1a6bdb2ccace84f88e7b3f18d27f3baf0f057cb4f73f SHA512 c0c64df8395e92c6f3806f4d9664c66088f194aee3217c90b0434e76b47af39d3283a9c1070cc6b361d78d5a4c6bc8bcb00720a988e9bf9993e22d40777bde5f
-MISC metadata.xml 484 BLAKE2B 47b64b57dbdb697f76843856756bbd865123c2e580ef37fa76df67cff774d9a337a5af1e7c4e2f6f8355190041d1fd3a235f5910b5bab65023c2031ec0a7136d SHA512 4adea61b092792b2ba2397d6bc8da3bc93909012daf00e1c134e51b4a75b197d29521b1325ad8e922e82aed8c74da691aeaabd3feac252c43c2d1aee15494f3e
+MISC metadata.xml 333 BLAKE2B 1c38fe17aad9e4db3ea93332c70e6efcc7f55880b3611b349167107d34fe8d98b540ecad7acea6c771c646bf7c199e79a40c25054ba78bfc8739b9d44268e796 SHA512 0ab234caadfa46c0eb341787b0670939376872721f8a06e53fbac6ff85c43bdd8933c158e99a3d2e6b3b24ee4ba1142cd2621c79d3acbc74757f39f2855cef8b
diff --git a/app-i18n/ibus-input-pad/metadata.xml b/app-i18n/ibus-input-pad/metadata.xml
index bf5fd2c11dc7..d4f9a8e15a0b 100644
--- a/app-i18n/ibus-input-pad/metadata.xml
+++ b/app-i18n/ibus-input-pad/metadata.xml
@@ -5,10 +5,6 @@
     <email>cjk@gentoo.org</email>
     <name>Cjk</name>
   </maintainer>
-  <longdescription lang="en">
-    The Input Pad engine for IBus. It provides an input pad from
-    <pkg>dev-libs/input-pad</pkg>.
-  </longdescription>
   <upstream>
     <remote-id type="github">fujiwarat/ibus-input-pad</remote-id>
   </upstream>
diff --git a/app-i18n/ibus-kkc/Manifest b/app-i18n/ibus-kkc/Manifest
index 04a4aa1000db..c04b0c6bfba2 100644
--- a/app-i18n/ibus-kkc/Manifest
+++ b/app-i18n/ibus-kkc/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-kkc-1.5.22.tar.gz 518844 BLAKE2B eb3d562960729ff4967781ca3cc2797915c4c3e3b60281ca05483da3180575500fd5688c1481d03a909e8a108082159197e23b3a6c4df672b7d57ccc774783b3 SHA512 767a995cb97ca7cf5434f64094351c4fcf1d3de9f31da6f6642ccec2d199ddfb58e27f281b4dd3c63f44dc29cd46b36808ecd1aacfe0b1320d0688d567eb6fd4
 EBUILD ibus-kkc-1.5.22.ebuild 694 BLAKE2B ba1accb04e5bd10ebbee544e15e2865312d67338afef9a09cb321550ed7528a4439c96adcc2c20b377fb33ca37157847912c1a5939a7d90a987da91c96794568 SHA512 92d2c1c5587edb7a62bac7e86c53858dd77d4f273fa8db304fb8749671a0ca1c94bdfd8655724a3531754eae712981ff32596128ec2572dd20864977c2cbdb07
-MISC metadata.xml 491 BLAKE2B 86b5c844b54926689e60e44fa12a91a0daffaf6ff2a95586787df96d3926072b87316a86201b6b07351be39ace8bdc822c7084013d92f30a9eb1373141cf1463 SHA512 a8a9e0599c426f5c64660b503c8d3ddfe3b1573a3b547f1b6e7bffd8a581dfe41d5f81439ad7456b589d43a41511a9d8a26dff9b7b8b138aa033e7ad1f917d69
+MISC metadata.xml 322 BLAKE2B 04629011af8393f0943c476300fa6a8b308f57ff3f95d73b053b4e0c70193b801b4d8507846fa48617bab510723febb3fa6a7b66947e15af95e00ab725c07698 SHA512 f8e44d91e68b7999131970fdfa7d0f59f0f26c578c2c79871c9ae46417c209592163ef5eff1dc6d25652fa843d03e570ec1fabb0dc1aac00e0f9c53544ce3112
diff --git a/app-i18n/ibus-kkc/metadata.xml b/app-i18n/ibus-kkc/metadata.xml
index 5516917a7bb0..c52521a4a3b0 100644
--- a/app-i18n/ibus-kkc/metadata.xml
+++ b/app-i18n/ibus-kkc/metadata.xml
@@ -5,10 +5,6 @@
     <email>cjk@gentoo.org</email>
     <name>Cjk</name>
   </maintainer>
-  <longdescription lang="en">
-    The Kana Kanji conversion engine for IBus. It provides Japanese input
-    method from <pkg>app-i18n/libkkc</pkg>.
-  </longdescription>
   <upstream>
     <remote-id type="github">ueno/ibus-kkc</remote-id>
   </upstream>
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index feafb7fdbcf1..68e0b4587bd1 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-libpinyin-1.11.1.tar.gz 1728202 BLAKE2B 6e2273c4ff1be76bb8b0e65b915e039c0a181981d20ed94662184e161e8639ad3d548de981d7bbae950ab8b5019bedaed9593e03282e2f9d207f831929d422bc SHA512 48691952a10f4ab545d8e233dc3cd75fc54270c03a687820048152636df26d233ee0fba89e4ec2ccd5a6e410b41e556872e3dd2468d59d44b3440e904b93528b
 DIST ibus-libpinyin-1.11.92.tar.gz 1730065 BLAKE2B 376bec6fa7616364c8ed4dc5b269edabda892ba4759ff03e93b4099c99440925126800ea3bf11eef91ea62c558fa7dbf05f3d68be5e25e701aaaeb37618b90a8 SHA512 b875b2fed6875806971b91e2abc62cdab1f70baef78840915f89466a7bcf3d1dfc70438ba85e7580bba92dec0ade50a2b05955fe6cd148bffd3888fa69f1c851
 EBUILD ibus-libpinyin-1.11.1-r1.ebuild 1233 BLAKE2B 9b1587e1c4d5b1d48e2f7d4f1ab3638146b051930ae9cddc0dacbca7e649831932991d214861bb961504d7d1cd113873a63b2fc871ca74498332a723a7d9faf3 SHA512 197112d524a17ef36f8d1ff1d3b89ffef0ae06c00238d6e385232af98dd3d4251fb79fdcc67f12e1f161f32e089ccf673e1a457e73bf5076972f3d470715dc92
-EBUILD ibus-libpinyin-1.11.92-r1.ebuild 1318 BLAKE2B 547550957a76e1e2aa586adb47c91f47fe34b2a880ad5df607505d5698a1b3312d7a6782d5595552ae96aedf47499033e845bd5b5b269a6f2027a10a1ede5842 SHA512 a3a64aed92c3bf1a16cc2ee9d2b2293063fa5c4873ad8f9f5c3a15fbee6a09f4503ee22883032c6a17d113575bffba903c98c2e87b105b447c461c0edc3b6a49
+EBUILD ibus-libpinyin-1.11.92-r1.ebuild 1317 BLAKE2B 1b67f62bfcfba49f7feaa8c4b5fd517f834af65a6253ff637fb8486ccc3696fac88a386278dee097a829d96855e78b43172586d850a7cbea9d67287b620342cd SHA512 3701f099effd1cfdb0457fe6ee510009c2e741ba6e53991b5fc1b56f931d19b53b3aeb5f4b75d690f8c05be9b2b39862b10e0f556d088e0ce09b9caa6db2ba9a
 MISC metadata.xml 803 BLAKE2B b10294253280adbc8725c28f0c0ff4763b4dbf622fbab14b4ac53dca90ab00727a889f502269dcdbb394259a7d55fb6267e4d39ff2921f27edc8c77d17d71060 SHA512 0f06e79c123901006aeeba3a076c01ee5175f0d5134afbdd058b54992a43c8bbe561589fb910e07734efbc0a81057934ea04dcbb42136ed2d82a9ff96ed270ed
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild
index b7607c018342..8eb5b596beb5 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="boost lua opencc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index d3934175abc4..5c28d3a2ae58 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-m17n-1.3.4.tar.gz 436687 BLAKE2B 66c1138101b1c3634ebeef4657ef9d4accb30e9db0047d7232d1c25a5d061e705fb1f1bd2800c951baadeddf999a4eb24a581d59e261df4fd68d23b29ef3c530 SHA512 9e9bc290b0f0d68558d408f6e69aa3bd9bb767db827a95839b576b58c7a5056dedcbd9b0bf1aab5e26ab21e601acd67a53404a5fd54b436efaf2a706489f25c4
 DIST ibus-m17n-1.4.2.tar.gz 488603 BLAKE2B b916e1cc799eca2f042a0496a1184ccf32174eef1399f9ef7e3b7f3fc6ef2177514159706f1f4a4d696df136e7a5e7967af90ce0e1b4a021ac84e44973fe446c SHA512 5f865bd5d6dcd29828b14ea991effa6e883777173c48dd88cf676890dd2a980f95b3859b90fb44fb8cfe84df6da14335d3060605c4ce517f5eb179497a7b146b
-EBUILD ibus-m17n-1.3.4.ebuild 720 BLAKE2B 3298a1d7210d4352da864718e433f8492f7b00f5da58461d11edaccea1ca42791c9b3c3b4beaa22d59d270291367a3127d2b6c62cd69b66658eaa009f6426b53 SHA512 071d3c02802dadf2c135caab8772855de848caeb78ca31d8c6cc7d18fc23e6cdaaf945ec65d09796832266100bf4a4aa29b1ab08994a360a92a83be38323e773
-EBUILD ibus-m17n-1.4.2.ebuild 896 BLAKE2B b93209f806529562d0e9d9ab83eb21951dab9ed8ebdfd594ba0ea4aea0c6f205775b25f3079e3eccbf72418b4cfade4d7707dd5b55f07dff85949b49907abd00 SHA512 7fd515019c35c3e7edb1efc49aa9994e91ef2053635d1d6525171e6f290999aaf3573320fc3c4f7106302adc2121ee4967548a5976d8d101fabb2f062eec6b5f
+DIST ibus-m17n-1.4.3.tar.gz 489392 BLAKE2B bd37fb1f7160d4306be008e4f27fc5852db54318e6075f0887294f7ce30406ff697f41c5cc56734cffa4605b37f28cb89b3eb04a942e6acf352be50a273bd71f SHA512 8b42bcac8662b4924f54b6fe56427b32603746a3d1b0dfafb6dfec1296ec52847119f94fabb0a276f9de5918414fdf5f7b5aceaaabd8c01632cfd677344598ab
+EBUILD ibus-m17n-1.4.2.ebuild 894 BLAKE2B a3b645f0619c883f004886c6af497494297a44ec2df9a51c5125cab268ca7af2a90ddbbc0e5422e5435090ceb0b1803a5cff22c688649224d5f106aa6a5bf3b4 SHA512 190c501a2a5a1a6ed2f2c59d584566fc0cd550ba7df0ccf4bcaf4119d0ae8938a5c7d2e3b8cdafc62066f1b624b1a4cb0aa7039fd922e6e3154e3567ecbc1f42
+EBUILD ibus-m17n-1.4.3.ebuild 896 BLAKE2B b93209f806529562d0e9d9ab83eb21951dab9ed8ebdfd594ba0ea4aea0c6f205775b25f3079e3eccbf72418b4cfade4d7707dd5b55f07dff85949b49907abd00 SHA512 7fd515019c35c3e7edb1efc49aa9994e91ef2053635d1d6525171e6f290999aaf3573320fc3c4f7106302adc2121ee4967548a5976d8d101fabb2f062eec6b5f
 MISC metadata.xml 679 BLAKE2B a374aafbf949a9cb71906396787329ea1cd31775b29bf1675b30c98098e1025ee5e96dcdce2e8324bd6d3bfc05e854f89b1120a2e9410834a4dab767db1336b0 SHA512 c07286ebfb6f8bcf82c4fe6b5d02cf0a49287c7609daa42a356b8bfe7b3c074558d39d987decbffd15b10a33d475630b5f7194ff9941c9762c87dbcbefada953
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild
index ed8610ca2b2e..3e340d79a5b3 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk gtk2 nls"
 REQUIRED_USE="gtk2? ( gtk )"
 
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.3.ebuild
index e4d15371acb1..ed8610ca2b2e 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.3.ebuild
@@ -3,13 +3,15 @@
 
 EAPI="7"
 
+inherit gnome2-utils xdg
+
 DESCRIPTION="M17N engine for IBus"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gtk gtk2 nls"
 REQUIRED_USE="gtk2? ( gtk )"
 
@@ -30,3 +32,18 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
 }
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index 6e1d3f2b7c8c..9ddc0956c2cc 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -2,5 +2,5 @@ AUX ibus-pinyin-1.5.0-content-type-method.patch 5534 BLAKE2B 658a4d099b02b344f38
 AUX ibus-pinyin-1.5.0-python3.patch 2983 BLAKE2B 35f8b1d0649a3614fcecec78b3246dcecd8b40f68d71165b2c40d802bb42bff1d8f3f4c2c1baf25fc6ca97e190f7eb2004054f4d9857b605129b45c41b273f52 SHA512 c9eda6fb227358c8214ba717f6d800f3c47f9110e99e16601966651bd698cd703daedcec82a2933b76701bc05870ff88715a6d639333b5e5959c1f5e86e2dcff
 AUX ibus-pinyin-boost.patch 409 BLAKE2B 5fececc7f4ed6941d374799ccdb1d9d7deeeb7078bedc8d0085e12f8310c42d752c14168a7d07a88e9412fa9cbff5c5bdf4274202d2ed6b6e7f337a96c65c3f0 SHA512 8e4efe9b5d12d35672dd8891a49599bef6611aeb723e8fbc08197896e417cca1d55cf31a0bb1f3ec572db489b01aa36349eaf9238d1a693483d6e21bc10eab2e
 DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
-EBUILD ibus-pinyin-1.5.0-r4.ebuild 1170 BLAKE2B 9211a46f626878625bafca245b4b906c5e1441c5c87a80c6747908e559415c5aa20a44d1a35616a21a29661355dffbc033c5052b4c9f9d4546b8f2e759fc4399 SHA512 5b06c0899359b69084dfc8bef3e0bff6fa2fbb2c2bb267496a566f9cd106da254384f6cf3d2efd50ccfedf8537fa1a435b22e0ca49aa169ba1d679a9f302ffe2
-MISC metadata.xml 675 BLAKE2B 53ddd9a158adba18b4bbb56af1f1e75013c61ea23c245703489b677ed3a5eefd1fb0bba28b4269c5bff4ca6453ea5bb4027b0904f21ee89ecc2ca0d5c7041b52 SHA512 87c1743bc802f22de1d2441403b00eaee1a834730ee1b9f3c3ae62728fdc7073bbe01faec464042243ac7dea1ce11aca709bd5d836fca3c09ccb77c64ea27aea
+EBUILD ibus-pinyin-1.5.0-r4.ebuild 1159 BLAKE2B 051c8d4de213c3efe0bc5cd054b710882736b2f6cb4cac2d26894e4c69c2c6c785d6eebbffaea3f129e1982843d3d71aa0970a30e187679b0815fb760df7903b SHA512 717fdef2d6a81447e131768681ef66409d1462d6ea8f64f159ab7376b8a9af06570dd8d1e49e2a69b8336045df1e1249747a65a4c91f1a2e4dd95a48ffc4ec0c
+MISC metadata.xml 524 BLAKE2B e4e6b11896bb13e6a6578cf560db7d0ea592af3d129cb15b9fa2302f259ef3fa9e78faced298bb2d1e0b8c8eb763607c84f0fa87feaf2f319607a4565a3d14f1 SHA512 cb400bcfd3a92b0adde9301e1c8c9b4f3251307d351caca6ece541793d24763431d1b67c35a191a28affd4543e3b4534d15c5a573299659f29edc8de26fb441e
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
index e5a1dd1e1eaf..b677397a4f98 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=(python3_{6,7,8})
 
 inherit autotools python-single-r1
 
diff --git a/app-i18n/ibus-pinyin/metadata.xml b/app-i18n/ibus-pinyin/metadata.xml
index f82714b167fa..c80f82c2f173 100644
--- a/app-i18n/ibus-pinyin/metadata.xml
+++ b/app-i18n/ibus-pinyin/metadata.xml
@@ -9,10 +9,6 @@
     <email>cjk@gentoo.org</email>
     <name>Cjk</name>
   </maintainer>
-  <longdescription lang="en">
-    The Pinyin engine for IBus. It provides Chinese input method from
-    <pkg>app-i18n/pyzy</pkg>.
-  </longdescription>
   <use>
     <flag name="boost">Enable support for <pkg>dev-libs/boost</pkg></flag>
   </use>
diff --git a/app-i18n/ibus-skk/Manifest b/app-i18n/ibus-skk/Manifest
index d40442def3fc..d29766f7e515 100644
--- a/app-i18n/ibus-skk/Manifest
+++ b/app-i18n/ibus-skk/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-skk-1.4.2.tar.gz 491882 BLAKE2B 999eb9f1b36406a8d665b2c929fcdef5e57bef5c6206075333435f46774445497d6d953bc695c22f6afa5700283c32a20c2d4e9227fd30e5552f5688cd524aab SHA512 cec7fbffaa78c406f3b9502bc64e2290fec579102a37ce61cb6424c3e06d159653f165b48e09f1256f38491bce6819460c6d226cd765ab150a8dfa80e2707fe1
-EBUILD ibus-skk-1.4.2.ebuild 677 BLAKE2B 5538513d4f7b79c2e51510fc470a0e4067d93eb3a8bfe0c33a86b64e830dcd37c05e5fec6defc0b0246e79c4e16539ba4a56ff926d6e045ab8cfa98a91847549 SHA512 52cce129f1d192217aae798513411a769cacb00fdd9449068cf00398c0dcae753c18d5194cb00caf55c91a3c49e0eea56f77b4af58f18138727823d84deeae5b
-MISC metadata.xml 473 BLAKE2B 8902e2b4a2bffb4243bef33353868e2c4c75c3bf36efaac1572f17a265b7084f0c136a4bf77f123016c3fe3cead11463dc1de34a981284c36228667240759705 SHA512 dc943537d163c1197dae0d85ee91fec23eba4026f0bb91d3211cf7ef2cba414c6ab65eb69c74205af35e0620f89afa553927d70b4883590b4a06823e442ae771
+DIST ibus-skk-1.4.3.tar.xz 321344 BLAKE2B f761cf7c97ecf5830715a7bbae657c72d437e0be69a0867780ee574f9ea17f3d612dc5a76e3b4499fd203878702abdd2e37fdc980123a80daf5f03db7645b1f4 SHA512 c05302878f9c4b0a59daa1d285ab44501f63c0f7890149412137d3f6124fc4a7ebfe16172de311cbb5f2b9035255b5784a715a7832e6734d76e11bf19e2c9d3b
+EBUILD ibus-skk-1.4.2.ebuild 678 BLAKE2B 2a3201da67aa8eb51ca068cacc85b849cf9535ee82a0b2f9770120794b79b18bd3db6c550870d3918dd44b391d16235613e2f101478ab15083c6eea617b1cb83 SHA512 99e7464159290b7a3f4be05145233c1f7a64ee43a58a8d7c2174ffb91cd9d33866c977414bbd12c6b86cabfe8546618e05aad5a118e15873f9a55ca9c5ca20a3
+EBUILD ibus-skk-1.4.3.ebuild 680 BLAKE2B 1cdaafb4d8b32cf6ef8291e01cd10beec54dcf8aa6f7a135c221d9f6c127a9a31cd7d78f253b9d6f4667e2fe65d6b6a9c1337f8bb7b838562fbbb87365cb7e42 SHA512 52dd6e6f1470f1c91c1fa60bf74a35f2c9e32992eab259ca83eac40f57eff6d1f68a6587c4dc63551263f8fecc2e5d830087f2b4c3f1f522992c9722217f257a
+MISC metadata.xml 312 BLAKE2B 4669631cc5e0b5311975cfdb1036a7128eafcf4ebb5d7eebac08292c65e7a0cbf53e422017c487f03547025a5457bf348fe8aaa8b5226698121a4108ed28c569 SHA512 e22f1ad5634ee6f67af7bba101d47cbe7112ca8c6966b6eaf202d18d6fc607558b28284b466210a53299655297757a3e2dbc9fde202e47d5f418fe94b08bf08f
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
index 0ad3a06bbcb0..4717ee5c4370 100644
--- a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit vala
 
@@ -9,7 +9,7 @@ DESCRIPTION="Japanese SKK engine for IBus"
 HOMEPAGE="https://github.com/ueno/ibus-skk"
 SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild
new file mode 100644
index 000000000000..60f705da342e
--- /dev/null
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit vala
+
+DESCRIPTION="Japanese SKK engine for IBus"
+HOMEPAGE="https://github.com/ueno/ibus-skk"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+CDEPEND="app-i18n/ibus
+	>=app-i18n/libskk-1.0.2
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )"
+RDEPEND="${CDEPEND}
+	app-i18n/skk-jisyo"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-i18n/ibus-skk/metadata.xml b/app-i18n/ibus-skk/metadata.xml
index b37d0b9824e3..43368dedb0fe 100644
--- a/app-i18n/ibus-skk/metadata.xml
+++ b/app-i18n/ibus-skk/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription lang="en">
-    The SKK engine for IBus. It provides Japanese input method from
-    <pkg>app-i18n/libskk</pkg>.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">ueno/ibus-skk</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ueno/ibus-skk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index c29f9b67957d..ee8c544ae091 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,4 +1,7 @@
+AUX ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch 4691 BLAKE2B 162301e028b0b8f864c394368897d635b3fea8939e52c9068884b08752f51a5d550381680dda65b42e80f471bd0ab616940f138fd53c79655454d6fbfa070b3c SHA512 e67e202fe2587a4b985b047c893164d3a68ba7ff4ae08d9cf5dde501614c9d71bc4d9628858f7bd9ef2f954c9826134d8965c59f8548723df6e94ab8652daafd
 AUX ibus-sunpinyin-python3.patch 388 BLAKE2B 35131840c58bc47980dbbe046723217afb8926f61de601d664524b961c80f718753e41a82b7cdcd8b137d71c97ad84b91a3b71677610b2f369f9be2da2582185 SHA512 90c7d08588e996e7df966f9ee4b3b044a038392a0f3f074f4803b45a6579ad774119a3c700167924f073a3109f8172f8fea12129c2eb36e914b89eb68cc5a7dc
+DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
+EBUILD ibus-sunpinyin-2.0.4_pre20200306162733.ebuild 2176 BLAKE2B 0d888d6dc8454753b7718dea85bca241a8680d3fea5a452b12d69e3c9e2d4f307783292a49aeb459108d0d390467492c688c1efaedffe8cc0e00d34fa76a8f51 SHA512 765578cd624782d80fd94dd6925b2e43ef44af73c2da19e69b344100e0a49f09a15f6b067b690e1b9ed6b500400d926fee6326af8fbfee6a8195822b37c458f7
 EBUILD ibus-sunpinyin-3.0.0_rc1-r1.ebuild 1331 BLAKE2B afb4525f5edfee440423c10c0412fd9a7d5cb6dc283bbd4cae5413f16e3d892b0e4ee178529b881d9243e9bce0482a65fe4f2f1168b6a21b2e184a5cdba28feb SHA512 915b0c1d6704e5b18a4b931bcb84cfd480f02322c01e74a0246eb7e7dc58e2a4609513889a9a88af7072e5b9361c03975a65e7cae0449deee17bb41f178c843b
-MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5
+MISC metadata.xml 420 BLAKE2B d59e5e24e6892f397a61f9b4f9cb3d82ca59a522ad8a82c29fcd9d636f097c0b8257363ae6d6977dafb3894aa8aa5f2f22b7664e4cfd8c79a571f9bf62e55f73 SHA512 ed92e8d756f41ea6618cf6f159a3514739a32344b4a63ab64037083e693d18af37de8747edf6c2f6e9006e4ce60ac128f4dbe36c2ab85801b78cbfe28a753a61
diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
new file mode 100644
index 000000000000..25b11f0a8009
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
@@ -0,0 +1,85 @@
+https://github.com/sunpinyin/sunpinyin/issues/111
+
+--- /wrapper/ibus/setup/main.py
++++ /wrapper/ibus/setup/main.py
+@@ -63,7 +63,7 @@
+ class Logger:
+     @staticmethod
+     def pr(message):
+-        print >> sys.stderr, message
++        print(message, file=sys.stderr)
+ 
+ 
+ class Option(object):
+@@ -73,10 +73,10 @@
+     """
+     config = ibus.Bus().get_config()
+     __wrappers = {
+-        type(True): glib.Variant.new_boolean,
+-        type(1): glib.Variant.new_int32,
+-        type('str'): glib.Variant.new_string,
+-        type([]): glib.Variant.new_strv,
++        bool: glib.Variant.new_boolean,
++        int: glib.Variant.new_int32,
++        str: glib.Variant.new_string,
++        list: glib.Variant.new_strv,
+     }
+ 
+     def __init__(self, name, default):
+@@ -258,7 +258,7 @@
+     def read_config(self):
+         if not self.saved_pairs:
+             self.saved_pairs = self.read()
+-        keys = set([pair.split(':')[0] for pair in self.saved_pairs])
++        keys = {pair.split(':')[0] for pair in self.saved_pairs}
+         for opt in self.options:
+             opt.is_enabled = (opt.key() in keys)
+             # throw away unknown pair
+@@ -445,28 +445,28 @@
+     # TODO: the UI should looks like a virtual keyboard,
+     #       user are allowed to choose the mappings to all punctuation keys.
+     def __init__(self):
+-        mappings = [MappingInfo('togglebutton1', [('`',None), ('~',u'～')]),
++        mappings = [MappingInfo('togglebutton1', [('`', None), ('~', '～')]),
+                     MappingInfo('togglebutton2', []),
+-                    MappingInfo('togglebutton3', [('2',None), ('@',u'＠')]),
+-                    MappingInfo('togglebutton4', [('3',None), ('#',u'＃')]),
+-                    MappingInfo('togglebutton5', [('4',None), ('$',u'¥' )]),
+-                    MappingInfo('togglebutton6', [('5',None), ('%',u'％')]),
+-                    MappingInfo('togglebutton7', [('6',None), ('^',u'…')]),
+-                    MappingInfo('togglebutton8', [('7',None), ('&',u'＆')]),
+-                    MappingInfo('togglebutton9', [('8',None), ('*',u'＊')]),
+-                    MappingInfo('togglebutton10', [('9',None), ('*',u'（')]),
+-                    MappingInfo('togglebutton11', [('0',None), ('*',u'）')]),
+-                    MappingInfo('togglebutton12', [('-',u'－'), ('_',u'——')]),
+-                    MappingInfo('togglebutton13', [('=',u'＝'), ('+',u'＋')]),
+-                    MappingInfo('togglebutton14', [('\\',None), ('|',u'‖')]),
+-                    MappingInfo('togglebutton27', [('[',u'〔'), ('{',u'｛')]),
+-                    MappingInfo('togglebutton28', [(']',u'〕'), ('}',u'｝')]),
++                    MappingInfo('togglebutton3', [('2', None), ('@', '＠')]),
++                    MappingInfo('togglebutton4', [('3', None), ('#', '＃')]),
++                    MappingInfo('togglebutton5', [('4', None), ('$', '¥' )]),
++                    MappingInfo('togglebutton6', [('5', None), ('%', '％')]),
++                    MappingInfo('togglebutton7', [('6', None), ('^', '…')]),
++                    MappingInfo('togglebutton8', [('7', None), ('&', '＆')]),
++                    MappingInfo('togglebutton9', [('8', None), ('*', '＊')]),
++                    MappingInfo('togglebutton10', [('9', None), ('*', '（')]),
++                    MappingInfo('togglebutton11', [('0', None), ('*', '）')]),
++                    MappingInfo('togglebutton12', [('-', '－'), ('_', '——')]),
++                    MappingInfo('togglebutton13', [('=', '＝'), ('+', '＋')]),
++                    MappingInfo('togglebutton14', [('\\', None), ('|', '‖')]),
++                    MappingInfo('togglebutton27', [('[', '〔'), ('{', '｛')]),
++                    MappingInfo('togglebutton28', [(']', '〕'), ('}', '｝')]),
+                     MappingInfo('togglebutton39', []),
+                     MappingInfo('togglebutton40', []),
+-                    MappingInfo('togglebutton50', [(',',None), ('<',u'〈')]),
+-                    MappingInfo('togglebutton51', [('.',u'·'), ('>',u'〉')]),
+-                    MappingInfo('togglebutton52', [('/',u'／'), ('?',None)])]
+-                    #'\'',(u'‘',u'’'),
++                    MappingInfo('togglebutton50', [(',', None), ('<', '〈')]),
++                    MappingInfo('togglebutton51', [('.', '·'), ('>', '〉')]),
++                    MappingInfo('togglebutton52', [('/', '／'), ('?', None)])]
++                    #'\'', ('‘', '’'),
+         MultiCheckDialog.__init__(self, ui_name="punctmapping",
+                                   config_name="General/PunctMapping/Mappings",
+                                   mappings=mappings,
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
new file mode 100644
index 000000000000..a73dd516a5ce
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2009-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+inherit python-single-r1 scons-utils toolchain-funcs
+
+MY_PN="sunpinyin"
+MY_P="${MY_PN}-${PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
+elif [[ "${PV}" == *_pre* ]]; then
+	SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
+fi
+
+DESCRIPTION="Chinese SunPinyin engine for IBus"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz"
+else
+	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+LICENSE="|| ( CDDL LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND="app-i18n/ibus
+	~app-i18n/sunpinyin-${PV}
+	dev-libs/glib:2
+	virtual/libintl"
+RDEPEND="${DEPEND}
+	app-i18n/sunpinyin-data
+	gui? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			app-i18n/ibus[introspection,python,${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
+		x11-libs/gtk+:3[introspection]
+	)"
+
+if [[ "${PV}" == *_pre* ]]; then
+	S="${WORKDIR}/${MY_PN}-${SUNPINYIN_GIT_REVISION}"
+elif [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${MY_PN}-${PV/_/-}"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.4_pre20200306162733-python-3.patch"
+)
+
+src_prepare() {
+	default
+	sed -e "/^exec python /s/python/${EPYTHON}/" -i wrapper/ibus/setup/ibus-setup-sunpinyin.in || die
+
+	if ! use gui; then
+		sed \
+			-e "s:'setup/ibus-setup-sunpinyin'::" \
+			-e "/env\.Alias('install-libexec'/s:, setup_target::" \
+			-i wrapper/ibus/SConstruct || die
+	fi
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	escons -C wrapper/ibus \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--libexecdir="${EPREFIX}/usr/libexec" \
+		--datadir="${EPREFIX}/usr/share"
+}
+
+src_install() {
+	escons -C wrapper/ibus --install-sandbox="${D}" install
+}
diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml
index 271ef4abaa80..db1b8135a9fd 100644
--- a/app-i18n/ibus-sunpinyin/metadata.xml
+++ b/app-i18n/ibus-sunpinyin/metadata.xml
@@ -5,6 +5,9 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<use>
+		<flag name="gui">Install graphical user interface tool (ibus-setup-sunpinyin)</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">sunpinyin/sunpinyin</remote-id>
 	</upstream>
diff --git a/app-i18n/ibus-table-chinese/Manifest b/app-i18n/ibus-table-chinese/Manifest
index 62c70f1808a2..5cd22f75cdf2 100644
--- a/app-i18n/ibus-table-chinese/Manifest
+++ b/app-i18n/ibus-table-chinese/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-table-chinese-1.8.2.tar.gz 10576111 BLAKE2B a80fa9c4780207efefba1118ee9dacc33dba4136b916a24971198b3325bf1b26f86cd4586db994db6dfaa85fffe087b021673d056b10df61c5f95ede4e967cd6 SHA512 30fd1c7ee8416cd62d8e26bc2646a667ac45c4579a7cb191c77e80fecccbc576c34f33ec0b5c55669c073a633298cfda1711e4b9d89a9ef8f6146acdc0167c1a
-EBUILD ibus-table-chinese-1.8.2.ebuild 747 BLAKE2B 529e69ecb824a1ae7d5f4b0e45236504690151e5d68c73564539232d9187200d91abcfea835e051bae12f77d9db398bd5bf2175fd2d516328b3a55710dcef87a SHA512 68e6bed7692488d771ecaf01dcd99a35452a4b9b709cc1565aead88a3728b23bdc34791dee695c1f4ef530ed171be2abad0cd429827f4527561d63fd7147f56f
-MISC metadata.xml 315 BLAKE2B a6f24959fcc2474a02a6dff5d81b54509c422cf333913b8120c8b93cad7f4261e58a5b480dcbb724559ec4562a7a43f1281ac772e7fa2e6e4c46393fa7bfde10 SHA512 ed671457e0df484fa4bcdc2673dee882b805fee5a912808d9b25ae1a201b443b7d5f29fa012f7fbb98e7195ede5f91583e907415b83279a9f034bbd65e4328fc
+DIST ibus-table-chinese-1.8.3.tar.gz 10824912 BLAKE2B e9f4e377a794827196e04e197044b3fdcd81d84ed89067e17745879495df69cc6e95814863f856cc0a7b7db0aba3cbd93d1c1d172f607fdd410dbed02dc4ad54 SHA512 610455343d9c9bf6577c7fd7aef9435c339c2f23c4d5f7ae2cbbc2366a9eb6a8a124e86621387497cc624e3276bf739b55602355ad41c4127f45f6d85cc5b4dc
+EBUILD ibus-table-chinese-1.8.2.ebuild 731 BLAKE2B ce48f80c7feb47b4ff2a0720e327faf322ebd180cfc022f4485d9a8d7da9de6ac8a480f8f3fc4beef1dfb811b15f2debbf4582c4a0f8cf70df26c985a32ec954 SHA512 13f1884ea80789b0436f3a993cd784fec1ac0417007c2b131ce3c3ce12e57c94b442d43e07a746c980360a910df7797cce9f11fefda92f6f5255ddc14f150212
+EBUILD ibus-table-chinese-1.8.3.ebuild 733 BLAKE2B 2e5b2092d7f6393a7d386e045444de81b7b0664744e085c14b2f70ecfac1e3371770a582172e74a881ae90823cf890369d3dcc033aee0f09aa3f0e20d6916ee3 SHA512 b691aea0d21000da67bc3a3c868c5db5d7b96799fd276092b9e43d439df9a15290ca98e599349e46511474abfccd9773b1438dbf6c888a04e20963dd56cc1e20
+MISC metadata.xml 326 BLAKE2B 8ad6d82690943dab490281b7528bec1206b13b15ed17c1092b82c7c0048888aded24806b286e87c64d211b1764ac39be710610d3d6f03915ba10c3b0cf887206 SHA512 936333058452b0857d987a7b56342defee9aef0f6b1bc689bdb8fc0b8c52c8d15765e013fb03175af8b8f1fa94adab214e2657d588175656b23de1c4baccd487
diff --git a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
index 8d412b554c15..193cb2396567 100644
--- a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
+++ b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 CMAKE_IN_SOURCE_BUILD="1"
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Chinese tables for IBus-Table"
 HOMEPAGE="https://github.com/definite/ibus-table-chinese"
 SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-i18n/ibus-table"
@@ -27,5 +27,5 @@ src_configure() {
 		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
 		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild
new file mode 100644
index 000000000000..a34f0e609639
--- /dev/null
+++ b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+CMAKE_IN_SOURCE_BUILD="1"
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake
+
+DESCRIPTION="Chinese tables for IBus-Table"
+HOMEPAGE="https://github.com/definite/ibus-table-chinese"
+SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus-table"
+DEPEND="${RDEPEND}
+	dev-util/cmake-fedora"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_FEDORA_TMP_DIR="${T}"
+		-DDATA_DIR="${EPREFIX}"/usr/share
+		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
+		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	cmake_src_configure
+}
diff --git a/app-i18n/ibus-table-chinese/metadata.xml b/app-i18n/ibus-table-chinese/metadata.xml
index d91706d7e8c4..e5db64701f35 100644
--- a/app-i18n/ibus-table-chinese/metadata.xml
+++ b/app-i18n/ibus-table-chinese/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">definite/ibus-table-chinese</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">definite/ibus-table-chinese</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table-others/Manifest b/app-i18n/ibus-table-others/Manifest
index 96350babc166..c8e1f3f16647 100644
--- a/app-i18n/ibus-table-others/Manifest
+++ b/app-i18n/ibus-table-others/Manifest
@@ -1,3 +1,5 @@
+DIST ibus-table-others-1.3.11.tar.gz 662398 BLAKE2B a600535b51b731c482eeecb78b8bff6ca14795e411348ed0e2cd4207ad1a89aed7d338c6b706695dd734f405ee5203e23dfffa370cae12ad763eabf6bbdfe848 SHA512 bfa17338e3a6a3e392bb3e5e5736af9bfa5584a897aea4ca72aec0df2c84dc94a0737f8fb87ced382e6acac3f8169ed2aef93a2f94330a4829048d009cb96ee0
 DIST ibus-table-others-1.3.9.tar.gz 627253 BLAKE2B b4c72ead9364945a3f15a348aa14e0886ebc7c7fd35448d573540ffd9510139630ac22228229ee1a37687e01179a0ec880ce170e84a196b0defe5c059b662583 SHA512 4557ba981a00035226b6cbe0d97ae14df275d3e7c5c453097b85e433a524e00efeebe508621495e63d6ff9cdd590f9d54b51a143147b83e1e3748f05b03d2019
-EBUILD ibus-table-others-1.3.9.ebuild 545 BLAKE2B e0193a288ccdc97aed4e45ac3c589f351d1037d19987948773d029ce92068b221de6f83326a6b2c14bdc397e8d611005165242a41a6c43cc2e75217e0502beaf SHA512 0f021b7df750474f7fb0f0f79434f6a481a50a7e52453818e72ea6be7510a0936ab4a4da2c473975b2f4151701adb427f93f5e54ad01143de4bf60b314debdd1
+EBUILD ibus-table-others-1.3.11.ebuild 552 BLAKE2B 1b430d48647bb709d400f599f734b835a924b31c65b8a139435c5ed8d8271aa7c30ba413738aecaccaedfff352ea55e70ba25e69ff5728c89cdd626d1b786b2f SHA512 8e0e686cdf3fbdac487bc9fa31009ff4f9ed60c1959a16219efe95a4ebcac935cde576cbc405963efddd9dcaca1444f89986940a52d2530338e9887871a64eb2
+EBUILD ibus-table-others-1.3.9.ebuild 550 BLAKE2B 00092cd76c017e18c6a51b55b420310f1ffd4857eac41b43ec55d2b3f708d0157b691b598c667874442eefebc47dd98a2652f4a66b514a77a7ed71c06ef5b59e SHA512 771619e90c05391279adf17213e2a66c323dc5927f25a73e1cfdc55886155ebb5f310bf0a81b9b344c1eb500009921092be0203715d696851734ceb110b17624
 MISC metadata.xml 641 BLAKE2B f397b2ad570982358e1eb76c061492976b937ab66c83eabfdc31c6e618f65f869b4f8488dc9d3a81c0a48fb0d84bd6c13af2fadb343f76b6bb2c75bdcff876fa SHA512 775e9f2f353f8bb9ed2a0aa1c6c8dff98886c0e28f10c87136f2b67f5eef9eb0af3b5d49ea0b1eb4ae5e09b43fa0987b8195520db844e0d20d07f0593fbe6b96
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
new file mode 100644
index 000000000000..9a293c70f8c3
--- /dev/null
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Various tables for IBus-Table"
+HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others"
+SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus-table
+	!app-i18n/ibus-table-code
+	!app-i18n/ibus-table-cyrillic
+	!app-i18n/ibus-table-latin
+	!app-i18n/ibus-table-tv"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
index ef774df954c8..c2f63c11cdbc 100644
--- a/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="Various tables for IBus-Table"
 HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others"
 SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-i18n/ibus-table
@@ -17,5 +17,5 @@ RDEPEND="app-i18n/ibus-table
 	!app-i18n/ibus-table-cyrillic
 	!app-i18n/ibus-table-latin
 	!app-i18n/ibus-table-tv"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 17ae9985a99d..001632a97ebf 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,7 +1,9 @@
 DIST ibus-table-1.11.0.tar.gz 1312790 BLAKE2B 2f4edf8c52fd24f8f6735cfae8fe471e3c30ed6aea341758fc891fd7aa3ebc0dc3bbbf2bd4135586b8400c3e39035e877a0486be58a74ad5eb78bfdeef547f0e SHA512 269d7516d2580436d3bcdef2c77717c8b21c277dae0f55da3703e2bb3f26669dac29ddf3d4291854b205b5b2f5ab54d1894b32d541d084b03cb6cbb870e6b256
 DIST ibus-table-1.12.0.tar.gz 1344881 BLAKE2B 7b463799dd8adebce2f626a82f469fa8bc77b6e9dc6812eca47b11ed84bf2fea97990262c15738e2e0a97620edf19415c3e4016c48029b29393e70492a96e666 SHA512 f99b4164c7304bc6137be07001d52fbf8267fa068d8a6e96e5cb7856d00f3a0b82ad0b8fa9ae577bb82daab78ddfab7a222e2ef8891515e9edbb4db6fac84862
+DIST ibus-table-1.12.1.tar.gz 1365421 BLAKE2B 1ce49d5a837fc6cc1e00e681a51518d6ac5e9fb421a10493c110c67247a625df1fd6174c7bf4ee1c465253b77fee402ef5ae2a6f50b9466ffd64727e68edaafe SHA512 9cbd7c24067d182d3917eb66d8b18ea30e893b2d9a19dfb48ce4c91a41868707bf9682011f374dc2397f59f101855bddde0fbbe374856063e1f4226de7a9a01b
 DIST ibus-table-1.9.21.tar.gz 615801 BLAKE2B f6b3fb4fe67e5f43cc7d21bd03cc530c03b3a161e099fbca0b116319f1590374ddcef2e97c2f4702c2cd8748e8009d703abfff51f93ffb933a1aecb028e03362 SHA512 354f7e8ece5c23b84251bd0d5ff06d7a368678ade25e340341ef9f85571b440c455d56660c743be97ff6776ff041c4da35079ce090955c5f87b8f3b587e35866
 EBUILD ibus-table-1.11.0.ebuild 1051 BLAKE2B 9e803ad1032e7857ef2ba7728c6bc1949224eb633060fdea8e721fcb998f9785d5e43ac1a551d0160046af802748a5616a72501220096b69bfa5402885e70aec SHA512 0d4a021c432d711f173ec393a90c182a818ac87b171e4c950698fc21aaf416a6f47eb7ed1f9e856e2bd8561b3199eb3fd19bb842795860066216061fa90a3063
 EBUILD ibus-table-1.12.0.ebuild 1051 BLAKE2B 9e803ad1032e7857ef2ba7728c6bc1949224eb633060fdea8e721fcb998f9785d5e43ac1a551d0160046af802748a5616a72501220096b69bfa5402885e70aec SHA512 0d4a021c432d711f173ec393a90c182a818ac87b171e4c950698fc21aaf416a6f47eb7ed1f9e856e2bd8561b3199eb3fd19bb842795860066216061fa90a3063
+EBUILD ibus-table-1.12.1.ebuild 1051 BLAKE2B 9e803ad1032e7857ef2ba7728c6bc1949224eb633060fdea8e721fcb998f9785d5e43ac1a551d0160046af802748a5616a72501220096b69bfa5402885e70aec SHA512 0d4a021c432d711f173ec393a90c182a818ac87b171e4c950698fc21aaf416a6f47eb7ed1f9e856e2bd8561b3199eb3fd19bb842795860066216061fa90a3063
 EBUILD ibus-table-1.9.21-r2.ebuild 1049 BLAKE2B dedee71b7357cedab5ff9c432e481213adbc46a878f396b80406e7b18b90ba871f1d1b76373ad46113891191c07d6cfe56efbc4508989635027a8e0d61d8e248 SHA512 8ba6eb93fc88a58783f886b4167f48a4537ec742db1cfd64a01044d5b2c95c64894772a74c3d898c0a1ce339d1ac4b32f416d19b213449685450f6fa4b3a41a4
-MISC metadata.xml 419 BLAKE2B 7d8e333e50af2c6d8032fbae3455032febd51e3e7209c55fbfb28b52bb80482d4b95f7ba3ce02465218a93741abd016366a5356d8febcbe50881c55c27a0d6d3 SHA512 b75c10c039ede5a9840b7ca4edf556a22d0072605b6e74d0e6f36e09ec32f66bc81f0db967a90716c5748dd3a5d2a4a64e6da704f7620e4ef2e4a041c9c9d389
+MISC metadata.xml 314 BLAKE2B bf730195fa020f6a78881c37dcca2874ff8d055f92cbfdd5c8a051bae6e6e7ba79f3346962e9dba9b424e69e6c01dbaffd65b2ba27aa374bbb34d7569f360868 SHA512 9abb502029e18744eee84d9a362594222a10ae9efb9a4d42d9bab1fc04b57c1067051676b028b10304d10a3925b23ee8bb5542d289db071b1c189d19764f81ff
diff --git a/app-i18n/ibus-table/ibus-table-1.12.1.ebuild b/app-i18n/ibus-table/ibus-table-1.12.1.ebuild
new file mode 100644
index 000000000000..f1c8d6b62e38
--- /dev/null
+++ b/app-i18n/ibus-table/ibus-table-1.12.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Tables engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/libiconv
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-table/metadata.xml b/app-i18n/ibus-table/metadata.xml
index 35a59248fa68..2d1e1c6bebf7 100644
--- a/app-i18n/ibus-table/metadata.xml
+++ b/app-i18n/ibus-table/metadata.xml
@@ -5,9 +5,6 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<longdescription lang="en">
-		A framework for table based input methods using IBus.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">kaio/ibus-table</remote-id>
 	</upstream>
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 195bcabcc84a..13c871119ad4 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,7 @@
 DIST ibus-typing-booster-2.9.5.tar.gz 8236281 BLAKE2B 749890cc3477db890603c9a700bff1a097fd2cd09d01477f319658c65c73688903171e49a0284176ce396d83587ef23a067a0aabe81c57bf70479050a15e8c80 SHA512 58db7d7e687512d8c436b23c28e1c614d56f486de13153f5ddfddecf32595f6de8c8289273b288c1df857dac5577df3eea48ca900b709a13b9c91b2e0ec21286
 DIST ibus-typing-booster-2.9.6.tar.gz 8238571 BLAKE2B f0d64d71c778bc47427ae7b87a23d53f77a537765113334cada73312452cfc0c66f8a321ff17f7722da6554230347253ac2bd0e311b4c5a8831dc17f34e8ef72 SHA512 d3038b744ba5049fed8cf4ba9d455502ef3061f35604d135ffb15604bbac78be1b4ba4232528daf87cb750772309cc9745d7ebc31ced2fc989395e0c62701eb4
-EBUILD ibus-typing-booster-2.9.5.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
+DIST ibus-typing-booster-2.9.7.tar.gz 8833452 BLAKE2B 4c4f33bcff2fa9e20afeccf242bec1a6e11fca0b5cb515b2c2dce7ef2401c092a7197a6637e2ca72d4c1bacd694860c07ae645a313e41cd879d6bde8c1736d12 SHA512 984beacdd6b853e074127372a912442ba1dbc536ecf194a34d03025277b9d6277e967e63a9bdcd1620f5094965a191297ccae9adbff2d54d1cd474437a1ec16b
+EBUILD ibus-typing-booster-2.9.5.ebuild 1099 BLAKE2B 7bb5ca273bd6e5a4f6c4e2913fc0a7c2cd42fdc68a9003fec646164b24950ed17b49dab5bccb0c1bc3ccf029b6fc1791d39d975ad890e59a9c7ccb05e69850d4 SHA512 ce95b1ec4505e8e367d27ecd2808675efbb19e3ebec672bee3fd5c1cbe9b7d0d328e5dd3b354ca2a5be18f82732d8e46031704fb9eb05c8cabffe7b03071abb1
 EBUILD ibus-typing-booster-2.9.6.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
-MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
+EBUILD ibus-typing-booster-2.9.7.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.5.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.5.ebuild
index ed1abe745449..69c81149e145 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.5.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild
new file mode 100644
index 000000000000..ed1abe745449
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/m17n-lib
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-typing-booster/metadata.xml b/app-i18n/ibus-typing-booster/metadata.xml
index bd6b0e5b1eb3..e1a49f498885 100644
--- a/app-i18n/ibus-typing-booster/metadata.xml
+++ b/app-i18n/ibus-typing-booster/metadata.xml
@@ -5,7 +5,4 @@
     <email>cjk@gentoo.org</email>
     <name>Cjk</name>
   </maintainer>
-  <longdescription lang="en">
-    A completion input method for IBus.
-  </longdescription>
 </pkgmetadata>
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 44aae2c01bd7..9a02e4be84ee 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,6 +1,3 @@
-AUX ibus-1.5.21-fix-authorization.patch 6553 BLAKE2B 99207da7679f7751cc90ed9b23e0ed29a472a79b953b122812ece3b883da9ce0542107d61ab409785935d3a7a7cb5dd47a6fc87aa31c026d60524486983b5673 SHA512 66348c8c1894654e432ce3b13e9858adc291c896ac343842486df14fb543d0816cafd4719d91d2417b1d750e0d056ce3a5c8d72498a80bebbb0bc47c3dc0f73f
-DIST ibus-1.5.21.tar.gz 3463069 BLAKE2B 75b9e7cc4d84b69941d53321da1fe63ad911740a36ed51c7fceaa2a7bc30f6ae39d3f575b4b5fc4268d7c3b3e1c0bae11881dd7a8b7bd441ecf89c83c7279858 SHA512 c7c06e13e78fb4d4d26ce8975b6db4f7914efb325a903999a82197229e13d5ebb4afc876ef67e1d86db58f08c16350dc095aaea050b2f69c2bfc4c452adc5331
 DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
-EBUILD ibus-1.5.21-r1.ebuild 4198 BLAKE2B 9da040a6f282dae6c6a669672ca2e346e2ddb111dc2bb9d6469736258139a77c9dac2da81996a1f915110e3f8b588544c214d84dbd0baa2e6788890675c3fc8e SHA512 ec0eedb15e94a726375235e9fdc17397911a86755b94c68d6d647523b542c68cedd761011052117c4de9087c4c53f92d03a67147d01b237d703a31d7c4725b17
-EBUILD ibus-1.5.22.ebuild 4119 BLAKE2B 1c3450bd8776f7dfd9b43855e51828e4e3d253c722d6e95e5d5de837b935347b7dccd0a4db4f4d17b8ec6f46df2c611824524dfdf9d5178d8fabba75574b152d SHA512 b6a09ed9cd8586050f24501ef1a6fc3ba08c3196566de8b5de98699ddc4fd00deff810447d70bd7618555b29eacc1ef542271b858620cb1861141fe7673433dc
-MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
+EBUILD ibus-1.5.22.ebuild 4115 BLAKE2B 2ec77d1d248e15dcbbafcc957643fe0988cfceedc60e120b9ded7d8cc1cc03fd26484d92d7d8c4abeec95de185cf0945e31d04a8c12c7d5d10ceecff050e8312 SHA512 5b470de75de14aa7dd45064fa7730d8b3b7d4180c623d31ac8313cc5e4920ecea4054163753f29fe042ecfb39c1505a3a9b1acbcdbddbbe19e505e64c451d6a4
+MISC metadata.xml 865 BLAKE2B bbf090f2a0102b1a5672dfd051cb4240b923b60146900e4c966a5d3da33ee795140820f5d2865dec984c90db6fc98e4cfe010f20e26f376cf98e929dca2516b6 SHA512 4c7ad9414350dba19fc3c0846c3197d0bb2f8cfe653242c547db9fedaa014329cfd39a2d086c7954b1377aaaee762dd3f4063ec071ef36dc748bf3dbadf85e77
diff --git a/app-i18n/ibus/files/ibus-1.5.21-fix-authorization.patch b/app-i18n/ibus/files/ibus-1.5.21-fix-authorization.patch
deleted file mode 100644
index 8b7674cddea3..000000000000
--- a/app-i18n/ibus/files/ibus-1.5.21-fix-authorization.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From 3d442dbf936d197aa11ca0a71663c2bc61696151 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Fri, 13 Sep 2019 15:59:03 +0900
-Subject: [PATCH] bus: Implement GDBusAuthObserver callback
-
-ibus uses a GDBusServer with G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS,
-and doesn't set a GDBusAuthObserver, which allows anyone who can connect
-to its AF_UNIX socket to authenticate and be authorized to send method calls.
-It also seems to use an abstract AF_UNIX socket, which does not have
-filesystem permissions, so the practical effect might be that a local
-attacker can connect to another user's ibus service and make arbitrary
-method calls.
-
-BUGS=rhbz#1717958
----
- bus/server.c | 89 ++++++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 73 insertions(+), 16 deletions(-)
-
-diff --git a/bus/server.c b/bus/server.c
-index 3a626230..2439de14 100644
---- a/bus/server.c
-+++ b/bus/server.c
-@@ -2,7 +2,8 @@
- /* vim:set et sts=4: */
- /* bus - The Input Bus
-  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
-- * Copyright (C) 2008-2010 Red Hat, Inc.
-+ * Copyright (C) 2011-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright (C) 2008-2019 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -69,17 +70,64 @@ _restart_server (void)
-     exit (-1);
- }
- 
-+/**
-+ * bus_allow_mechanism_cb:
-+ * @observer: A #GDBusAuthObserver.
-+ * @mechanism: The name of the mechanism.
-+ * @user_data: always %NULL.
-+ *
-+ * Check if @mechanism can be used to authenticate the other peer.
-+ * Returns: %TRUE if the peer's mechanism is allowed.
-+ */
-+static gboolean
-+bus_allow_mechanism_cb (GDBusAuthObserver     *observer,
-+                        const gchar           *mechanism,
-+                        G_GNUC_UNUSED gpointer user_data)
-+{
-+    if (g_strcmp0 (mechanism, "EXTERNAL") == 0)
-+        return TRUE;
-+    return FALSE;
-+}
-+
-+/**
-+ * bus_authorize_authenticated_peer_cb:
-+ * @observer: A #GDBusAuthObserver.
-+ * @stream: A #GIOStream.
-+ * @credentials: A #GCredentials.
-+ * @user_data: always %NULL.
-+ *
-+ * Check if a peer who has already authenticated should be authorized.
-+ * Returns: %TRUE if the peer's credential is authorized.
-+ */
-+static gboolean
-+bus_authorize_authenticated_peer_cb (GDBusAuthObserver     *observer,
-+                                     GIOStream             *stream,
-+                                     GCredentials          *credentials,
-+                                     G_GNUC_UNUSED gpointer user_data)
-+{
-+    gboolean authorized = FALSE;
-+    if (credentials) {
-+        GCredentials *own_credentials = g_credentials_new ();
-+        if (g_credentials_is_same_user (credentials, own_credentials, NULL))
-+            authorized = TRUE;
-+        g_object_unref (own_credentials);
-+    }
-+    return authorized;
-+}
-+
- /**
-  * bus_new_connection_cb:
-- * @user_data: always NULL.
-- * @returns: TRUE when the function can handle the connection.
-+ * @observer: A #GDBusAuthObserver.
-+ * @dbus_connection: A #GDBusconnection.
-+ * @user_data: always %NULL.
-  *
-  * Handle incoming connections.
-+ * Returns: %TRUE when the function can handle the connection.
-  */
- static gboolean
--bus_new_connection_cb (GDBusServer     *server,
--                       GDBusConnection *dbus_connection,
--                       gpointer         user_data)
-+bus_new_connection_cb (GDBusServer           *server,
-+                       GDBusConnection       *dbus_connection,
-+                       G_GNUC_UNUSED gpointer user_data)
- {
-     BusConnection *connection = bus_connection_new (dbus_connection);
-     bus_dbus_impl_new_connection (dbus, connection);
-@@ -94,9 +142,9 @@ bus_new_connection_cb (GDBusServer     *server,
- }
- 
- static void
--_server_connect_start_portal_cb (GObject      *source_object,
--                                 GAsyncResult *res,
--                                 gpointer      user_data)
-+_server_connect_start_portal_cb (GObject               *source_object,
-+                                 GAsyncResult          *res,
-+                                 G_GNUC_UNUSED gpointer user_data)
- {
-     GVariant *result;
-     GError *error = NULL;
-@@ -113,9 +161,9 @@ _server_connect_start_portal_cb (GObject      *source_object,
- }
- 
- static void
--bus_acquired_handler (GDBusConnection *connection,
--                      const gchar     *name,
--                      gpointer         user_data)
-+bus_acquired_handler (GDBusConnection       *connection,
-+                      const gchar           *name,
-+                      G_GNUC_UNUSED gpointer user_data)
- {
-     g_dbus_connection_call (connection,
-                             IBUS_SERVICE_PORTAL,
-@@ -136,14 +184,17 @@ void
- bus_server_init (void)
- {
-     GError *error = NULL;
-+    GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_NONE;
-+    gchar *guid;
-+    GDBusAuthObserver *observer;
- 
-     dbus = bus_dbus_impl_get_default ();
-     ibus = bus_ibus_impl_get_default ();
-     bus_dbus_impl_register_object (dbus, (IBusService *)ibus);
- 
-     /* init server */
--    GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS;
--    gchar *guid = g_dbus_generate_guid ();
-+    guid = g_dbus_generate_guid ();
-+    observer = g_dbus_auth_observer_new ();
-     if (!g_str_has_prefix (g_address, "unix:tmpdir=") &&
-         !g_str_has_prefix (g_address, "unix:path=")) {
-         g_error ("Your socket address does not have the format unix:tmpdir=$DIR "
-@@ -152,7 +203,7 @@ bus_server_init (void)
-     server =  g_dbus_server_new_sync (
-                     g_address, /* the place where the socket file lives, e.g. /tmp, abstract namespace, etc. */
-                     flags, guid,
--                    NULL /* observer */,
-+                    observer,
-                     NULL /* cancellable */,
-                     &error);
-     if (server == NULL) {
-@@ -162,7 +213,13 @@ bus_server_init (void)
-     }
-     g_free (guid);
- 
--    g_signal_connect (server, "new-connection", G_CALLBACK (bus_new_connection_cb), NULL);
-+    g_signal_connect (observer, "allow-mechanism",
-+                      G_CALLBACK (bus_allow_mechanism_cb), NULL);
-+    g_signal_connect (observer, "authorize-authenticated-peer",
-+                      G_CALLBACK (bus_authorize_authenticated_peer_cb), NULL);
-+    g_object_unref (observer);
-+    g_signal_connect (server, "new-connection",
-+                      G_CALLBACK (bus_new_connection_cb), NULL);
- 
-     g_dbus_server_start (server);
- 
--- 
-2.24.0
-
diff --git a/app-i18n/ibus/ibus-1.5.21-r1.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
deleted file mode 100644
index 66c047159f59..000000000000
--- a/app-i18n/ibus/ibus-1.5.21-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-VALA_MIN_API_VERSION="0.34"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-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"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/glib-utils
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	unicode? ( app-i18n/unicode-data )"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-authorization.patch )
-src_prepare() {
-	vala_src_prepare --ignore-use
-	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 6bc65214c6da..5eae573dbe96 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 3e5476424e4b..0a198f3d1609 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -12,7 +12,6 @@
   </longdescription>
   <use>
     <flag name="emoji">Enable support for Emoji</flag>
-    <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
     <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
     <flag name="unicode">Enable support for Unicode choice</flag>
   </use>
diff --git a/app-i18n/kakasi/Manifest b/app-i18n/kakasi/Manifest
index 4a266d820027..2c967c1b0dd7 100644
--- a/app-i18n/kakasi/Manifest
+++ b/app-i18n/kakasi/Manifest
@@ -1,3 +1,5 @@
 DIST kakasi-2.3.4.tar.gz 1099258 BLAKE2B e3644e8688082df393ab3b1dc356b682b3ea4a66c46d33c3e3c65ffd882a357600ec99f017e72bea491ad7779cbbaa044479101322a14baccc5385edc20a7b22 SHA512 33fa17251ba00163f6d9df208f18c88ff2dfa9891320f1d00fc0c72686bbcc59cf3ccbfb76fa66dfb135a6e942ef4d5d907edc3f1ca9d380c5b7a7d4df090a66
+DIST kakasi-2.3.6.tar.gz 1352154 BLAKE2B 2e23c5e83aefc040567d0a945b98c52a1123fe41383ded90a2e2a0cea5a9ee0e8d1f4560cb1d5959df5253702eaa958d3522791ef16235aa07dcc2beb2fe008c SHA512 212dbf4125db343b5d8ab5849fd85cbc1060c259eb1a37593817a990104ce53c146e0ba8e79c7f7427d1eb59b0d7d6c3d7f9e2cb8e303cff3088a030f1b0327a
 EBUILD kakasi-2.3.4-r2.ebuild 820 BLAKE2B 5a51df72a8c14d14e74f6ba02f96ea8a2bb443cded7e63beb8454132f1cc384e7083067996c59c6f3492dec115a977713c55617877bc2afce1815efc20d7039d SHA512 e4042dbdf406cfd20d88847182575e8777e26f0036131922bcfdc4e051d99a4446b81f1d71fb8eda7d0bbefbbf319a2563e947c7dc4aebdb5ce8ef0324700771
+EBUILD kakasi-2.3.6.ebuild 796 BLAKE2B f6b2e2be1ec75b8df8ea2d2f780ecb4814e488c1256bba4a4326e2dae196ff348274ea41bbac5bb9684c53d5483ee3b57affd3651ffc52fe622113f677bc3366 SHA512 7666e34f3376ad8bc012be9795b98cbe9aed336b6b2239bdc3ea48e7037bf0a712eb251bdf21062854e48f53c458f373bebe752851e4636a387c39b0c849f69e
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-i18n/kakasi/kakasi-2.3.6.ebuild b/app-i18n/kakasi/kakasi-2.3.6.ebuild
new file mode 100644
index 000000000000..3743b23970a4
--- /dev/null
+++ b/app-i18n/kakasi/kakasi-2.3.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Converts Japanese text between kanji, kana, and romaji"
+HOMEPAGE="http://kakasi.namazu.org/"
+SRC_URI="http://${PN}.namazu.org/stable/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="l10n_ja static-libs"
+
+DOCS=( AUTHORS ChangeLog {,O}NEWS README{,-ja} THANKS TODO doc/{ChangeLog.lib,JISYO,README.lib} )
+
+src_install() {
+	default
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.a' -delete || die
+
+	if use l10n_ja; then
+		iconv -f EUC-JP -t UTF-8 man/${PN}.1.ja > man/${PN}.ja.1
+		doman man/${PN}.ja.1
+	fi
+}
diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest
index fe515d78cdc0..178db0ef8683 100644
--- a/app-i18n/libskk/Manifest
+++ b/app-i18n/libskk/Manifest
@@ -1,3 +1,5 @@
 DIST libskk-1.0.2.tar.gz 867572 BLAKE2B 32f599e83bf7ced796d2f37f6f4bf5e45f47c90e144784b7b3e082866cc619a26e3aca4f16051685baa4d8ac54b0462930193f978bc1e8220b378679269c5833 SHA512 f8fff94b216c18f66bf1004ee068f8d737177f1b70ac36d054d9a68ce02ba9b8d1b7b4127d9a330f64054b2fe06f352070c750a3562d4be36fecf20cb854e6c0
-EBUILD libskk-1.0.2.ebuild 970 BLAKE2B 0f32293b6de350ef5520297717534a513a733886916ca04bb734a0e7a64fa6e3737955c4d6cafe3d59c67913c7e99cba777a9acde8c1b3a1213af555de8ef84a SHA512 59036b59358024d1b7fe583c59b6b7fdb9638678d91dfd7ec6c168079b79b08571e444d4aab8d54d52a32c3260aa594d7d7f66f5730a5b3e8ca8934d3c67a590
-MISC metadata.xml 320 BLAKE2B d8aac0823caa1962d5f1219492766ddec90fc92728b0f9f6f802d8f98d4d1c4cce00d3f6e688faf43729e8872f981582d9bbd586fcdc1cbf82aa7d54cd759d78 SHA512 a62e6d05067067cbcae666b635047834bca3c4ca7a4b217ffb20ace08fb05ba8917d8f413319a0ebe14d54c9fdf803c247644da9b22764335f5e9fc41529f67d
+DIST libskk-1.0.5.tar.xz 564488 BLAKE2B e7108bd2f44e5a0a0756cd25da4b07376b36604d6d2159b283e8a5f4ef76006210ff993d58b653cbce01ae4c9e003acf4acbd93ebc40711fec2600e514c49e9f SHA512 6db675edba89b83da0c29afb42644c39bcb0ccfc47f067a18e0eda817df4f58a86c86e8747080018c132d8734754a6fd8a30fe6578050eb93ff636edeed534ab
+EBUILD libskk-1.0.2.ebuild 1003 BLAKE2B 07baeb3e83de3b216fc0907650ab26c1fc4b27e4716e491c69f5fd7efd1d7ffbfc1a4af31fb65acd9427fdb76ed95cf0ed5cdce7a011718238409aff10ab7e39 SHA512 47b42411854c92f92e33539bd98d40b6ce021d1eb3f541c506cbd9c0020c65ec95e0d4345733c6c0ab9bb6ea3ce94cde9af6970b02d85ea476348e6688ad3c7c
+EBUILD libskk-1.0.5.ebuild 1009 BLAKE2B 2aa468ec81a2e21308128f5cd7d7040e7a94641a1b2dd4d05eeddfb1542ffafc73fd1c2cadc9282c07dc5408029a109324a35ab7c413c4cfd00ff265df7ba6ef SHA512 a3020515616d84e13604803a7d4c29f1b05ee337945e26f14e9a771cae2588c2761483bfaa1ed98280bde890513a805c817f8c21b69002b58b6558dfe58fe870
+MISC metadata.xml 310 BLAKE2B 5591da5bdb083505412172e1f9aab4b34554ad28101e40bf63a2ad1ab3160a5eb4e7246d507edbfff61ce57939445c4148a1a0390837cdffa19f17024f87a34d SHA512 dc3b62a6475657da51c53e59d48611ff3bfd1c779c20c5c67f2f0489402ccd3e9c5f51847e39f8392c1452719d31b5046b1f6c6316c026070c282b2ef604e81b
diff --git a/app-i18n/libskk/libskk-1.0.2.ebuild b/app-i18n/libskk/libskk-1.0.2.ebuild
index 559b09d8e283..593469dc3036 100644
--- a/app-i18n/libskk/libskk-1.0.2.ebuild
+++ b/app-i18n/libskk/libskk-1.0.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit ltprune vala virtualx
+inherit vala virtualx
 
 DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
 HOMEPAGE="https://github.com/ueno/libskk"
 SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+introspection nls static-libs"
@@ -44,5 +44,5 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files
+	use static-libs || find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-i18n/libskk/libskk-1.0.5.ebuild b/app-i18n/libskk/libskk-1.0.5.ebuild
new file mode 100644
index 000000000000..eab92a1f7f0c
--- /dev/null
+++ b/app-i18n/libskk/libskk-1.0.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit vala virtualx
+
+DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
+HOMEPAGE="https://github.com/ueno/libskk"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection nls static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	x11-libs/libxkbcommon
+	introspection? ( dev-libs/gobject-introspection )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="memory"
+	virtx emake check
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-i18n/libskk/metadata.xml b/app-i18n/libskk/metadata.xml
index 47d519fd6058..8d9f83d4f2e9 100644
--- a/app-i18n/libskk/metadata.xml
+++ b/app-i18n/libskk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ueno/libskk</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ueno/libskk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest
index 248e401bb0ec..16afef007f5b 100644
--- a/app-i18n/man-pages-it/Manifest
+++ b/app-i18n/man-pages-it/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-it-4.00.tar.xz 349192 BLAKE2B 90f25e7abfd64d0f175c2596bc9203626d9e7e53218d579081d17aa01665be20ffa721e33379107814a57715a35f480bb1833a2d3965f4b86b3247bf70e9162c SHA512 6392b42254eba42bd76f3aef3b6206396a817019df61462e44bd0f7dc519768cb1b1107726c45e402a0cf27e6f2ca8c8912363bd9bec7562b10e8fd5dcc60ffe
 EBUILD man-pages-it-4.00.ebuild 716 BLAKE2B a1fbfdd982e84396a87b2c0d5ace02e9853c875a497a6206e2f6e6b83967011c56b3867fc21796df4a3eef05b6318edae89a38c39d60f85413c39dbea86504a8 SHA512 e0e3ccf3ce3eb3882e77c7fc3e030af7c560ba50208dab79009f23a6cfebf33cc63c7d4cf45a6d1ccf81956c4848044c90db9ecd646cc112d49e816b046f5b0b
-MISC metadata.xml 421 BLAKE2B a703dcd3047685aa6aa2a276d88a4a2f7a804bfcdf9d2980af1cf243b5f002361e8ed0b78961baab773fc20d46a6f860c8c912b39dc8a821d7ff4dcc7b317de5 SHA512 0c58ae5b97148e94d374bba03e0a65a2462b5f0d750c4df4e52ebd0cfac649fe4f35011429423ef20a20391cf4d69c206eb8bfa3d4ddd060265427b6d96aa095
+MISC metadata.xml 305 BLAKE2B 809ae5adc5df5aa49702a9d9d4c6763fa3c91545e9d91f96723eef8a10d225a69e6ad5b7edc88b2d5c629b5e87a7cb7b15255d21b6f192b863b4052ec7e99212 SHA512 9379e9697859a2ab06cd2c1aef12279e9e8ac0183ca730a16234bd208357539fe1743d9f27b6179f498ab6b845e8c61ba1378657829fa740d78fc5e5691cbcda
diff --git a/app-i18n/man-pages-it/metadata.xml b/app-i18n/man-pages-it/metadata.xml
index 2caf37121cff..65484e7dc6cb 100644
--- a/app-i18n/man-pages-it/metadata.xml
+++ b/app-i18n/man-pages-it/metadata.xml
@@ -8,8 +8,4 @@
 			<name>Giulio Daprelà</name>
 		</maintainer>
 	</upstream>
-	<longdescription lang="en">
-		A somewhat comprehensive collection of Italian Linux man pages.
-	</longdescription>
 </pkgmetadata>
-
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 6602b5bbbbd7..aaf623fbd9d7 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -16,4 +16,4 @@ DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e
 DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
 EBUILD mozc-2.23.2815.102.ebuild 11134 BLAKE2B f5569a3a225216f6e34021d888664169e3fd07cc1faeceb7e64a46581e9a17b56e700e0c282ebcc1de5d163cebe2a9ecd67835937b38e96decae9851f865445e SHA512 4740d3ab5421017067db1886320ba4563ebbe159335ee92748507692861d256bc5b9d21bda3341b6877c35f968fc8e7c5e43b3a215f600fc477339b167c9e7c7
 EBUILD mozc-9999.ebuild 10967 BLAKE2B e6e857970fa7e9dfc191328fe84df1f5b5829e63878579049f56bce2cd8abfcc655078d7ff4a09c0c8ae8d1656385fdebc4a73e36ad6c3b8e7bf286dac27d7ae SHA512 21877036de3d1630bd9d1aa9a369111442b1c40a641f8ddbab0c745f9749d9dc8ecf90af084e88170b2786985f0c4ea5adadf802637390cdc9ee3bb67754ac17
-MISC metadata.xml 1149 BLAKE2B 62ba0c21b06854dc0873cd3677245f083cb21923de1f6aeea41065b8d216f54c485f11474afae8901682d5bdb9fe79c19e4e54af2051984a0e69639d80de72d3 SHA512 55c96d85f11cca6cb6b00ab81e2b84905c20db880f0c0dc7484e4b7210e31699fc340ce4a5e32234fda68e20de9d3fef635091658b916dd238a556a60ce9476a
+MISC metadata.xml 1001 BLAKE2B cbbb63e46d6b9cca2c1c5d08dcfeacc8fe82910a0a7398a9060a2ccd06d395765865674b1c66c72cdb9c71d5984b8d0a05a2784052219a6d6af2e0da175e65ac SHA512 98b86d4e51b43d95f7d647cf2cb57ed2a8a7e1b20042a60bae7e56d82596e2f94b2d57cb9dfbf45ae5e2a5a19e78f335e89a8e724424b8fc04f21d344c4e2c75
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index 967561182aee..d1e036ff9821 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -9,9 +9,6 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<longdescription lang="en">
-		Mozc is a subset of Google Japanese Input (Google 日本語入力) released in open-source form.
-	</longdescription>
 	<use>
 		<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
 		<flag name="gui">Install graphical user interface tool (mozc_tool)</flag>
diff --git a/app-i18n/pyzy/Manifest b/app-i18n/pyzy/Manifest
index f56ef12045e4..9e000951978c 100644
--- a/app-i18n/pyzy/Manifest
+++ b/app-i18n/pyzy/Manifest
@@ -1,10 +1,5 @@
-AUX pyzy-boost.patch 411 BLAKE2B e56c6b1a79a9ef30096403c5ec445d52eecb7df8f979d6cdaac06fed4439e1280433964f76cacd8c38994f2cbd75f7e8ff31a89f15b724a94435edd4750f079b SHA512 3cb8a0cf43f1fc53949fc8a69c95fcd04b49121d676530da39da6aa70a4916a2f0a6974056b1ee461d2804a28fdb7bb6a9780e5f5e217a4ffa8716b6f2060882
-AUX pyzy-db.patch 359 BLAKE2B 78a99578169984ade022edd5df52eede1041d5e9f55464e1cbff6f8ca6885d68e0cc639f6c0e351d347492a178d635128ea8cce99be60440a27eadd513f547d0 SHA512 794366e0304e92b55bca70eb11a4373eb29e272c2db27db3259b5ca84e8164427ffaacb1fdb15fc0d2a4c6c9d36408f0bf8b35ee5ccba9a9746ae13c7032cfdb
-AUX pyzy-opencc-1.0.0.patch 1712 BLAKE2B 67befcfa21dd1f1ba6543e93eacbd857f0d28a4e14940128710d5fff30f4041748d04addb2990d3e9b08f8533bc58fea67c8d3201054a12f8155f2c0275e2bd3 SHA512 4455229fb9c271e5f2a08292b34daf0cb2969a21af52cf116fadb15764cc82a4e557a9672d253af9a3968a8e907c92d8fd4542e2225a2f09fafe9592c58e7713
 DIST pyzy-0.1.0-patches.tar.xz 5288 BLAKE2B 9a6c86aeedd496ae8372bb0640cb1e03386408a0b00a4c51a6223c4fba23f59631267eb0b7c707a11662025ded410609d17ba39327e0ca5011f48bea3422cd79 SHA512 3a3b9fc317f1c5f59bbe83f3ce58fc76a50bcee798118d66571ba31d504e73fbe7a6976f03ae28f9712c0ba641386ac69390a86185464371728782a62b98291f
-DIST pyzy-0.1.0.tar.gz 1571946 BLAKE2B 2a09dab87ddc9ca9a1e2c7b71dd66fb8d75a9a0932fd87d94392e64bc6a940ce8d3d89ed09f9b3ae0da1a76275ec580033c745c7cfb85724be1f7732cb52d3b9 SHA512 42477152ffd6a2f7ce0e8f920d98e9dc9c7fc32fe9e93a2a4de75c791e70d0f08c30eca0244dc2b87981f6bfc4e635234d62720aa19358c8f80a84e0c371c662
 DIST pyzy-0.1.0.tar.xz 752248 BLAKE2B 5f927cfea31f8cd67cb3e7af9b48c6f48a7707e8324b6b211c3baea0e07683df1da3c8683a5f9aa5073277229ee4d712174f95a764b4dcc5dc5f40330791561e SHA512 18d78bc70229caad44fdba4b7971014979da0aeb35841cea9577d05e5eca871dfe40d285a926ac05a247c8a0b8ab34fd721dcd34517200c5cc75b6b1ed545b35
 DIST pyzy-database-1.0.0.tar.bz2 9977983 BLAKE2B 86f9ee48d584f33ada1ee5380efdaefd85750290caada320c4c9a21206b8fb50fe6a43b931fb41a8c3bc24853bb7843e23d1778b40e6eae68fa4ec383f2b4dcc SHA512 5a7248870407f7f92c418ada49a275062325f2eb33a7eb4b91492e4b706ae70ba931b04377a758ce429fa64cd22e8bee2ac4279d4f205bbce406248eda1decf7
-EBUILD pyzy-0.1.0-r2.ebuild 1272 BLAKE2B ff8885974ae0dcfeeecf721e7647ae9d10f3f2163833505c7e72d7a2fc55bb6d8e927bad973be7bd125ebc60fd0427505b37c85d02ae506ad1d165ffc8400882 SHA512 28c9aecc4ce1d935d84188195ec5cbf59d73b4fd42421d5d8adc54f28f85e83d050c5a91419a03e05b5e7f3f9654e2ba01e97b946d8e1c43d20e54bdc11715a4
-EBUILD pyzy-0.1.0-r3.ebuild 1217 BLAKE2B f56a62c2996bb95a837206b20995d4c6e2e48469238052ba7197dc53f8afae931f64c26d96cd6766d791c95353651c9fda1194f469fc8dafe0f894691437dab6 SHA512 8a549910f0bcb137f3b3804ee268fa3970e136753131a04cd608c8b54c43d26aeb20988da6293cd4c581b77cdf5c92d508ccc1ee2ad88893ff2c423e3376d16f
+EBUILD pyzy-0.1.0-r3.ebuild 1215 BLAKE2B ed7b82a68addb322b185a4854f8921e53b6e31cc101fff10aaf037773019ce2a023e589a13140345e61f042f1558308da2e2cf544b50a5012c02d50663cb1df6 SHA512 e9766216c2f0c070963ddb2ff7afd48442fbe4839ef781a470b7843e579055e06a1981bd12d528a680daa73ae9fb3567261de0045255c3b2a418b04e8279ba2b
 MISC metadata.xml 649 BLAKE2B cab621c7a04f8b7672825ecf49fc56c251afef71dcbb7d6c728815b7b56f8bf5c77650ddb91c704dd2b5aaf89d3d55c7e83bd9f7510d164fef13db118177c81d SHA512 46c86fc066ea686db8497ff7dc76361a865a24215b49d2924521235c5bf88f9b029c25597f1bd19399f965052c6b324ded0a2d287cdd29518a2f46cc6614c4a4
diff --git a/app-i18n/pyzy/files/pyzy-boost.patch b/app-i18n/pyzy/files/pyzy-boost.patch
deleted file mode 100644
index 34acacfbc9ba..000000000000
--- a/app-i18n/pyzy/files/pyzy-boost.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -143,9 +143,9 @@
- )
- if test x"$enable_boost" = x"yes"; then
-     # check boost
--    BOOST_REQUIRE([1.39])
--    BOOST_FIND_HEADER([boost/bind.hpp])
--    BOOST_FIND_HEADER([boost/signals2.hpp])
-+    AX_BOOST_BASE([1.39])
-+    AC_CHECK_HEADERS([boost/bind.hpp])
-+    AC_CHECK_HEADERS([boost/signals2.hpp])
- fi
- AM_CONDITIONAL(HAVE_BOOST, test x"$enable_boost" = x"yes")
- 
diff --git a/app-i18n/pyzy/files/pyzy-db.patch b/app-i18n/pyzy/files/pyzy-db.patch
deleted file mode 100644
index 44d0ac6bf456..000000000000
--- a/app-i18n/pyzy/files/pyzy-db.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/data/db/open-phrase/Makefile.am
-+++ b/data/db/open-phrase/Makefile.am
-@@ -30,13 +30,10 @@
- DBTAR = pyzy-database-$(DBVER).tar.bz2
- 
- $(DBTAR):
--	$(AM_V_GEN) \
--	wget http://pyzy.googlecode.com/files/$(DBTAR) || \
--	( $(RM) $@; exit 1)
-+	touch $@
- 
- stamp-db: $(DBTAR)
- 	$(AM_V_GEN) \
--	tar jxfm $(DBTAR); \
- 	mv db/main.db db/$(db_file); \
- 	touch $@
- 
diff --git a/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch b/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
deleted file mode 100644
index 1e23e8b6e5db..000000000000
--- a/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://github.com/pyzy/pyzy/pull/1
-
-Author: Hillwood Yang <hillwood@opensuse.org>
-
---- a/src/SimpTradConverter.cc
-+++ b/src/SimpTradConverter.cc
-@@ -4,6 +4,7 @@
-  *
-  * Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
-  * Copyright (c) 2010 BYVoid <byvoid1@gmail.com>
-+ * Copyright (c) 2015 Hillwood Yang <hillwood@opensuse.org>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -40,7 +41,6 @@ namespace PyZy {
- #ifdef HAVE_OPENCC
- 
- class opencc {
--    static const int BUFFER_SIZE = 64;
- public:
-     opencc (void)
-     {
-@@ -55,29 +55,13 @@ public:
- 
-     void convert (const char *in, String &out)
-     {
--        long n_char;
--        unichar *in_ucs4 = g_utf8_to_ucs4_fast (in, -1, &n_char);
--
--        ucs4_t *pinbuf = (ucs4_t *)in_ucs4;
--        size_t inbuf_left = n_char;
--        while (inbuf_left != 0) {
--            ucs4_t *poutbuf = (ucs4_t *)m_buffer;
--            size_t outbuf_left = BUFFER_SIZE;
--            size_t retval = opencc_convert(m_od, &pinbuf, &inbuf_left, &poutbuf, &outbuf_left);
--            if (retval == (size_t) -1) {
--                /* append left chars in pinbuf */
--                g_warning ("opencc_convert return failed");
--                out << (unichar *) pinbuf;
--                break;
--            }
--            *poutbuf = L'\0';
--            out << m_buffer;
--        }
--        g_free (in_ucs4);
-+        char * converted = opencc_convert_utf8 (m_od, in, -1);
-+        g_assert (converted != NULL);
-+        out = converted;
-+        opencc_convert_utf8_free (converted);
-     }
- private:
-     opencc_t m_od;
--    unichar m_buffer[BUFFER_SIZE + 1];
- };
- 
- void
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
deleted file mode 100644
index 2c736e2414ad..000000000000
--- a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools ltprune python-any-r1
-
-PYZY_DB="${PN}-database-1.0.0"
-
-DESCRIPTION="The Chinese PinYin and Bopomofo conversion library"
-HOMEPAGE="https://github.com/pyzy/pyzy"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
-	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${PYZY_DB}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost doc opencc"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/glib:2
-	sys-apps/util-linux
-	boost? ( dev-libs/boost )
-	opencc? ( app-i18n/opencc:= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	sys-devel/autoconf-archive
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-boost.patch
-	"${FILESDIR}"/${PN}-db.patch
-	"${FILESDIR}"/${PN}-opencc-1.0.0.patch
-)
-
-src_prepare() {
-	mv "${WORKDIR}"/db data/db/open-phrase || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable boost) \
-		$(use_enable opencc) \
-		--enable-db-open-phrase \
-		DOXYGEN=$(usex doc doxygen true)
-}
-
-src_install() {
-	if use doc; then
-		HTML_DOCS=( docs/html/. )
-	fi
-
-	default
-	prune_libtool_files
-}
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
index d73898c2b194..986a3e9bb94e 100644
--- a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
+++ b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="boost doc opencc"
 
 RDEPEND="dev-db/sqlite:3
diff --git a/app-i18n/scim-sayura/Manifest b/app-i18n/scim-sayura/Manifest
index f90b0a399a21..91f643821615 100644
--- a/app-i18n/scim-sayura/Manifest
+++ b/app-i18n/scim-sayura/Manifest
@@ -1,4 +1,4 @@
 AUX scim-sayura-0.3.3-gcc45.patch 353 BLAKE2B f2576aff8d65beec5ad0751f7f2cb22142a25a890081ee634606725a6eedf811f14e89d85d74bf968c4fed6b3264da45c5dd2832da252db12370eab7a1fcc98b SHA512 2f4c3ce88dc9b21eb59bff14cb16ae36ed60b0b0a75638bb2080e9bfbeab986857a6f7095f5ab4c4f065f168faaa870ba115922c9b8d28222da821d7dcd5d554
 DIST scim-sayura-0.3.3.tar.gz 380147 BLAKE2B 12e1968e0b581c20fe12fe306c0f01cc5ddff15b5d3bc01cf43efb3538747cd29ef223583b2b8a3fb890f2108536f5cae328dca4a4e666a56e5b7d666b9e8bf3 SHA512 bf97b8d82e0e193a94698dfe7d3c9b1256e928a2082dc0ca6be328ed56409a05d38ba04254617b3800116514c1c8fdbfca869f2aa3f2f005505a4e873d2b90bb
 EBUILD scim-sayura-0.3.3.ebuild 672 BLAKE2B 7d626a06c6ffac07427fafa803d52c7cdd99d3aa559396ef06ee7a9c25d2d8c793be6fcea18e07778885bbe18ea381ba83d446fef7c4f89500b81cb798b86b2b SHA512 65aae4dc4677101745f67c32e0b30a509806c04e9d787868093a434db6be04eda55b4316a6c283a4ac0f3fb603bed19d061b85e9b22376b1af8742131b4e95f9
-MISC metadata.xml 341 BLAKE2B 6f2f812f898b78c0198bd500116b4f0664ac37ee511e57dfb9c36abd9f5386171594aa7da706c5f93d4f98de2fad9630f94eac2e785c64918c865076360150b7 SHA512 93333f168a51bc5b932b06f436c6254d56da5b7de8cc3127e5641a74488a01aaa650d01a018970da8202a7432d8dab8f73d0786802634bc9b131f90219ee2eef
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/scim-sayura/metadata.xml b/app-i18n/scim-sayura/metadata.xml
index 948a4b76fa5f..c921b96adf6c 100644
--- a/app-i18n/scim-sayura/metadata.xml
+++ b/app-i18n/scim-sayura/metadata.xml
@@ -5,7 +5,4 @@
 	<email>cjk@gentoo.org</email>
 	<name>Cjk</name>
 </maintainer>
-<longdescription lang="en">
-This package provides the Sayura Sinhala input method for SCIM.
-</longdescription>
 </pkgmetadata>
diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
index cfc1550cdd29..7cd85a185393 100644
--- a/app-i18n/sunpinyin-data/Manifest
+++ b/app-i18n/sunpinyin-data/Manifest
@@ -3,5 +3,5 @@ DIST dict.utf8-20131214.tar.bz2 674512 BLAKE2B b5e1756b52e8b4fd7839d4a72004b7ddc
 DIST lm_sc.3gm.arpa-20140820.tar.bz2 36623028 BLAKE2B 9456c51dbba59e5d20a1bdd9b06f0ef863c77eb7651287b45f143e6919aedf46ea81ca4da5c037c4b9775c19e68849720cb0e1b3db4cc9dd8df84832ac2eba6a SHA512 ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519
 DIST lm_sc.t3g.arpa-20121025.tar.bz2 36262281 BLAKE2B 55d8820228986f9a7b3d567ebca7bf37079e3d05f9b062814116702957e4447c5283ac9034b6a9171a9696df01398bb29ea55a2a1ded3a952e48f14a697d8698 SHA512 3159dd3700382cfa617ba025ce542660580f3057e0dd6bbb92947902495db08e4454c1d09d01a55c90653444513d125dd034e944b060a9d8e009c3633b106d97
 EBUILD sunpinyin-data-20130220.ebuild 984 BLAKE2B fdce14f8c0249901c821f913a793273dfd6c1be537656323ec28b428bec3758e45f065b89e5b62bd2066ab204410c81f61d5fdceb7bd51aebef32d54747926d4 SHA512 b58d6e341b56027aebe84fc5144a3b1da3c83feeabf4392a4c39e77f88b8a9d4c1ae7ec0075d822ac24be031c13cc72b5be530a1678fcf87b87ba4fb79b2d559
-EBUILD sunpinyin-data-20140820.ebuild 1021 BLAKE2B 29fe8b3174cb786e2f3bd169440031b126f00bc21b86cd943cc7f31cca730fbaaa3751e74bb035ea0cad2fda8ee86f27b4af9f2ad0b5ed51f90dfb0bf57bc913 SHA512 fe35e205be1a079abf43b8b3e4b793e7fc3207d95498a32dd9fbe95e87fcf3e4ffed08501f7e26dd5f1a25b4cf4326352f1968844391a0e93dc89a622c812087
+EBUILD sunpinyin-data-20140820.ebuild 1151 BLAKE2B da08bbd9497ea53e4a7537a02a5605c51990787860d930780b6773d729e655d80e2ddce40daa6f9c7b15c4d71a01552d802c3d4c8c81b2db64bdbbf2a23f8b2d SHA512 13323239f441dda14ffd2acda59952a9100f49a17b05ee05e3ba21b2f29b23c0ac35e1a84678038f40e9b3cdcac2be1b44ef920b368fd409d83ec1a866465252
 MISC metadata.xml 328 BLAKE2B fe394bf1f33b3b39d476a8e8a0ce7a58c071646be7455b102c5b298ae22afc9e2b6a2571e3ca52024f46d7675a6568313dde549576d17d117e1feb01a6559e78 SHA512 43f6f1fc7c0a311ae6e0d5712e570a43a3530173231f054eb939a36f7c4bc117e026678a837dd11b3fd10945d7a476a38f2d10f55501884bb53a29895fab9e01
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
index c35487a14eac..355015764c1a 100644
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DICT_VERSION="20131214"
 LM_VERSION="${PV}"
 
-DESCRIPTION="Data sets for Sunpinyin"
+DESCRIPTION="Data sets for SunPinyin"
 HOMEPAGE="https://github.com/sunpinyin/open-gram"
 SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
 	mirror://sourceforge/open-gram/lm_sc.3gm.arpa-${LM_VERSION}.tar.bz2"
@@ -16,7 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="=app-i18n/sunpinyin-3*"
+# https://github.com/sunpinyin/sunpinyin/commit/0fff1e78d9a409205e025736286838721a2ccbf8
+BDEPEND=">=app-i18n/sunpinyin-2.0.4_pre20140819192400"
+DEPEND=""
+RDEPEND=""
 
 src_unpack() {
 	default
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index 8e136a764a42..776b4ca2a5b7 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1,7 +1,9 @@
 AUX sunpinyin-2.0.4-gcc-6.patch 959 BLAKE2B 72e027a928bd9f684dbecc7ce50074df6d915b9e699de661853012961454bce48008bff50fd2de135ef828f08e84647b624bd844b9baafb2e929480171a44f63 SHA512 7093542613a2c15c6e1dc7e500bc38f65061d927d3f89f281973f401f19f0e151f0ef438c2a1c21d102bd56b23c81d206b6a524d77b04ae4e0b79f0b97691b96
 AUX sunpinyin-2.0.4-pod2man.patch 406 BLAKE2B debbbd0c004625c3e9dc73e07876774d12d3514757ea1d5a8ad9a978868f85175d0fa92e0e46541e00c208498b7bae9ac7257491de50f6d0829616c68decbcd5 SHA512 7a0b48e4b0270b1c60844b91df42dd8f59460c9a5725c5492fd4886b77d8e993dbe2c8efc464da271d51d19d17c3c94573c57c0dd7f28414336138212911e387
 DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
+DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
 EBUILD sunpinyin-2.0.4_pre20130108-r2.ebuild 969 BLAKE2B 3a4fed1810722b8d0f74282add5b5298c120b373c083fab1f1289285435915a12be3b8cfd3c44514c5f0d085231ffe933d5fab0ba3a2522d1422b71447bb0da8 SHA512 588f5bf39e30b91ecea1550c28c6ab2fca113fbbcc999f12ebaa335abccb214d4d2f4f6d28dbbdf728561b6ccecd9177f518134b0d39dd9c36a19428cab70ebf
+EBUILD sunpinyin-2.0.4_pre20200306162733.ebuild 1585 BLAKE2B 910ce94a0b0595f95ee479a186241c3d3d8d5ba8abca47e9bf9dc33ef1df3d9fd48c02d2a1d3d7cc04d9253ed2f71a52d06c91e9a50dd3bdf400d834c9f80509 SHA512 1fd476776703c7669bd187fea471c25c4471f74e897720de92454b5a18831826385b1846ce70990a871cfdbc8ae8e5d5c2674c060777b51f64be0658d08f9698
 EBUILD sunpinyin-3.0.0_rc1.ebuild 918 BLAKE2B e5220cd1829a49aa2155ab92e5b9c2ea82ca281bff4743935f24b2072a8237f064905f979feccca99007d653877728430108c45793286eeb41d3668832b39859 SHA512 065897821edeed4dece2aff5061f7d97fcf634a544a7d1d6cf614b4215e05808459c7940953e8ae6f0319f3803d36630cb520b2b97da1284289e5d447da9a3e3
 MISC metadata.xml 328 BLAKE2B 61db20b9475140020b99ef82cc8949db01b996bbe043b4aa68bd7bd6cb67c56286ce0e00c8dd1a039798b23a8921621260286231f1d87a079ef13a4a764b8049 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
new file mode 100644
index 000000000000..9c87c79773ce
--- /dev/null
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2009-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+inherit python-any-r1 scons-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
+elif [[ "${PV}" == *_pre* ]]; then
+	SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
+fi
+
+DESCRIPTION="Statistical Language Model (SLM) based Chinese input method library"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/sunpinyin/${PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://github.com/sunpinyin/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="|| ( CDDL LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+DEPEND="dev-db/sqlite:3"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" == *_pre* ]]; then
+	S="${WORKDIR}/${PN}-${SUNPINYIN_GIT_REVISION}"
+elif [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+src_prepare() {
+	default
+	sed -e "/^docdir =/s:/sunpinyin:/${PF}:" -i SConstruct || die
+
+	# https://github.com/sunpinyin/sunpinyin/issues/109
+	sed -e "/^Requires: sqlite3$/s/^Requires:/Requires.private:/" -i sunpinyin-2.0.pc.in || die
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	escons \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	escons --install-sandbox="${D}" install
+}
diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
index 176d30735772..165d3cd3ef44 100644
--- a/app-i18n/translate-shell/Manifest
+++ b/app-i18n/translate-shell/Manifest
@@ -1,5 +1,5 @@
 DIST translate-shell-0.9.6.11.tar.gz 76779 BLAKE2B 39748d0a2d7db504fd4c0bee516f703291dce93f19aa760fdae70b0551cb5f14ae5483314114f7e1141ae2231e0b128a79a9c05ec1fd08c970be886c4430e32d SHA512 d4d376b3750e43e3de5b95790fea7fc91e94140526ac15ee9f7818554f95d410772c8f8887433b6fd4547f569b3d6f510c1bc1497d8237223c344dbb8f0ae87f
 DIST translate-shell-0.9.6.12.tar.gz 77580 BLAKE2B 78e8c694edc03fb03facd8c705c7e703a106fe9f2d7b46d464a681d52523817b4aeaf023fdedf46a9792270daf758fde457ba30ab1ffaa778f8db3eba3caa892 SHA512 6cbdfd14b7004d0e37a4abee01bec87409137f1bb7a14a964936bf0a2ad704ea1fc04dcd8ab10404a5c2df105bf7a6a8b33ed02c75c1035a6900082f6dfbb20d
-EBUILD translate-shell-0.9.6.11.ebuild 1121 BLAKE2B b9dc48773ed5e46051f2104aabee7d141db90ee7ae14582876c854caa4aa2835396b8cc26f3dbaf42cc35a6d8c7c82320df2b40869b47f8400579e52ba80c09d SHA512 f82fd64fb170be69999ff3e843760fee79f0613777e8eb09582a6c1c61f9c83f004199f319fa564d37b131d495b982f14acdd79a1f8faa4da07ff10d977c86b0
-EBUILD translate-shell-0.9.6.12.ebuild 1123 BLAKE2B 41bfb63a6c7bcc778922ae0aab7275449cd7c99935e2d23a4c87b3b50f301c254ef52259bafd79df94731e34dd9d57d0b4a4178adc9de81dc44803383da82cae SHA512 eb3b03970e019d84f3efe5d2ceb704d9dffcbd4dd60b953aded0eae634c11d218228637726dd963c7cd6fc158ad5d52e913078497439d18de96df23ad7603afa
+EBUILD translate-shell-0.9.6.11.ebuild 1125 BLAKE2B 82038fffdbecd83785571132e127eb43cae6cc489a5659c875cc4118786271cbd5e49e091c01ff5cbce162a579a293495f2eaeed0cc80163273c2416bbbb1d5e SHA512 cf76ed4c4045ca16112cacf45e1b1d87db6346f7830408de72d2018bf4cbd10fe9604f19263db55226c37f5b186704ff2d845b3ab98117a8ff4b7ac73498c27d
+EBUILD translate-shell-0.9.6.12.ebuild 1127 BLAKE2B 0eb66841382df394b9a01c66c18cd3512cadce6279817a234b97f8fb7af4b3cd79370bae9dc759699bbdcbf81f4a9eb015de74ab94f3ce16234a9523d77ffebe SHA512 e14456110f351a380310fa0c61f1a8a1dc70f0874ec9965312f7a6e8fae54da3915200e972a7ecb470f991ab71bda8266720b3533b359d403eb0fccbce7dc62c
 MISC metadata.xml 794 BLAKE2B d4a2ba634882f73eb5b151682ce5015169cebf0269edd6358f0b1acbf88d255fed8b45ac0bed74b0371c7a98b77fb37ba8b2712bbfdbc924bb99c78b5e1dbd2e SHA512 fa67bdf15aec6119714fc5160189f7b08c24bcacf7471fc4fe0812a410639690900a3132164f87ac41739a597091d5aefc2dcaee50f1c5c72b4d34f982e3e99c
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
index 79cb22614834..b91284b3e3f4 100644
--- a/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils
+inherit optfeature
 
 DESCRIPTION="Online command-line translator"
 HOMEPAGE="https://www.soimort.org/translate-shell/"
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
index 2538cb44a321..e467c42875dc 100644
--- a/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils
+inherit optfeature
 
 DESCRIPTION="Online command-line translator"
 HOMEPAGE="https://www.soimort.org/translate-shell/"
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index 133b087bef0a..c0acc1736da9 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1,5 +1,7 @@
 AUX uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch 2401 BLAKE2B 3f0cf425385d333488c7eeb37c37f3ec6a224e0a96d2c1bbcaded770c8ab6b5bd8277808fbce2bbc960cb3838e0e9de8d889ef9fe2af2e3b44ec4a81031d43f1 SHA512 fb684a362095810bb462609859018dd22987704ab9def0d0ea9ab6afc076fddcf338c622b9f587649d6f561a216b8bc234d3499c499ce3d4589113e908037972
 DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
+DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
 EBUILD uchardet-0.0.6-r2.ebuild 854 BLAKE2B cf08d7188aeb89ed3b08956f404bd79392716206a2c8384f31978e0b5b726fc8d3916224bc0420ab2d085927d98629160116830c2a92a75cc8d6ee6dde257727 SHA512 254306625498713aa5406cdd3e2eeadb3a6b944656f806bb82bc5dca807574a68f0129fe2d94414a2ee7c39ab2e57f40d38ae49bd4c69de5a2dfc6b2452b7a6e
-EBUILD uchardet-9999.ebuild 733 BLAKE2B 906374917b288ccca166615ed84e3f98003c7878302c1eeb7914aea6ec20aa708a5e69ef041874ad55628e8a1476d86531a63f15dcc3c87073ff8c457f72336c SHA512 0760ac16abbbee9e3b7bfa666db0d26e7d76bade675dfdd9c35226cfe0da302088451de5b5aaa2b6327fb0106b34c956ea2bde80744e0b90303d9a8c849c13bb
-MISC metadata.xml 273 BLAKE2B 94626860410b060a578f7f9d3b5a398ba7c627e1a30d9e056e6f599e19edab3a3c695645ceee6300e77c88c3a8e28fa2b5840698aa1cc155c9443b2f6480712f SHA512 5d8167272e5a8d0e78b21250c91b5164d101f73eb7431bdbcc06dc7bbf43f5415dfd3ad46c0c995c8a1a06be063095a69c91e06e175d3da950c5104f11f35433
+EBUILD uchardet-0.0.7.ebuild 899 BLAKE2B 8986cc6e306cf85d8bd33944748450783aac0280e5415308dc3c005ebf33df275e37f680942823c244864c9bcffc05cd35b73171ac5f410453fd90d911a73689 SHA512 b802c47645927791f8ea8c64ca544ec7901aa7eec7f3d4067cadc767e7149d9203009ed64c2564f4753a5d54b2d3a31cb04d2f3efe35eda0cc832c389ef4cc95
+EBUILD uchardet-9999.ebuild 838 BLAKE2B 1fa9152117465b5e792942983a98d1a0f69373b34f723d1811d5bc8718cffa6f61f3a808d5e70e5837bd4969eb32a49b744a7e200d7d1760d60a0bdf1b08a6c2 SHA512 2a0a59e862a98c88f1a4186043e3eb6819ea09b5b28fa5ae8ec5edaa2f328ced05cd2ad19b2288ee119741987ed7f8ba8756d440d48c264996f2e3d6a6e39e04
+MISC metadata.xml 533 BLAKE2B 37f21d9d4553f2fcd80e5de0d6896005d21f5595a7d070aa385cc55a9dcb1a1ec6f50f06d81d99d18da5ff9dbdeb4afed3bd0eecf9ae7453f3d29645d0802400 SHA512 914c9c5d837e9508f5a33191971761d6d956b785e9ff8329d42c821eba4613e7e7d45e40fb112667c3891b1aa2d824f09d2b2c13e3e412e12d0d937bb3fef782
diff --git a/app-i18n/uchardet/metadata.xml b/app-i18n/uchardet/metadata.xml
index df067141bad0..3c431c24f073 100644
--- a/app-i18n/uchardet/metadata.xml
+++ b/app-i18n/uchardet/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=uchardet</bugs-to>
-	</upstream>
+    <maintainer type="person">
+        <email>coppens.matthias.abc@gmail.com</email>
+        <name>Matthias Coppens</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=uchardet</bugs-to>
+    </upstream>
 </pkgmetadata>
diff --git a/app-i18n/uchardet/uchardet-0.0.7.ebuild b/app-i18n/uchardet/uchardet-0.0.7.ebuild
new file mode 100644
index 000000000000..ca135f83ebee
--- /dev/null
+++ b/app-i18n/uchardet/uchardet-0.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+if [ "${PV}" = 9999 ]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/uchardet/uchardet.git"
+else
+	SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
+fi
+
+DESCRIPTION="An encoding detector library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 static-libs test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTARGET_ARCHITECTURE="${ARCH}"
+		-DBUILD_STATIC=$(usex static-libs)
+		-DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
+	)
+	cmake_src_configure
+}
diff --git a/app-i18n/uchardet/uchardet-9999.ebuild b/app-i18n/uchardet/uchardet-9999.ebuild
index 0aef01cb3c64..031c6d829482 100644
--- a/app-i18n/uchardet/uchardet-9999.ebuild
+++ b/app-i18n/uchardet/uchardet-9999.ebuild
@@ -1,13 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake
+if [ "${PV}" = 9999 ]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/uchardet/uchardet.git"
+else
+	SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
+fi
 
 DESCRIPTION="An encoding detector library"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/uchardet/uchardet.git"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
@@ -16,7 +22,7 @@ IUSE="cpu_flags_x86_sse2 static-libs test"
 RESTRICT="!test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use test || cmake_comment_add_subdirectory test
 }
 
@@ -26,5 +32,5 @@ src_configure() {
 		-DBUILD_STATIC=$(usex static-libs)
 		-DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest
index 7a715785d9a0..16284575cfc8 100644
--- a/app-i18n/xsunpinyin/Manifest
+++ b/app-i18n/xsunpinyin/Manifest
@@ -1,3 +1,5 @@
+DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
+EBUILD xsunpinyin-2.0.4_pre20200306162733.ebuild 1822 BLAKE2B 29544096b09a537a7ff42ffb1018748b80189877c785837a9bbc8e06e4c3b12e2460e5f71baaf900de2a68b7cac83b63214fcf96769125bc677ddd942e859bb7 SHA512 a60ba52e47fc68e71b3dc3e5d719fc6237c152a9454a127287830ae8df5f8be4c8fb28450775887a0cd634648dd2cac82a9783d82007c19aae4afb89ac4a804c
 EBUILD xsunpinyin-3.0.0_rc1.ebuild 838 BLAKE2B da1adbb00714726eedd65cd1ccfe144ed469265dce54afb0e64ba2f8ffe72cab2eaa6f99a44375164d28fbabe2315296318a1c8916aff579ecb53d7b48542a37 SHA512 f44f42d1a03aa89d9c2ab128f4a8d40823546029a053910f1b5b28ad3a48a9b951ea83bb15f6301a361ad0c0efa72b83d8f855d2fced666d5588d6fa0f330cf4
 MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
new file mode 100644
index 000000000000..410b23009438
--- /dev/null
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+inherit python-any-r1 scons-utils toolchain-funcs
+
+MY_PN="sunpinyin"
+MY_P="${MY_PN}-${PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
+elif [[ "${PV}" == *_pre* ]]; then
+	SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
+fi
+
+DESCRIPTION="Standalone XIM server for SunPinyin"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz"
+else
+	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+LICENSE="|| ( CDDL LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="~app-i18n/sunpinyin-${PV}
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango"
+RDEPEND="${DEPEND}
+	app-i18n/sunpinyin-data"
+
+if [[ "${PV}" == *_pre* ]]; then
+	S="${WORKDIR}/${MY_PN}-${SUNPINYIN_GIT_REVISION}"
+elif [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${MY_PN}-${PV/_/-}"
+fi
+
+src_prepare() {
+	default
+
+	# https://github.com/sunpinyin/sunpinyin/pull/101
+	sed -e "/^[[:space:]]*print /s/print \(.*\)/print(\1)/" -i wrapper/xim/SConstruct || die
+
+	# https://github.com/sunpinyin/sunpinyin/issues/110
+	sed -e "s/^\( *\)('CXX', 'CXX'),/&\n\1('AR', 'AR'),\n\1('RANLIB', 'RANLIB'),/" -i wrapper/xim/SConstruct || die
+}
+
+src_configure() {
+	tc-export AR CC CXX RANLIB
+}
+
+src_compile() {
+	escons -C wrapper/xim \
+		--prefix="${EPREFIX}/usr"
+}
+
+src_install() {
+	escons -C wrapper/xim --install-sandbox="${D}" install
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /app-i18n
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)