gentoo resync : 05.12.2021

65 files changed, 444 insertions, 434 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 2f0c1ecd7334..2285673e82dc 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-anthy/Manifest b/app-i18n/fcitx-anthy/Manifest
index 6e2631293049..21ba97cf2057 100644
--- a/app-i18n/fcitx-anthy/Manifest
+++ b/app-i18n/fcitx-anthy/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-anthy-0.2.3.tar.xz 78020 BLAKE2B ae054f753dd7d10a0dafd80d67413c29806b6c3b08de9eac3d7eae1d540f01b7bafd22bd9c722a7fc517f1752d90c1c3d82e75aaf58a807daa60b7e9a047d152 SHA512 2769871059053fb370ba84af7cdf0c461d64724a240d58a5a8889cfd9bfb5d145998f79ed2d06a1ae1ab907f9db04fc122bfaf6957ef572fc833e400ffefc642
-EBUILD fcitx-anthy-0.2.3.ebuild 784 BLAKE2B b1c3a32f4e878d38cb77cd278e67184fc1d2868071ef6c400047ef28545467ee3bc3a28a3201de647c37dd72d254930b06dac6187ec485c8a8fe03a57adfd1f3 SHA512 448abeb934e60470b79c22efaa58826a93fe0fe384a36a7fcc04c9d7b638624e123f0943a8ab8acd7a25523f59dd4f30c35074ecbd3e2f025cf26e8d03e3e8ac
+EBUILD fcitx-anthy-0.2.3.ebuild 791 BLAKE2B 730c8672faa0f69dac2c91e205a9c288a6e4a62584eb62d538763e942f3f8fca3983ea64f7a06d1db0d02d5fac163e136e0978b0841b3119c8498ba6898f9821 SHA512 e93cd9afe9052ae954b6c7d19c29c9ac9325424847693e6c4d02c0c14796c1866f2ea774e32cec55ce088259e161320b8a41066364d02c9829d117cda8c2ee0d
 EBUILD fcitx-anthy-4.9999.ebuild 765 BLAKE2B 974c2629472eeb6122b291e06c7a621b19cf22a253b2dba10a40285e5a65e111bf047fb9cf0d711b2a5b4338927012886462aeb84aba51366d010b4bf797072b SHA512 79f581adc7a301fb4012e4abab6c8a3821257b3981b595699c52d83036fbe856293c5876e3fe1d9935e02f2f28e8218ca4e45e1a86258fa64b55ace44bf71a72
 MISC metadata.xml 465 BLAKE2B 3af24146b901c25d66054900928edc40b31be664e2027828fc4f997c83ad739df52490893225cdc1cb4c530cc63794c8282efd5222ae04be1f54d025f78e5cdc SHA512 0f10823c40f3e3dee6a08359af9564b19733caf252b43c529ffefb95aa019df80948a5358add1a03b950d1ebf1ac2b145f7ad3542f180505d765b77495518604
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
index fc844ebde29e..a07614fa3037 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 2013-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/fcitx-chewing/Manifest b/app-i18n/fcitx-chewing/Manifest
index 6c05cc9a3f07..fd6e9dcc4475 100644
--- a/app-i18n/fcitx-chewing/Manifest
+++ b/app-i18n/fcitx-chewing/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-chewing-0.2.3.tar.xz 19804 BLAKE2B 0a83ae9a17eb74898e41471450a9054bb05e504a60d05bda91fa53f90cb4328b0db4bd5e1d662c81c9322268660e57a7f2cb9c547593913206a00394883341b1 SHA512 3492ad6ecaf00bb1ea07b76c9c23da075615597c1a68434a2da003cbe410d12172510d4306379777a1d04a359b017c49d278c002a7230b030693b668b6030bfd
-EBUILD fcitx-chewing-0.2.3.ebuild 794 BLAKE2B b0883cab14161ad89ec9ffb4f3b8ec653c54bcd772c39d1c89adb838616c3ab0306bee05773c83244299b3c50ec813a78f148aaaf5c521476fb9eddf6e8816ed SHA512 e68fec3fe75da0a853a6a4759457e35522c6c75f39b4256a583976a22b048d611a120493473686a03b9289306b3f0935717acf4217bb3d4c70f1887fd393e122
+EBUILD fcitx-chewing-0.2.3.ebuild 801 BLAKE2B 5ea495592cf3cf2817b4d3358ddb51f2ff4ed4e8fbb12460be8e0c2bed7307ddaaec9b4d5e1928d8b472e81cdbbbd1402fb590c20021a386880427fd3c5c6a01 SHA512 3a8823b2a836771cf46fce014d2456d3296f7b7b418aa7005e986c7d12c8f5085b0baec769765d84cefd185a2cde88d6e39fe4f35b7c86d8eb2afe2d43235aa7
 EBUILD fcitx-chewing-4.9999.ebuild 775 BLAKE2B afac4b517c3f11dd5a9b0fc8e0a92f1d43d6f99fc6572edabe0648a55f9085898025ab19f4be7e5957760365ebed0279441efcd2f60fc9cdc9c6cc99bc3d06b1 SHA512 21db151a86da51155aead4012a8eb19393fe4928f950f4905d6a4904c2a907eb0e8b041ad6e86355917bc5185e6749ad81701e5e3c67b6050b6bdb111fd8d170
 MISC metadata.xml 467 BLAKE2B c319479e5201f46551889b137e44ea68f47ebefb060a1c73d89d30683f73ddfc8e72e51a6818bc3e2396d8a45152c92c6fec299d5ffac9dc833f0ab3584bd93f SHA512 4e50ca435b0889ab4a8655c850ac5aa6d6e34c0229ff86da882e35f804f0afab158cbd71035c0dc3629bb5b92732a0aa98f4a33b893bee9f147a658d4bf47bf5
diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
index 62f9a48cb0ac..e160732f8a5b 100644
--- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 2013-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index d41876136edb..4bfd262636f3 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f
-EBUILD fcitx-configtool-0.4.10.ebuild 844 BLAKE2B 00be69c6f35916baa58dbcbe77181c9992b12d4c94b8e83adc97f3b2f6bfc61d5e56694e1127be9ed8f775a755d6202e51b0d6315e1e1333effff5c6426e24d1 SHA512 37b70b8381dc84748a173402fb9396b2480e89680083354f1dca436df44ab5f3ff656d54e5b06cd51ec008e316230bbb4d0bd71e36918a901c6f343bc4173de7
+EBUILD fcitx-configtool-0.4.10.ebuild 851 BLAKE2B 97d7acbf9f2984de63df3c6e603fb7d5c4bb8d5828d70d3840b8bc8fb8381388112978c2967f404f485ddc441daaa14b8ea972cad92068dba17cc6758063f7b0 SHA512 e7de180936ec303bfc23e02b77f0d367e94c30253b55dae9bd47ea2a0eb60df7da2360eb25b0c5b6930d08239109629e75179d502e930140b46385bc1a262c7a
 EBUILD fcitx-configtool-4.9999.ebuild 818 BLAKE2B d034a75bf15f37b71243d5d1c15a8ec6114ca559d715101f031d434b1a9478c39298f95b022c7c4f8cd08ad2701eeefb4cef628a4795f5fd15567723b0c71362 SHA512 42b150975f7293dfdb67c6d6479803526438adc80032adbaadf6f03927f6adaafd4469d145d07a21f8b929cba6eddf20e21d2374085c8791d77046ed0f496659
 MISC metadata.xml 470 BLAKE2B 0209cf8225588df5e3c412c3e1fadcc34221cddf910dc7ca2af19b1332792d96a152d992d3386270a088d179d23073925c4259736107fdf41ad08ddc300dd9b1 SHA512 7addbbbce24ba4a02bb313a8d4be91b811337b6add5b98cd79eb242c2144b703f8e4b3da9d08b128cd08bc71b7d34ec3feacd99e0642bef697da3023b6a4e511
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index 940ea21df73d..965a595ecd0b 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="4"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="dev-libs/glib:2
diff --git a/app-i18n/fcitx-hangul/Manifest b/app-i18n/fcitx-hangul/Manifest
index 2d7330b82b87..4721e45b81e7 100644
--- a/app-i18n/fcitx-hangul/Manifest
+++ b/app-i18n/fcitx-hangul/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-hangul-0.3.1.tar.xz 26612 BLAKE2B 59770762ecbd5027d9010d99037881c576f638d30cf22234e5b110e9264637c3ff2049fbf8c7e44ca27acebff5668b2eefee5aeff78622ccb338ff68abc42490 SHA512 6ad2e34644c9246490a91342a11b186d40702f7e587beeb056ad98538da50dbf9fdc9f298e5b379bef50f63ad5be5da79ba84e60a22b57c330d0a68dd5bf5ca6
-EBUILD fcitx-hangul-0.3.1.ebuild 822 BLAKE2B f4d971b9c5210e709a1263015783300155d112f7eb6f5c17c59a4c7990f50eec27d7394bb2023677bc0c162fcef7cbe30b92e1401f39af0d6018c5bcb0b17e80 SHA512 8df67887faf2bbcd58a2703c2e57668883a60658437e7d8f6969663ba41b225b4f70f30a0e49a4d5a2ba718e49d8ec9c22c917e11422d5a7f1a293021df5303d
+EBUILD fcitx-hangul-0.3.1.ebuild 829 BLAKE2B b2dc70b846114167cd2963762d76673052207c2fcc4cd8c725d7bb2627754658f3068d45cd13d0b0eff365b1fe4f923b88c8c3cd564cee72ec778f241decfc8f SHA512 c0faf0bcef7dc66df47a39c95b05d217714ca6f466791faa1514ad35dc7cadbf123af96b14336e519c8d1a7cf58cdec87210ac8d435c53f596ddf9f7636e0869
 EBUILD fcitx-hangul-4.9999.ebuild 803 BLAKE2B 84ccc25600ba5cdbbbb51f6ae9c2a4b4b04cd902a3f2444502ddfb0980b0c6b892fdd994b8d2b1ff3b252f033133e64941aa9da20211f56e6344b3d2a0d48ad9 SHA512 0ec0d8966b9b5df8963c1602e5430f9b0dae90e4c35cde5107848d0acbb37dbd0ecc116d4fae25d56b36c333ff483b41be062e43a9225eabf2fba831e03a9494
 MISC metadata.xml 466 BLAKE2B 53e390d7dc1a86d0f55c7e17df9e56c60c479334a5861357b842f0a27d8bb02c57e0ec0857784e1c69f5392bf30271c3335fc33c57c0607bfa79a206d1c48cd5 SHA512 3bc17d20b077002ee46bef6a352dbaf5ec52564528a16d424a1d7dbfa8992435c137cff24654ccbd1204512248caab5d2f3f4a89fd1d78a793968f3df3bb564e
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
index e203a031e17f..30622826e963 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 2013-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext
diff --git a/app-i18n/fcitx-m17n/Manifest b/app-i18n/fcitx-m17n/Manifest
index 289216b472e2..6b249e1fc34a 100644
--- a/app-i18n/fcitx-m17n/Manifest
+++ b/app-i18n/fcitx-m17n/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-m17n-0.2.4.tar.xz 35076 BLAKE2B c53c8ee8156b49607cd5bd951eb031e2dccb6a18bcdafcbfd17ebf07506c750414abac3f2dd5965fdd8b154df9c16820850f61d07cd38745db0af89ccf2acfff SHA512 b7c483e9c88e58a47ead294c36ed182558f09b41996e97faaba9fd3a96612f6a0fc240fdcb95db9a08c1546abe5fc97337957e2124844bd011363b7468f6e112
-EBUILD fcitx-m17n-0.2.4.ebuild 709 BLAKE2B 3ffe009bd55dfc99014f91efa9e85daef6e4bd81eda805efd67a2c1cbc16cf74aab0b8846a40ed2952d7dc107b9ef8edef7705143e8ba4db8a07d2a553ccdd3d SHA512 571d3c6b61f7e4127c22a52ea963769e19cebcd271394ac3463bc6ff70da85b9aa2d62ce0aa85e9e2cfcaff290c0ad11ea58b0265e7b3d46d47714265a0d4c81
+EBUILD fcitx-m17n-0.2.4.ebuild 716 BLAKE2B 81bac3d7f881fc247177f1617f33c454dd9b3d2290c6bf0165a1d8aecd336bc37bd67ae548c3385fcc1e87bad47fe45afeff7fd96ba893fadc061641f9d18ba5 SHA512 ca8b372c2f82c0cdf60937ec5181825789d2b052326de630d5424024a23309bec9850196bd1394f2e4da0b1477196a40e8298f446b3934db2e09fd37ad184cd1
 EBUILD fcitx-m17n-4.9999.ebuild 684 BLAKE2B b305cb0b38cf7fac69bd8e394393f359513bd7a8e85b800762280a9bed1f685723ed9530776dbc3fce0e61946c9c45740224958ff16a388c07b22e73c22fe381 SHA512 e65e8ca0017ae9486bf138005e9c0759a4d5e64294384bb3e7be20ed083f5441be56bc2ac066b16f06174ae77f77bed36f33185f816ed33f1ffff17b2ca4012e
 MISC metadata.xml 464 BLAKE2B 58e5f6b16f001cdbe0400ccf8ae1c6031022c1085db689fee3e46cae70c7540e4ca2f1f2ad59796f3dcc6468ee13d53fb48acdeb2f7c5da5e0642c58c27012d0 SHA512 39796fa7f43bb86c4b77d21a07f8388212f7a663ad5a9c7aae99706ced057214b345fad555d138a48d28e0ef5a5a06b2321b1765235680083d62af7b2b523d00
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
index f282e295308e..d3d153b67ae4 100644
--- a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2020 Gentoo Authors
+# Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="LGPL-2.1+"
 SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index e828cac24760..349f3149ab05 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,5 +1,5 @@
 AUX fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch 859 BLAKE2B 6dc1a1d4b942600ec953cb18134a9e5fd9a812af8eb1629f942edd0e2a927596eba3ca276be1228d09a2ac14fbb4735d299473e915a90644fb869d979a10283d SHA512 39657019234402ee385667dcb8071209502d4b8e471bdff7fa13980afe2a358891d78447fb95d0f2c14a5aaccdb878d4cc8b9e95a85bb9c22cbdea475523c3a4
 DIST fcitx-qt5-1.2.5.tar.xz 98604 BLAKE2B 07f3d62c3c47e5ce0805a087cc4819dec44d8038cc428a3f9b39d640e409372eeaf0f8326a00be8b4af1ef6ec21870dd5ebdabfe39a2cf92ab9cec8c32be059f SHA512 238ebd02e4b07a1bffcbf2d1534492589bce206c3bce0197e075e8cd3f1b16a2867b5e9beb3bc2a0a5e9391acbf20c07d4d5a35f1550b4e71ee663712a8d56c6
-EBUILD fcitx-qt5-1.2.5.ebuild 1036 BLAKE2B 26032825d5dd23cb39131cea21bf6caf7fcbb6320e0e02bb859c343c4cc585d7c520311a7376aba379f8863e938b4532baa68d39e1e444d711a3c38b18ca7e94 SHA512 b22e0c9ae346a80890a277b8445186fa8b998acf5a6102dbbf91f348de57a9b48013bc3330187ec269fe8e9c6c88d240574e671b371970801c697eb00bc35f22
+EBUILD fcitx-qt5-1.2.5.ebuild 1043 BLAKE2B 41ded2b7088775805bcd9afe4ced7bdeb4b7499549505612c882b6b74ce359a3d894ae60c64917b9014311b2ce4bba4588a271a234dc59760a6f9201501c7269 SHA512 3a710f4a354b550d94f1e748dc8d58f75de18e0f7da0a839960f6cf7b784c36076f2e080abcd70f30fb6734ab8ae47adcebab15e345a1d776e1247fc4d534cd5
 EBUILD fcitx-qt5-4.9999.ebuild 928 BLAKE2B 5967c2e2b9ea9fc3accf378978ad1c5d29d452502c8614ad70feae710fc72266f1974850871bd96ce522ce6b27c4240afd805a461528a165a969ba1c9af5cb4e SHA512 25a3395f1309f09aaace89cfe2e38c7693108b8b72891994d73f15a847c8a9e5c38a0a686890e50ecd0a98a8580d6a1c7d99deb149e6ea8e4c4289b1a1fd572e
 MISC metadata.xml 463 BLAKE2B 597ee7c01e42ae4a209c8855e93fbe55fffd288117c0700707894add2087195db39b3dc4e0e1aafcf7eea4ca250c8a47da3458b0e4a0b6797643e4ad8849970a SHA512 6724c8eecaa8f707b19317867fb941aea42eb9768d43779ba0ca93274dad3e8ee0bab1ba014e75ac5b05e7e60ff7360e9ddfee9246feb06d68c4e5fdc83ebcd8
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
index ab3c7cd48900..a95e8874b964 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-sayura/Manifest b/app-i18n/fcitx-sayura/Manifest
index 59abc0124e79..48f50cb118f3 100644
--- a/app-i18n/fcitx-sayura/Manifest
+++ b/app-i18n/fcitx-sayura/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-sayura-0.1.2.tar.xz 25400 BLAKE2B 6bed1b86499b4448e87cb76c719d8fec3f7af7e5a4a4846ddc30e6e278f5e67c5ee47d39f4e19d3c8c927ce34bf66f51cf189d1147af0e509c3815ba4552a953 SHA512 2118c95d4f831e5f4e0af0549ae3eb4f16bff8b30b03452837bd14f35fcb524f730b27ceb7c14cf6a4db7400a67070929a75465195b5524187e97c7ca02de466
-EBUILD fcitx-sayura-0.1.2.ebuild 777 BLAKE2B e40203bc3690cb53df151ff7a0d734226c7ef4049760746b63080bb76efc90301d87a0dcbcf045dc0a47820990eee0b48ac87f5e318a0e46793b465434bf67f3 SHA512 7bdbc7748a560dde57407415ec109885413bc677ee4f61e2ef7bb5f12964be1e1daf5a6fe5e9f39c625699e7f05562a69c770324588672739b94bcc576318158
+EBUILD fcitx-sayura-0.1.2.ebuild 784 BLAKE2B 38a841cc0427897c9527fec05a74d630bf25b8cad001a21ce8bb50ae0f8a460299b55dcb54ee2856c6cb246a4ec2320be36bff9d6805f9ff2a5e2b5b6b56828b SHA512 2a5b7948f3d21849937c4c59224af8965dd5a6886f2ae069ec15f196fa40d5bfa2b48f1650b922bc70f622eb124c504d55b2f711bc62daa3c4388810ef998831
 EBUILD fcitx-sayura-4.9999.ebuild 752 BLAKE2B 1586570bbf9450e512cb8f1db440cd71c3c3e7156b81a6348f315b2c20b7c139771e8090ff660d440afe42c8e26739a211bdda8889344de8d59adc46695e211a SHA512 769efa27440e0b39d7d6b508004ae07570e9dd9287c72f4c4afd33e4a448dfed27ea5688dc3cd5e74eb8274294db644c7a6b3599d835e120adaa8dfd3d5f6c12
 MISC metadata.xml 466 BLAKE2B 596f5baeae13090f6da42735bfaf74755f42ff506c97e727dfd4b56d0a1c5daebb42cb41134074b0dbd45876520f881e9117fba90b899744fc5bfc8c1baed93f SHA512 8d66075e3e898d5acb9a4746548a27ba10ec776a39a0664c5b310faa6be0d810428f362a62a3c653c3227f8e5b08e9392d25705d58ff948a72d6b985b81ae9e5
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
index 69fb1d323273..ff59fdb17065 100644
--- a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2020 Gentoo Authors
+# Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest
index c52e318bfbbf..87209c3ce2ab 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 830 BLAKE2B fe2e82ecc1ebf52770a10cb4d5a683609b304584408d6108851c6b017da74558ec451bc8da7adf7094c2515006862a0a92d3e83303b0617047b31f99872033c0 SHA512 0317002310d21121b52331e2e1bff8dc732f9d626d03c1cced36bb82429be0adccbfa1f2d2073cf49d5d18489383629d5485364c03696457072e0f20b9f4d926
+EBUILD fcitx-sunpinyin-0.4.2.ebuild 837 BLAKE2B 3f5f3fb6ce12b4f4c2afa072a2f7956cb8677bf75ed88a8f0e08fff80864eebdc75c7725a8b79d76cb8d2247d7bdec61ec2cbb4c11613dbfa0fc01c5b0b1a48d SHA512 dab7e0bf4fa3b051f816b3a2848c8f57a6e984a3ee467c6c0af7fd30d2b8b1b249b589d0ba8d78a0e589a7437f3c7ec54258ca345d9251851852deca1e41bbe3
 EBUILD fcitx-sunpinyin-4.9999.ebuild 811 BLAKE2B 6ae98312e88bde2da2d6439b85ad9f9a1653aa691e459240f40824522eee67f7582d0a777461c43b3fe9d1516b51a07333896d48e65d3e0db7cfc6cf9b62369e SHA512 af403d1715e14ca877460ba2e08adef7cb8b980c234938dc7a246117cfb741d29ac991d1b3d976fd4e5af65283f43d95571ebd90a254222deb6f28cd92c27ff8
 MISC metadata.xml 469 BLAKE2B 9505e1bca0a92a469fd384ab3900c355507ee330e80dcf566cd027f31fd46bc54533326b8c90c10c10b1dbff6fc7679bd05de2a6b85268d466c758ea665a7217 SHA512 5fe1dea7527c15de2601b3834924fd16f6a58f8fb00bab1bab03644df1b4da04f0f9052e35362b2cfd16015f3154c19df0051302f6026a97d95e8dee73867414
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 9d24259252a4..f42e0fcb150c 100644
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest
index d7b0cef8ef1c..63ff15d6d423 100644
--- a/app-i18n/fcitx-table-extra/Manifest
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-table-extra-0.3.8.tar.xz 3700736 BLAKE2B b8ce4b3aa04eba8b594b86958bb83e348758c30688828a4834643cf7bdd62852c2ca89bc4f75f0cb1b16ce969b0454c58e3abadff9c78318dc0953e0905c75fa SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df
-EBUILD fcitx-table-extra-0.3.8.ebuild 792 BLAKE2B 9b55a05194b7103a97629ca7782093d95fd512ea840b0bd8c38d2ab179d10827879d5088e275226cd4f55e9653bbc164ba676dddc4c6601d32cbc14e25ac0348 SHA512 1f12e525ed4d17dadc020fa133f3abe8015389af6e5ae1f98d71355501437d5e4ef9902e09a8c7b4a388364368528793252725abe5d6653d27352ce047ae954d
+EBUILD fcitx-table-extra-0.3.8.ebuild 799 BLAKE2B 6fc1349116575e7e3d321cecc4ddc79291fb21f6c029ed79dd37fb82f4ae43be065c1c8497400276bc6b8dded972d35c96533271a9cf8d774115d247e3be2ac8 SHA512 42fbd0c40568c75a9e0f765b1dc1a5667c5878b5d1d9abdbcb445ca134a40d3f2f2e97b652ca8115e19f59243ddb7283074b975034de1b28f201c53ef8cfbf3a
 EBUILD fcitx-table-extra-4.9999.ebuild 773 BLAKE2B 1debb5da1822ed6e17c62a3a37f2f80e079166b9434cd2f9840f8d0a9f747affbd556040bf7088951fd1a5851e7dbacc62d4f98c3d9961a7f28488b41d65d5c6 SHA512 fd3b5d55e45e0712211cf7ebb8808fde09ba373d7f3ae13a9c43b871fb5287133fc4bb26429f2916d0ca1883406a49003f7b3b400d1e2c2a85dccc281034ac26
 MISC metadata.xml 471 BLAKE2B 9d488d42b2d848a4bd3ed3ce1f7bcf83a52881006c2c70f61fddd93edb9295a86a77491b7cc68348034170da87f0e210a13f4119e28b701669e9dc9a55603a36 SHA512 6ae0dc202a27e5f23c17a4c06c7e31732bca86ed1f122f9506b37ece4832a6ded865a2b091eb5834b10bde00d60de864412519bc954ac414607e39d9fa63ec77
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
index 473763dfd10b..20ec866a0cef 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index 937932bd760c..07d37e30ef90 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-unikey-0.2.7.tar.xz 75204 BLAKE2B a0d70747a560b2493a3b7f7e06ff35f7e465bb4c4c8d22cb4db02f70a6298c49780fd0045874faeba1f20ad188a01a81fefc67a4f6ac9d6946d959f731a376a4 SHA512 1bb78e4f27f0cda1e3aa5a633be45e0a26d121d5b472b1325b0c028ff65ca156d23e7ffee0367badeac1dd21ba1743ee8a2c9c27c629ae0996e84e0062b67ad2
-EBUILD fcitx-unikey-0.2.7.ebuild 1099 BLAKE2B eb051e22a3184c0f4d4dff9c0ac742a7272ef8f6011a1631fdb9868b9812d581f8d3cb54efd3f59a299b3bbfb5fb443a566f5018229e61dfe86492e1fea3405b SHA512 95b1eb66170bcb1aa997e374ae860117ab2afc4cb55940c0755382fef360c5fbe81cf82da09fc0ff5714a821c46eea8feaf1028702df7dc3889c409d1cb255f9
+EBUILD fcitx-unikey-0.2.7.ebuild 1106 BLAKE2B 942d948547b51586cb5acf39724a0bfb5ce6324e5d5dd2c6adadda53155fc67bee2e09978878a2cf7819635a36838f7598323a0566d468e8f6229b2710c7bc59 SHA512 315ccccf245e58094a2ece09ca3f6efbb2712317ce7682e8c38d5aa5618c355444e5dc9b127f482b3e084dfc9a44a9480481de933be21ee01bf93f6870d9e25a
 EBUILD fcitx-unikey-4.9999.ebuild 1080 BLAKE2B d0294f4b5b7d75792462a72743b7e6697d0c7e9802cb53d38587a957f3666dd99f6fb319f417f7b5202bf68f91a657d03f4fc6f22647a5c0127583edd7b2fde1 SHA512 a1b852387046602883c45c2e98a8b6441a4bbc40b2a7370d8410f33054879a1ea45bc311ae042bc53a0f535a16a6c2724309499bd628e4879f8706358e70bdf8
 MISC metadata.xml 537 BLAKE2B ef008abf0f3dbee618ea0585654e390f47f5689fe94db1752b11efa3138cdc2e437481652a21cbddd680e6d40981f8055255199f0d5ea42146098c9549b242cd SHA512 d4f1313ff46a220310795cb07a2b80b8a9e5e2e6ced0b9b8bf605684d3e404a6c1011dcf22f50bc1fa4642e79a3d0609ef22fc68ff2186096d955a53dba19507
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
index 778af9552b8b..f977418e9bc9 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 2013-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE="+macro-editor"
 
 BDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index cdbaba436426..d5f9be455d4b 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-anthy-1.5.12.tar.gz 825323 BLAKE2B 4d81a5885e4ad6cfc7a10ecb61bf998a76c24049e58841f84ed31f45a8ab5e91cfd2c60be3a66008f97317047487bedcf956b9126fa17602c6f8a29950687b84 SHA512 6950a2865e4753831f8918f4a5926571bc8304454b6368662ef56a6fb11a60f0675e3d589108ebfd38cb5d193f7b61053a10baa6dad23adad67b3b3fc58760e8
 DIST ibus-anthy-1.5.13.tar.gz 265252 BLAKE2B d35299dba3260b85f80f259e0a40ea1ec061ed8082b6e5c872eab6398b6242342b2ee4da0c3b191aa428ae2d8dc652b0e414fd0c9f7b93ca8dcd6303c0586b4d SHA512 058feb49b2fe50ae3ca959f4754b8070f3ebc1e6727fef4bca791aa45a23c95018000e2a8bca496d6592b052298a6fb2869a07c2cc56cc473c81cc437efa175b
-EBUILD ibus-anthy-1.5.12.ebuild 1295 BLAKE2B 9545399cd39d088b51bc65dd4fa3a00fcca0acbd1f0deb2da97f2a1a549580794c15907f91dfa6777674f9416fba3c1b4d33ddfa38715f5bb40b4bab4166cb6f SHA512 1777a0358cecaa593962a71893eccb53679b268c62673a637070f0974598ec9bf7ea342797b587c0852e0e03920df33223f47b65144b25e04edf2058aec95f91
-EBUILD ibus-anthy-1.5.13.ebuild 1311 BLAKE2B bf015015d31584b8c91ff856aacad58c157fb135cfc717e86b40260328b13033bbf2d99d6f6cbf27e12cb6526087392f3cfde5ab37f06e8d9642115db9588305 SHA512 5f4abfb8f62cedc817cc5eeee4e975dba33b8ddd7544beaf02697f47456636bfcd7ba6b9919848d0ec7452321c9dd74597a296a54c808d87c4063acb3b56975a
+EBUILD ibus-anthy-1.5.13.ebuild 1310 BLAKE2B 448f52507f33bbcea960398d1ff9e2b177c54bd3523ea63cd3ad034758cbfbc4708b668bd368fc0fb9cd73027f4d290a765f97d4f2cbf03a0fbc403dde28cb7b SHA512 0cbd544a986bce8d41829ec6b3d391ef1bd09e9a8ae7ea382aca72410d778e28e11ffae3c725f94833aaff6f2c132549d288a46a318307ac1e5b24096764bbb2
 MISC metadata.xml 325 BLAKE2B ae0af274a4321f66c02696f5f6440ce55a1a8406efe0f5c17c76606ab536b157f528eb93508d1ac95a893a54ada06c538d627754f8795271e3bb99eb4bbfdcc1 SHA512 64b47eae1d72f07324b98eb1dbc9a2a4b7cc0c74172e0df55e9d5abdaf10ebe1d90f4217b973979e3b53c5a21084fcad6785203a7b4280dc0706d4e6d1bd74f6
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.12.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.12.ebuild
deleted file mode 100644
index 168ebcaf662e..000000000000
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.12.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Japanese Anthy engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/anthy
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--enable-private-png \
-		--with-layout=default \
-		--with-python=${EPYTHON}
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	python_optimize
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version app-dicts/kasumi; then
-		elog "app-dicts/kasumi is not required but probably useful for you."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild
index b74c9f0cf162..308e6241c021 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
+EAPI="7"
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools gnome2-utils python-single-r1 xdg
@@ -13,7 +12,7 @@ SRC_URI="https://github.com/ibus/${PN}/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 2314326a2a04..54df6aade9a0 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-m17n-1.4.7.tar.gz 493889 BLAKE2B 48a9b2ff1590d790d763014c0c9e5c08bf7ba84361a922aa71ab9cdb5b5e4c69fc5608a27c19eadc83578fdaafc3375c5bcedc1d81e2743a994d622042ffd436 SHA512 b011d4ee63a538a51f67012932d872fc2d527c6f3e5dd1642b7e70d3a32164532bc2ab69fb794eb985617b2698074af9079dac7991b5a2a30828595b129cce40
 DIST ibus-m17n-1.4.8.tar.gz 494516 BLAKE2B ec4cb36d465e25a6e0e334243e7df83444846f9109ef2142daea4949ddaa7cdf5290fc2749a978f7b8fb6d49bb080b2b826726fdc97e26bc722b019c93f13882 SHA512 3e808ffc3b7d03a745be1009a58c8d03ecabe15478f7bf36d70b777d342ad04d0f5574bb78743bcb67ab36674d316aef3cd7070d48ef9e11d07f960d75597aec
-EBUILD ibus-m17n-1.4.7.ebuild 801 BLAKE2B ae98e47abf2b6a6df31f97e538132ff89550861bcb6e736f7cc626ded61eea34d7e7437119f67483b70a24190e16a26bb47345e7dc023bf8f0d88a0b1fd8341e SHA512 c4e4525aecd307997c3a7a497355fb91cbdf50eec1e1596ca812b7188e2de71b54626bf8efd33efaef28625a015e5aedd91c962409b521f59e05e739be5a41da
-EBUILD ibus-m17n-1.4.8.ebuild 803 BLAKE2B 407d381baf82ab7a97876f9539735575b68175e745d0f7e8b4a83d4bf89e1b8aebfd56dc0bc462c2a751e39e2677a8e3b25c7b2e3cc0c7d1d6d74ad1d3513110 SHA512 f8a64621c6d98ec52730f3fd9713245a8b9f47c076b67c786b291cfa39febd66bd51132845f4a2b205a00006488c83b4b83b9f43de633a37ac5e743768499899
+EBUILD ibus-m17n-1.4.8.ebuild 801 BLAKE2B ae98e47abf2b6a6df31f97e538132ff89550861bcb6e736f7cc626ded61eea34d7e7437119f67483b70a24190e16a26bb47345e7dc023bf8f0d88a0b1fd8341e SHA512 c4e4525aecd307997c3a7a497355fb91cbdf50eec1e1596ca812b7188e2de71b54626bf8efd33efaef28625a015e5aedd91c962409b521f59e05e739be5a41da
 MISC metadata.xml 555 BLAKE2B b9dd5e7d4f230dde589a7e73333d14d52dae05d0e549dbde75332807434fc7c73ee7fe468dd919762527ac65f16c7a484b8d8b5c629c24dbe695c19c96b9abba SHA512 311891667bea4f2d4797440920ba2779a7f54766d3967edb25cb65b30800164a33192babdf7aadaa9adfeade385852d7d8d2a9a039b7c4ecbd2e9ed0a553fe89
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild
deleted file mode 100644
index 8ec1183befae..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk nls"
-
-DEPEND="app-i18n/ibus
-	dev-libs/m17n-lib
-	gtk? ( x11-libs/gtk+:3 )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk gtk 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-m17n/ibus-m17n-1.4.8.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
index 1fabfb506072..8ec1183befae 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.8.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 nls"
 
 DEPEND="app-i18n/ibus
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index a069391d869e..8849cf42434c 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-2.14.12.tar.gz 10226257 BLAKE2B 5dae530a7ec425e8bd3c6009d0bdb9b8d321c8670769ddf80ba7f706d6b5140f21f184f877603de3cc6f425a4a1953c645eb177c9fa8183ecfd091ccfb32353a SHA512 09d1898c3ac8a1dc79768df7a44c33862a0b0fbb2122d184f1e8a839b8c3c71191fe5ef932f9e649ac715c8093a5c277d5783594f8defc06ecc13727b851ffa5
 DIST ibus-typing-booster-2.14.13.tar.gz 10239396 BLAKE2B 1c4db896f28f3f1b58bd3071fb6f2d5c1b2b4e0fbad43568ae25d69f301d4ce408ca6c2fb829818f6981c2f212c499c1dfabc3511f09f7a9f5c3d4ae2d08a212 SHA512 4e1f1c39fea030f1f056966007127afeb5c6c098a66ecd6fe0b4ea60f302438e072d6d409ef2bee9ea5b0d1048b5a22d7e4fad9f7f509362e2af251855f6e535
-EBUILD ibus-typing-booster-2.14.12-r1.ebuild 1148 BLAKE2B 11526afa746bbad40c6747c1a6b83b6be5d3b224373164d5286435c795814695e59b4842c7a7061298c7d160001729e0a5becc50bc4f4673ec97424311646805 SHA512 16c9fe7b754e26af1425fb8e68232097531c1985c8485055eeebace97252e8aa5037ac40d7b0756b202b2cf56fd6aedfca294507ac964e93c2212a56263186c9
-EBUILD ibus-typing-booster-2.14.13-r1.ebuild 1151 BLAKE2B 9a584e3949d7065bd70ba6341be236025c5611503f5d9cb6f0e9849e481916eb9e89c18701ff7fd0cbae9bf0641543ef8b33c536ad7e5501882bac0d4f5335a3 SHA512 16e8dea273ef486a1b62b92161a0beb8aafb70405541d072f0ffcaf72f972401376dd887fa3e1a5605f792e60d1e0e1ceb5c244a94bb49a9edc2c2ce161cb7e7
+DIST ibus-typing-booster-2.15.11.tar.gz 10250973 BLAKE2B 1285d34535fc7087d19c1e01f70ace3aacc4a45ae04d7ab32c2af7b61eab7b547fa901ee01ddd1b1356de7fcb1f30d8c0dce58692b8b9448442eb5bdcdd9f7bd SHA512 38e74e6b95bff13f7b166158c145aa9d2180ba70380dad428fce322535b959cd3b8980ed499c2aec4a9701f1398b4ce793b99ce0af30c1eb2ce015bd35b990a7
+EBUILD ibus-typing-booster-2.14.13-r1.ebuild 1150 BLAKE2B 7818e815685aa34d330c6034189ea5b8853974c43327f0af17341fd402b618d585796da8fb7e88d6dee55bf87a0a76768599b289c9b3dc6be7d15f324eb0977d SHA512 a001e68b8c7777d786d65c3523481bf0f7d31520b9b869e880c0a551e5e48773f991dccf1af12328cca19e3df523c90413d4895bd2ecb7ce60be3a0c5c07a274
+EBUILD ibus-typing-booster-2.15.11.ebuild 1152 BLAKE2B ac31646eaad089059fe20bd6fffe960a90283e030542b98e734d3a48e0c9ce672575fbdf9dc4ab46576b51eea5961868b87fc741be0e5fc3b89c36e3c60cc11d SHA512 c0618306f76a06300f214aa239d296378a1f07d5fc8e06ab265d7333464820639310a8b970c1b6e43aaf3d261a4efaae03c0964e45293dde5dd861c3b897a07c
 MISC metadata.xml 331 BLAKE2B e076fda3780cbfebae0a799bcc320de0417dfc2a726320c014d253163625da4fd629b180442449368e316e134bf2024f7e03373f2ca0342c4b63a11c63475697 SHA512 f79eaa01a0ad3005064928ef7fbaed4bc98f8850ca36b23309096647b6158c7500e0075f149e4e764a89af99a8fe342eb6a1d9b83a347557300545ecf870e4d8
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
index a57f70b73a9b..dcace1669979 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
+EAPI="7"
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite(+)"
 
@@ -14,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.14.12-r1.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.15.11.ebuild
index 3c0b95dc64fc..34ef03a80db1 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12-r1.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.15.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
@@ -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-unikey/Manifest b/app-i18n/ibus-unikey/Manifest
index 9815c7e3bbe8..c2e35c972c0b 100644
--- a/app-i18n/ibus-unikey/Manifest
+++ b/app-i18n/ibus-unikey/Manifest
@@ -1,7 +1,3 @@
-AUX ibus-unikey-slibtool.patch 578 BLAKE2B 97cca9aa00dc520da9850a197bde0065e3579cc8e4df73fbd9bf837ecc4f1df0c34e2c3339e9da8034fa8e4fbb3674ad8549e9917b448228b6a8f19f60ffed3e SHA512 5b609626d19b41186f309b96c55d7303b5ea1380089c27eeb4bc4cc7d7a07f77bdb33e26d7a642db6e83a74631b65eb4422566604f9cd60d662bcf9842602676
-DIST ibus-unikey-0.6.1-gcc6.patch 31686 BLAKE2B 5d04ba5e66b1a128a04d23e73e20a8e6a269240a07604e71f3e232e0087f0a47d9a4ff6aeaa10a001c5be9b113d8cdc2a917ecc5084d576d6f918b4c699f2ab3 SHA512 9e1b172a904076ba817c7bab80cbbf7d736c078d3ea285cb946be23552ff0f571ca8e0187cac4e5bfecc2b0032512d6f09af4435056d6b653a3648d07356d9b2
-DIST ibus-unikey-0.6.1.tar.gz 516250 BLAKE2B edb5e46df983fe54ce84f778a23814ae946c6ace772d262a06f473013b84d87d3b1293e7faa62f070763ea837eccc08dfde51cf4b23353e84ac1ceca79a44d80 SHA512 f8d519802d9b304cdaebfcee3f9fef5f17756cde48aa48b9dd357d714e2eaaba0df8f91218b658fdd1d85343804e054b7987caff2734913b29dc76263c30d4e6
 DIST ibus-unikey-0.7.0_beta1.tar.gz 90086 BLAKE2B 450968ce10d5a455a9014cbd2cd9e6cbfbf559ae354dca8ca02b3a010edba4ff56caef7d79d5d80becbc51436e2192a8f9be5e936b606bae8ac65d003431188f SHA512 5e0bc188fe720014071c1c563c7bd3e92bc9e00d063c5c0647a9277fe3e05cb6c00a0aabb33e44ac5d31274f0fb03f495107195432bd7b0a89948ed3ba43d363
-EBUILD ibus-unikey-0.6.1-r2.ebuild 833 BLAKE2B f798e9ba64dc853d94a56c8003a0ebf36c379697489355dcf18f364cbcee825adc98a2924bd3e41beec608125ef51bcd7c4bfd244ec13d228bfe23d1a7aad68a SHA512 cf01f65749455c64b2ecb2225ce119da366ad8182e195187e7d28c502fc997b4e8038518c3d991bae66b2e25758aabdf26a011b1d510658186ddf339c4a4387d
-EBUILD ibus-unikey-0.7.0_beta1.ebuild 754 BLAKE2B 2c603b1321ae988cef8c34ac223bd79b5f62818b4dbedfdabe42c615853f8dad04cd6bf0d9b1288fb5aa3d773bcf1cdfa37b22e40dc1b7d564634f2c6239b1f5 SHA512 476014565c3445b6ae6f26b3045f58e85ca0082db74cf70e732dbf476531585d33b0b50e2c212ae6f9fce8d61da13a4ff78e371833a68c21f57457a6a6766cfb
+EBUILD ibus-unikey-0.7.0_beta1.ebuild 752 BLAKE2B 93caf222990ed6ff65edf12744cae5ef391df9e27f1dadef527abc6f9d7d09cdf94b495e41d822911ae4cfdd020c0d59a041a698c381c3828b6cd07d474b10e1 SHA512 d262d5fea6f21762368aef80c82676abb3036d8862a05d0c9d69c263fa4693d28ac11708ac98b241420a44dffb347d673bc6332a84bb48875356c15d27a29fe4
 MISC metadata.xml 521 BLAKE2B e4def0d06f9ba87e61b682c8d18839725d2ee9f5fb51686be6ec5cd5dd9152d95063559ed12c9f4bcd106cc2e2b6aef97dcf51e337b603f3781b343e0072e822 SHA512 a1436b1b0c957a93eccdbf01b34b3f3bfd9772f02e1b646a867dba02beae6cb236a8cd071f42d91dd37160758de7fa139abbc2469600465c65027a04e95904ef
diff --git a/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch b/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
deleted file mode 100644
index 02551ba608fb..000000000000
--- a/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/setup/Makefile.am
-+++ b/setup/Makefile.am
-@@ -34,7 +34,8 @@
- 
- ibus_setup_unikey_LDFLAGS = \
-     @IBUS_LIBS@ \
--    @GTK_LIBS@ \
-+    @GTK_LIBS@
-+
-+ibus_setup_unikey_LDADD = \
-     $(top_builddir)/ukengine/libunikey-ibus.la \
-     $(top_builddir)/src/ibus_engine_unikey-utils.o
--
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -25,8 +25,9 @@
- 
- ibus_engine_unikey_LDFLAGS = \
- 	@IBUS_LIBS@ \
--	@X11_LIBS@ \
--	$(top_builddir)/ukengine/libunikey-ibus.la
-+	@X11_LIBS@
-+
-+ibus_engine_unikey_LDADD = $(top_builddir)/ukengine/libunikey-ibus.la
- 
- component_DATA = unikey.xml
- 
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
deleted file mode 100644
index bbe901807543..000000000000
--- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="Vietnamese UniKey engine for IBus"
-HOMEPAGE="https://github.com/vn-input/ibus-unikey"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/${P}-gcc6.patch"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="app-i18n/ibus
-	x11-libs/libX11
-	x11-libs/gtk+:3
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	dev-util/intltool
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-slibtool.patch
-	"${DISTDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-gtk-version=3
-}
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
index 2aa330c6d61e..7a1e8a57f140 100644
--- a/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vn-input/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-i18n/ibus
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index a68742ac91ee..d0c3ad5603cc 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,4 @@
+AUX ibus-1.5.25-ibusimcontext.patch 1440 BLAKE2B 500b9e26933cd174c476a6ed16af43d1c85631276d182bdd8f80118a54be785655c5638f09de0caaf845bf6fe9f48e07bbfcee8cc64f8c0acd9767c557c093e2 SHA512 fda744135768e4aa2e2bb7dc9d2cad6a92d7653a2e96cf5a69b757637e875b649284523b8c55e142ff3b2db85a8c3b27dc23dc7cef135eada69f485ba88024ea
 DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
 DIST ibus-1.5.23-gentoo-patches-1.tar.xz 1596 BLAKE2B 5a2c084cb25cb35d16eba8e6953c1ffc249875ab11485a675497f04a4366ea3fe216bab3407f390a0330f4f17cf5a70a43547160cc9c29a6b14890fcb7867456 SHA512 a1c2a77dbc4185c3658c36b998c9d925fff2bbeb9bc5fde5c74c62081056f134875d557ba0b4af7b06d56f004975889f453adea623541d3bfff2c391912efa05
 DIST ibus-1.5.23.tar.gz 3557661 BLAKE2B 4cfb3287c80d46e55090d4f361dd977f4be5988a8b7ffc24755954090dc25021ea6cbb6798769494e6cd70267aac6daa238fdc7cf4156296d93f79f325a18ac4 SHA512 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205
@@ -6,5 +7,6 @@ DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5
 EBUILD ibus-1.5.22.ebuild 4143 BLAKE2B e539ca4998d07537d138fe2b8d88fb49865471875759512289c8b388ea5e01931822bf2af986484b8f3bd3f791cb964a112473e3b51c62a774b59ec16c6b0e27 SHA512 6165d5f700ef3ca7a66098b5f2463b40ac025bda2ac5df148bc341e08827717ef58370e564c883ae8a7526f9f79e97e1ff927eb316244d69e516498ab85de931
 EBUILD ibus-1.5.23.ebuild 4450 BLAKE2B c88dc256f2ffbe8cf035a27d4081e5473dabf4875ea39b0f7695d086328ba58a3fde097f1a6dcfc55ede344faa8607eaa93812f89280100802be78cf7f765f3e SHA512 685ca1cc3bebc48ce15c68f3fe5587a1ac646245ffad3e627bf2de705bfc92cd0373336fc6767b11ac16dd3df7c2ca79fc9e266021af00ca965e3a2c3556fabf
 EBUILD ibus-1.5.24.ebuild 4483 BLAKE2B 1400cbebfb9b2dc425786261a75274d5c1d4748af74334517087aba27bcc55fc331f1c32401927499f3fc6780ffabbd4a73f866f6388f3bc9c3835b60c57ab5d SHA512 a7dce123b28947240d7ee13f2161a80aa884c2ea68879aa403fefa76f2cf1a5d240d411f08e4102cf7a4e97dfd61203d4939c1c9cd34898f264459b554d7aab9
+EBUILD ibus-1.5.25-r1.ebuild 4561 BLAKE2B 8895ace0bc547e935acf1dbfaf4a4ecf03868bba4235764f447c1ac8a4fb0297731e67af2e95bc554d98148aae3c64065a1d642ce3e10662ab9ee20d9a258e34 SHA512 631dd778c4aebb1dd9116e6f8bf1d7f7e5f974c77382f54e4301c32fdbbb05c063dccd83df60355c7db175388054045d56874f0f6203591d6a037ce681cc431f
 EBUILD ibus-1.5.25.ebuild 4509 BLAKE2B 88a60da65725ed03ffa3f3c6a19301d518622e286d7905bc432a957b61bc13108874849f425ad5855b3a8c923c0710ed5ba0f31aba27216e8818efd200a46e28 SHA512 85f85d88b231fb8b5d38e5d34bb834a81c4f96583bdd7bbbd37f2ac8122047174d09b454a9d4fc9fe2abd0ae207d2ac338fe34b9c7088f32d911237468d1e8e9
 MISC metadata.xml 866 BLAKE2B f6a00311b03da6e54d020fef05fee2f168834ea624a362bf15eaa4a52c72e8db828e7a9da8066b4facbd449d6395eedc9dace2d57465ae6f0aac3e80055267ee SHA512 7b595b5228656e6cc49c8875cc2e7fe75bfb95e94f7fd324bfabd55d03f180475554fe77949e154b9281a8426bcc7eae025329c6a5b141a0dec7341a2136b94d
diff --git a/app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch b/app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch
new file mode 100644
index 000000000000..6187ff77fbac
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch
@@ -0,0 +1,35 @@
+https://github.com/ibus/ibus/issues/2337
+https://bugs.gentoo.org/824494
+---
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index da9a402..b1ccede 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -1497,7 +1497,10 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
+ 
+ #if GTK_CHECK_VERSION (3, 98, 4)
+ #elif GTK_CHECK_VERSION (2, 91, 0)
+-    area.y += gdk_window_get_height (ibusimcontext->client_window);
++    if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
++        area.x = 0;
++        area.y += gdk_window_get_height (ibusimcontext->client_window);
++    }
+ #else
+     if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
+         gint w, h;
+diff --git a/client/gtk3/ibusimcontext.c b/client/gtk3/ibusimcontext.c
+index da9a402..b1ccede 100644
+--- a/client/gtk3/ibusimcontext.c
++++ b/client/gtk3/ibusimcontext.c
+@@ -1497,7 +1497,10 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
+ 
+ #if GTK_CHECK_VERSION (3, 98, 4)
+ #elif GTK_CHECK_VERSION (2, 91, 0)
+-    area.y += gdk_window_get_height (ibusimcontext->client_window);
++    if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
++        area.x = 0;
++        area.y += gdk_window_get_height (ibusimcontext->client_window);
++    }
+ #else
+     if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
+         gint w, h;
diff --git a/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
new file mode 100644
index 000000000000..e4d24fa2a59a
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.50"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+GENTOO_VER=
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+X +emoji +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
+		>=x11-libs/libXfixes-6.0.0
+		!gtk? ( x11-libs/gtk+: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
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+PATCHES=( "${FILESDIR}"/${P}-ibusimcontext.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
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	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 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_optimize
+		}
+		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
+
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest
index 44ddbb861bef..2a22b850efef 100644
--- a/app-i18n/kinput2/Manifest
+++ b/app-i18n/kinput2/Manifest
@@ -5,5 +5,5 @@ AUX kinput2-segfault.patch 240 BLAKE2B e8815bf5a3ca6b19fac492e51dea7faa98d3acacb
 AUX kinput2-wnn.patch 1726 BLAKE2B 034b74ce8de370d2088dbd77ac61f3268c5b28537619985ed1ad6896d011ddff31c1b9523f38681e8461b935b01239697606f3106cad521e5d1dc55922f1d760 SHA512 a8ea7756ca893b0bdd7d491c8e2a4187c5d34b084c567449597b8fa1d9fb9ae4437bedba9d771a7b88a3e621573ce6650243dfa5ff396bebb653cbf4b6f5712b
 AUX xinput-kinput2 121 BLAKE2B 34d40a7874ee79faff6f602bb32d705efdeac28a3d0a2bf89c68ba8f6e771eacc5878faf8347de171e813384e3bfdb113dcba7229ce1b5ecf6b1a293a6516b00 SHA512 09aaae3bebb062db82e8440977f58b9324e53262c6a9c95a276d305e87a2f9c0f9775077bd05c6ea069cceb6e45cb4efc4a6c412da7501b2b01825bc26799ec5
 DIST kinput2-v3.1.tar.gz 512177 BLAKE2B d67ca132fe3054d862c80b03b4665cdc5f4089745d848f6af9309b5896e0931182bdeefc621fad1cb8f1fd3686b07106cd6df5e703b3623f926cf83d637fa5df SHA512 5950f7294fa2bf915e6591290a3deb2c95f27706f3a180a084d14fbc008f3cf363b155b29c8103a8b999e44ae98182ff35bcfda85725b2c565f3e37f54788731
-EBUILD kinput2-3.1-r3.ebuild 1663 BLAKE2B 302c8a01772167670e5db8b2a45b78b57c91e7ed4387be912a18a67459ba0abf57de318c567fc9925076e0397f4280b9fa857738d37bc9f2d7e77851ae3dcd1a SHA512 b41e6ff23269e12f499ed9e1d39dec91508bd70fe79440258647a9d94ac36e64b41db9d87acc2df7c8c8f42888eab5c66830353de3ac546757bc205d7fffe0f6
-MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
+EBUILD kinput2-3.1-r3.ebuild 1667 BLAKE2B 13ef8bd4e6c63e5924a46e8c5bd58c837a8f0c02b26d7ba1440df383ee1c08b97d0ebeb6c00c5c252605b08bc89b521cf9ef70c78d1d3de4da06f9ead0b31a0c SHA512 868280b20f676bebcc9656e2293d5fe1c3aadc2b36bad6aaf6099a674846788f6e0b9ecc7d490042e93f5684194d78528111562b499779e839db0ba277942c2b
+MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/app-i18n/kinput2/kinput2-3.1-r3.ebuild b/app-i18n/kinput2/kinput2-3.1-r3.ebuild
index 98694463da46..87035d98354a 100644
--- a/app-i18n/kinput2/kinput2-3.1-r3.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 inherit toolchain-funcs
 
@@ -10,14 +10,13 @@ MY_P="${PN}-v${PV}"
 DESCRIPTION="A Japanese input server which supports the XIM protocol"
 HOMEPAGE="http://www.nec.co.jp/canna"
 SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
 
-RDEPEND="
-	app-i18n/freewnn
+RDEPEND="app-i18n/freewnn
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -27,9 +26,9 @@ RDEPEND="
 	x11-libs/libXpm
 	x11-libs/libXt"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	x11-misc/gccmakedep
+BDEPEND="x11-misc/gccmakedep
 	>=x11-misc/imake-1.0.8-r1"
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
@@ -38,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-segfault.patch
 	"${FILESDIR}"/${PN}-wnn.patch
 )
+DOCS=( README NEWS doc/. )
 
 src_prepare() {
 	default
@@ -45,8 +45,7 @@ src_prepare() {
 }
 
 src_configure() {
-	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
@@ -64,17 +63,15 @@ src_install() {
 		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
 		DESTDIR="${D}" \
 		install
-
 	einstalldocs
-	dodoc -r doc/.
 	newman cmd/${PN}.man ${PN}.1
 
-	rm -rf "${ED}"/usr/$(get_libdir)/X11 || die
+	rm -rf "${ED}"/usr/$(get_libdir)/X11
 
 	insinto /etc/X11/xinit/xinput.d
 	sed \
 		-e "s:@EPREFIX@:${EPREFIX}:g" \
 		-e "s:@SERVER@:wnn:g" \
-		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf || die
+		"${FILESDIR}"/xinput-${PN} >"${T}"/${PN}.conf || die
 	doins "${T}"/${PN}.conf
 }
diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml
index 491c88b3a31f..a94766977fa6 100644
--- a/app-i18n/kinput2/metadata.xml
+++ b/app-i18n/kinput2/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest
index 3c9ec0f0ce79..376ccb6a24b3 100644
--- a/app-i18n/libchewing/Manifest
+++ b/app-i18n/libchewing/Manifest
@@ -1,5 +1,5 @@
 DIST libchewing-0.5.1-autoconf-archive-2019.01.06.patch 34944 BLAKE2B 582e2041ff8e99c90df6726ffe0fe7c3f09672ba841def4ded4f367d704a56349da9fe8c555e9b24ec5c82d73774c8690219532c08904cda29a2a33845d2f3d6 SHA512 8e93539fdea3fc6ef01ea070a64d6bdd873ec1c2555fbcb40cc639a22c74a07f8c2936eb100ebb36d146c0e17ce5f80afa8dd3468ff1f5c26a835c3d12b98bb2
 DIST libchewing-0.5.1.tar.bz2 3141084 BLAKE2B 28f9e803c8815c0e1b1a1134becffe12f92c1ae24b4b6d4163769d898861fec024db8332befe7130487a72fc20859b6292837e9d68ab1b6477de4cf4f789f2ee SHA512 a6551661bb5e56bba59730b93b373db56af7d42f2ab4881fbfff8727689dd2604d42d2e5c0b04820df66a431dfb5fcb73cc5c9b538615da76198ee3635501c1f
-EBUILD libchewing-0.5.1-r1.ebuild 1577 BLAKE2B 743bab3b9fb97610171f368c92297a8672f57de1377b8793881c3d55d7ea68dc01c539f46dd984ab517cbe8b7bc7a19c920920a83bc747d030ccb21f57ffd6bd SHA512 8ad88794739290cb5ab2987e0c9fd20fd6ef80326e607303f5aaf4170f2e2d356f2a19086d02dd9b6e75f7bca583407593ed5c8f31e4ca726396b093d51e1cdc
+EBUILD libchewing-0.5.1-r1.ebuild 1584 BLAKE2B 25c2075962fd88923a068e8af1ffb8fcabd8942237c57c1339e769b8a7db3b6f2e30eb0317d61c8a32a52f5abb8d35da984469b290e41c5001919e5dc64254a2 SHA512 8dd7f4a51f1adf3b2f69db05c270731c27bff154cec6d4a8ed7ba2db18c0dd1025591290f2c1e615c8a4ff26945c10a9734ff5fc46421b9bc016244e745b6fdd
 EBUILD libchewing-9999.ebuild 1546 BLAKE2B 473a7f0dbb25153e14ab5563bc735cf833e20b8ccf52acdb87bb4ca0a6c7dd802c42d146b9ea307ab5f2900a00b5c2ce3da24bee15f2fd5947038dd09fd8f1f5 SHA512 06ab48e4d1a6809a1ff26565813daa4ccb763909a6423144908c93ca16f56340cbb3b468fb38fcb1dff74719d2249f90e3648da7259fd2b7f820ef12287899fc
 MISC metadata.xml 466 BLAKE2B 09e6f1889991f76e576ff6cf3b00704aae5226d5a973ef3dee7b4f066fb7270e19f24714d3de727c4f85028d97686273c3bb6e86241f572bb60d895844f415ab SHA512 453a3fbb0a7a179a94a8666aef952bf6a06ed6a311e45672176cb11c76398382b48427866b15650694eb32dead7165d2060858e1bdfe114a71ca3a9e5dec506b
diff --git a/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild b/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild
index e29bd0411fd8..f9d8864487e0 100644
--- a/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild
+++ b/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/libhangul/Manifest b/app-i18n/libhangul/Manifest
index 1cfdb7cda199..be40a0be3c44 100644
--- a/app-i18n/libhangul/Manifest
+++ b/app-i18n/libhangul/Manifest
@@ -1,3 +1,3 @@
 DIST libhangul-0.1.0.tar.gz 2899845 BLAKE2B 5d6f4f9d6dfc32b8d6c6c0219b6e25b9c483555dbe623e5d284043d15eb24b4c7044003bcfd4c55b1ff6ab4b3b0c28037a8497f79fc9b733eb7de8952fee3ed0 SHA512 cf84850bf7a41e743457300513c5efdf7b3e18d168f4fdc324aaa8e1be78743752fcb98385764f94c707777ab82cc9444e076808e61fdbd915c9c0d7ea93c534
-EBUILD libhangul-0.1.0.ebuild 811 BLAKE2B 5eb2e5bf56ef7877b2b5dd15b8b9dae095fdb0d0e76c846cd238b543bf075d6566f7ec8be4b89ca2229cfc429c59c6ad86614f27951ef6d7696aaa8e9908826d SHA512 ad8e216edb7f4cc0ef1e53637faf8cd02eb9188842589ec0fd348e51356c4fb1658ae5024ead7a7960a4c20cd55d7d2817f55d54dbd7ebbe7d162005234fe899
+EBUILD libhangul-0.1.0.ebuild 818 BLAKE2B 6d55aed05f94477a74ca245ae917ee93cb66f3b4b12b07591188c3da1dcb41cf3e3aad084c9519d61e3d607addab029ac7cb651bba808bfa6fd50d12194e15eb SHA512 022daf66a4a9455f52c8b1cc088a75e3f0d66362474e39266b73285d2b96bf42fb2af694ed755bf9127ee58b164e01454b6e77c35fabc4156a4196f83add14cc
 MISC metadata.xml 521 BLAKE2B 1c1aab288333ba0d459f22f0a19e3ecea24d31f04937490c3ce68f80020ca4b00ebd77c7ad7326a4f1b9422b4792bfc572326c5fab277f671d44b2f2eed6cbfa SHA512 a011481897d3b89ae414405bdf9e5f34ad0542d5ae295e23711666d42c3fc0e097a8826d186c37ab77d3a622868bd2d273b8e9d7fb4f0960a3d88199b3d410c6
diff --git a/app-i18n/libhangul/libhangul-0.1.0.ebuild b/app-i18n/libhangul/libhangul-0.1.0.ebuild
index 2d05ccfaf080..6a732d0874e4 100644
--- a/app-i18n/libhangul/libhangul-0.1.0.ebuild
+++ b/app-i18n/libhangul/libhangul-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2006-2020 Gentoo Authors
+# Copyright 2006-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE="nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/librime-lua/Manifest b/app-i18n/librime-lua/Manifest
index 8c4f5a3d1f05..31730e6212db 100644
--- a/app-i18n/librime-lua/Manifest
+++ b/app-i18n/librime-lua/Manifest
@@ -1,4 +1,6 @@
 DIST librime-lua-20201011103348.tar.gz 21600 BLAKE2B f7046d1eb23391ca70543aa64c52092081cef51a69ac3a282f2f1392eaf760515186f063e9d469c5c41ac9f495ace814ab741a0821d1a635b9ad1f4faa7a3912 SHA512 2a3d3b49d53066fe96dd008e8064718082225e6bf185574a25b8e98175d9936abcfa1fdc56e48f9c72a2deb46f8157d6132fd119ff8e0a3d52fbe9e2ea21386c
+DIST librime-lua-20211030072627.tar.gz 27894 BLAKE2B a527e865a9945aa7d56cce3905bc80156b60ebf6323828ca40999cb73ebe8d8f66ddf6b0a1d6d5904f2bc754b5f8fe6ac1f5ecdc56351c2222a21429a0c2b701 SHA512 b15f85b0a18e5e05fa691a84aef7cf3689b4a5271a1d5b6f78ea42488f6dbe4dfc56a91fa547ca3636269b9c898d646d24d3a160096ace9927901f9fdba06e9c
 EBUILD librime-lua-20201011103348.ebuild 1412 BLAKE2B 98ecf2db48ce1af044ce0249e57da2da033be40da046f5b7d5c40a93b91ab73b1a479182e33842070c4b2da57bff5451c931236f6eadc22a2da468054e400c10 SHA512 2be8960f57334952ea225853c10bd0af1e0da58e63da746f38c43791c1659c302e40f8e61d53ae3c55233037a40f7177fb6ae6335bea4f5432752ce1d69b2bf5
-EBUILD librime-lua-99999999999999.ebuild 1384 BLAKE2B b3892ddc41646a07daf5ad4f6a1788022549673aba9566251767165c176ae1bd6cc03c06bf1d8a8fe3b7ecc226ee81770980d461fed3f86129a5c61da7446e80 SHA512 e1faf6c9bd1e5ba5744dcd0212c2246743cfe6e3693bda450958695f0da636c6787fad402ac12ee328f1c008837babc096e1f0927d4fa8dc445fed65ee61c4ae
+EBUILD librime-lua-20211030072627.ebuild 1403 BLAKE2B 08198da195f4f4794d7c6a2cc641aaa67f7c6db4f871b38b97358aed24a7747d542b2eedd83f5c15c7830e706135874e0a94372d29b1ef28dabf43050474ab01 SHA512 8111746867b8a18296bc15eb090cb31d6389e169f93f58c25a910a6ad2566db2dc5ac84e30c0e4e9ea15d939ff2cbc37dd225aad28d43ccbd790f1a1df53e98e
+EBUILD librime-lua-99999999999999.ebuild 1340 BLAKE2B f77d43a85abca142676706b14e29e3801c6578b03f4065dfe518b10bd16115747962ba71b5df74bffee99380365f8e7df8671702d98feb558542ff083d7c7e4c SHA512 b841b02e2b1ba8f3f81ab800e92a4fa1de2850db7dc00c896e184f9171ae3079c97896dc9428e9c021183b59db09600c0f66c23c0f873a7b816b90d04b547f6e
 MISC metadata.xml 468 BLAKE2B ea5c1e18f45d407545766eedaa97001e5d350e8c15933a11541c91b942de5e968fcaee42853ecefca39f01ac8dab17962189267b0cf1a449107743f15e8ff686 SHA512 32a8d40ba13bb8e0cb75579b4ffaf0695ccec5f7cf6c224ef687d1058d0f4adec67a523f8e58002a8020be5e148d05676bc17470c6ddee73f45a4bac961ef0f1
diff --git a/app-i18n/librime-lua/librime-lua-20211030072627.ebuild b/app-i18n/librime-lua/librime-lua-20211030072627.ebuild
new file mode 100644
index 000000000000..74d5ffac79a3
--- /dev/null
+++ b/app-i18n/librime-lua/librime-lua-20211030072627.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+LUA_COMPAT=(lua{5-3,5-4})
+
+inherit cmake lua-single
+
+if [[ "${PV}" == "99999999999999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hchunhui/librime-lua"
+else
+	LIBRIME_LUA_GIT_REVISION="67ef681a9fd03262c49cc7f850cc92fc791b1e85"
+fi
+
+DESCRIPTION="Lua module for RIME"
+HOMEPAGE="https://github.com/hchunhui/librime-lua"
+if [[ "${PV}" == "99999999999999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/hchunhui/${PN}/archive/${LIBRIME_LUA_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND=""
+RDEPEND=">=app-i18n/librime-1.6:0=
+	${LUA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-libs/boost:0"
+
+if [[ "${PV}" != "99999999999999" ]]; then
+	S="${WORKDIR}/${PN}-${LIBRIME_LUA_GIT_REVISION}"
+fi
+
+src_prepare() {
+	sed \
+		-e "1icmake_minimum_required(VERSION 3.0)\nproject(${PN})\n" \
+		-e "s/ PARENT_SCOPE//" \
+		-e "\$a\\\n" \
+		-e "\$aadd_library(\${plugin_modules} MODULE \${plugin_objs})" \
+		-e "\$aset_target_properties(\${plugin_modules} PROPERTIES PREFIX \"\")" \
+		-e "\$atarget_link_libraries(\${plugin_modules} rime \${plugin_deps})" \
+		-e "\$ainstall(TARGETS \${plugin_modules} DESTINATION $(get_libdir)/rime-plugins)" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
diff --git a/app-i18n/librime-lua/librime-lua-99999999999999.ebuild b/app-i18n/librime-lua/librime-lua-99999999999999.ebuild
index fcf9189fe7df..0b7dc6a14eba 100644
--- a/app-i18n/librime-lua/librime-lua-99999999999999.ebuild
+++ b/app-i18n/librime-lua/librime-lua-99999999999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-LUA_COMPAT=(lua{5-1,5-2,5-3,5-4})
+LUA_COMPAT=(lua{5-3,5-4})
 
 inherit cmake lua-single
 
@@ -11,10 +11,10 @@ if [[ "${PV}" == "99999999999999" ]]; then
 
 	EGIT_REPO_URI="https://github.com/hchunhui/librime-lua"
 else
-	LIBRIME_LUA_GIT_REVISION="d45a41af2f9d731e3c1516a191cc3160e3cb8377"
+	LIBRIME_LUA_GIT_REVISION=""
 fi
 
-DESCRIPTION="Lua support for RIME"
+DESCRIPTION="Lua module for RIME"
 HOMEPAGE="https://github.com/hchunhui/librime-lua"
 if [[ "${PV}" == "99999999999999" ]]; then
 	SRC_URI=""
diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
index 933ae51f9fd2..5ffcc22e28cf 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 1151 BLAKE2B da08bbd9497ea53e4a7537a02a5605c51990787860d930780b6773d729e655d80e2ddce40daa6f9c7b15c4d71a01552d802c3d4c8c81b2db64bdbbf2a23f8b2d SHA512 13323239f441dda14ffd2acda59952a9100f49a17b05ee05e3ba21b2f29b23c0ac35e1a84678038f40e9b3cdcac2be1b44ef920b368fd409d83ec1a866465252
+EBUILD sunpinyin-data-20140820.ebuild 1158 BLAKE2B 6e3887d9e49b89a0a19582b2da70a78522903ec0ace2c1306eca7e9c6353775360b9af49300c4547f60c530ba3fbf1052da88ff7ba849727d99acf433d46a7e0 SHA512 5a7796a66aa9a427ca2a43d74cf1a8e6a1b83bfe990db805619a8487d0e69eb79b6d747afe17a39ecf54817c35a115681e1524b3b3c7102e5c164615a4c4c394
 MISC metadata.xml 329 BLAKE2B e8af2229536f58bd5a36e51afd60c63ef56bf4d02002e90fa7cd9b97681a610cd669bd1c83ee48b441a9167903511faff140197ea51ccbafb85f8323ba6e5642 SHA512 f79be60ea988b1a0db4b8c2b84e47a078717eced5c456919ab588828b14a7d503d17d051650ab86cb17d77b6d671c7ed0720f848b4125074866966493a8cdec0
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
index 355015764c1a..07cc5315a958 100644
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 2013-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # https://github.com/sunpinyin/sunpinyin/commit/0fff1e78d9a409205e025736286838721a2ccbf8
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index c4d200f7961e..6866df26fe45 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1,3 +1,3 @@
 DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
-EBUILD sunpinyin-2.0.4_pre20200306162733.ebuild 1599 BLAKE2B 7c937dd2ffa0197cb6067126193942aa0ddd74d4973eeba7d569c2aae0363d340476e3e413999704661bd65d136deb2ce0306abc373b334d6fbd3e29248768fc SHA512 e4c584061cd630c033dd9152d72f1d1b1e15e86dbc8ce9246a245635185c834902e3c9d660d2823f527f88a54ac2a32333a03642339b238c6472b34ec9bf6cbd
+EBUILD sunpinyin-2.0.4_pre20200306162733.ebuild 1606 BLAKE2B de356852a1b144e56ffdfc2f0cf75024cce08f31a07c7ed9c6056cfb1577d13ba361a17d36f09abf25a73d4e0b3b0833ae0f2ef9266a9ad6f09ab10206bb02d5 SHA512 49aa251a71bea9991a852795fb2550743219c432d9de48f5543dcb3b9056d90d6d91c238e587f0ccd1fbccb877089dc7e2627f50ba44a29ca978269c9b4fce51
 MISC metadata.xml 329 BLAKE2B ae12dbfefc0d959e096722bb38250c1100ef684d340a2c35012ca4700cd3498e04cdd7f42028b51587d2202a419de9513af1a5cce4aac7ccca206dd302cdd5da SHA512 bb572b7fa4623dfdf63f15be02449479fa4de2557cec4896d743c5e5f1ecbcb98544fabba0111f4e6544fafca95a1b82bfd819e74a4f4543fb2e7b0f3fdc1858
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
index 4ac6f810f10d..aea1528e539e 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2009-2020 Gentoo Authors
+# Copyright 2009-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -26,7 +26,7 @@ fi
 
 LICENSE="|| ( CDDL LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="dev-lang/perl
diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
index c495ed1cacb6..338793461f57 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 1029 BLAKE2B c3322f3fbb4bdc26e9a2bc35e04ca4363a3e7dda9747e6c2ccd827ba84f32543471b78ffa6b8405be01d66baf4a9da8f65e6565a36c7131c1769d95dfdb3bcdd SHA512 f9cfc6d352d838445d96c69af6177cd33d468b503425bb51d6bf39b9d0145834beabddc927e2ffa714c0530328d10dadf6b65cdc6ba886850bb32c9e918929e1
-EBUILD translate-shell-0.9.6.12.ebuild 1029 BLAKE2B c3322f3fbb4bdc26e9a2bc35e04ca4363a3e7dda9747e6c2ccd827ba84f32543471b78ffa6b8405be01d66baf4a9da8f65e6565a36c7131c1769d95dfdb3bcdd SHA512 f9cfc6d352d838445d96c69af6177cd33d468b503425bb51d6bf39b9d0145834beabddc927e2ffa714c0530328d10dadf6b65cdc6ba886850bb32c9e918929e1
+EBUILD translate-shell-0.9.6.12.ebuild 1036 BLAKE2B ada133e0b274dc8539c192363c3ec89a9e547cd87280d4daa073a84dc54cf5c45c4a26c5f638741bbcdde7066be8fa3954a7a205a776cccb080970937888f23e SHA512 899d61927b7fee3aa73cbdb6f6092600d7982a79ae44b350f4d47070a4473489590ce0dc6c189295da8d8dccf31ff658b9eb11e613b782ab2d82eada3a604ed1
 MISC metadata.xml 717 BLAKE2B 53ed2e77c7b83c2ee83ed142e4f2c3e5c3ddfddffcfe3c6b7aa5bf7f8cc6ece578a73e13065501e27ec4b69ce84aa5e6638256c33c3daf2b539e12bfebe96f8a SHA512 fb560261ed1c1146e7c0b898065d15deb7fb6fc17c9284d88132b43945f18336f17ac4b0641b4e1b030e52757095e98cfa9a06c144bcab66ef62d1776b3a6ff9
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 68425a1a688c..91bcaae94964 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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index ad1854368dd0..e22b8aee9490 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,7 +1,5 @@
-DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
-DIST unicode-cldr-common-35.1.zip 22368309 BLAKE2B 3d00bafccca8d0b8821083fdf94440adca6f8931951de33f5914308bccddaf5c3b642d59c2b7d04588995c9a284852677ae3ab2feeb9fe531e7479d08f4ee7be SHA512 e06594da3d6dc376457e507fe234281fcb04d08daabfdaed60afb3aa59f88cdc0a7c27974c52ebd432746fcc7664948f9d6e6fde5874ad85c6c73a6441425465
 DIST unicode-cldr-common-37.0.zip 25983328 BLAKE2B 6210d9f71cb57bc8e663eb51b2af552e30debdfeae206c2368e3ddafad723d1077cb0a2b2defb75170ef056f2d81d510e62761cbec2ed2071071e3859e7dd098 SHA512 b42e2c889b78d2ed774e2fb9f67cf3f9154aca57c5a966ea740fb7852c8c59e142f89764491f569c62d58f288e55176c8517674e2aefd2e9b8598eee3ba4307d
-EBUILD unicode-cldr-33.0.ebuild 685 BLAKE2B af75e0169cb257d4773a985ff5134fb5c8f12afb36408b2f9517411390981183f529c7468f5e5c59bfb43aa192e24cd17de7b2a1016c7ba31484630c948380e5 SHA512 59d010a5f4ce34157292e4db4b48823124d37b7e5267af2fcda4084da5783356def38fb138d5b1bff040bbed12b9dba5138099141afd265c3fb6174e7906a585
-EBUILD unicode-cldr-35.1.ebuild 692 BLAKE2B d97dbe12a6e6f6a9df84253f71f65b2eed95851e56dc99d3a4b27ea63c844848cfb0d2b588841e056305157650d9e31c2a790772b5deba39e5dc973fdd93ec8c SHA512 6899ab659b5b52e4fa814efa6bea6b55669d3eccae1e97561bcedd8d74efcd007b4f3a8e78f8ea815614353e08442859e003a120bc18706e2e553d7bf16b0b08
-EBUILD unicode-cldr-37.0.ebuild 538 BLAKE2B 3479296b6fe5c78180b5ece71809ab3a1ab19f88204e6c4ce7239726339d0c9983759ae9c281c60a0cb41d4489ffb4854f29058b851af1d4e456ccb23dabec25 SHA512 cbed854201924c238da0a161f7a9f10df0de09d852fb37197c37e1c029b176962a168334f93a828316f41ecc03f37d84b77a80ebe513eec020294ade03db07a0
-MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
+DIST unicode-cldr-common-40.0.zip 28558521 BLAKE2B cc49a6471c9cb80abd7c2cf203547c14cea08fa2ac18a5f2b0cd4e7b3cfc48fcdb4491c1e9eb37ae398caed554661ad6957ef8e3b9c41b6a68b8afccd6e7a7a8 SHA512 b45ea381002210cf5963a2ba52fa45ee4e9b1e80ae1180bcecf61f431d64e4e0faba700b3d56a96a33355deab3abdb8bcbae9222b60a8ca85536476718175645
+EBUILD unicode-cldr-37.0.ebuild 532 BLAKE2B c2fd560e8f0b16dfdb51ed2690950d70655f9fad0554ed7cf174ce7a91a97af81cd2fc8e0b91cd543995c6babd1a395030d6b7e18f21fb8dd7182098dff1a52f SHA512 00a8a8a6a283578b50abb912fe8e599d597fbbabf0f9fe71ff241e7add5b2bf48662de3ee275be2ec6ec879a802f3f36da8df1d1e25212ff9c2cb688d18bd17f
+EBUILD unicode-cldr-40.0.ebuild 539 BLAKE2B 6d2939ff1b871d6ed648d00c8f07065c7eae040412f83183aa209dcd83ac75ab5f30df4c0c2a5c77dc8ff09f217bc534a2944307885aef451c2e9fe114c39c0a SHA512 0bf42ab3f73a873acfde07791706d83654878ac838a6612d36923281d1b7b79f19b3fdfbb58748c59d9b7d3e0451e68b06d8cd9e88c4d1f8133bd8332fb47b14
+MISC metadata.xml 259 BLAKE2B 473457dc1808c494d8a08c731bc36bc3f6fd42ac730b0e7372e9749275ad413c56abc214d6b8d43c3e3f3d878a81e61d3ac1088b0606e99b449018828f056c4c SHA512 42603797647a4e2bdd69fc8548c0f035143c2a94b836763b39fc0dda770621970fbb233327c142107bca40f48b2b380fe97c6517e5fce633ba2c11f7a34402fc
diff --git a/app-i18n/unicode-cldr/metadata.xml b/app-i18n/unicode-cldr/metadata.xml
index 491c88b3a31f..a34fdeebcd32 100644
--- a/app-i18n/unicode-cldr/metadata.xml
+++ b/app-i18n/unicode-cldr/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
deleted file mode 100644
index b85c8b99db19..000000000000
--- a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Unicode Common Locale Data Repository"
-HOMEPAGE="http://cldr.unicode.org/"
-if [[ "${PV}" =~ ^[[:digit:]]+\.0$ ]]; then
-	SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
-else
-	SRC_URI="https://unicode.org/Public/${PN#*-}/${PV}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
-fi
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/unicode/cldr
-	doins -r common
-}
diff --git a/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild b/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild
deleted file mode 100644
index cb5a1743d529..000000000000
--- a/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Unicode Common Locale Data Repository"
-HOMEPAGE="http://cldr.unicode.org/"
-if [[ "${PV}" =~ ^[[:digit:]]+\.0$ ]]; then
-	SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
-else
-	SRC_URI="https://unicode.org/Public/${PN#*-}/${PV}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
-fi
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/unicode/cldr
-	doins -r common
-}
diff --git a/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild
index faf48dd3eca0..073231a2bfa8 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 DESCRIPTION="Unicode Common Locale Data Repository"
 HOMEPAGE="https://cldr.unicode.org/"
@@ -9,11 +9,11 @@ SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
 RDEPEND=""
+BDEPEND="app-arch/unzip"
 S="${WORKDIR}"
 
 src_install() {
diff --git a/app-i18n/unicode-cldr/unicode-cldr-40.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-40.0.ebuild
new file mode 100644
index 000000000000..323c59263064
--- /dev/null
+++ b/app-i18n/unicode-cldr/unicode-cldr-40.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="Unicode Common Locale Data Repository"
+HOMEPAGE="https://cldr.unicode.org/"
+SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+BDEPEND="app-arch/unzip"
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/${PN/-//}
+	doins -r common
+}
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 44d94dffb34b..2c17a9251ead 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -1,19 +1,13 @@
-DIST unicode-emoji-data-11.0.txt 59720 BLAKE2B f1416d01d384245769549cc6ea93a2fe28bbfe77d30b26c9042965e3f9aee546572ef593284f767017b3a76acbc8015987c924be3afcc06df60b31588962a455 SHA512 501847414275564c7753b7d2b8e45cdfbf9fe96a96f0f3eea81f34c480da551b317b432ca426f6441c95eea520992e8888ead749e9c60da38233afd159d9b555
-DIST unicode-emoji-data-12.0.txt 63812 BLAKE2B 7e21860d73372aeebf487c2c4ddebe76585fef30670bdb4d27cd4d1f62ce863009524f1c4eaef62be693b127fb08b20585b2b1ca059bf993412b0f7d1530d061 SHA512 3e60e8a63abb40332a7ace61d1790b29e00251edca92afe52075627fb210a1097eea6033b727b458b6a5c7935018706ae71a2c1ec439bea3ccb8501c47c4abb5
 DIST unicode-emoji-data-13.0.txt 105959 BLAKE2B 6cfbc3170f8ef990ece1f1ae9e923ac4a753dc2c2d949e5bc82c2afb0bb12a90eb4e2dcd505666b8cadc91c42f6ca9c6bec3293fecafdacf911a885b0cc42468 SHA512 7b6f838a5b863b070cdf4289a8b7a2e6f07e5af8c6614aa58b4179658f7d73161615c3c4757464585d1e9d73d307e0a60fd6621900aa9e88365d8c03729780d0
-DIST unicode-emoji-sequences-11.0.txt 105983 BLAKE2B 5b929faa3cfdbcfa11fa72f77386d3a7aee2dddc5ceb3d110d275a3ed523ddadc7be71b3fb857901d880970d5ab48dfc4b024d7e379b5efb0992e7424bfde80a SHA512 c9af23e0738350b6d61691498ac82cccec970bb2cd4a0c5d6fab6c86fef742c09c6a83f50124c1f98c285e706d145786bb29cbf4339ff1a01c75ad7515b159a6
-DIST unicode-emoji-sequences-12.0.txt 155539 BLAKE2B 701e283fcfda3582a7ec1e0922a8fa584c2e77bb7d59aaa826324d2163972b59b004107c778dc41880c7768f9c884f64d6e41639696c91052d8c81e5fb409f22 SHA512 7ddadff1259c08d503b5936aecac9ad51e9cb2b0ed84c70fdaf0df370b2edd5e24ebed99d5df7325becf269e9f2d931d1bbbabe5d95c1b9af08111bf37bd29b3
+DIST unicode-emoji-data-14.0.txt 109396 BLAKE2B f4268938ef60de5200f78856c6a0886a463d6c3c0de9bb3220f58328aa53c709dc4fd79f5d2f607bd5b07f46100026fb08f4a413803d5d3720fd61dc75d708fb SHA512 364dc7413a1ab959e886f787450071dd8d139ec3d2dc8ca382c700661d93002a4406511e74de27f3cf7b9db793e8a3b48649128e786b20c02cd710350e07c8ca
 DIST unicode-emoji-sequences-13.0.txt 178671 BLAKE2B e391c53f8737fe7e9d8b002e61471afd903859ed9c5ca8035b04fa1c31d3f199b443e39ba7996604c606c5c46f2d9ff521d40af85e0b7c493bfcc784e2e61af3 SHA512 65f4fdaf6f2038d34f645220a0306036244dba69aeba0a44939584c18ad8e0488cb612f07e17cdb1ffea3d8d2fe3e54ed2e134855c3dc615730fd14cd297a9a3
-DIST unicode-emoji-test-11.0.txt 361356 BLAKE2B 0e3b035fff3a4e542b3dd1172cf1438648a273ec0490316f843009b725c04764180a3ce0581b3e9819a0a5724c95ae5b536065e80401510d0b8e174636544184 SHA512 89c5a0f2eb460234e50dcc0fc904fbb254a1c0afa54b5bb672032f01764e0bed3624d1a4cd5627c83fcf1ea1347c9e3baaca05b2c685890afa505763baf8be79
-DIST unicode-emoji-test-12.0.txt 394898 BLAKE2B bdb5d32b657edfac1693fc8748653f2cbd513dc5b5cd558d24c2667bb5e7efa1c3bbf25c042bff509722acf448fb633baea24ddaac8c0144e0b368a394ea6b18 SHA512 b02c7977961f1b9a8c52322ba6b8d27afb84a2d131887add18352460dc6eb2488afd7bb9dac2e3f62b88604b69d02e4289bbaad551463d8b4b0589fbc16b64b9
+DIST unicode-emoji-sequences-14.0.txt 188859 BLAKE2B 40dd76c52c329b5c0296a72d3f92bf41a55d63a57f094b49d449ee3624b7275562575e76fd5cc877c17ccab9923cd07538e4370615b8f05324706d3c861285e8 SHA512 527a763fe43e4679b7a689c2b736a4cba9a76ebdd601a0550992391d98431a5248ebec3ba35b20e8bd34cfb3075bad399825371c8f11ffe78e12e0fe09bbc181
 DIST unicode-emoji-test-13.0.txt 453143 BLAKE2B 3effaedbd7f37c0bc1d3aa122b0240c4dbf981b05bed83b6bb6523a1680900c64ff27edd1dc14d14d072a8631176f5fab5ed0166bbead6944d5b89e9729d6c75 SHA512 6da82936f1eb92e5d31a4e815204e17119011408d746c60c3ecd700c8039389d7c790c8ea6b8ec2828aadd863b923f0d3861a42a1f6b5ecdbbb19d2f5f81ea56
-DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d24645d33fb000c31997c26c1e6de956fc82ae41c2fd43b244f3757e8ab217cbb03434defca16373fd33affa25c6df0b7b9393f0ab191ec65f SHA512 a0a487ef43d9cd49ff2ced654794e7190f357b00dd70ec9b84e640181dc5b2df44b2063aa4b16447d00815094155b24531f115e9121c51c95635b0af4b043643
-DIST unicode-emoji-variation-sequences-12.0.txt 36333 BLAKE2B 812dfa33f4c21aee0ac7895339d81ab6fb36c550f72df0dbfc491390082223e3babc55cf6a78b7f2ce1ed5bf739ae5eef8c7fc2afe223c5c1c14491d3d29490b SHA512 aaf6c964db27ba41b0becc6aad87e40ea7b3d7a593d33052a4ad1a67528cdf663a46622c367830b6ac47e3efccf1e52eeb18802b235560b47a7fc485097e1fba
+DIST unicode-emoji-test-14.0.txt 589717 BLAKE2B 2413d55c386607a88114cfeab5805476ba676a480a7d4de99eaecc7c6e825d883ab6e1217a2e0cd33ab951ae2f39a6b3547fdaace31bcf6985113d42b4e5f9b7 SHA512 693fe5c225e28a694d7aa436d3c6546c3376854878bb92d15f1c88b2d6ce3e9f67ddf66bd08e6aa99930d2965a28f8ed4dd3a895fdf5311abb0a323de27e1a12
 DIST unicode-emoji-variation-sequences-13.0.txt 36485 BLAKE2B 81a7ee549a209aa1cfc0c0c941c9163c35da357541d8a234be26d18df1abbc8db8b62577c6aa15699b0b173497374a4a4fa1f7d23a9d2698f33ba0ea7d3a1b03 SHA512 7edaf7c4df3eb34aa208ae5688a59220d125d3eb262b750493e758584d92ab3dfb3eee23a9e31c50902f4513a5a91e6cee5708bc16d052a568bd7b355573895c
-DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
-DIST unicode-emoji-zwj-sequences-12.0.txt 148234 BLAKE2B d5facf566e48f49f87df30b928b4d60cfeafa11da383aa34cefae0b05a796f3a9c78bbaa79ee8b460eea92c753b7e7d7840849fdc9f7bc57b2752f8b63d2988c SHA512 8d7c59d01d702d10f162476d7f96feea0d515521d1dca6aa819ed4d482a83d54c26ed225fcf864b607999a7016dddc89961b0760584d7ec0b5cbdf8e12b85051
+DIST unicode-emoji-variation-sequences-14.0.txt 36547 BLAKE2B fa63c1924a00026489465f6a949b1124661fbd1877baaf10560424f8fdd59289947f2759e7873632f644b14213e1309601e764c1545e25ee9b94aea2ea813848 SHA512 d54dc787796609546140d1d730ce3574afe15a6dc4c947d171929df96a1189f5e65c8335d2c7429c06d8a9abe20a3f6332e551629e9808fd1e7f5b2ed6cbc24e
 DIST unicode-emoji-zwj-sequences-13.0.txt 189608 BLAKE2B 759c8c0763ed88a9ebbf40a8ef1046537773cae3043186aded7089ca3052a5c6d6baba3c30f00df57dcab0a83d46323a0c1e8551db63c3329610c641646a388a SHA512 a0b04ca2732acd33c7ea9a2929ef5d60080dfeb4b1b452e853486e57663518773af4e863b239dd2bd6f5e78ce2a7e828898757ca4adc82134da370111c3e0272
-EBUILD unicode-emoji-11.0.ebuild 999 BLAKE2B 2db60b0cb51b73d1ff6208d26028b996bae0dfed9d1a3354f068e5322a5d4c7ecc2fee7d0617349e0292f0aff93e75328d378b82c4b37b0d13f6a74bf0bf1efc SHA512 3700b820199ec46201d2cf703cf901baf8aa58e075300fd26b9e2e4e3582145f2a13119f414ec07a28ecdb295106d75d68f8f2c35026643ba998aa800000f746
-EBUILD unicode-emoji-12.0.ebuild 1006 BLAKE2B 25297006b65daead9be9df4871a0909c02851b3b2244856d2ff430ff04a33f8cc9c9796f36019412fafe42eca01575a2954cd009c86f9a20c836fbd1ea236c52 SHA512 dc3cf5e6e0aa9ecb8dcdb352c7a082e6a05c92b87b068c4846f7a3840c4eb4e6adaf708d094eed579c8d3e1160e82798975c710c645b9e920da2343b27d404ca
-EBUILD unicode-emoji-13.0.ebuild 981 BLAKE2B b9ee2d6a924caa9e443f98563985bc3d2bece1717a30ec745506eabd921939465ca873f10f7783d9471339e09f52f62ae499ccf17aaa297add35e537a90bd3de SHA512 467edf008518d0ad02ac4b0c656ff4da171dfbafdf1c7e2d08ee88292b441a951ce04cce0dd2093e5d4b4e64490175999e6f61f317ef107707fc8dda6b63c28e
-MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
+DIST unicode-emoji-zwj-sequences-14.0.txt 231001 BLAKE2B faf8389549d9977ac87605af8c209d340261c4a14adec9932bdf41690997730c8dfb3a3261fcbca8b4c24f5f20ed8e3355330049c850680b4159afa73e935b01 SHA512 f1098393fbea76ece6838b509b985f06d92ac3f3ee0a0faf14cc92dc1dce73c3d3b7517fb940d48de27243141568acac88bb5b4438ead445cec9434826932e59
+EBUILD unicode-emoji-13.0.ebuild 964 BLAKE2B 7bbf8148b33fcea858156797c7f780c40408282591b1c16e00e95d2b51a2d7de6e319ec73097b7c2b87d41d8714a65ff75ebe4150c80a68bdcaf07abcd754ca6 SHA512 54538536034a1e4b89e7c677e10f7aa5b25e6d0cf5e2953a8a9fea5328ad487576bb7791072ee5927ae24926d7f96c5fd2c197fec5580b429d0a1faa3c5ce4cf
+EBUILD unicode-emoji-14.0.ebuild 971 BLAKE2B ae295ef6268183c679b1c62f9927ac8066be10635c4ff67ea5c66f699862d0f2f2169860f5d41ccc798881e29afe0891c9b887d6caca61ecc5a09a25ca1e86c5 SHA512 d0b2486c7407f76e681f18e5ee4cb5ca2c3f16072217c9ff468a37ed285dcb9e4c470309b7f268ea586fbc7bc757d9dc13175ff9accd61be25ffbf40b3071f2e
+MISC metadata.xml 259 BLAKE2B 473457dc1808c494d8a08c731bc36bc3f6fd42ac730b0e7372e9749275ad413c56abc214d6b8d43c3e3f3d878a81e61d3ac1088b0606e99b449018828f056c4c SHA512 42603797647a4e2bdd69fc8548c0f035143c2a94b836763b39fc0dda770621970fbb233327c142107bca40f48b2b380fe97c6517e5fce633ba2c11f7a34402fc
diff --git a/app-i18n/unicode-emoji/metadata.xml b/app-i18n/unicode-emoji/metadata.xml
index 491c88b3a31f..a34fdeebcd32 100644
--- a/app-i18n/unicode-emoji/metadata.xml
+++ b/app-i18n/unicode-emoji/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
deleted file mode 100644
index 8939ac8ffae5..000000000000
--- a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="UTS #51 Unicode Emoji"
-HOMEPAGE="https://unicode.org/emoji/"
-BASE_URI="https://unicode.org/Public/${PN#*-}/${PV}"
-SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
-	${BASE_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
-	${BASE_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt
-	${BASE_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt
-	${BASE_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt"
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/unicode/emoji
-	local source_file target_file
-	for source_file in ${A}; do
-		target_file="${source_file#${PN%-*}-}"
-		target_file="${target_file%-${PV}.txt}.txt"
-		newins "${DISTDIR}/${source_file}" "${target_file}"
-	done
-}
diff --git a/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild
deleted file mode 100644
index 9460559ffde2..000000000000
--- a/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="UTS #51 Unicode Emoji"
-HOMEPAGE="https://unicode.org/emoji/"
-BASE_URI="https://unicode.org/Public/${PN#*-}/${PV}"
-SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
-	${BASE_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
-	${BASE_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt
-	${BASE_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt
-	${BASE_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt"
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/unicode/emoji
-	local source_file target_file
-	for source_file in ${A}; do
-		target_file="${source_file#${PN%-*}-}"
-		target_file="${target_file%-${PV}.txt}.txt"
-		newins "${DISTDIR}/${source_file}" "${target_file}"
-	done
-}
diff --git a/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild
index 2a2ab980f142..2d7249e1c3b1 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 DESCRIPTION="UTS #51 Unicode Emoji"
 HOMEPAGE="https://unicode.org/emoji/techindex.html"
@@ -15,10 +15,9 @@ SRC_URI="${DATA_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
-DEPEND=""
 RDEPEND=""
 S="${WORKDIR}"
 
diff --git a/app-i18n/unicode-emoji/unicode-emoji-14.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-14.0.ebuild
new file mode 100644
index 000000000000..93c2b32bae57
--- /dev/null
+++ b/app-i18n/unicode-emoji/unicode-emoji-14.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="UTS #51 Unicode Emoji"
+HOMEPAGE="https://unicode.org/emoji/techindex.html"
+DATA_URI="https://unicode.org/Public/${PN#*-}/${PV}"
+UCD_URI="https://unicode.org/Public/${PV}.0/ucd/${PN#*-}"
+SRC_URI="${DATA_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
+	${DATA_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt
+	${DATA_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt
+	${UCD_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
+	${UCD_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	local a
+	insinto /usr/share/${PN/-//}
+	for a in ${A}; do
+		newins "${DISTDIR}"/${a} $(echo ${a} | sed "s/${PN%-*}-\(.*\)-${PV}/\1/")
+	done
+}