gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-i18n
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
64 files changed, 607 insertions, 904 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 2d8a539dae26..aceb2d389ba0 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index 81084dce4f19..ef7f168d8330 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -1,5 +1,5 @@
 AUX 50anthy-gentoo.el 63 BLAKE2B 8680f0a54f0c16a4d869f52d1589c6af39d29c151a5f7e7182f7afb2417aa5ba2fea002d7638271f486f95931036a1e4e4a83af8d796c3b751760d5750adf1d6 SHA512 ca11bd44d092da07278905555513e8b5215413af64c46cfb9213cbd27948727133c06fb1fcfc1a48d67d196c693ed2835e8dbae142a52ff4dbd5ea8d49e6e65a
 AUX anthy-anthy_context_t.patch 174 BLAKE2B 0a38c7a467b5a0331762fa1083c2dffef8f4c39c8bfbf7ce0ec431f6f865dc8727fac391ff77a6a1cf5e455ca274c78b7a6ebf7a2326ba90c6cd979f8e3c7a3f SHA512 3f252628f77f53dd96eac50f08a36bb782f0ddc37446c1bdd5bd94fffa3454b9adcaff7118d76fdc7e8bc3f86b1a84e9830da5b67b2b0d281847b26ff62cdee3
 DIST anthy-9100h.tar.gz 4446148 BLAKE2B b07da205694db9223c22ebcf6158158247611be41448457ee112766d1ea5fe72eee3f2292276363245d751eb49bd582c39330cc6df5e52547b6188386439d29a SHA512 315ebd9e1af208f3ecaeaa13620213b35f004e47edb54e60c3e02c2997444cd2326cc58b725dd2d0bd6a723130884d946ea193ea3d92418082256b59ecc8d88b
-EBUILD anthy-9100h-r2.ebuild 1322 BLAKE2B ee6d1d355f9137cfc75f7b5aee31fd40e2a35ff390f929c1f5ec3aab27fe717b1526bf3d0ff2351efeee1189973b750414f4d3508ddb21195bfe74436b73360d SHA512 bb293e6fc010516b80de34186390868fae5be2b6a82969eef63ceea0bcc0089cc7033953d4fa9fff253b8d6c76e69d23a5907aa942bd697535d2dc8c545fd30a
+EBUILD anthy-9100h-r2.ebuild 1324 BLAKE2B cbbb511431cc23ac30fcf25dfe17059ad8cf5a7b5de25402ae12afc98cecbaf0c0250904ad583d253076d02873fcbfe20aa9c13fdfbc1d866f75a6017e62ac45 SHA512 f49dee3ff11e0de42712b901dd08dd5283010c96561e7680471ee42f888693b89cb14afa4a63b2949b8c7b5b76dc3cb9fd6c78f3dbf8ccaf329e22a65b0aa520
 MISC metadata.xml 907 BLAKE2B 4192793f866cd1747335aef0bcf556db1e39c80a8dd5661b66887ebd6deb498db52bf86020a426a0828d192dec0a41600cf328af344cad07cd20cf81e77776eb SHA512 1a57ac78da70868dd6580bac2c85b4510e1f4b1db2bb3629c17a16fbf9e44d711a355d3c488479d00a466930d4cce9980803e526f4b574e48a1a5b6e3bd3d24c
diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
index 47e4b7ad139e..bfd867fdc12f 100644
--- a/app-i18n/anthy/anthy-9100h-r2.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="canna-2ch emacs static-libs"
 
 BDEPEND="canna-2ch? ( app-dicts/canna-2ch )
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index 59293705ca00..92e8ada39441 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -10,7 +10,7 @@ AUX canna.hosts 5 BLAKE2B a10fe2813bf946464641605e8cdda362629a62817de0a7f72f2b0e
 AUX canna.initd 782 BLAKE2B 1e34cfc3ed28f5903600f591e55d0eb559aa5336eee54a54a7ab40d2be3816f6a62a947e9c87d4834425f71640c96847836830439f4eeb76a4f25a372fc9d1d0 SHA512 1fd348f2aa4139bbe6154b157b75bf8a39a8ddf36a9a072088279c88241981a9af9024df71aa777ca4e93270d53d0bea8363b31cfb07d229d4a37c48828779e6
 AUX update-canna-dics_dir 1101 BLAKE2B 9b429c2ddfb0e3c2c8a754f7fb61b776abbb809f81c93127e5f8be9ec768df6c28fcce75fe69a5b92a195ce49e20572c083aca5b4309f042a50b53bffafc4042 SHA512 135fdabf3995ddf82d3f14aece908e952f3d514fd83e2f86d8113b1026b7dcaea2156225be251a6d9a74a35ee075d5ebb32c05d9deb85905120287d0af1f4207
 DIST Canna37p3.tar.bz2 1263065 BLAKE2B b5fb496c0ef71dc57b2da1409eea2238ea62ece3286d498d694bc7a18cb0f5e052dca95d692b4302988acd2199d350b893ae4aedc91aab0b737c3e0675be9cba SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
-EBUILD canna-3.7_p3-r1.ebuild 2262 BLAKE2B 212e5701d1d09df79509799ab5d28295125a1610edc48638785d9a908955252fafaff5f70cec8c58448e9c1601829208d0aa412ee252a5bdefe91f9cb0103d4a SHA512 5eccb13de1e2ae2d396b051c7eb45f9cad777f95e122cfa8dc9f6851e2fce7613d8a9c53bf34778009fbdcda14a52b302cea6ca1cb257a8c50c4ed1f3e56c3d9
+EBUILD canna-3.7_p3-r1.ebuild 2263 BLAKE2B ee87ded5fa3dfb95aa0a41c2e09cb83513e044903fa6055574e8a2e34174eeddb1731abc0f3e11c3d4c3b3e972b687d5bf9cb3cfbaf9e2b437206d14e1641809 SHA512 8a139403e0cdfeab5b7fabd2280ce0fa0c4b580a5db386524321db6c0f24f2e53726358123b4cde1770b29ae9af0804478bf6c2bee577f8777e83b0fecbf403f
 EBUILD canna-3.7_p3-r2.ebuild 2893 BLAKE2B caf22d1d8914257992917784c03f173446e3cfa0c28aeb55a9007b07d053e33d9cc574d4f55eb253954442ab8c6f17805bf72c04113b36874a6693fe690490a2 SHA512 8c5a7660f2be089841953914fa8863d0ba9190b88c23d8266d5181c1da9e17f313e36b4448ec8009a65802b203d69c72428a640a3a2e0bf01049dffac3f12bba
 EBUILD canna-3.7_p3-r3.ebuild 3297 BLAKE2B 5cb2d2305ab5b780efa5ab5a261c12f48aa536c53283c05bc1a448669c9d639cd9fb41f46609135082397bec23e00634691e2011a421bed9030abcbf080baacc SHA512 16111ac8cef55bfb54c6666ed50288629e3753d571defa98d68fb156e2e4d8c562c130b2ea374faeab2194a53e6521d66e092e054bc884cfad1ead480e9b7323
 MISC metadata.xml 383 BLAKE2B 2947ceefe007eb9bcfd46a69a4b97a2406383931cb320cb594b96952697378147824461f1b55d5caddc419b19aebeb1c5ce69c0f0d31568cbbbe3d1d15fba9ba SHA512 8affc10d697147ea5430d73c40eb4e7621ee9a06d444725566d4e16a28ccab4f53aed3025905894fe6cba0ea874dcf0d2d583d3dcedf3a0ccc8b139af02e5e98
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 496848722637..687ab7947083 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="x11-misc/gccmakedep
diff --git a/app-i18n/enca/Manifest b/app-i18n/enca/Manifest
index b4c74fada8f0..633f6440c2a2 100644
--- a/app-i18n/enca/Manifest
+++ b/app-i18n/enca/Manifest
@@ -1,3 +1,3 @@
 DIST enca-1.19.tar.xz 465412 BLAKE2B fefd58502cf345f9b88d620d5af349d72b9e2af70d61c9b5aa3632cf91011110dc1fa08e78dd04c02c5a333adfefeb88f529f3cadcb75d0cea2b500a5a70c057 SHA512 6678639992685180457bbef7b0da6e475071ec6935dfd672188fc242ef80b906e75eff9a206e07989893d0ef4ae5eb500f1d0bbd6b4d58146c94bb143b5fb296
-EBUILD enca-1.19-r1.ebuild 2089 BLAKE2B c0454d621e219855c67bb30e007c492104e0b6375fa49edbaeda8f5cc334787446762bdac204e35ed1dba14bdfbb6505304b6e149976c2dbb3acbaa74fbddd26 SHA512 41887b0887488eb5d01cb522ae5f57bdc77d9237c8a18f16e14ad7a668e984167fb213e56d46d12e042e34129141adff4900d679b923291668457958a161c3bd
+EBUILD enca-1.19-r1.ebuild 2090 BLAKE2B 5d7958f57a2c021c252950f3da8b23d6230cf9c676fd4581a85c3fcbbb72191c6166c2ccdf37515a8647ea0dbfeb7d08e1e1af1c6c42fa68b326192bfd4926b7 SHA512 913cceec54ecbaa2a26c325f5eca1e994eb29a7eb4e9bce824f150c40ed4e9173877efb93e253c6e1a54e021c4a57bb64270545e12ccb280689d9efaed82a591
 MISC metadata.xml 324 BLAKE2B 61e560fc5161d96f01841ebd42ce64012725667f0545fe3bfa463f94b61a536822e1109bfa044f17f6e12c6c45bd24c284aa4846f36db5836e24742b1cc171e9 SHA512 b10801cd8a372709601915899abe03282148aa9a0519160963f5a7734fbeadc082f5493e46ecfb887a16c4b9b5f28424b3b2b87ab4b34708b77cdf3cd4eba03f
diff --git a/app-i18n/enca/enca-1.19-r1.ebuild b/app-i18n/enca/enca-1.19-r1.ebuild
index 4f6c00e1f837..4344574406c0 100644
--- a/app-i18n/enca/enca-1.19-r1.ebuild
+++ b/app-i18n/enca/enca-1.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +iconv recode static-libs"
 
 RDEPEND="
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
index d423351aef33..55062ddcef09 100644
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -6,6 +6,6 @@ AUX freewnn.initd 283 BLAKE2B 363b8b99876aa0552f49a10bc973925d7d23900c24601e40ff
 AUX freewnn.initd-r1 306 BLAKE2B 2c5eeede614062832ce9d799e228a7927793679aa129151b68c9f1392056c8faccda4ce3dff5b4dc0f9da5d1557c8799ca663c1b20d9c3b2208b72a26f78adc3 SHA512 306ad8dd6ae7060fc937f2ac2b266f385480961ed0c2074f1dcfc77fa82bb7a23042019672b47c32fc8d55079730ccda68c616c0f5411b0704db2c34d2caaf02
 DIST FreeWnn-1.1.1-a022.tar.bz2 3137954 BLAKE2B 1f3a920ef7ddb4cddaa95de4d60bccf20c8e6d207216e406cb7dc503411e932b4578ed1c3c302249a94e0ede1d948aa62f5ced804d0d142ed5e04dbbd6789277 SHA512 938c8bff69e2f43cce265a6a84822ae08b89725837f808addb66ba202dadafa60c213638f298d9efe1257fd96f7193fd711a3dacecd803289d925d8f6ea6eaf3
 DIST FreeWnn-1.1.1-a023.tar.bz2 3147378 BLAKE2B 63f3fbf37b53e5e6f32f83513d45aaf4915cbd33789ab8edfc93b22de1fbbe242e52e7bd40ce7ef22e24ae1f4ee151261c2041af9c78720875303b5d2b6c18a8 SHA512 f0b8c657f0441463c752314b7d2fd603b4df056b049d247ecd77ff8b2f2f837fed7e75ce89deabca7061d3126afd51bf301bcdd3ac429056f43bfc8e0c7c8385
-EBUILD freewnn-1.1.1_alpha22.ebuild 1092 BLAKE2B 50a997c857d9e810ab5b2037590460b5b029967a771b99ee86d9bfeac6214491947b242391fc04baba61cbcc46414c034578d27b5a4d69d6ca70243f5836f70e SHA512 6327bd363bb82bea8a6de9a25a86f5830c3c359d9398c01d2ff6bed96dbe7a32dc290ce4dd98b0675e787aafb8e96f354aa9e98e517d89d0ae75186a8484ed94
+EBUILD freewnn-1.1.1_alpha22.ebuild 1093 BLAKE2B 50566dcaeabd467fc1947ab8e10b852bea9b530be5cddf83fb82ae3eeddb2dcd455bcdeca0a6be1fc75dc33a3778287dd17582806dcb6c0e6f5008bae0a08086 SHA512 70e0628f6e9e905e5e2676b7f8d0df73adef3e7d98fa33dfe8fe5a10dc806868c0ba79b197881c1ac05f91c80c2b4202e36ac514d4ff3cf18d290441c61841e2
 EBUILD freewnn-1.1.1_alpha23.ebuild 1559 BLAKE2B 40ccc0185b58a2bc9fcea76b18d4c65a00b5a6e3288a3122237cdd8f64492cb7290d9237c2edb5564e0bf59657bd126a1e8d58a0559601439b9ba86edd022ce5 SHA512 026e644beb3802f78787b31ba6577ce89b9e376460e37eb5c7e0fd05d004a7fbd9f87b02ec589804094a172d0c33da30bbfe86ba8dd7c19efec87073eb9322b5
 MISC metadata.xml 379 BLAKE2B 7944902387626d8b50d6c99d570e5618d35d5b271141143b635a11808cf3ecf52be22e18304709f708d89b2b88673790379ea4129cc4bd3f303c94835c067023 SHA512 ccecd3e1a8245d6ae953997d87f6daa127eb1759f6f91b866c9cc778a11289e3f72ce671d4c62032210568a7a915387cbcb02bb7b7284d515bb20e4c02bd8a6b
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
index beed2597ec6b..4a8f28768556 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/59257/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="ipv6"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 04e5499c8fe7..d87c8e90cdc3 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,12 +1,6 @@
-AUX ibus-1.5.18-enable-gsettings-in-runtest.patch 1707 BLAKE2B 760f99faf079a65b7c36e355f19f16e71a0d3fa5dcee2a8201e571732c317f238d7bac7bcde6d823d5ff6ecde40c430ff310356f921d665f08708c4b5e24c4d0 SHA512 fedcb39f6a4b70055aae2dd90a03fa6e709feebeff20bd5df30deec3346c85036ede017c0a8bab92680a5a004e50e5e450b288bd8981889a8b1cd89334f74531
-AUX ibus-1.5.19-gdk-wayland.patch 2996 BLAKE2B d203c843a0ba692c1be81c1172866bea6ea30e6ea25c562d04ad31934af48f4e2bcc5d5ec862af049a026c3656c0fce960715c7271514e1d4faa54c8f6ed369c SHA512 e53619feafc4f5e7cc662d0c59be5beda916dc3b2ec2f74121b6b3fb874ed3bc15f43ee739b272f2304344c9acbc399b5c522d2f5d54695aca7e48d4b68430bb
-AUX ibus-1.5.19-vala-0.43.4.patch 8430 BLAKE2B 2c87c226b3e52710eac046d5c822031626629f8cc1fd85701f2102ea75883a55391c1f33909d041c31f78c0c305a23515b3151e35f92f2a4ff06d39c4b415e66 SHA512 cdbf1b5ab214a62c67d46c689c2f8ff98ab273b7faba6dafd88b3be78227c2897710ff105938936b93435c0f2ee896f2ffbea78ecfa96e59323e0535b799f367
-DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
-DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
-DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
+AUX ibus-1.5.21-fix-authorization.patch 6553 BLAKE2B 99207da7679f7751cc90ed9b23e0ed29a472a79b953b122812ece3b883da9ce0542107d61ab409785935d3a7a7cb5dd47a6fc87aa31c026d60524486983b5673 SHA512 66348c8c1894654e432ce3b13e9858adc291c896ac343842486df14fb543d0816cafd4719d91d2417b1d750e0d056ce3a5c8d72498a80bebbb0bc47c3dc0f73f
 DIST ibus-1.5.21.tar.gz 3463069 BLAKE2B 75b9e7cc4d84b69941d53321da1fe63ad911740a36ed51c7fceaa2a7bc30f6ae39d3f575b4b5fc4268d7c3b3e1c0bae11881dd7a8b7bd441ecf89c83c7279858 SHA512 c7c06e13e78fb4d4d26ce8975b6db4f7914efb325a903999a82197229e13d5ebb4afc876ef67e1d86db58f08c16350dc095aaea050b2f69c2bfc4c452adc5331
-EBUILD ibus-1.5.18.ebuild 4317 BLAKE2B 704b07c49a7f2fc61f639d805039edc75de499658afd5e2307e392b4acc315502b779a46a3f519da462e7da3c42b2344f979894bae5cbabc2fc72bb13ad8aa94 SHA512 fd67d859e5ec0c9d48a86c2064ff8766be66d743e0a342ab8cd277924ab865b2df60419eff2a7604688e5e40b4e9b0def868696f4e430d374300db88d3c6629b
-EBUILD ibus-1.5.19.ebuild 4431 BLAKE2B 0fd2ce30ac58f8a650b52482b3b3c46f10d89fee3a0f3f20e3a6b4e0a07f713af5da86c9a740f6ad8a97a5acff25c2d6121a3fbf82cc17bef91f3a9d74e877aa SHA512 56770a304f75a5f93b9effc63fe8c21dfb51e019af00bea7d3e99e37b0e9dd2ccccf9e647815fdcf21ec9a5ee47ece587302d8c2c8cccaae61c581a7b07a9ff5
-EBUILD ibus-1.5.20.ebuild 4142 BLAKE2B f2900cffaaf23fdea948172b8171061df4ec4b0ac86dd35518d7cba01555d6c7db45687424b5e0647abdf80900180131cd73b05b88a5b578ba1c289a418891a1 SHA512 465d545578163fe8a90b9e7fc26959c1912962b7058aa72103de12bc879f978bc1e02de5ebf23b73524b00e94a2307982068e77af6361178a1d132778de4cafa
-EBUILD ibus-1.5.21.ebuild 4150 BLAKE2B 538ed0faf3ad25242f9c5e5ec8b8cd0e40d9a0665f7acd37c4e703f6302b4d06488a4e22ec1af63835329909b821da53f94f38733b432e52d0c87c54d0a8c06d SHA512 e0fc70e73398d013bc206f4eb2b493133674e48d9fff443c25159d60b174dc22e5ad36120504ed692853c49a9d5a28e6c6eb76814f31f945b91fb6c88e757400
+DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
+EBUILD ibus-1.5.21-r1.ebuild 4198 BLAKE2B 9da040a6f282dae6c6a669672ca2e346e2ddb111dc2bb9d6469736258139a77c9dac2da81996a1f915110e3f8b588544c214d84dbd0baa2e6788890675c3fc8e SHA512 ec0eedb15e94a726375235e9fdc17397911a86755b94c68d6d647523b542c68cedd761011052117c4de9087c4c53f92d03a67147d01b237d703a31d7c4725b17
+EBUILD ibus-1.5.22.ebuild 4126 BLAKE2B 1ddb8d94ac83d214f080c1ad7dc63aa3fac674c2c03c1f9b6b0e4382f9d220d7ec556890f9b80eacfe84d519a933812f70d4df57ee18714100fc10e334c7b6da SHA512 9d89cae90bbfe5fc6d0492325bb4ac7f724e80f70e467bf12a32dd6d9e343abce9a064245c33a5b697dbbfbb01c4ba326fe0d83dc651d489ded9e924cd650346
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch b/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch
deleted file mode 100644
index 24b5cd3f6a8c..000000000000
--- a/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4b4fe00cc2750713ef8d2bc0a9f396ab577c36fc Mon Sep 17 00:00:00 2001
-From: Naohiro Aota <naota@gentoo.org>
-Date: Thu, 4 Oct 2018 18:14:17 +0900
-Subject: [PATCH] src/tests: Enable GSettings in runtest in ibus-1.5.18
-
-This patch is based on:
-https://github.com/ibus/ibus/commit/10cc30eac200d10b581d9d2122d5a732f4880943
-
-Signed-off-by: Naohiro Aota <naota@gentoo.org>
----
- src/tests/runtest | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/src/tests/runtest b/src/tests/runtest
-index 0e43fee..84d85ab 100755
---- a/src/tests/runtest
-+++ b/src/tests/runtest
-@@ -29,6 +29,7 @@ ibus-engine-switch
- ibus-compose
- test-stress
- "
-+IBUS_SCHEMA_FILE='org.freedesktop.ibus.gschema.xml'
- 
- # Portable replacement of basename.
- func_basename () {
-@@ -80,6 +81,12 @@ trap 'func_cleanup $tstdir' 1 2 3 15
- tst=$1; shift
- tstdir=tmp-`func_basename $tst`
- 
-+# IBusEngine has GSettings
-+if test ! -f "$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" ; then
-+    echo "NOT FOUND $top_builddir/data/dconf/$IBUS_SCHEMA_FILE"
-+    exit -1
-+fi
-+
- test -d $tstdir || mkdir $tstdir
- 
- ( cd $tstdir
-@@ -101,6 +108,20 @@ test -d $tstdir || mkdir $tstdir
-     IBUS_ADDRESS_FILE=$PWD/ibus-daemon.pid
-     export IBUS_ADDRESS_FILE
- 
-+    cp "../$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" $PWD
-+    glib-compile-schemas $PWD
-+    if test $? -ne 0 ; then
-+        echo "FAILED glib-compile-schemas"
-+        retval=1
-+        return
-+    fi
-+    if test ! -f $PWD/gschemas.compiled ; then
-+        echo "NOT FOUND $PWD/gschemas.compiled"
-+        retval=1
-+        return
-+    fi
-+    export GSETTINGS_SCHEMA_DIR=$PWD
-+
-     # Start ibus-daemon.
-     ../$top_builddir/bus/ibus-daemon \
-     --daemonize \
--- 
-2.19.0
-
diff --git a/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch b/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch
deleted file mode 100644
index 8eed29daf397..000000000000
--- a/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From aa0f4252ff965729b871c91b4ed089bf98963c0b Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Fri, 10 Aug 2018 15:43:58 +0900
-Subject: [PATCH] ui/gtk3: Check if gdk-wayland is installed
-
-BUG=https://github.com/ibus/ibus/issues/2035
----
- configure.ac              | 10 ++++++++++
- ui/gtk3/Makefile.am       |  5 ++++-
- ui/gtk3/panelbinding.vala |  5 +++++
- 3 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 091e20f2..4b6a7a21 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -237,12 +237,21 @@ if test x"$enable_gtk3" = x"yes"; then
-     PKG_CHECK_MODULES(GTK3, [
-         gtk+-3.0
-     ])
-+    PKG_CHECK_EXISTS([gdk-wayland-3.0],
-+        [enable_gdk3_wayland=yes],
-+        [enable_gdk3_wayland=no]
-+    )
- 
-     gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
-     GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
- else
-     enable_gtk3="no (disabled, use --enable-gtk3 to enable)"
-+    enable_gdk3_wayland=no
-+fi
-+if test x"$enable_gdk3_wayland" != x"yes"; then
-+    enable_gdk3_wayland="no (disabled, need to install gdk-wayland-3.0.pc)"
- fi
-+AM_CONDITIONAL([ENABLE_GDK3_WAYLAND], [test x"$enable_gdk3_wayland" = x"yes"])
- 
- if test x"$enable_xim" = x"yes"; then
-     # Check for x11
-@@ -785,6 +794,7 @@ Build options:
-   Build gtk3 immodule           $enable_gtk3
-   Build XIM agent server        $enable_xim
-   Build wayland support         $enable_wayland
-+  Build gdk3 wayland support    $enable_gdk3_wayland
-   Build appindicator support    $enable_appindicator
-   Build appindicator engine icon $enable_appindicator_engine_icon
-   Build python library          $enable_python_library
-diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
-index aaba7a4d..6ebc96ce 100644
---- a/ui/gtk3/Makefile.am
-+++ b/ui/gtk3/Makefile.am
-@@ -78,7 +78,6 @@ AM_VALAFLAGS = \
- 	--pkg=ibus-1.0 \
- 	--pkg=config \
- 	--pkg=xi \
--	--pkg=gdk-wayland \
- 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
- 	$(NULL)
- 
-@@ -105,6 +104,10 @@ if ENABLE_APPINDICATOR_ENGINE_ICON
- AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON
- endif
- 
-+if ENABLE_GDK3_WAYLAND
-+AM_VALAFLAGS += --pkg=gdk-wayland --define=USE_GDK_WAYLAND
-+endif
-+
- libexec_PROGRAMS = ibus-ui-gtk3
- 
- ibus_ui_gtk3_SOURCES = \
-diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
-index 95115b13..981b5509 100644
---- a/ui/gtk3/panelbinding.vala
-+++ b/ui/gtk3/panelbinding.vala
-@@ -237,9 +237,14 @@ class PanelBinding : IBus.PanelService {
-         GLib.Object(connection : bus.get_connection(),
-                     object_path : IBus.PATH_PANEL_EXTENSION_EMOJI);
- 
-+#if USE_GDK_WAYLAND
-         Type instance_type = Gdk.Display.get_default().get_type();
-         Type wayland_type = typeof(GdkWayland.Display);
-         m_is_wayland = instance_type.is_a(wayland_type);
-+#else
-+        m_is_wayland = false;
-+        warning("Checking Wayland is disabled");
-+#endif
- 
-         m_bus = bus;
-         m_application = application;
diff --git a/app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch b/app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch
deleted file mode 100644
index 0ebb92c21e5d..000000000000
--- a/app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From 4d7c1e00e15921a0448947961183c1c124b6b49f Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Tue, 29 Jan 2019 17:57:16 +0900
-Subject: [PATCH] Delete weak pointer in GList.SList for vala 0.43.4
-
-Vala 0.43.4 does not allow to convert a weak pointer to the full one in SList.
-
-emojier.vala:424.36-425.73: error: Assignment: Cannot convert from
-`GLib.SList<weak IBus.EmojiData>' to `GLib.SList<IBus.EmojiData>?'
-emojier.vala:636.9-637.69: error: Assignment: Cannot convert from
-`GLib.SList<weak IBus.UnicodeBlock>' to `GLib.SList<IBus.UnicodeBlock>'
-panel.vala:526.36-526.65: error: Assignment: Cannot convert from
-`GLib.List<weak IBus.EngineDesc>' to `GLib.List<IBus.EngineDesc>?'
----
- src/ibusbus.h        | 11 ++++++-----
- src/ibusemoji.h      |  6 +++---
- src/ibusunicode.h    |  8 ++++----
- ui/gtk3/emojier.vala | 24 ++++++++++++++++--------
- 4 files changed, 29 insertions(+), 20 deletions(-)
-
-diff --git a/src/ibusbus.h b/src/ibusbus.h
-index dff3dfb7..fddcf5b2 100644
---- a/src/ibusbus.h
-+++ b/src/ibusbus.h
-@@ -2,7 +2,8 @@
- /* vim:set et sts=4: */
- /* ibus - The Input Bus
-  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
-- * Copyright (C) 2008-2013 Red Hat, Inc.
-+ * Copyright (C) 2013-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright (C) 2008-2019 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -692,7 +693,7 @@ gboolean     ibus_bus_register_component_async_finish
-  *
-  * List engines synchronously.
-  *
-- * Returns: (transfer container) (element-type IBusEngineDesc):
-+ * Returns: (transfer full) (element-type IBusEngineDesc):
-  *         A List of engines.
-  */
- GList       *ibus_bus_list_engines      (IBusBus        *bus);
-@@ -725,7 +726,7 @@ void         ibus_bus_list_engines_async
-  *
-  * Finishes an operation started with ibus_bus_list_engines_async().
-  *
-- * Returns: (transfer container) (element-type IBusEngineDesc):
-+ * Returns: (transfer full) (element-type IBusEngineDesc):
-  *         A List of engines.
-  */
- GList       *ibus_bus_list_engines_async_finish
-@@ -740,7 +741,7 @@ GList       *ibus_bus_list_engines_async_finish
-  *
-  * List active engines synchronously.
-  *
-- * Returns: (transfer container) (element-type IBusEngineDesc):
-+ * Returns: (transfer full) (element-type IBusEngineDesc):
-  *        A List of active engines.
-  *
-  * Deprecated: 1.5.3: Read dconf value
-@@ -782,7 +783,7 @@ void         ibus_bus_list_active_engines_async
-  *
-  * Finishes an operation started with ibus_bus_list_active_engines_async().
-  *
-- * Returns: (transfer container) (element-type IBusEngineDesc):
-+ * Returns: (transfer full) (element-type IBusEngineDesc):
-  *         A List of active engines.
-  *
-  * Deprecated: 1.5.3: Read dconf value
-diff --git a/src/ibusemoji.h b/src/ibusemoji.h
-index 4edee726..5e9fbcf4 100644
---- a/src/ibusemoji.h
-+++ b/src/ibusemoji.h
-@@ -1,8 +1,8 @@
- /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
- /* vim:set et sts=4: */
- /* bus - The Input Bus
-- * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
-- * Copyright (C) 2017 Red Hat, Inc.
-+ * Copyright (C) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright (C) 2017-2019 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -209,7 +209,7 @@ void            ibus_emoji_data_save            (const gchar    *path,
-  * ibus_emoji_data_load:
-  * @path: A path of the saved dictionary file.
-  *
-- * Returns: (element-type IBusEmojiData) (transfer container):
-+ * Returns: (element-type IBusEmojiData) (transfer full):
-  * An #IBusEmojiData list loaded from the saved cache file.
-  */
- GSList *        ibus_emoji_data_load            (const gchar    *path);
-diff --git a/src/ibusunicode.h b/src/ibusunicode.h
-index 99de9451..473bdb19 100644
---- a/src/ibusunicode.h
-+++ b/src/ibusunicode.h
-@@ -1,8 +1,8 @@
- /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
- /* vim:set et sts=4: */
- /* bus - The Input Bus
-- * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
-- * Copyright (C) 2018 Red Hat, Inc.
-+ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright (C) 2018-2019 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -201,7 +201,7 @@ void              ibus_unicode_data_save      (const gchar        *path,
-  *    #IBusUnicodeData, * the total number of #IBusUnicodeData) of uint values
-  *    with that signal by 100 times. Otherwise %NULL.
-  *
-- * Returns: (element-type IBusUnicodeData) (transfer container):
-+ * Returns: (element-type IBusUnicodeData) (transfer full):
-  * An #IBusUnicodeData list loaded from the saved cache file.
-  */
- GSList *          ibus_unicode_data_load      (const gchar        *path,
-@@ -290,7 +290,7 @@ void              ibus_unicode_block_save     (const gchar        *path,
-  * ibus_unicode_block_load:
-  * @path: A path of the saved dictionary file.
-  *
-- * Returns: (element-type IBusUnicodeBlock) (transfer container):
-+ * Returns: (element-type IBusUnicodeBlock) (transfer full):
-  * An #IBusUnicodeBlock list loaded from the saved cache file.
-  */
- GSList *          ibus_unicode_block_load     (const gchar        *path);
-diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
-index 0b9b54a9..aedeb4cb 100644
---- a/ui/gtk3/emojier.vala
-+++ b/ui/gtk3/emojier.vala
-@@ -2,7 +2,7 @@
-  *
-  * ibus - The Input Bus
-  *
-- * Copyright (c) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright (c) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -882,8 +882,13 @@ public class IBusEmojier : Gtk.ApplicationWindow {
-             update_unicode_blocks();
-             return;
-         } else {
--            unowned GLib.SList<unowned string> emojis =
--                    m_category_to_emojis_dict.lookup(category);
-+            // Use copy_deep() since vala 0.43.4 does not allow to assign
-+            // a weak pointer to the full one in SList:
-+            // emojier.vala:885.48-886.62: error: Assignment: Cannot convert
-+            // from `GLib.SList<string>' to `GLib.SList<weak string>?'
-+            GLib.SList<string> emojis =
-+                    m_category_to_emojis_dict.lookup(category).copy_deep(
-+                            GLib.strdup);
-             m_lookup_table.clear();
-             m_candidate_panel_mode = true;
-             foreach (unowned string emoji in emojis) {
-@@ -1547,8 +1552,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
-             m_vbox.add(widget);
-             widget.show_all();
-         }
--        unowned GLib.SList<unowned string>? annotations =
--                data.get_annotations();
-+        GLib.SList<string> annotations =
-+                data.get_annotations().copy_deep(GLib.strdup);
-         var buff = new GLib.StringBuilder();
-         int i = 0;
-         foreach (unowned string annotation in annotations) {
-@@ -2001,17 +2006,20 @@ public class IBusEmojier : Gtk.ApplicationWindow {
-                     ) as IBus.EmojiData;
-                 m_emoji_to_data_dict.insert(favorite, new_data);
-             } else {
--                unowned GLib.SList<string> annotations = data.get_annotations();
-+                GLib.SList<string> annotations =
-+                        data.get_annotations().copy_deep(GLib.strdup);
-                 if (annotations.find_custom(annotation, GLib.strcmp) == null) {
-                     annotations.append(annotation);
--                    data.set_annotations(annotations.copy());
-+                    data.set_annotations(annotations.copy_deep(GLib.strdup));
-                 }
-             }
-             unowned GLib.SList<string> emojis =
-                     m_annotation_to_emojis_dict.lookup(annotation);
-             if (emojis.find_custom(favorite, GLib.strcmp) == null) {
-                 emojis.append(favorite);
--                m_annotation_to_emojis_dict.replace(annotation, emojis.copy());
-+                m_annotation_to_emojis_dict.replace(
-+                        annotation,
-+                        emojis.copy_deep(GLib.strdup));
-             }
-         }
-     }
diff --git a/app-i18n/ibus/files/ibus-1.5.21-fix-authorization.patch b/app-i18n/ibus/files/ibus-1.5.21-fix-authorization.patch
new file mode 100644
index 000000000000..8b7674cddea3
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.5.21-fix-authorization.patch
@@ -0,0 +1,175 @@
+From 3d442dbf936d197aa11ca0a71663c2bc61696151 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 13 Sep 2019 15:59:03 +0900
+Subject: [PATCH] bus: Implement GDBusAuthObserver callback
+
+ibus uses a GDBusServer with G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS,
+and doesn't set a GDBusAuthObserver, which allows anyone who can connect
+to its AF_UNIX socket to authenticate and be authorized to send method calls.
+It also seems to use an abstract AF_UNIX socket, which does not have
+filesystem permissions, so the practical effect might be that a local
+attacker can connect to another user's ibus service and make arbitrary
+method calls.
+
+BUGS=rhbz#1717958
+---
+ bus/server.c | 89 ++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 73 insertions(+), 16 deletions(-)
+
+diff --git a/bus/server.c b/bus/server.c
+index 3a626230..2439de14 100644
+--- a/bus/server.c
++++ b/bus/server.c
+@@ -2,7 +2,8 @@
+ /* vim:set et sts=4: */
+ /* bus - The Input Bus
+  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
+- * Copyright (C) 2008-2010 Red Hat, Inc.
++ * Copyright (C) 2011-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
++ * Copyright (C) 2008-2019 Red Hat, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -69,17 +70,64 @@ _restart_server (void)
+     exit (-1);
+ }
+ 
++/**
++ * bus_allow_mechanism_cb:
++ * @observer: A #GDBusAuthObserver.
++ * @mechanism: The name of the mechanism.
++ * @user_data: always %NULL.
++ *
++ * Check if @mechanism can be used to authenticate the other peer.
++ * Returns: %TRUE if the peer's mechanism is allowed.
++ */
++static gboolean
++bus_allow_mechanism_cb (GDBusAuthObserver     *observer,
++                        const gchar           *mechanism,
++                        G_GNUC_UNUSED gpointer user_data)
++{
++    if (g_strcmp0 (mechanism, "EXTERNAL") == 0)
++        return TRUE;
++    return FALSE;
++}
++
++/**
++ * bus_authorize_authenticated_peer_cb:
++ * @observer: A #GDBusAuthObserver.
++ * @stream: A #GIOStream.
++ * @credentials: A #GCredentials.
++ * @user_data: always %NULL.
++ *
++ * Check if a peer who has already authenticated should be authorized.
++ * Returns: %TRUE if the peer's credential is authorized.
++ */
++static gboolean
++bus_authorize_authenticated_peer_cb (GDBusAuthObserver     *observer,
++                                     GIOStream             *stream,
++                                     GCredentials          *credentials,
++                                     G_GNUC_UNUSED gpointer user_data)
++{
++    gboolean authorized = FALSE;
++    if (credentials) {
++        GCredentials *own_credentials = g_credentials_new ();
++        if (g_credentials_is_same_user (credentials, own_credentials, NULL))
++            authorized = TRUE;
++        g_object_unref (own_credentials);
++    }
++    return authorized;
++}
++
+ /**
+  * bus_new_connection_cb:
+- * @user_data: always NULL.
+- * @returns: TRUE when the function can handle the connection.
++ * @observer: A #GDBusAuthObserver.
++ * @dbus_connection: A #GDBusconnection.
++ * @user_data: always %NULL.
+  *
+  * Handle incoming connections.
++ * Returns: %TRUE when the function can handle the connection.
+  */
+ static gboolean
+-bus_new_connection_cb (GDBusServer     *server,
+-                       GDBusConnection *dbus_connection,
+-                       gpointer         user_data)
++bus_new_connection_cb (GDBusServer           *server,
++                       GDBusConnection       *dbus_connection,
++                       G_GNUC_UNUSED gpointer user_data)
+ {
+     BusConnection *connection = bus_connection_new (dbus_connection);
+     bus_dbus_impl_new_connection (dbus, connection);
+@@ -94,9 +142,9 @@ bus_new_connection_cb (GDBusServer     *server,
+ }
+ 
+ static void
+-_server_connect_start_portal_cb (GObject      *source_object,
+-                                 GAsyncResult *res,
+-                                 gpointer      user_data)
++_server_connect_start_portal_cb (GObject               *source_object,
++                                 GAsyncResult          *res,
++                                 G_GNUC_UNUSED gpointer user_data)
+ {
+     GVariant *result;
+     GError *error = NULL;
+@@ -113,9 +161,9 @@ _server_connect_start_portal_cb (GObject      *source_object,
+ }
+ 
+ static void
+-bus_acquired_handler (GDBusConnection *connection,
+-                      const gchar     *name,
+-                      gpointer         user_data)
++bus_acquired_handler (GDBusConnection       *connection,
++                      const gchar           *name,
++                      G_GNUC_UNUSED gpointer user_data)
+ {
+     g_dbus_connection_call (connection,
+                             IBUS_SERVICE_PORTAL,
+@@ -136,14 +184,17 @@ void
+ bus_server_init (void)
+ {
+     GError *error = NULL;
++    GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_NONE;
++    gchar *guid;
++    GDBusAuthObserver *observer;
+ 
+     dbus = bus_dbus_impl_get_default ();
+     ibus = bus_ibus_impl_get_default ();
+     bus_dbus_impl_register_object (dbus, (IBusService *)ibus);
+ 
+     /* init server */
+-    GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS;
+-    gchar *guid = g_dbus_generate_guid ();
++    guid = g_dbus_generate_guid ();
++    observer = g_dbus_auth_observer_new ();
+     if (!g_str_has_prefix (g_address, "unix:tmpdir=") &&
+         !g_str_has_prefix (g_address, "unix:path=")) {
+         g_error ("Your socket address does not have the format unix:tmpdir=$DIR "
+@@ -152,7 +203,7 @@ bus_server_init (void)
+     server =  g_dbus_server_new_sync (
+                     g_address, /* the place where the socket file lives, e.g. /tmp, abstract namespace, etc. */
+                     flags, guid,
+-                    NULL /* observer */,
++                    observer,
+                     NULL /* cancellable */,
+                     &error);
+     if (server == NULL) {
+@@ -162,7 +213,13 @@ bus_server_init (void)
+     }
+     g_free (guid);
+ 
+-    g_signal_connect (server, "new-connection", G_CALLBACK (bus_new_connection_cb), NULL);
++    g_signal_connect (observer, "allow-mechanism",
++                      G_CALLBACK (bus_allow_mechanism_cb), NULL);
++    g_signal_connect (observer, "authorize-authenticated-peer",
++                      G_CALLBACK (bus_authorize_authenticated_peer_cb), NULL);
++    g_object_unref (observer);
++    g_signal_connect (server, "new-connection",
++                      G_CALLBACK (bus_new_connection_cb), NULL);
+ 
+     g_dbus_server_start (server);
+ 
+-- 
+2.24.0
+
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
deleted file mode 100644
index 07657d250782..000000000000
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.42"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	libnotify? ( x11-libs/libnotify )
-	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/intltool
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	unicode? ( app-i18n/unicode-data )"
-
-PATCHES=( "${FILESDIR}"/${P}-enable-gsettings-in-runtest.patch )
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i \
-		-e "/^py2_compile/,/^$/d" \
-		-e "/^install-data-hook/,/^$/d" \
-		bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
deleted file mode 100644
index 368c0a122fc4..000000000000
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.42"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	libnotify? ( x11-libs/libnotify )
-	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
-	dev-util/intltool
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	unicode? ( app-i18n/unicode-data )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gdk-wayland.patch
-	"${FILESDIR}"/${P}-vala-0.43.4.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 ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus/ibus-1.5.21.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index 7d58048b6672..66c047159f59 100644
--- a/app-i18n/ibus/ibus-1.5.21.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )
@@ -71,6 +71,7 @@ DEPEND="${CDEPEND}
 	nls? ( sys-devel/gettext )
 	unicode? ( app-i18n/unicode-data )"
 
+PATCHES=( "${FILESDIR}"/${P}-fix-authorization.patch )
 src_prepare() {
 	vala_src_prepare --ignore-use
 	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 2ae5a95c9d46..5bd83c3fbbe4 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 
@@ -14,8 +14,8 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
@@ -36,7 +36,6 @@ CDEPEND="app-text/iso-codes
 		x11-libs/libX11
 		!gtk? ( x11-libs/gtk+:2 )
 	)
-	gconf? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gtk+:3
 		x11-libs/libX11
@@ -118,7 +117,6 @@ src_configure() {
 		$(use_enable emoji emoji-dict) \
 		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
 		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
 		$(use_enable gtk gtk3) \
 		$(use_enable gtk ui) \
 		$(use_enable gtk2) \
@@ -148,6 +146,8 @@ src_install() {
 				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
 				DESTDIR="${D}" \
 				install
+
+			python_optimize
 		}
 		python_foreach_impl python_install
 	fi
@@ -158,17 +158,15 @@ src_install() {
 
 	insinto /etc/X11/xinit/xinput.d
 	newins xinput-${PN} ${PN}.conf
-}
 
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
 }
 
 pkg_postinst() {
-	use gconf && gnome2_gconf_install
 	use gtk && gnome2_query_immodules_gtk3
 	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	gnome2_schemas_update
 	dconf update
 }
@@ -176,6 +174,6 @@ pkg_postinst() {
 pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk3
 	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }
diff --git a/app-i18n/kakasi/Manifest b/app-i18n/kakasi/Manifest
index 6d06a6836d8c..6f23bd2ba4d0 100644
--- a/app-i18n/kakasi/Manifest
+++ b/app-i18n/kakasi/Manifest
@@ -1,3 +1,3 @@
 DIST kakasi-2.3.4.tar.gz 1099258 BLAKE2B e3644e8688082df393ab3b1dc356b682b3ea4a66c46d33c3e3c65ffd882a357600ec99f017e72bea491ad7779cbbaa044479101322a14baccc5385edc20a7b22 SHA512 33fa17251ba00163f6d9df208f18c88ff2dfa9891320f1d00fc0c72686bbcc59cf3ccbfb76fa66dfb135a6e942ef4d5d907edc3f1ca9d380c5b7a7d4df090a66
-EBUILD kakasi-2.3.4-r2.ebuild 705 BLAKE2B fc951beb9a0c3a59c48c7d5fe2c6fd833038ca149e00e787c754cdf6a5136d8b7274b69847bbdf324881aa141391364a6e85ca18e48b8d03d97fa81f5b793836 SHA512 31143e6daf3e2cfc72c26e63905182e49b4b34e99e375f557799294bd8b755fa69b7c325afb62ddb696e16f7598285a208aab3bac94522db2462f78d067a1aec
+EBUILD kakasi-2.3.4-r2.ebuild 706 BLAKE2B e704c19d2b3562d07388c703440eabdbd6da5250b6578df77abcd0b71a5354b0f9392e95a5f76f0a28d5557830384e1fad659669c3347382b49d3fb93c7dd2ca SHA512 72f2c976bed0eec7430cf43ef6f5ece427a9b1d1376c832a600f0240ffb1b1f9141da17630147b7a9532bc041d0544f1c1ccc29e4b8bd02dddba97b5c36d4616
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild b/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
index a502ccd1f027..30107f0de0d1 100644
--- a/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
+++ b/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.namazu.org/stable/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 DOCS=( AUTHORS ChangeLog {,O}NEWS README{,-ja} THANKS TODO doc/{ChangeLog.lib,JISYO,README.lib} )
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 834a465528f6..6e47f37d5825 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,4 +1,4 @@
 AUX librime-1.5.3-log_files_mode.patch 458 BLAKE2B acd2f59f409b3643807ea845fd08bfcfe730cfedaacb7d70a4b1ba017a299cb95b8d815bbbf53b2c0e3c86c4482a2d71a97fef362a6f0404dd45e96b57f78be7 SHA512 d8b12367916ed1ad5deb2e982437d3e5e04592baa6c1e12f6b78ff99b8cc407f2c9fc6f47c0715054572f6f8a5edafcb6f6da033902175cc4357a07faad04420
 DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3
-EBUILD librime-1.5.3-r1.ebuild 1605 BLAKE2B a1e91aa0248c50d3561e47e4e81982137978fc77d797040768136997d8cdd1d2250e45b2b6d73e7a68b4a787426acf75507efb619713eaa893c2ab07a2a19fbf SHA512 2fe3d9cdef8176f38e3c4346542bf09181863fbd62e6968fb452da64c63ba5645ef73588f01eb3fbd1307dbde96a3867754e77c869587b33cf74ec89e02aa4f8
+EBUILD librime-1.5.3-r1.ebuild 1598 BLAKE2B e2bea3ac09fb0f5f132382caa6a37b8fc3e674688fbbba71e68a5a48e1375248633ec5de170030a5d734f18e294aeb8c3b2b2cba9d033c56bdd88e9709c14c1d SHA512 9c389f0f4ad573bada9c18bdfb3af3cac4f17e42f3bc1fe5d308fed123a3458a28e243f0ac4134753d24b1cbffb644707adbf693fc0f01d5fbc5eb25177bf416
 MISC metadata.xml 647 BLAKE2B 2837d0505f1721cbb6a60414b846ad95ddbaca6d682e9f93acc82998430cdbc73038b124c1a0a73d7aedf132535276e6bd88015a47e4f4ebb86619aad38e9061 SHA512 a388004662d39511749e6fcf618fc28411f81ebbf2078ea2b3e4123d63544790fb017ced2df16556fdf763c854d34a7fcf5a59931153f6c94841d9cdcff4d3ec
diff --git a/app-i18n/librime/librime-1.5.3-r1.ebuild b/app-i18n/librime/librime-1.5.3-r1.ebuild
index 91569d76fae8..e05bb22da525 100644
--- a/app-i18n/librime/librime-1.5.3-r1.ebuild
+++ b/app-i18n/librime/librime-1.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2019 Gentoo Authors
+# Copyright 2012-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
index 9d1e5670ad26..7b770ec3e12b 100644
--- a/app-i18n/man-pages-de/Manifest
+++ b/app-i18n/man-pages-de/Manifest
@@ -1,4 +1,5 @@
 DIST manpages-de-v2.12.tar.bz2 10242050 BLAKE2B fa497a6fce2c2387dad2ab9443584174d8d5fab530b94e0123e71286c588cb3a2e52aa96760dbfd6545bed013c460e1bf61eb4a5af0673bb84c1c0f0c960a357 SHA512 548d3dd500ce1eadc71365119e35072b71e3fbe36eba664d992e94897f442fb93f9397053f72363f83dff2e931d93e2af995976736d8513d11d7c42bdb471862
-EBUILD man-pages-de-2.12-r1.ebuild 1939 BLAKE2B 72a35122ddd8142df74d0d672085822586f3150fb099d86d632efc6023a946400b6b785d3303fa5bb392e6b5b47a3e07f6053c8a4790a0a7f6a84375ee1190b1 SHA512 0f02c403ac476ad1a62ead48b63c651e5bcaa38f9e5fa69cfd8b081a3e1015a66e7a0524171be5f1601758ee8e43587ab399ad50c5accb7743962fa26f08da51
-EBUILD man-pages-de-2.12.ebuild 1885 BLAKE2B 37b9fa1c64f6247eff9b1f17d4a3d236cf1479ccd0d8eafa0d92b1d553dc90dec733edca50056ae30fee8a91208faea0aef5c8cebb438d46f3135d3b4da3d51f SHA512 6e07902a7259200bdeacbc13d9269e7852ab4d1fff2dd4a84268f785469171c3c1763ec25a47356da9607fa50394522bc31e7b40b9491ec5c885a1bedd7397de
+DIST manpages-l10n-v2.16.tar.bz2 26569385 BLAKE2B ff5877a2a58e48fb7411559bbc22dae5918bda2d1fa38b5239bb6fc0561d85c44a276a491a368fee75ee26508f0128b5f4a5d0afe344321b4d4c653dd6a24898 SHA512 e534276b693c124a70a409ba9318a4a3e168c3d10c8e2837811f27d471ebb25eb4235eff9910cfc57624560fbc6273379a2d813b4a8cec2dd7ca1a0cd09ed78d
+EBUILD man-pages-de-2.12-r1.ebuild 1925 BLAKE2B 813a1e51c6cfac0aac9264583c62ba17e7cb9473a2c361ecf637c53812a6abdae0604cde202e0476de1238049160d1e999890ff34452f344ed30c93c63c43620 SHA512 65229c44e14ba1f4df186eab529691150ac66fd4a9e1457024c0810b2c4b875915c7cc52bb05b48b0d94d33dfe7b11a3504f3c28f523849aa4224d96e7a9ce5a
+EBUILD man-pages-de-2.16.ebuild 1439 BLAKE2B e7b8b5c572c04a6308faa4841b8e2125d5d3cec25c493148f5a7e117bb3d480cfd16e0cab46a88333e6ff948498e0d70e9de213afb7224adc431b2b67ef61033 SHA512 4518beb6324e3a658b4c610a763b3755e98f4c0ff9b2fef32ac37aa16b86291ee2f4b0f7eaad8eaa3fe3806fcbdc6b58541cd85d6e094311d8888a924b54eadc
 MISC metadata.xml 369 BLAKE2B 41170815bcde0a65831b0453eee7b99359594bc67d345e31d1228d6b5def740d73087b96473511a8249528ac16a80b0eeee91791f9d4f113cb5caed918b40552 SHA512 e36208b3689927021e51ad2348ba3f5a5598b9657ffd7156d928dc817b90ed91a57d43605eb8a3e2fde1caf04349ba76b68ebc7ead1061ecca66280095179658
diff --git a/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild b/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
index 5901e1eda028..b38f24d861d5 100644
--- a/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v${PV}/
 
 LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-de/man-pages-de-2.12.ebuild b/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
deleted file mode 100644
index d2837b0ad588..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN/-/}-v${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="https://salsa.debian.org/manpages-de-team/manpages-de"
-SRC_URI="https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-BDEPEND="app-text/po4a"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	sed '/gzip --best/d' -i po/Makefile.am || die
-
-	# sys-apps/shadow has it's own translated man-page for this
-	local manpage
-	local noinst_manpages=(
-		upstream/debian-unstable/man1/groups.1
-		po/man1/groups.1.po
-		po/man1/su.1.po
-	)
-	for manpage in ${noinst_manpages[@]} ; do
-		rm "${manpage}" || die
-	done
-
-	# Use the same compression as every other manpage
-	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	local PORTAGE_COMPRESS_FLAGS_LOCAL=${PORTAGE_COMPRESS_FLAGS}
-	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
-		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)
-				PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
-			;;
-		esac
-	fi
-
-	# Fix source files for symlinks
-	local LINKSOURCE
-	case ${PORTAGE_COMPRESS_LOCAL} in
-		bzip2)
-			for LINKSOURCE in upstream/*/links.txt ; do
-				sed -i -e 's/\.gz/\.bz2/g' "${LINKSOURCE}" || die
-			done
-		;;
-		gzip)
-			# pass
-		;;
-		xz)
-			for LINKSOURCE in upstream/*/links.txt ; do
-				sed -i -e 's/\.gz/\.xz/g' "${LINKSOURCE}" || die
-			done
-		;;
-		*)
-			ewarn "Unexpected compression command ${PORTAGE_COMPRESS} found, symlinks will not work."
-		;;
-	esac
-
-	eautoreconf
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES.md README.md
-}
diff --git a/app-i18n/man-pages-de/man-pages-de-2.16.ebuild b/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
new file mode 100644
index 000000000000..f802bbdaabd6
--- /dev/null
+++ b/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="manpages-l10n-v${PV}"
+
+DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
+HOMEPAGE="https://salsa.debian.org/manpages-l10n-team/manpages-l10n"
+SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+BDEPEND="app-text/po4a
+	dev-lang/perl"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# some packages have their own translations
+	local noinst_manpages=(
+		# sys-apps/shadow
+		po/de/man1/groups.1.po
+		po/de/man1/su.1.po
+		# sys-process/procps
+		po/de/man1/tload.1.po
+		po/de/man1/pwdx.1.po
+		po/de/man1/uptime.1.po
+		po/de/man1/pmap.1.po
+		po/de/man1/pgrep.1.po
+		po/de/man1/free.1.po
+		po/de/man5/sysctl.conf.5.po
+		po/de/man8/sysctl.8.po
+		po/de/man8/vmstat.8.po
+		# app-arch/xz-utils
+		po/de/man1/xz.1.po
+		po/de/man1/xzdiff.1.po
+		po/de/man1/xzgrep.1.po
+		po/de/man1/xzless.1.po
+		po/de/man1/xzmore.1.po
+	)
+	rm "${noinst_manpages[@]}" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-compression="none"
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake mandir="${ED}"/usr/share/man install
+	dodoc CHANGES.md README.md
+}
diff --git a/app-i18n/man-pages-fr/Manifest b/app-i18n/man-pages-fr/Manifest
index 7ae11168f114..eb5b1d1db9a2 100644
--- a/app-i18n/man-pages-fr/Manifest
+++ b/app-i18n/man-pages-fr/Manifest
@@ -2,5 +2,5 @@ AUX man-pages-fr-3.70-r1-fix-unpack.patch 701 BLAKE2B 7ad8cc9877f8bc0a206258e4ff
 DIST man-pages-3.70.tar.xz 1266044 BLAKE2B 00aa14ac7c9aafb9883713c4d13fe9318cf10cfe844663226bcd374b0a77b8b8a60cefeada7ca058f9d4e8b4e1056f4c8c6d762f46507f08f454bbe450f49fe3 SHA512 3e5590fe5181a914bb49531b7786eefc9d13d1ce1e3a80b09500dfc31a7fa01543f36c44484194613d2c87b840e4bdd9774eedc67251d3378014698078cb3ca3
 DIST man-pages-fr-3.70-1-r1.tar.gz 4669973 BLAKE2B 2fd32c5e922f8d74dbec74724c9acb8f5fdc0fd7a88f4687465713b22ddee5589b4a54383bdf14eb76076538e9d28a20ffdac2415c521b21e21f5186606121d6 SHA512 002ca3b7066437ce3a42f9c0396940ffc8593d2acdd05a3150c54b8d1f272ef6a448a18e6f3de0f90ac6eb4e616c132eb4e11e3e052b2e6f83a820a7d56f32d1
 DIST perkamon-man-pages-3.70.tar.gz 24292 BLAKE2B 60848a93d95c1eedc50b10a4b8cfd68c3847ae5e6d13de06058f1c89218d953f68f5428fe3d422c11078f80a5bcb678abd51388b6ee4ea20c2db2e9a87fc51e6 SHA512 648f16c958d1ed5933da1e971f94391761cad94414eb4d0d3eee612f9cabef3a56f07c5f83b72be3f98d49a9956d3ccceb1568ea76572f6d4a6fb8b50a8225a5
-EBUILD man-pages-fr-3.70-r1.ebuild 1210 BLAKE2B 0f2e628d511b8127062c820cf8446b68ba3b6efcc59fa89ac12e9f73d2a0c7329af66ef8c3b2f6a1f397020dc48bcffeb3e4c9410bce25ad7b3c540741c832c5 SHA512 0f04983e8fe9c827f70ab86c56ce63721b40166f4bf5dc8367a218094f0a9cad82edaa11fd119623d3a0c8d1e64d33f64c943c2a39b9423732f7ab465a77216c
+EBUILD man-pages-fr-3.70-r1.ebuild 1207 BLAKE2B 8a7ef9c4b44e116871e08b35895861dfbe0c88987db25ee8e8ebdcaee97fad692819cd92f7f5eb4ba7b4a0b6349f26bdc9e1f917bf279a481d3cf73119e45a76 SHA512 48fc118b6776326798ac40abaf8c482b59d8c6fc20a2ff2966672a444549c4d61c8fe1750a396336911764c2277227373442c53bb3f6e7b0f035af455742a79b
 MISC metadata.xml 546 BLAKE2B a22dfeb81d1ca03f415767c7666bf5575e9c6bffb6a12b7f75b3c1921c05f21d7cd2eac020facc5b161ca89204d6d1d64b47e7436b577dbf2939b0799820cca6 SHA512 dcda3faede9782291b4ee3a1022434bea5c1807fe1099f84f3869f6d4276a918fb0eefef6879db96497d1106deb490d0a993dd5636d36b4e7455f71b6b809c17
diff --git a/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild b/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
index 5b926ac55aee..a3c05f2063e3 100644
--- a/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
+++ b/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2+ man-pages"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="app-text/po4a"
 
diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest
index 1b9381e4bf60..7b2552d325af 100644
--- a/app-i18n/man-pages-it/Manifest
+++ b/app-i18n/man-pages-it/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-it-4.00.tar.xz 349192 BLAKE2B 90f25e7abfd64d0f175c2596bc9203626d9e7e53218d579081d17aa01665be20ffa721e33379107814a57715a35f480bb1833a2d3965f4b86b3247bf70e9162c SHA512 6392b42254eba42bd76f3aef3b6206396a817019df61462e44bd0f7dc519768cb1b1107726c45e402a0cf27e6f2ca8c8912363bd9bec7562b10e8fd5dcc60ffe
-EBUILD man-pages-it-4.00.ebuild 717 BLAKE2B ebecafd0931c41582650d0d8a8b9ca70ab862a049a6305f654bffbc5a9fa6904076424944bbe13949984c322210c1e22b4a7bd6c7bfe17fb96ae8cf1d2d201f0 SHA512 7628fecd7a2b0a2f1ac18862ac2648517de8065a043e289a83c07311a8872351dafeaa0deeca8d47f046cbe554f2e940e3f7cd5772dcb61366faa79e3b67911f
+EBUILD man-pages-it-4.00.ebuild 715 BLAKE2B 1a1536afa9759eb3b56aa01397e17ac2a4bd9a0277eaec013635905b4b4c6de46252848db685ceaa306625eba04ac2498744c3de5d3f03dea55502d4ddde3a4d SHA512 6af3148cc62ff1c5eef22df0e62c702d817892a9241cfaf73e862c75ec71878ce961097afa0f44448755996eb21499ff5dde5851402d908f30260fad12f61fe3
 MISC metadata.xml 421 BLAKE2B a703dcd3047685aa6aa2a276d88a4a2f7a804bfcdf9d2980af1cf243b5f002361e8ed0b78961baab773fc20d46a6f860c8c912b39dc8a821d7ff4dcc7b317de5 SHA512 0c58ae5b97148e94d374bba03e0a65a2462b5f0d750c4df4e52ebd0cfac649fe4f35011429423ef20a20391cf4d69c206eb8bfa3d4ddd060265427b6d96aa095
diff --git a/app-i18n/man-pages-it/man-pages-it-4.00.ebuild b/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
index 31a3fb195d75..5bd8f3adaa77 100644
--- a/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
+++ b/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.xz"
 
 LICENSE="man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
index 8b641d172210..af2f92da3877 100644
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@@ -1,6 +1,6 @@
 DIST man-pages-ja-20171215.tar.gz 4802604 BLAKE2B 24ded9e82f20df322fa7e96a05806f37f26796475f64e2b075a60b60762e4b331c96e82e0582896da323a643070779204fb50eb8e68156ba2e74a1a41649f10e SHA512 8cef4489e3210c2e30fd880c1639aaf314005c7f3987001677cd869924275cbf9df27fdc855cba9d887e5a185da72779167227a68a080d370b233bcd4eca4d30
 DIST man-pages-ja-20180315.tar.gz 4808885 BLAKE2B 961cb265d2a5034368ac5766555440019e3f80710644f9ca6389e9932391f806ab37803b198d4f3619ad2a3fb34a91092b7c50c8f5c69dd1a909268c739fb931 SHA512 5cc8d247f24aeeb5f9ef9b89f214f7d74cf3d1db8f46140cb307f8398bde785c13041ec2947173d3a79121285afb3a5b383d3bff972eba017e88d17d722c173a
 DIST portage-man-pages-ja-20060415.tar.gz 67347 BLAKE2B 77be89a79be1d4fc3c09cd7c74cd8ccfd18649cdf0121daec008b21114c5a77618a88f4abed266599b944aa5bf11fe55c5b6e89fbba51ebe2a548eb85d9a2c6d SHA512 37364cdcb27b460663bdae31fea1ac653317ba4d928a5325c51814eb1677d7d9fb9bcc55cf64d63a8e6daaefa34d8604e0efe3582308957397cad31325a6eaad
-EBUILD man-pages-ja-20171215.ebuild 2023 BLAKE2B 66944f9721fe62ecff1cb8841f9b5fc5923192e1824f94bc4e5539c85035b2ea1b6840c5b9d4d66211dc1767936a20241e92654fa013b3b923990846168426ef SHA512 0b3cec75d411b9ad7ee81ed18b21c36db79ed521512de8933f0de3fd2fbc3d88dabf67b4b00ba380f0367103c01e2abc768f8f93fa13cab2879ed9201942ed9f
-EBUILD man-pages-ja-20180315.ebuild 2040 BLAKE2B 3d2db5f3c5458b0772aa1ba4407c115b72a7fafc01647d845697b51b5b4377d4f2726d893a2190e4fcf060e118267f8074be6d5e2bfe9b022ab6bd03fc3c62cf SHA512 ba7dcff4fb93431a54170cbf0cd87db4b8078e8fc026a1546c8a915ccbdc75c5d3538321cedf0285bf96bb335d204aa8d099188659407c1c71700153a350d69f
+EBUILD man-pages-ja-20171215.ebuild 2020 BLAKE2B b4fff45aef468771b13355b42ca163785bb9b40c9e1cc40697b768dbce9bacf4be75e35b0dff52f18719e5af3b813a2cc91ce2a7104ee09348e56302e7b4ad65 SHA512 7c168befe44895827165eb39472f03d3cbc952044bfe58defe4d5493e18eb5ff00605cc7e9400c8245b72053f1af27d6541770be4458238b385f42f975fb1403
+EBUILD man-pages-ja-20180315.ebuild 2036 BLAKE2B 0013bdf5a1e29e9bd367e8ebf140e8a71d439d5e205a731852014e4270f4ef4e6707b3f2c5fb1e8eef83a2b91aab0872e073d8bd89d8b488308dc372210f5350 SHA512 743450e4507af123e8693ddaf9878b5841b389a576bbcb6458bdbd1cef0a4ea2de4c8e5cfb846452718ae1e183dc2d8aa46fd1d464611846a284f85569894bc4
 MISC metadata.xml 674 BLAKE2B 52381f36a78ec6aaf9855e9828d0f6e25f46c78d9049f90c604ef6ddd339e56831731c5e2a6c25731725767763cc37e9ece2a6d862500ed3de63c9501d305fa7 SHA512 4930172347182e65fa0fa30e2fcef5bfc391e6fb1dfefaa872ebe609c9583b58a5d8a62bfbddaf8b8ecf2a80ec30752c71fb658dfd4569a4493bc9eeff6de2b3
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
index ad5ed669802f..2b922228c951 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
 
 LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild
index 68b1c0acd44d..d37c1cb8beba 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
 
 LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
new file mode 100644
index 000000000000..ee2514d9b669
--- /dev/null
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -0,0 +1,3 @@
+DIST manpages-l10n-v4.0.0.tar.bz2 34796889 BLAKE2B 6413278ab2c9482ffdd2cf6ef1f4c6e05f2f1d7be8c8d556cb137ca4c5c2d6297f9547725f3afcf8023478c05e41d99d595a0b5a44da0d0188ed0287c630e5b6 SHA512 9c83363ffaa9ff9015934869623958594e64f1cbb52367dd8274425a5cb45dac06109d231fd7f165eb35248b4229f3bbf252a6a4630e7d5a47edbf41d4a646a9
+EBUILD man-pages-l10n-4.0.0.ebuild 1650 BLAKE2B 43d51ef6468d0f1edfe821a835515ca8473925d20803c13eb3d0817ef0f939eca964d20165ae9bd7378365e82321b9248e5d153ad5a7e160b1fccef2522b58f8 SHA512 44259080acc3718a45c5f0c6afbe28e342984592f1ff3044b649f7b18230cbc2021fa963067526a3301c6abca91f68be9c52eaec075b7bff31bd7300ac1c4a51
+MISC metadata.xml 235 BLAKE2B a6e10699959bdc64d99b8c0b00f46388bdf0c1e125a9351c63e61aae65c6bd9f70ab55a9497f6a6dcf10b161022abdd23c50443193563ba83744c09d1d4cd9c6 SHA512 fdebae10dcd9eddfe7d9546337826902e38d3d0e7b7e6e140038bcb293c98ca81b096d203b5709f42948bfa8868fe2d68d1385fae6664505e14d9ac1541898f9
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild
new file mode 100644
index 000000000000..bf46b86a840e
--- /dev/null
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN/-}-v${PV}"
+DESCRIPTION="A somewhat comprehensive collection of man page translations"
+HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
+SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# omit pt-BR and ro for now, because they each install only two man pages
+MY_L10N=(de fr nl pl)
+IUSE="${MY_L10N[@]/#/l10n_}"
+REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
+
+RDEPEND="virtual/man
+	l10n_de? ( !app-i18n/man-pages-de )
+	l10n_fr? ( !app-i18n/man-pages-fr )
+	l10n_nl? ( !app-i18n/man-pages-nl )
+	l10n_pl? ( !app-i18n/man-pages-pl )"
+
+BDEPEND="app-text/po4a
+	dev-lang/perl"
+
+DOCS=(AUTHORS.md CHANGES.md README.md)
+
+src_prepare() {
+	default
+	sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
+
+	# some packages have their own translations
+	local noinst_manpages=(
+		# app-arch/xz-utils
+		de/xz.1
+		de/xzdiff.1
+		de/xzgrep.1
+		de/xzless.1
+		de/xzmore.1
+		# sys-apps/shadow
+		{de,pl}/groups.1
+		de/su.1
+		# sys-process/procps
+		{de,pl}/free.1
+		{de,fr}/pgrep.1
+		{de,fr}/pmap.1
+		{de,fr}/pwdx.1
+		{de,fr}/tload.1
+		{de,fr,pl}/uptime.1
+		{de,fr}/sysctl.conf.5
+		{de,fr}/sysctl.8
+		{de,fr}/vmstat.8
+	)
+	printf '%s\n' "${noinst_manpages[@]}" \
+		| sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm
+	assert
+}
+
+src_configure() {
+	econf --enable-compression=none
+}
diff --git a/app-i18n/man-pages-l10n/metadata.xml b/app-i18n/man-pages-l10n/metadata.xml
new file mode 100644
index 000000000000..7fccbc10bd18
--- /dev/null
+++ b/app-i18n/man-pages-l10n/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>ulm@gentoo.org</email>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-i18n/man-pages-nl/Manifest b/app-i18n/man-pages-nl/Manifest
index 7c05c046478d..5e6af0ca96a9 100644
--- a/app-i18n/man-pages-nl/Manifest
+++ b/app-i18n/man-pages-nl/Manifest
@@ -1,3 +1,3 @@
 DIST manpages-nl-0.13.3.tar.gz 303975 BLAKE2B 645447f850f9b6621e190629892b5caef566e718052cea226584cf0ce6990bb8155080f19ceb45f86aee22b09730d3e1167a5ed02ebdf725867a48cdc6df03bd SHA512 2fe12911105366e3355a46f7da988ccb888ada5f20760a4651dd34a7dcb354e85796ca70f54c06b921dd7fffc7b5c9141b4a09b0a53bff383540621652e59591
-EBUILD man-pages-nl-0.13.3.ebuild 519 BLAKE2B cabe81db3ea6bbf6a635c241ed7b89d77ae8dc1146511f4d08a4747b55fc18f00fe8f1f7d32b294f4613b3b9fa4212a8509c8c41b090a508d0969505401bfe5c SHA512 69e84bf6ccb4775f5aa8df99ffc54dd99128974aaeeb0122a9edc7b54994e8a37f8b674f9d4a1060d1911325f6dbd1aaf6709203583c94f077ea42a925d6a636
+EBUILD man-pages-nl-0.13.3.ebuild 517 BLAKE2B 58408a6f69dfb85f7312da5edbdda06498bf61207de356b2b3ace090cf2adb1960fc0becd0c6f2002c9e2e36b97ced3cdd99bdffa5764b624cd7d2700d8eae95 SHA512 414a47271f4dc2ad50538deea33ffbdf61fc72ef3e944698cc844bd103d9dc51dd98172f6a0d2b369d360fb87ddc6081fcec92c0dd76ae03bc7b73835d4444a7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild b/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild
index 656a75f9a5ed..1fec072b4d66 100644
--- a/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild
+++ b/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.nl.linux.org/pub/DOC-NL/manpages-nl/manpages-nl-${PV}.tar.gz"
 
 LICENSE="man-pages GPL-2+ GPL-2 BSD LDP-1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-pl/Manifest b/app-i18n/man-pages-pl/Manifest
index 48e4d6c54452..2549331ffc4e 100644
--- a/app-i18n/man-pages-pl/Manifest
+++ b/app-i18n/man-pages-pl/Manifest
@@ -1,4 +1,4 @@
 DIST manpages-pl-0.7.tar.bz2 3791061 BLAKE2B 81809280c78ecafc67c59a5353a589c119fe6b590c9d655dae4accb5247a178df9f3f186822834f3426b0d41ed9ab83f335204eb654acf2cf5a472dd7ca4cafb SHA512 79293e1bbfbaed5f97e63cb86fc1b445ea960fdee96567899ba9f6836d4188e0d80d4788180c29fdca3d358359b6fd3768c195857657819534942ece2c43694b
-EBUILD man-pages-pl-0.7-r1.ebuild 778 BLAKE2B 4ead2f0ea3800f14708b05ddadbe639d1ec90b435dfec039ea4795f035f86f6ed1729c5d664c7ae502a0d68ca857874b3c2209cdce121fad991173ea924e61ff SHA512 8e73e048523614fdd028adfccfa31bd8439cdb6441d8a4b15d8df54516abe25045d0632bdb4149b99562f9c5d1b855ae444ba342a3b2bf94c1f9aa330fe903e8
-EBUILD man-pages-pl-0.7.ebuild 730 BLAKE2B 901ef424fa378b27bfd5224b28aa16dfa66a84b8fbe9a6d431bb9cd22dc3a804048dc8dfe2bf067d23efeaeb5bcde6dd453b08b1167c1ecb456bbbb01f05e546 SHA512 c47f2e6fbc016caa9ca029dffc63e767ff8946c4137b2b117e848c65071eded1fed3baf6201c8d00bd65082fc4eeece09728207211eab4e0aa8741881ad7123a
+EBUILD man-pages-pl-0.7-r1.ebuild 774 BLAKE2B ba82a8059064d61ce8f433d25abe00a000fed83857c0f6c4ebfdaa40e6af2bb494e995161125bd99f249c5729aa2cd37216719da95257b462f6711adec3c213e SHA512 bcf6069555e7de2c7ab39b77ab677eedb68bb8cf28f1376e9fabb5d51cf51b932025542617de654a4886adc0879807d1bf5e8c17e04019a5710074e02e2706d2
+EBUILD man-pages-pl-0.7.ebuild 728 BLAKE2B da374b5879bd2234bcb34492f1e590c1774a40f3544b832410907a36aabd5bf5973db3b6a8a35037cc6449e533cbace2957083bae2c0a573b410101ea168477b SHA512 78141793173a67971d8d49150954a827c85ae78f02154b9db967665a9969074917d7972871f6c3b547ada2bcffd3c724b9fc6b1055b445b69d42a866bd4d6483
 MISC metadata.xml 447 BLAKE2B e8f0a2348cf7a9937b9aeaf647ed1da769201f131b377f965ac3965ee0d86a5fec00b61b804f4145e0c31c274a850481f756c8510e6ed49a951d533a94a427ce SHA512 ce47231649316f102bc2b2318d51b548efd9159b3c2df9edfc0e17dda5710cac2a39c1cd86961d842f627c4b6b83fcf32da0b6194518109b7fd69355ec337f54
diff --git a/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild
index ef7e788c0ad6..822ed83e0f5b 100644
--- a/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild
+++ b/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/manpages-pl/${MY_PKG}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DOCS=( AUTHORS README )
 
diff --git a/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
index fa9345c5de55..90ac2b2fc183 100644
--- a/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
+++ b/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/manpages-pl/${MY_PKG}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 DOCS=( AUTHORS README )
 
diff --git a/app-i18n/man-pages-ru/Manifest b/app-i18n/man-pages-ru/Manifest
index 4a155f6654dd..956c728b315b 100644
--- a/app-i18n/man-pages-ru/Manifest
+++ b/app-i18n/man-pages-ru/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-ru_4.16-2383-2383-20180422.tar.bz2 1682388 BLAKE2B 3707d972313ca1f96c3d5be3f8f74dd3e88322f3e9504799d49fb57c06f99d62f0cb88d545c90c4b47795b9aee92d1f89d55c777b0970070120b1496be0b3426 SHA512 df358c917ba55360b86e075097316c2eeb29eb9f9938ad7ee1ae6679690f1d736f448cee36643f2645c40a964274e1a3d0948f91ec0f99d81b4a29009704f009
-EBUILD man-pages-ru-4.16.2383.2383.20180422.ebuild 674 BLAKE2B 554c739f511247f7298ab1ee3a190d4b5dd32e0eb86fff62041236b1a8d3b824eaae5f81adcd8e573b135d08b65ffc6adf2525c0c005387e69fbf9b1f60874d4 SHA512 a6693f5f3d6da60aa9af428208a8bb71d488e01faff1376615c86dc3302ef294a00018929ccedd328f097c95f5faf2e928f6910fcec63e5bef78f5c9099d308a
+EBUILD man-pages-ru-4.16.2383.2383.20180422.ebuild 672 BLAKE2B 0c221169aa91f88085afa7a78be520fbf9cb67066f0dc64409462593680ea23a1f2c4bf6da935da0ba1c0a010a42932825714536368ad6df5d774f3c4ade6833 SHA512 08a29b64f7ddbac0a1b84370f6f709cf5fbb1aeb45afe07ffd8c5b17114a86355389ea1632856670bcd403582993477b91ef044e91fe53c485f140f44c8f87c3
 MISC metadata.xml 436 BLAKE2B 7e17e7dc25a13db3594b5a5e630e41ff08012b530736bcbb5f5a1cd302e705cf30025bf93afb31f3de631e01e9588a037d9213651f0ad358fd3a87ffb727ca3e SHA512 1f7c55f697fe501f62c9cde15f0f82cedf7cf62251efba961c4e236ec99974fe7345fd77a48d92eee9472fe519e7c4ea040fda5df31d743f2eddf09644ae81a5
diff --git a/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild b/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild
index cd90dcee255d..c3154bd2db81 100644
--- a/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"
 
 LICENSE="FDL-1.3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND=""
 RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-zh_CN/Manifest b/app-i18n/man-pages-zh_CN/Manifest
index 84fd0979a45a..2ddd0f67ee94 100644
--- a/app-i18n/man-pages-zh_CN/Manifest
+++ b/app-i18n/man-pages-zh_CN/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-zh_CN-1.6.3.2.tar.gz 1845997 BLAKE2B 3af6859593e4b2a52ef3ce93f2d18fe0f102e63cee3c7035de04ab4d8b8ac491ceff284b1a2f01a5e4dcdc4869c2a9768ff7dfde48b9e89813a2e558bf7b259e SHA512 61171406482a24c3dfd1b6303af3d7fb086466d5f05d5799f50488beb78c91c5d1bcf574aab669b71fa0f027691a0be1a1d254d08f823ff4bd8bf976e0c83dff
-EBUILD man-pages-zh_CN-1.6.3.2.ebuild 832 BLAKE2B 19dbf11917e26c8b7f36deb0217592c5bb89c03f188d13a27d32095146bd1c4145018a54d2e40ab0ea87c65085f580c8f7342008859368aa3aebe3ccc0b0352a SHA512 8d734895887cf5152b920d8391139c4e42afaa947bf667b68d71fa98cc7020597b2f4208d6989d8fd8868f7aa556fdcd2741a1a5a5b0af26a759f383b5392d5c
+EBUILD man-pages-zh_CN-1.6.3.2.ebuild 830 BLAKE2B cb8b3d6f3688f0578b7079446e62ecb381734363b40d8f7cd4cdeaab51c7c588b683e309cf53c249b84eac0b248a764ac0992bb7f7768d596fb4d7027202e1bd SHA512 46724fe6524a941c7682a9ab63cb6a6f93a5ad79352621b12f99163d1b7b3ae186769a410ee00d5fb0f9b0e380e585b370dfba8a18ea6a0b7fbfb542b381829c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
index 376236748218..6181f5e79c90 100644
--- a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
+++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 1cc94dcb6fcf..b4baf24e8ad7 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -5,6 +5,6 @@ DIST nkf-2.1.3.tar.gz 195020 BLAKE2B 7ffd2acdc16d98cfe1e7a73ff5999756a1c46e5dbbb
 DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca50e1fbeef7be4f50af9ba9b64ef140163e325e57c351dd384ee8b09849bad7c37b03d48a9cb4b88f2ee199 SHA512 8667c20a6c5e9c0c6df7ebe2571bcf24090f04dafd306d32f07312acd659ea026a91d31521b4b213f77aba8218159effd73607d0b7236b7287e4a4cde8cc62b9
 DIST nkf.1j 24160 BLAKE2B 1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
 DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
-EBUILD nkf-2.1.3-r2.ebuild 1687 BLAKE2B 73cafa7b8acdacb5f582848b3b2ef6684766c36ca2a771f55e2b0cc5fec446f05d6ae555b915c01d4a6b2e302afb216c8946d920c97472b03f23c403bfbee2a4 SHA512 bcc8dbf0c017015f7c2f464ed268ecd2b30dc8e7e19923bf906f03e8640554757eb3e9dfadc13e389f337b5309c6da0f3f60bf5aba2621838cd803adb58d3e23
-EBUILD nkf-2.1.4.ebuild 1797 BLAKE2B b69b716e3dce6e7033a3b8fcd6d69aa1c6a1789ab3df7bfd0c8f8a3a4919a2c01597896e1e5b240abe47d210a1c5826c9b1dc6dd51e7499c3da4aff7cab780aa SHA512 87bdba65f903aa753cb72b47573c81972066157d24c795e485d1437641ec69e017793a04e6521fa1e87881df6a650bbf14aa29c51de0494ddb5d3c5030ad77fa
+EBUILD nkf-2.1.3-r2.ebuild 1684 BLAKE2B 8d163de8197a52c0ad0054d14b8899cd6f05f4ac0468318d58a345b0afcfaf1c4ad36ad028686b42a568022226c45124e9f022e421136757edc001c1f8831502 SHA512 1ecddea3aef41246748bda0b999afbf3b0acaef17c02f4dbd6d8a36b41a0cfff1669b871f5b9f69f5924c898ee7c1674e9ddca76e336b95709835468c808e147
+EBUILD nkf-2.1.4.ebuild 1793 BLAKE2B 2fc0ab2f2e606aaa5a4f633f6784b9f0c3c3ee24e5eb1c4c9955c2410059b861fa19289a8d8b08dec528d1187c666e75e58b0ac2b7d2aac0f7ca0ca756706ffe SHA512 b110a15aa43098ea9cbc8eb347d53656f495b044ca4f0278a6f8f485b075f4de1eb6b4306c3ff4218338864a3ce810c4cac72a23b14902d20a24d2df31fef82d
 MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
index 97e811889919..ee2518acd6d2 100644
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
 IUSE="perl python l10n_ja"
 
 src_prepare() {
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 2735d8fc373e..313a6e04ac42 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/64158/${P}.tar.gz
 
 LICENSE="ZLIB python? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
 IUSE="perl python l10n_ja"
 
 src_prepare() {
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index 6aa6fe5974fc..cc0889866bd6 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,7 +1,11 @@
 DIST JMdict-2020-01-01.gz 19493878 BLAKE2B a797cbabffaafdcc967078ebf91ba27280d9a2ba040021fa605e674246ad3837774b2f17a7f4386cec3a2f53afb742fcd9f0bb6784b2014659d8785d59e321cd SHA512 691077030421e909dc171c217e6951edd48b567bf0821c7b68da7a2fc410e3f55d73db1943a9b99128763655d03e175e431590d869032645ae32d69dae5acdc1
+DIST JMdict-2020-04-01.gz 19606278 BLAKE2B aa4f4287dc57ad825df6a8606840d2dd64bf9901cfc546cf25cacda3c838bc0827430bfb948c92183f6f35d356eb97eaf09b743e70740364293dc278168510ba SHA512 ad3907bff000b684af2d78135da0258756757cc715c5827f02a8703e6b9a3f0796fd6e3d24509ec13d84464ec6591e7acb0b9c253724e55a2cb44a564a7e5602
 DIST kanjidic2-2020-01-01.xml.gz 1482692 BLAKE2B f50f45e982842b1fc161551640aa7bb8bc13e858c64576af25101c0bbdcb5d5734ebba86be180434781ba62d37370eae9b53bad7a30eb06bcffb86233f85f3fe SHA512 df0d0827525ff0406b33811f9b0eb24f7ab99288879dc316af8125c24448b9919224d6cc7c20648791dbbe8f29d05d977e77c9316a9aeb69513e29cf2bc40e92
+DIST kanjidic2-2020-04-01.xml.gz 1482869 BLAKE2B 05a8ed51adaf56023b41d6ac956496fda780d14e55d1947dfdec0647a78d4bcb2f5cab730e729ab42a176bed7de7548276d9d9fd668ca2c6e045296ba0ab4f7a SHA512 87d0562bb5d4ae7153be8d684d1bd9b199039417a76289d783e96e09ea52b6741d923dc2f38500a7b2299c9f4cd0f6c8d7b8b7e00da2f102681387ec858ce852
 DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
 DIST tagainijisho-1.2.0_pre20191230120610.tar.gz 3635034 BLAKE2B 4f86febae1dfe1de236668bd405294c1e11510b8a942abfcb378d0e46c38cc179d16f5365dbb8322c7ad47cc333a816ce883af5993e0be90f11a43f2710cd45d SHA512 4fa93b7a51415c57f1d81748f15f23e90e4d9a1f91c3f0d96447d08a5bf1bbfc6bc2dbd4083e0b9328e32795f01de94bae834b4e7ff1830cfbe0ec215f20d7f8
+DIST tagainijisho-1.2.0_pre20200118132551.tar.gz 3635265 BLAKE2B f8f831f698bf0ca56c57e8343adee92d3b42842c95fb971c9d8696eaf660ce458d8fd2108ab4568463bed6711c5295d27efc34f2fab512c3d0bc2a11a4f76c1b SHA512 14d6fc5ce891437159ca2b3db53c776420a6d4e305f6753c7ccf5ce773d43fa31f875ee9582c9db1fe05364b18772cec43dd046a6492b6eb45c12b62f7d60407
 EBUILD tagainijisho-1.2.0_pre20191230120610_p20200101_p20200101.ebuild 6662 BLAKE2B b55c84d61fef76786a82f67904b1b4b058a430023f05a9521d0c1783e4834d0333362de53fb791e907451fb73e593ade756fad600363d2619774c9d18a69a70b SHA512 b3055cbbbd23ae22e827181a6c11e17943d3c604a2453afb6fb389c0d4a877f77585242d39c747e3a9cee81df52ce1754aac3e7616051dbfeab84e07845cf09c
+EBUILD tagainijisho-1.2.0_pre20200118132551_p20200401_p20200401.ebuild 6662 BLAKE2B d0e51fac4398e2108660bc3a111b01c140be5237d7fbf2e2bf60ea2cdc7439df96df2233ca0b7ec02b2aa89feecbf35cf5601fd14b0ff15e8bf8d813c0917858 SHA512 7a7128adc528c86e3860ddb8ce7a1e6d039a1eb8b3659c21f9ee64d0e410d19f1225c8be2b644b2f367feb463c9c37c4869b0e0115dec84d6176d4a6a78a39ec
 EBUILD tagainijisho-9999.ebuild 6611 BLAKE2B 49eb2ad3a99a2cae8097c3fbe54f99b7d63fe1ba2b88793bfe9a57f38afc04ae4ccd5297642603cc55203ec461d2b56885cf0a504c75b9319194df878d27b752 SHA512 ff98dc941da2ae88e664564a5fbf674e75f5da2e8d1501dac23c294bc1ed718f6b8e7252c9e889cc9b3519217b9a2b37a5e6f38dd828dce7f269296af316311d
 MISC metadata.xml 1133 BLAKE2B 863fcd0cbb85b715cf7666210c74a9e88423b0e982b3e05b4333036b607e4d2cf73b35dc6b8f5e549a35a6d8e2cc107f110f3500762d49065bd1ed2097dd6338 SHA512 cde2818f44f02091ac994ca049a25b90519b62b669b7923a52043df23a0de7f3e1f657d3080e574048556dbacd5521995addd35267ec9d1357360f473222cef7
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200401_p20200401.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200401_p20200401.ebuild
new file mode 100644
index 000000000000..9d1700175eb0
--- /dev/null
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200401_p20200401.ebuild
@@ -0,0 +1,200 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils xdg-utils
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Gnurou/tagainijisho"
+elif [[ "${PV}" == *_pre* ]]; then
+	inherit vcs-snapshot
+
+	TAGAINIJISHO_GIT_REVISION="2d2a3182a70a22bf27b0be42a3e896283513761e"
+fi
+if [[ "${PV}" != 9999 ]]; then
+	TAGAINIJISHO_VERSION="${PV%_p*_p*}"
+	JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}"
+	JMDICT_DATE="${JMDICT_DATE%_p*}"
+	JMDICT_DATE="${JMDICT_DATE:0:4}-${JMDICT_DATE:4:2}-${JMDICT_DATE:6}"
+	KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}"
+	KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	KANJIVG_VERSION="20160426"
+fi
+
+DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
+HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho"
+if [[ "${PV}" == 9999 ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz"
+else
+	SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz"
+fi
+if [[ "${PV}" != 9999 ]]; then
+	# Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz"
+	# Upstream: http://www.edrdg.org/kanjidic/kanjidic2.xml.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	SRC_URI+=" https://github.com/KanjiVG/kanjivg/releases/download/r${KANJIVG_VERSION}/kanjivg-${KANJIVG_VERSION}.xml.gz"
+fi
+
+LICENSE="GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+if [[ "${PV}" == 9999 ]]; then
+	PROPERTIES="live"
+fi
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND=">=dev-db/sqlite-3.12:3
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh)
+IUSE+=" ${pkg_langs[@]/#/l10n_}"
+unset pkg_langs
+
+if [[ "${PV}" != 9999 ]]; then
+	S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}"
+fi
+
+src_unpack() {
+	if [[ "${PV}" == 9999 ]]; then
+		git-r3_src_unpack
+	elif [[ "${PV}" == *_pre* ]]; then
+		unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz
+		mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die
+	else
+		unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz
+	fi
+
+	if [[ "${PV}" == 9999 ]]; then
+		# JMdict.gz and kanjidic2.xml.gz are updated once per day.
+
+		local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+		local today="$(TZ="UTC" date --date=today "+%Y-%m-%d")"
+		local yesterday="$(TZ="UTC" date --date=yesterday "+%Y-%m-%d")"
+
+		if [[ -f ${distdir}/JMdict-${today}.gz && -s ${distdir}/JMdict-${today}.gz ]]; then
+			# Use previously downloaded file from today.
+			JMDICT_DATE="${today}"
+		elif [[ -f ${distdir}/JMdict-${yesterday}.gz && -s ${distdir}/JMdict-${yesterday}.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			JMDICT_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget http://ftp.monash.edu.au/pub/nihongo/JMdict.gz -O JMdict.gz || die
+			JMDICT_DATE="$(gzip -cd JMdict.gz | grep -E "^<!-- JMdict created: [[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} -->$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${JMDICT_DATE} != ${today} && ${JMDICT_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in JMdict.gz: '${JMDICT_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv JMdict.gz "${distdir}/JMdict-${JMDICT_DATE}.gz" || die
+			)
+		fi
+		einfo "Date in JMdict.gz: '${JMDICT_DATE}'"
+
+		if [[ -f ${distdir}/kanjidic2-${today}.xml.gz && -s ${distdir}/kanjidic2-${today}.xml.gz ]]; then
+			# Use previously downloaded file from today.
+			KANJIDIC2_DATE="${today}"
+		elif [[ -f ${distdir}/kanjidic2-${yesterday}.xml.gz && -s ${distdir}/kanjidic2-${yesterday}.xml.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			KANJIDIC2_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget http://www.edrdg.org/kanjidic/kanjidic2.xml.gz -O kanjidic2.xml.gz || die
+			KANJIDIC2_DATE="$(gzip -cd kanjidic2.xml.gz | grep -E "^<date_of_creation>[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}</date_of_creation>$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${KANJIDIC2_DATE} != ${today} && ${KANJIDIC2_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv kanjidic2.xml.gz "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" || die
+			)
+		fi
+		einfo "Date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+
+		mkdir "${S}/3rdparty" || die
+		gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die
+		gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die
+	else
+		mkdir "${S}/3rdparty" || die
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack JMdict-${JMDICT_DATE}.gz
+		mv JMdict-${JMDICT_DATE} JMdict || die
+
+		unpack kanjidic2-${KANJIDIC2_DATE}.xml.gz
+		mv kanjidic2-${KANJIDIC2_DATE}.xml kanjidic2.xml || die
+
+		popd > /dev/null || die
+	fi
+
+	if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack kanjivg-${KANJIVG_VERSION}.xml.gz
+		mv kanjivg-${KANJIVG_VERSION}.xml kanjivg.xml || die
+
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	# GUI linguae
+	# en is not optional, and build fails if none other than en is set, so adding ja as non-optional too.
+	local lang use_lang
+	for lang in i18n/*.ts; do
+		lang=${lang#i18n/tagainijisho_}
+		lang=${lang%.ts}
+		case ${lang} in
+			fa_IR|fi_FI|pt_BR)
+				# Use generic tags.
+				use_lang=${lang%%_*}
+				;;
+			*)
+				use_lang=${lang}
+				;;
+		esac
+
+		if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then
+			rm i18n/tagainijisho_${lang}.ts || die
+		fi
+	done
+
+	# Dictionary linguae
+	# en is not optional here either, but nothing special needs to be done.
+	local dict_langs
+	for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
+		if use l10n_${lang}; then
+			dict_langs+="${dict_langs:+;}${lang}"
+		fi
+	done
+
+	local mycmakeargs=(
+		-DDICT_LANG="${dict_langs:-;}"
+		-DEMBED_SQLITE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index 840d808f1126..29b442201eaf 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -3,5 +3,5 @@ AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af9
 AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c
 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
-EBUILD tomoe-0.6.0-r5.ebuild 2199 BLAKE2B 240e9312cfd232c1afe7c2ee748a50cc3cf6e9d8b8fd52b67d3cb837285af8e134b7ff2af7e991dc4a6406de05bfb1bfab95184c058b244f0893a75e3d82ac6c SHA512 65df6d8a174907477efc18153b02cb35f32f82f606bd01b826a1f32482a134ce7121126bb4d37e18049f49413daec3573c4a75c93db292ae66f7dcd2b1a53cdf
+EBUILD tomoe-0.6.0-r5.ebuild 2112 BLAKE2B c60b4ac44e9db3005059b9543c81a8b4932e9344cb5dfea9c234dba273d97ece424f53af97714b95c134f99ffc9f180790f09b127274924e7ce9f8d0b7013ea2 SHA512 d9232f2954d898247cbce92152ef2ca59771759658ff664707b56153075f81f07421ccb3263dce3b8f26603ffc3867a6352b643d8678dfa386dcf2f0b1b72198
 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
index 059d1e78dd7d..9f94b8adc0c2 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
@@ -3,9 +3,9 @@
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24"
+USE_RUBY="ruby25 ruby26 ruby27"
 
-inherit autotools python-single-r1 ruby-single
+inherit autotools python-single-r1 ruby-utils
 
 DESCRIPTION="Japanese handwriting recognition engine"
 HOMEPAGE="http://tomoe.osdn.jp/"
@@ -17,17 +17,7 @@ KEYWORDS="amd64 x86"
 IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
-
-_ruby_set_globals() {
-	local ruby
-	for ruby in ${USE_RUBY}; do
-		RUBY_USEDEP="${RUBY_USEDEP}ruby_targets_${ruby}?,"
-	done
-	RUBY_USEDEP="${RUBY_USEDEP%,}"
-}
-_ruby_set_globals
-unset -f _ruby_set_globals
+	ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
 
 RDEPEND="dev-libs/glib:2
 	hyperestraier? ( app-text/hyperestraier )
@@ -40,8 +30,12 @@ RDEPEND="dev-libs/glib:2
 		')
 	)
 	ruby? (
-		${RUBY_DEPS}
-		dev-ruby/ruby-glib2[${RUBY_USEDEP}]
+		$(for ruby in ${USE_RUBY}; do
+			echo "ruby_targets_${ruby}? (
+				$(_ruby_implementation_depend "${ruby}")
+				dev-ruby/ruby-glib2[ruby_targets_${ruby}]
+			)"
+		done)
 	)
 	subversion? ( dev-vcs/subversion )"
 DEPEND="${RDEPEND}
@@ -75,7 +69,7 @@ src_prepare() {
 
 src_configure() {
 	local ruby
-	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+	for ruby in ${USE_RUBY}; do
 		if use ruby_targets_${ruby}; then
 			break
 		fi
@@ -85,7 +79,7 @@ src_configure() {
 		$(use_enable ruby dict-ruby) \
 		$(use_enable static-libs static) \
 		$(use_with python python "") \
-		$(use_with ruby ruby "$(type -p ${ruby})") \
+		$(use_with ruby ruby "$(type -P ${ruby})") \
 		--with-svn-include="${EPREFIX}"/usr/include \
 		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
 }
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 03ac36dad9a3..f66266050004 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -10,7 +10,7 @@ AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
-EBUILD uim-1.8.6-r1.ebuild 4904 BLAKE2B 90385c626c8b2712ac338e328403b867146afd8db26aef74c00b979d9679d72ed311933e26616f9e0c39ef04aab67cd91022b4f52a4ebb15acad4d97c57b61ac SHA512 e15d8e7c539092e7ccd765b9ee618c5f587cd57134477e12cb86ce5d018d13287a31da15df07219d9d22199912736c331ee307f7378199a3b12667162ce35108
+EBUILD uim-1.8.6-r1.ebuild 4905 BLAKE2B ee4345c48c89c562b3737bd0b9869f07dbacb89d48bcf4babe4210afdcaaa6f61ee10a0658003ff50c2bff9185f182268d141b206e399f652fdb1c900111bdf7 SHA512 d51ca040b24bee9c496c397654651882cc3f413ca02dad9bba525b77db4cbe2be44646678d4f4698e13df43c2b0f48bda5b0d2e895291ba4f41d6199b7cfbab9
 EBUILD uim-1.8.6-r2.ebuild 5009 BLAKE2B dae5ee163f218c32bbb8b20feff326380d8bd4af4051268f1b453302df1ef533358f883c5a391a86b0b917a240ed604b5246a20641deb1e22d94c05bd7422203 SHA512 7bdc3aad39e88f6bd4241de8718aed676611db8d6fddf377b763ee36d92eafb9ac1eb1b795c07314d7d4d972757f831e30e0def92c96a226f04ebe36144b5672
-EBUILD uim-1.8.8.ebuild 5473 BLAKE2B c2b79dce71dc6e7d0f910d76589f1698ba5dd9fdd396176769606502081615d0e0543a28026e1fb42dc3392bbb1483c2b69f5b15a041bcef092c66e151099384 SHA512 6b750bdbebb32b87a8079eaa607db467c3463f5f302f0917ba12149aa284e84ab8cad96308f546b3cad0ba66f949207ff17b48d8e7a351518a3d2e482a224e93
+EBUILD uim-1.8.8.ebuild 5474 BLAKE2B 55ef0e1a31bbe7448b7803ab02f5f303ab352fb35febec28f433f8e3f9cd58419ea70c11da6a7e9b14223bc8b67deaca45ed7b56f5e6e17b70c9814569d20c11 SHA512 99fe55bc3576f0d210b8aa3a0371b1efedbf139c3c2c0345bafa790c18fdb22c89b61ae99dcc517b540116c2df2215c4f120138546c849d13202ccf8da8c7a5c
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index a26a90d22a50..5b032d6a9eab 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index a47cea7facc9..3cb465c9e793 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index 002610b74df2..95600d2a54dc 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,7 +1,7 @@
 DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
 DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
 DIST unicode-cldr-common-35.1.zip 22368309 BLAKE2B 3d00bafccca8d0b8821083fdf94440adca6f8931951de33f5914308bccddaf5c3b642d59c2b7d04588995c9a284852677ae3ab2feeb9fe531e7479d08f4ee7be SHA512 e06594da3d6dc376457e507fe234281fcb04d08daabfdaed60afb3aa59f88cdc0a7c27974c52ebd432746fcc7664948f9d6e6fde5874ad85c6c73a6441425465
-EBUILD unicode-cldr-31.0.1.ebuild 496 BLAKE2B 8df1bcb6bbc05a9177c20aab6337a752e65d21ac11993aaa85a48025f5e196eb151a09dd3525ee76ffdae1710c0ff399fe6428dbada25ae89d83f64300b445ff SHA512 93ba56c3abf39bc27c7d825c63255fcea2c1c2d942b3984fd5a98cd911399f5ac4002e1e89972ca5495e9787cba266d0ce82f4d83ff9699d4c33bce90a02a880
-EBUILD unicode-cldr-33.0.ebuild 684 BLAKE2B afc83162281cbc7f7becc465113d9d4b2bbce3654eb3677dd99f929ead9b33e100cd5342e58d15b37497e0dc289f41195ba9e639ed2133a1be5bb81a25d6a4c7 SHA512 15b4068990aa5b52ed8a739b58ba102ce35f1e9530f61a1849e35d2efb9246acd4dcf73f2640ac08f247e40e19f9a796ba7a6e506d72ada1a15b09e4e49fc623
+EBUILD unicode-cldr-31.0.1.ebuild 497 BLAKE2B 9dbd1fa7213e0424f97c4c365fbfe5fe1f9e52a7008219cce2ab8cf3fc2b54e3f363743129f5b9db7b890a627738b2f842f7119e52cc2d52e438d2ee7e266e01 SHA512 74b59c4201a0ce17158eaa84bb0c9de3969849d7c368588024fe94319b18d1c761dc8d373d5ac1d0837fef930e529ab77e7594f3be3204eef7989413b5de06ff
+EBUILD unicode-cldr-33.0.ebuild 685 BLAKE2B af75e0169cb257d4773a985ff5134fb5c8f12afb36408b2f9517411390981183f529c7468f5e5c59bfb43aa192e24cd17de7b2a1016c7ba31484630c948380e5 SHA512 59d010a5f4ce34157292e4db4b48823124d37b7e5267af2fcda4084da5783356def38fb138d5b1bff040bbed12b9dba5138099141afd265c3fb6174e7906a585
 EBUILD unicode-cldr-35.1.ebuild 692 BLAKE2B d97dbe12a6e6f6a9df84253f71f65b2eed95851e56dc99d3a4b27ea63c844848cfb0d2b588841e056305157650d9e31c2a790772b5deba39e5dc973fdd93ec8c SHA512 6899ab659b5b52e4fa814efa6bea6b55669d3eccae1e97561bcedd8d74efcd007b4f3a8e78f8ea815614353e08442859e003a120bc18706e2e553d7bf16b0b08
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild b/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
index f055cf19ccd9..9f65fc0fd5e9 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://${PN%-*}.org/Public/${PN/*-}/${PV}/core.zip -> ${PN}-common-${PV
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
index dfa79d44c1fb..b85c8b99db19 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
@@ -13,7 +13,7 @@ fi
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index 1f0e45ff3698..299d3d618ce5 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -2,6 +2,6 @@ DIST unicode-data-12.0.0-UCD.zip 8410561 BLAKE2B 10d34faaad501ddaba6de73a126b8dc
 DIST unicode-data-12.0.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
 DIST unicode-data-12.1.0-UCD.zip 8410738 BLAKE2B b635b449a04f3ffed8ec7311064cf2093cec5e7ebf8ec9a52b753a1c9a3f50374bdfe41a4e3e61bceefb69a847474b086b24a43f7f02de7183474737086f869f SHA512 68512627ecb75520b354160216cc14622c0d5321356f03429a102f734bddf6859c4ab266ed15db177dcbffd76c97d13d90de9a4fc38b10082a0e58fe3c82cda4
 DIST unicode-data-12.1.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
-EBUILD unicode-data-12.0.0.ebuild 780 BLAKE2B b5b302e0a4a6179b4653d517e23abdae0c093d2d5e563ff3d6a413aac3ceae7e723525b8f344884277e6e2549151519089911035cb1904b7273bc2db6cfbd669 SHA512 5be16633e018102c1eced34cb8c0bb57a509b276bd2b275e8e40972f3c8f0ea6f82717a5d98eda499ccccdde312a54add0db34bdc7ea4212043e2d6fc3027369
-EBUILD unicode-data-12.1.0.ebuild 793 BLAKE2B fab2098bcc5c34446b048cddeba1bd970a99750ebca3597159ad0f2cbd6cfa745c09808a5cf4c5078984c40761d6fef278dc72430fe004d90ae5d74ffeda4e34 SHA512 33d7b60d03ca917850900b980dce4a2b1e9798466ccc5075d3f467d233ee6288b461d6b3d1efd0feb336c5d1b72f3eb4705ad94dc7efe2f01b93ccaaf2de96da
+EBUILD unicode-data-12.0.0.ebuild 777 BLAKE2B fd8806e48c3c1a1368dd4db416a7c0b8e85819cb0174b250932b0258b8b21611401cf31aa3575471888969fe06b621f4acae03728d6ec6976ce12536fd295a55 SHA512 15673e33060bbc37eb4da94b7887ebdec3c0641e08e05b356dc29a776948c36f1c7f2f9ef9280c948d63abd455059854ca44889fdf3d5c054362b6e767c7f1fe
+EBUILD unicode-data-12.1.0.ebuild 789 BLAKE2B 53712a51a60f329af8ae58974407987407d6a4245c1abd44a4e795a80a765503a41423f7fa8ba8d44c86de19e314076fa31469f9a5a2701cea3f9a6e148b83f7 SHA512 abc12447244d4c387aaa3803405b57529a391b96df8a66b79abf54565d64dca65055fd1dc70c617a327af7235f21135e3b721502de145ef8f8165048705a3056
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
index b0676279deff..d61241208f21 100644
--- a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
index b4b5023a9867..77cce03aea3d 100644
--- a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 2e4be346552d..d522534de978 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -13,7 +13,7 @@ DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc
 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-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
-EBUILD unicode-emoji-11.0.ebuild 998 BLAKE2B 3c1e2b8e4f8543596f242046362827d4fb448e81aa3cdb10841ad6fc06b79c0d41228b0c32478beee88e73c09158c84141755a6e151af6a1bcda3f23128d30b2 SHA512 6e2dc540092240c196be2750cf032b102c30cf3142ae81ed6e93cc360c67fc8cbac4c1449255bf14e510f4b505a3be437898dcf4e81c3ae97e03e6cb23b0fd6c
+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-5.0.ebuild 880 BLAKE2B 08d91ce21e632d7a1befe8be1ca4495ece3e56d38d9bf2f062d086ebe10c0b8db89d021ddde659f0c1a383edfae80bdc5becbcd0ca37c7edc158c1d93ef8775a SHA512 b23eae90ba1df31c6965028ebc6d9b0f3064cfdb16f1069a7774e20ea61780bc4b4c086113f45aaa7e5aa00c4501782ed01972186cb5b753b61d9b33dbc328c5
+EBUILD unicode-emoji-5.0.ebuild 881 BLAKE2B f68d27e7ea5db9ba81eb9a55d8c44587a2425f7396d43d29e3196341567b6b420a86bee4f7b4a61ed35702a16745de11d2a69514f1015e1a7b3082c02e210cb9 SHA512 fb8676f2643cf0f54fb1a2af488629b3467daf31098b1208773293e2802cd7c78f9a8cdd3300028ba9186bc34c95dea7b16ff6fa8efdfb02f83fb3fefbe22c17
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
index dfc2746a39b1..8939ac8ffae5 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
index 88eb81f4ac53..9cc4bd6649fd 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN/*-}-data.txt -> ${PN}-data-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 S="${WORKDIR}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-i18n
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)