gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-i18n
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
66 files changed, 321 insertions, 391 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index c0624175edd7..17e528088efe 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/bidiv/Manifest b/app-i18n/bidiv/Manifest
index d6ad13178ea9..c86bf5abf483 100644
--- a/app-i18n/bidiv/Manifest
+++ b/app-i18n/bidiv/Manifest
@@ -1,4 +1,4 @@
 DIST bidiv_1.5-4.debian.tar.gz 5863 BLAKE2B b91f6756156815bd12b6c6e56a058a63db5be805cab2c5fb29e47f0e66bf8ba8638bdca2ed83c63117144c2f9912ed4ba79bb1b143f3bd2f6c4fef33397225e2 SHA512 63e998cae38e08181cf4e40a54119b9b4b5ab3ede7fcfbf852a1a7ad51a671d14d4094b3af8b89574eef51f8c6ee34f2eab6242bf69e77d954826931a801e8b1
 DIST bidiv_1.5.orig.tar.gz 13865 BLAKE2B 9f289a2674b3d5ce895e65f6068252d78eafea735783ca8947be446d0830166708474fda041bea85adcc8930ec615d68978d7f8151afdcd645640b9941be009c SHA512 f8ddaa4a7ae6e7b723eb6e4f5dc91bd2e189c02e116ecd1fb02d300f12e913e9dbf328d65f40ef8c2e7d8e822d1a612966fe0f59f44129fd5dc7ece26c021cc2
-EBUILD bidiv-1.5_p4.ebuild 1110 BLAKE2B c7d76c8af02b97eb3afb7bac40f51b7570a8b98418355df6ea9c39efaec1ef6af0ca8ba7ce6d4d6a8d6236db4bd6669681ae7892b5ff1b2de51fe95145765d52 SHA512 64ce715b0dd99fc72a64fcd96f04e105a200352641f5617763c3a5b9457f8b16d604553dde1490c816830dbb518af0d8ce9efc78e1030b1f792ad1aef8cbf060
+EBUILD bidiv-1.5_p4.ebuild 1111 BLAKE2B b82a36dc284405ad69706e39d827a1a4c6078d3d5e9aee0b99ab43f9a726edd9f31709fc53dc33db426a27d68e44c008eb36bb3d4662b4def252e10f8a596984 SHA512 6402f94d789f7f06a78dcffafc9e47c40c747add99b7991b94290eb5d71776a4f7a74fbab55e2edb7513807740ee5087aeb91f9bbdfba702b9f3dceedbd1b9e4
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/bidiv/bidiv-1.5_p4.ebuild b/app-i18n/bidiv/bidiv-1.5_p4.ebuild
index 73aafaeb98cd..4a6b745cd10c 100644
--- a/app-i18n/bidiv/bidiv-1.5_p4.ebuild
+++ b/app-i18n/bidiv/bidiv-1.5_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND=">=dev-libs/fribidi-0.19.2-r2"
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}"
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index e35dac2e06ee..5814554c46e2 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -12,5 +12,5 @@ AUX update-canna-dics_dir 1101 BLAKE2B 9b429c2ddfb0e3c2c8a754f7fb61b776abbb809f8
 DIST Canna37p3.tar.bz2 1263065 BLAKE2B b5fb496c0ef71dc57b2da1409eea2238ea62ece3286d498d694bc7a18cb0f5e052dca95d692b4302988acd2199d350b893ae4aedc91aab0b737c3e0675be9cba SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
 EBUILD canna-3.7_p3-r1.ebuild 2264 BLAKE2B cd59e7889883924274c75eabaf64ca6264456b4a0218a6e326e038d3bf7dd3df3b79679118db7a4d09741f56fcee3c19e5edd3a8edc4bde6eeaa4720c34d839b SHA512 dd51d607cff4107ae904abe906e5d0396e0bcbe53d3b1df3157680b56a95cbc336f96a006cc7ec9498db4e7dc657808749b42b549ffaa4aab755d1c5b0f87b6d
 EBUILD canna-3.7_p3-r2.ebuild 2893 BLAKE2B caf22d1d8914257992917784c03f173446e3cfa0c28aeb55a9007b07d053e33d9cc574d4f55eb253954442ab8c6f17805bf72c04113b36874a6693fe690490a2 SHA512 8c5a7660f2be089841953914fa8863d0ba9190b88c23d8266d5181c1da9e17f313e36b4448ec8009a65802b203d69c72428a640a3a2e0bf01049dffac3f12bba
-EBUILD canna-3.7_p3-r3.ebuild 3300 BLAKE2B a10f4c2fffc415844770a40b10068a3cf6f9fa1f8c59ee2334b87920cde1fdea194c8a791e25e1bec1cb390c1731ce8180f08c4f36344f77b08826d9275ff76c SHA512 bc9183a986cf26f7283fed6736c5eddb7e697817f67cba307322450c627ab401bec9ba87541c641fc9dafa259a2ac4b54df2a2a5875f4618e7fe59bed576db90
+EBUILD canna-3.7_p3-r3.ebuild 3303 BLAKE2B 6fe3d13730d9f125f8458e1668cf8bbb54624d6972f5ff0aa5f8ab7f715650950be720c31490d8b7ddefcbd11dd56cc90b5622ee41c4e429ccaa7fe06df6d05a SHA512 7ed105d416e17c8ffd56157e50540f063e071d512e60e7152a0b50169ad0da310ea1f8a1b3063c2ac8c68a2e6d2060650f1971f6bfd6de61bbe5fc83f05fbee1
 MISC metadata.xml 383 BLAKE2B 2947ceefe007eb9bcfd46a69a4b97a2406383931cb320cb594b96952697378147824461f1b55d5caddc419b19aebeb1c5ce69c0f0d31568cbbbe3d1d15fba9ba SHA512 8affc10d697147ea5430d73c40eb4e7621ee9a06d444725566d4e16a28ccab4f53aed3025905894fe6cba0ea874dcf0d2d583d3dcedf3a0ccc8b139af02e5e98
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index a2494559aaaf..5550c3d89b3e 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (
@@ -65,7 +65,7 @@ src_configure() {
 		cd canuum
 		xmkmf -a || die
 		# workaround for sys-libs/ncurses[tinfo]
-		sed -i "/^TERMCAP_LIB/s:=.*:=$(pkg-config --libs ncurses):" Makefile
+		sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs ncurses):" Makefile
 		cd - > /dev/null
 	fi
 
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index e61fb5c20623..8fe1924141b3 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f
-EBUILD fcitx-configtool-0.4.10.ebuild 837 BLAKE2B acf5e7b715031125db579e07a887d8cbd2452c6cafe7f35c3579aa12132853806e4efe21d5b7013ad0727c49fb16f37b55fcd53a3f54dba51c6547c6ccf15881 SHA512 dde980fb55abc939c37b5d2c15d6ea6a79fe12789752d5bdd0bf3fadab58fdecd720f4f9baa31b520c61b42511d2d4d1ad42ef3c0d3a52a606064df754c07e35
+EBUILD fcitx-configtool-0.4.10.ebuild 844 BLAKE2B 00be69c6f35916baa58dbcbe77181c9992b12d4c94b8e83adc97f3b2f6bfc61d5e56694e1127be9ed8f775a755d6202e51b0d6315e1e1333effff5c6426e24d1 SHA512 37b70b8381dc84748a173402fb9396b2480e89680083354f1dca436df44ab5f3ff656d54e5b06cd51ec008e316230bbb4d0bd71e36918a901c6f343bc4173de7
 EBUILD fcitx-configtool-4.9999.ebuild 818 BLAKE2B d034a75bf15f37b71243d5d1c15a8ec6114ca559d715101f031d434b1a9478c39298f95b022c7c4f8cd08ad2701eeefb4cef628a4795f5fd15567723b0c71362 SHA512 42b150975f7293dfdb67c6d6479803526438adc80032adbaadf6f03927f6adaafd4469d145d07a21f8b929cba6eddf20e21d2374085c8791d77046ed0f496659
 MISC metadata.xml 469 BLAKE2B 6ee438af60b172c821bf75da2da0586ae55d4b8538346719d08fd3d53919ef8c5d87b9059a2c0dd20ea9968c734db3c03c7c08ca71abac0491499c616ac2b5a0 SHA512 7bfc73979cd6f7384776e8e9f1de18aacdc4d4b74b1feb1b2be8373b4f999e1756d7bca20d49616dda6e39033dbf5dbf7795baa392523f88f0fa6cb321354c43
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index f7411584a948..940ea21df73d 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE=""
 
 BDEPEND="dev-libs/glib:2
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index b3e9f15d4fe2..fd46783294f5 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,9 +1,5 @@
 AUX fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch 859 BLAKE2B 6dc1a1d4b942600ec953cb18134a9e5fd9a812af8eb1629f942edd0e2a927596eba3ca276be1228d09a2ac14fbb4735d299473e915a90644fb869d979a10283d SHA512 39657019234402ee385667dcb8071209502d4b8e471bdff7fa13980afe2a358891d78447fb95d0f2c14a5aaccdb878d4cc8b9e95a85bb9c22cbdea475523c3a4
-DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af SHA512 e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3
-DIST fcitx-qt5-1.2.4.tar.xz 107620 BLAKE2B 3577555192d2eda9e48fbd31149100f0d21fd1b0b7d162d14cef89818f86d5e32e2bb835f4f47acf150cfd0b0fc506031454e4ffe1315424314fc7512d391f8f SHA512 c9ceaaedeb26ac4c7fa1e0bf34096725afc14642b795d9c624f4fc7fbf56c04acad12d8d3ffb60c164281b6373554c0524e56209a2d1d123fbf348d15dcc282a
 DIST fcitx-qt5-1.2.5.tar.xz 98604 BLAKE2B 07f3d62c3c47e5ce0805a087cc4819dec44d8038cc428a3f9b39d640e409372eeaf0f8326a00be8b4af1ef6ec21870dd5ebdabfe39a2cf92ab9cec8c32be059f SHA512 238ebd02e4b07a1bffcbf2d1534492589bce206c3bce0197e075e8cd3f1b16a2867b5e9beb3bc2a0a5e9391acbf20c07d4d5a35f1550b4e71ee663712a8d56c6
-EBUILD fcitx-qt5-1.2.3.ebuild 953 BLAKE2B f73f95dc706619866904fc03cacad15b13faf7a5e28045d2e6e5b72dfe1fa04d979406dbddf02bc62499466b7ad804462f806b4bf0dfc76df045fabce29cd0c8 SHA512 eac8c0ad2a284f54f6487ac203fd29f1fc63b2ff6c8e193cccd9ce92ad182eafe68e8aa39c2686dd26fac4ced569933b32ea3dd286560f3764d623891e5e0edd
-EBUILD fcitx-qt5-1.2.4.ebuild 957 BLAKE2B a126752b8b2e5233f31eb1387a2537b6e87a9fd4d2c10896c756447e36263b067dd7e2628c7f3dba93a5ace3bb4471069c0876fc6025e79591badc190fb8a4c4 SHA512 d3f8568e472b53e2eb7d918ffde3f280f4437074c6e184776f4c240191a37b5f2fcb67d42a03750374a517de7aa8280cbb92525696e7006b06c3d163f5156344
-EBUILD fcitx-qt5-1.2.5.ebuild 1029 BLAKE2B abd2326715f7a239efb1d517dd52e4cade3aed14cce3c330f31b6c232670bada43a64a1d5ba9ef4b6f0add1fc5e31cb880548c92f5a7ce583c79b90745dcdbc6 SHA512 ea2c0ef63d29912db710f29a0b5b2f985d86a973dce1958b1695b58a08c31d0266dd359edd72f992984a3ff2fa8ae7b239431a037859fed3772202ba2b213215
+EBUILD fcitx-qt5-1.2.5.ebuild 1036 BLAKE2B 26032825d5dd23cb39131cea21bf6caf7fcbb6320e0e02bb859c343c4cc585d7c520311a7376aba379f8863e938b4532baa68d39e1e444d711a3c38b18ca7e94 SHA512 b22e0c9ae346a80890a277b8445186fa8b998acf5a6102dbbf91f348de57a9b48013bc3330187ec269fe8e9c6c88d240574e671b371970801c697eb00bc35f22
 EBUILD fcitx-qt5-4.9999.ebuild 928 BLAKE2B 5967c2e2b9ea9fc3accf378978ad1c5d29d452502c8614ad70feae710fc72266f1974850871bd96ce522ce6b27c4240afd805a461528a165a969ba1c9af5cb4e SHA512 25a3395f1309f09aaace89cfe2e38c7693108b8b72891994d73f15a847c8a9e5c38a0a686890e50ecd0a98a8580d6a1c7d99deb149e6ea8e4c4289b1a1fd572e
 MISC metadata.xml 462 BLAKE2B 7a233fce87fd36fe60e197aacd130b79e3f74d2cd2d4080643c3f4382f3d890806ac31447188a6d914f79932363c0fb8c04f3ea09fa2767db181f06e381d8a35 SHA512 07d45d9e7d3616dcdaae37f59cd100f58bdba0da66a13122161a154dd2d7a2f5f5cbe7c13c2f9c673314fd74bebf7314966853fcd1be51e565e97d9f96063a4b
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
deleted file mode 100644
index 1699cf4ea4aa..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-BDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild
deleted file mode 100644
index 610eb112d602..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
index 6b458b4252ba..ab3c7cd48900 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 BDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
index 0b9258d13b4b..273e8fd43164 100644
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -7,5 +7,5 @@ AUX freewnn.initd-r1 306 BLAKE2B 2c5eeede614062832ce9d799e228a7927793679aa129151
 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 1094 BLAKE2B fd08da40b66067c772c69d92ab54c447a327e30b68c2b3eab9e7e867324353eecd451724eb113ea17a5c4019ada0b9a6cab82bf3238f1263ea9772edabf2c53d SHA512 1b3adcf1bd793b8d8d72b1b5c50056cd282353e301564f13c87cd4a486cd13aab47a1b86d15c406e1be9749b63eb7d2b0fe9bd2f5e4f5d3a9b7a902ed5313f3b
-EBUILD freewnn-1.1.1_alpha23.ebuild 1559 BLAKE2B 40ccc0185b58a2bc9fcea76b18d4c65a00b5a6e3288a3122237cdd8f64492cb7290d9237c2edb5564e0bf59657bd126a1e8d58a0559601439b9ba86edd022ce5 SHA512 026e644beb3802f78787b31ba6577ce89b9e376460e37eb5c7e0fd05d004a7fbd9f87b02ec589804094a172d0c33da30bbfe86ba8dd7c19efec87073eb9322b5
+EBUILD freewnn-1.1.1_alpha23.ebuild 1590 BLAKE2B bd8e806952d59512d9b94fc5897790beb72268d4f5c6bcd59b2cf8b690beeb26c4dedcd0f9fb03a7f13db545ddfc518bc59e66fbfcb454175d385e33988a0cc1 SHA512 8b31138415ee17ef2339e033f1e0bbb1979c616f5dacd077ccbb677a04e15451c830c6e8fc8b0d0da5770c26a02641b494e27993ca3fee7e67ca6bef59793829
 MISC metadata.xml 379 BLAKE2B 7944902387626d8b50d6c99d570e5618d35d5b271141143b635a11808cf3ecf52be22e18304709f708d89b2b88673790379ea4129cc4bd3f303c94835c067023 SHA512 ccecd3e1a8245d6ae953997d87f6daa127eb1759f6f91b866c9cc778a11289e3f72ce671d4c62032210568a7a915387cbcb02bb7b7284d515bb20e4c02bd8a6b
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild
index e6dae1fef125..70978e2d84fb 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
+inherit toolchain-funcs
+
 MY_P="FreeWnn-${PV/_alpha/-a0}"
 
 DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
@@ -50,7 +52,7 @@ src_configure() {
 		--disable-cWnn \
 		--disable-kWnn \
 		--disable-traditional-layout \
-		--with-term-libs="$(pkg-config --libs ncurses)"
+		--with-term-libs="$($(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
 src_compile() {
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index 46dcec56e0a6..879625e12761 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -2,5 +2,5 @@ AUX ibus-pinyin-1.5.0-content-type-method.patch 5534 BLAKE2B 658a4d099b02b344f38
 AUX ibus-pinyin-1.5.0-python3.patch 2983 BLAKE2B 35f8b1d0649a3614fcecec78b3246dcecd8b40f68d71165b2c40d802bb42bff1d8f3f4c2c1baf25fc6ca97e190f7eb2004054f4d9857b605129b45c41b273f52 SHA512 c9eda6fb227358c8214ba717f6d800f3c47f9110e99e16601966651bd698cd703daedcec82a2933b76701bc05870ff88715a6d639333b5e5959c1f5e86e2dcff
 AUX ibus-pinyin-boost.patch 409 BLAKE2B 5fececc7f4ed6941d374799ccdb1d9d7deeeb7078bedc8d0085e12f8310c42d752c14168a7d07a88e9412fa9cbff5c5bdf4274202d2ed6b6e7f337a96c65c3f0 SHA512 8e4efe9b5d12d35672dd8891a49599bef6611aeb723e8fbc08197896e417cca1d55cf31a0bb1f3ec572db489b01aa36349eaf9238d1a693483d6e21bc10eab2e
 DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
-EBUILD ibus-pinyin-1.5.0-r4.ebuild 1304 BLAKE2B eeef5a07476794e223c861c1c2723a01b906eeb8dc78b8845d7337d70320cbe680000c2b1d864b087b22ef27bc0db7d52f296b27ab9bf6eee51571f4e87ba759 SHA512 7cf93f1bdf834102f29b92fe1d534b2eb1f651a31247830bd7eb19d22103da392be71452852ac1b0e69193100df29a3d6ff911ea5f456da07489b6b1e7a7fc98
+EBUILD ibus-pinyin-1.5.0-r4.ebuild 1315 BLAKE2B 16458502108b394c2220e45a414fd9ebf4118c6404465075c7f207621842ad7c93c25adc8a3a26a3d01510af059fadc9fbf464807d88d9bd5c639e1d2dfca5ee SHA512 55a5df6eab4870836034473e72c9d24786fae1991bfbe1464fac57d66e2bcfab2bbb8b3efb36faad0a39392d59caa703ad85305e1590895b1434138ad408da7c
 MISC metadata.xml 524 BLAKE2B e4e6b11896bb13e6a6578cf560db7d0ea592af3d129cb15b9fa2302f259ef3fa9e78faced298bb2d1e0b8c8eb763607c84f0fa87feaf2f319607a4565a3d14f1 SHA512 cb400bcfd3a92b0adde9301e1c8c9b4f3251307d351caca6ece541793d24763431d1b67c35a191a28affd4543e3b4534d15c5a573299659f29edc8de26fb441e
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
index 4bd398081e52..5344bb6d677e 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,8 @@ RDEPEND="${PYTHON_DEPS}
 	boost? ( dev-libs/boost )
 	lua? ( ${LUA_DEPS} )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	sys-devel/autoconf-archive
 	virtual/pkgconfig
diff --git a/app-i18n/im-canna/Manifest b/app-i18n/im-canna/Manifest
index b15fb209561b..a0ee9655c1d5 100644
--- a/app-i18n/im-canna/Manifest
+++ b/app-i18n/im-canna/Manifest
@@ -1,5 +1,4 @@
 AUX im-canna-gentoo.patch 912 BLAKE2B f0f8b62ac935b8f0356d96dc0dbfdbef990c1e38e4765ac0715a34749dffae1c57961a5b4e99b58e62bf966ab1b3ba21633fa7e9bf7065e800488605c3ec5e1a SHA512 5b9c98b3495bafcb9eb31d431abba0490817518c9804de6b09d6287d5e45540bc78d27d1be2496bcb1c6435db28666adc9b5b3967195399d57576aaf79da4ecc
 DIST im-canna-0.3.2.2.tar.gz 314633 BLAKE2B 971ab1d00645a0bd977a156abd6a1d3ad767505b5bd45792332a399685388b53b08e3133bc435adb7a7e27125fb1ad2d538f78af2420679c6d6d17878251b2ac SHA512 6ec4253038ca97e3e6319c024e4d11ca5418bf478280c4b19b81a9c628310a06bcd4ec35334d3a2bbdff0245bdfa660c1cdfd949ddd6b768d3b73d78648edc81
-EBUILD im-canna-0.3.2.2-r1.ebuild 770 BLAKE2B 0e61ae82678cf080a617fb2860b293fbb1d7374178f51272391fdf4edf955a13a4285d37ed4f23c75dabfbc16a4f3c78b4c590a8802608c04eb8e3849228bb67 SHA512 f3908c519bd345ff1d2ec54868c4ec53a6dde1269b3d65f38325e7104a4db1dfcc3becddaa6f4db2577505ce808e2292baf369ea5bf26191d18cb501d5ea8ffa
-EBUILD im-canna-0.3.2.2.ebuild 574 BLAKE2B 992152864f9e3da4b70efd9a6b690a52f1b835981941b9c9765e5eb8d68cc78a277413268be0b9cb2dd1f350726b169f766203511ac1a9c67be25b77b2274259 SHA512 e7a3cff5ef4b13d8348cb092b2eb50f67dc2f39a4e5757e383010019b488ce146d0380ac26a2e5af11c999a2c4c96939d8ccf5e708d6ba6048e11df597d483cf
+EBUILD im-canna-0.3.2.2-r1.ebuild 757 BLAKE2B f562faa7c963e8ec96d2d1b90cdfe60793785f218c4be1677323712c3a963ec3b95acd2035f83d38fcfca5c41a8f07ac84277c2013dff0c1e646658f646d83eb SHA512 bb675ddc3f94751196cfd1c266a381c1d006b3bfef6c19ec4134b2a6e9004abf5f63585d26ebe3361bc190ef346a9982867b3e7dfaa16552f8b6562c6b334c68
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild b/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
index 673a3b973445..fbbfae447fbd 100644
--- a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
+++ b/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,8 +11,7 @@ SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+KEYWORDS="~amd64 ppc x86"
 
 RDEPEND="app-i18n/canna
 	x11-libs/gtk+:2"
diff --git a/app-i18n/im-canna/im-canna-0.3.2.2.ebuild b/app-i18n/im-canna/im-canna-0.3.2.2.ebuild
deleted file mode 100644
index b979ded7fff9..000000000000
--- a/app-i18n/im-canna/im-canna-0.3.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2-utils
-
-DESCRIPTION="Japanese Canna input method module for GTK+2"
-HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
-SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="app-i18n/canna
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/im-freewnn/Manifest b/app-i18n/im-freewnn/Manifest
index 2131161ea5c0..82d20e12304b 100644
--- a/app-i18n/im-freewnn/Manifest
+++ b/app-i18n/im-freewnn/Manifest
@@ -4,5 +4,5 @@ AUX im-freewnn-headers.patch 511 BLAKE2B 13ed6574b9a6aa29db8a20c9b2deff0b0374ad2
 AUX im-freewnn-wnnenvrc.patch 367 BLAKE2B 5225eceff814d61c2f864b5f8316bb0e902eca4c5d606f724a0bf3ad12b3ce0f0a54af28c4112378a47f2fac3028d9d2fca362f40a20d62d95f656130043dc67 SHA512 0a8e506944d537084a6cd6efe7c0e7583781220e38fb17f164ba7b01290bbe59a4db04a95d2d72299dbd5bc2d9ff2af036d00101c6ced1b593a0a20b98531df7
 DIST im-freewnn-0.0.2.tar.gz 322963 BLAKE2B c089688a52c86cc8c0050987a17d294365e29ef33e70258efaad719876d079e997a7255b86a8b23b6c3bb2c779702e6dd8d6eb9825943f9a7034757ac27e5e51 SHA512 c942d320433d0b1ff15fc1566eff183f5761ce14cb0575834f4ee80504be6d286068203c22ffea81345dab3db11a873f0a559b3d38ba8505f4966f9532a06358
 EBUILD im-freewnn-0.0.2-r2.ebuild 878 BLAKE2B a3707432d6ba6a6333dc10331d644b0f33c169256f5c33be41b2d11b693de00251da6871eb716e312befbe0c78b8b533d8a3384f3be1945981bc4ec858763dcc SHA512 4e1e23279fa65a206e0c5b23aef2fe41b448651f616d6df180ed47c7cb501c73865b6e7c91516c6d7204a84652394c5a8aa88d814079b71f347f2460fc9437c2
-EBUILD im-freewnn-0.0.2-r3.ebuild 880 BLAKE2B df2099671864019b883c0e8eb795d0c295c1d407fee85256ef68e446bc22d588ab7ec0f1027eef31d97fe5a340e63b3f8e32366ee057af1efdb66a52f8587407 SHA512 e8dcfc8acd4166b14644e61a7ca5b363bc2a03b8fb1cba26eb5f3433ac8ec64baa9a96487041eab7e9a9248fc9684b3b65349f2840f918fc2ba159eb3c1590b4
+EBUILD im-freewnn-0.0.2-r3.ebuild 873 BLAKE2B 3da9c0075170e3cb46f73764fdf9399ff0bbb76491e5291bdae2ff0ee398174db083ce3be4a027996d876eb60c3806d110b5d9343f981d44fe2bea38fc2e5e32 SHA512 55d87b9ef55fd455c26d0d5bde019770689cfda3ce34ef1d9bc4881223e2d31ad2abeff5ef14c7ca5fd88f048fe7228573ec2e3b402b434c1a0dadcad344acde
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild
index 9057c74300c3..da6fb572c71a 100644
--- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="app-i18n/freewnn
diff --git a/app-i18n/imhangul/Manifest b/app-i18n/imhangul/Manifest
index c580b0f442ea..4c7e277cd7b9 100644
--- a/app-i18n/imhangul/Manifest
+++ b/app-i18n/imhangul/Manifest
@@ -10,7 +10,7 @@ AUX xinput-imhangulro 50 BLAKE2B 01b0a4e625348fc9221b2f52d10288befbbf71774e34060
 DIST imhangul-2.1.0.tar.bz2 268205 BLAKE2B c45cc3e0919c695466f7d09c20c3ee5ae827865b6c3093746f8435bfb3f18da0cf94bc4225829dbafb2f13fcd1da0ec4a696adb966bff90285c769eb36232c4b SHA512 ea4621c4e0e5ed1786e644b577bc0c9f3dbbf296f938ddb2ab04923d8147e01123e10e09a61484e30c3ab0ff51d86da80a93bce583eceee207eab90c27df5f8e
 DIST imhangul-2.1.1.tar.bz2 288452 BLAKE2B 14aba1fb582edd735d1469b2fc1c4b576c64f073f525b30a3c5dd681b82d07f7b2960a63c388dae47d93855f25abbfbb2a48b032e5509239325db1cd05ff6b5e SHA512 5db3843aec698bd6315e4c76f3d8ea374b5d985ff7ae8a3d05861afb1d564ffe274d56fa27e8f669884016c50d5fc1850984050d93fdee944c6f7c3c963c96f1
 DIST imhangul-3.1.1.tar.bz2 288236 BLAKE2B bb762481c98d8e4d3e1f32629802320fbdd6ec2388e9d7e9f1838fbbcb05f247549dc2baa68e6f4ec626f32b1911b5dfa89810e64c9e826cb1887400bbe11e71 SHA512 a27fb34a826ceccb16e4c8a422f5571c7c6a4c253cd2a55c1025b0c22500a380a35a8703e9f0f6300fdc92544e1d7b59e33f11e059b85754b1619698e0f74d89
-EBUILD imhangul-2.1.0-r1.ebuild 1291 BLAKE2B 0a4b3e83864ea6ef927e1ebc577151a4558bc47ae271900ca1b28a421fb0dc258ac8d8147f1066230f38e42cb8ec46eb41efa5aa071fb7a72f017e76ed9c5e40 SHA512 db267904dc583fdc1315b9c6b2a2f83830339445d73cea8aa96c9bcc7d943c4fe6b2a8edf622f915165c1b2b6b6c9c9c889ba06f61b6e7dc17b859497f690e50
-EBUILD imhangul-2.1.1.ebuild 1294 BLAKE2B 96091c1c23102af68dc5d290d37c5d2481aa844982545d75c553e296a34e3a8b57ff00423308f90fe13387653158c5098a7d0c955bc4ba05bfcda9164ecddead SHA512 9c3922e9b1c6d5d961395f9bd841807a6030496b1fea388d2f8cbcaf996ecdfb569c383b01019e4182ceacd4d9264b861f246eac648cc783393ec3ada6b2953f
-EBUILD imhangul-3.1.1.ebuild 1294 BLAKE2B 6d026d9d0fd3a236926f7f96ac24519d6e29363a4eac3995d6025bad9095ea766a00af77e0783e85a17c5ce991538c31be0991a41b798d8104e5b1e8ea77d2af SHA512 f4b223d4b4cebe18e0b552db798f4a15c5aa27d931b797241cf5bf597d00fab6793691465856c7bfe327eebe8cd73e63f5ef93d2d854a75c778ce5ea404d51e7
+EBUILD imhangul-2.1.0-r1.ebuild 1316 BLAKE2B 69126f747d8bfb63a7a84bb709c670d9c367334ac6b7878540793e1e6609887e3b80d2bcb07cbd2029b420113d4f485dc952d17165b9adf5aceddff222e5d01f SHA512 b15817264f7f780ef0bd952cd86a4b36038d10b96bc3e093bc05af8c4a5752b56688d6f9a2efac33dcd3ae45fea551707fadf092a8dcb063fb0a620d92517859
+EBUILD imhangul-2.1.1.ebuild 1319 BLAKE2B 05095d8ec85c6116720f41100c94ee8cd83e7852e094906a63dea652170e55657e58f7f32d177456046bf957f91a7d5354367fbe808bc73b0d72bed9dfd6c720 SHA512 86b23e2ddbd70b6a0c07f89e45e672fe9f940b9f2fd313489fb8b98f80847989b8d16f09828c9923b3a5504a34e2674ab2d3f26f55cfe4103345021f4889fe6c
+EBUILD imhangul-3.1.1.ebuild 1319 BLAKE2B 6f6ada7d0d9fa00447fbec8012178f0d6317bb4ba93786f29a5248d3df9af02bc4c709886f2b4fb63e2c9082df0fff7c57a205e959c81632c9c51502ac175320 SHA512 adf94976d571b323fafa899f89285a67a6eb7d69e59094c2336c49b9315530154232488d07ef9c64c3feb9ade5d703af43477393ef05e23df6098a2709ff758d
 MISC metadata.xml 370 BLAKE2B 3376831ba7380688735a4e50c6e60dc545d34867163bb9191ea4ccd4dcbdae9d2e6e8eb0429195fb7fcafc920f95ff653553f4661e4a08d8d6f823838e89b2a9 SHA512 abd3a62a28dc9405ffa19aad3a8b213a906eef144f10ecb5bc5632d5b892eda73d600c70e126975299fffeeb59ccf38c03b4abdb36fb5e5870130b4453a27b39
diff --git a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
index fa3a74b4b503..22f7c57fe635 100644
--- a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit gnome2-utils
+inherit gnome2-utils toolchain-funcs
 
 DESCRIPTION="GTK+ 2 Hangul Input Modules"
 HOMEPAGE="https://github.com/libhangul/imhangul"
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$($(tc-getPKG_CONFIG) gtk+-2.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
diff --git a/app-i18n/imhangul/imhangul-2.1.1.ebuild b/app-i18n/imhangul/imhangul-2.1.1.ebuild
index 6c217abb020b..bce95ecb2cd7 100644
--- a/app-i18n/imhangul/imhangul-2.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit gnome2-utils
+inherit gnome2-utils toolchain-funcs
 
 DESCRIPTION="GTK+ 2 Hangul Input Modules"
 HOMEPAGE="https://github.com/libhangul/imhangul"
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$($(tc-getPKG_CONFIG) gtk+-2.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild
index 82c47a857350..27ef02936dd6 100644
--- a/app-i18n/imhangul/imhangul-3.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit gnome2-utils
+inherit gnome2-utils toolchain-funcs
 
 DESCRIPTION="GTK+ 3 Hangul Input Modules"
 HOMEPAGE="https://github.com/libhangul/imhangul"
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules
+	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-3.0/$($(tc-getPKG_CONFIG) gtk+-3.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
diff --git a/app-i18n/kanjipad/Manifest b/app-i18n/kanjipad/Manifest
index e9463a954026..c995acb5c312 100644
--- a/app-i18n/kanjipad/Manifest
+++ b/app-i18n/kanjipad/Manifest
@@ -1,4 +1,4 @@
-AUX kanjipad-2.0.0-cflags.patch 613 BLAKE2B bae1e330b7256a81b0ed3bf79fd3a778e55ce8c21fe6a63bed07ed90d33383ff0c4b8edb5eb0f11e930d498ee302886fe8127162de5c4d9f4f9f7c1868c92aa0 SHA512 2164e5ff2202cd4314ee2d8dcc98f6d428748c3c62251c89daae83466a4a4b59bb08655d1bd98a5725569e680f1cfc25f3cd971919d3ffa20c78d38dd895b402
+AUX kanjipad-2.0.0-cflags.patch 550 BLAKE2B 532cf60ca9fcc38613b8de2cdd384f60f2c296f4ddb60e32da6928a58d760040e6b2ff70559e75bfe066d111b220b68805f33504d4bdf7ac951e0ca3274c32ef SHA512 eaa9a9ed6a2d221c5637b27b06808db74f69e47d9993da6579bfdd32045ab3234efe98af6732f1529865c96585153e8015731d207e6a03a01defe152ce55c7a4
 AUX kanjipad-2.0.0-underlinking.patch 449 BLAKE2B 2ff743dc0bf407a499b181295e747c1327361dcf5f0ab63f91544ddce5aa73bbe16b1acfe85c1b4aa28ae88268f32d5b52e87947686bca10301c21b30413852e SHA512 78c510337dfe2ed1bff81bbdd6195b6e76e97aac4b1a634b8cf29590eac9d70ddf7b720ad9fe6cfcb9c01e3697d3c6def382d8693902369a2be9531440daf95c
 DIST kanjipad-2.0.0.tar.gz 75930 BLAKE2B 032031a30ed294d2e1951e0cc123b599db2f34fe7ad7714200107644167e69b57e292ec1fd0af30bb354516a9eb27bbff5aeb4055319c98a690ed53ee002cc96 SHA512 66a38597358f97a9b43c3d1f4a9d6cf583b6158350131bae3b4d47edb167877def8eff4dde666c41549accb54c7256e08403985bb06d56758050a46d5b471ef6
 EBUILD kanjipad-2.0.0.ebuild 878 BLAKE2B cddc79498081d19e7b086ee4be2f6d3aafc41511d6395a4dd18f103bdd58f0b4dfc6bebe4a8fc5644e037d0fadef56dd6b2eb0aa33dae94c64ea6acc5e86691f SHA512 3a25a5ed9e2cfc17701fc58ae4ac9c8d51bf2804635c7bb045d585bd6d385c12d51ee34ad06bcb1a73b555c24d8b5eec60e133d18a23b7eebd4e312476c0a1c1
diff --git a/app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch b/app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch
index b1a6786bf17a..ba47ceaaf804 100644
--- a/app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch
+++ b/app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 4869923..0f7509c 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,4 +1,4 @@
diff --git a/app-i18n/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest
index bdc8c7860b98..f5dec9671c61 100644
--- a/app-i18n/kcm-fcitx/Manifest
+++ b/app-i18n/kcm-fcitx/Manifest
@@ -1,6 +1,4 @@
-DIST kcm-fcitx-0.5.5.tar.xz 63364 BLAKE2B e3b185468a4587c510e47bee4d7260d5d9ed27032174e3928ed3f008a68e8a4b9d124bda14a75348d65c41ddff2e39bb91d8a4f3663a81788850e5fb33740c8a SHA512 e6a7bcad10003a956389ee266cf6d2f3730dafafcdd0bb43de328397749775e5cd305f16fdca2365e246c903677dba042da81a6dfd873aa1be74174e2b0b372e
 DIST kcm-fcitx-0.5.6.tar.xz 63556 BLAKE2B 8518c454f15e5faeaab136c08eef9a7474537414485815e67ee26fcff815f6506769ec047158450a7a0f1843ac31616d34317e9de7bec8ee62fc81541134625a SHA512 a3d378ecd9ea9fa5bcc42c75e5b0b0ac2ba6c94fda93b7213d821546bb83b5904c75c2fc9482cd7b47fbf5ad81a0641b7ec345aa2e630c8795bf8d5b89f9cd3b
-EBUILD kcm-fcitx-0.5.5.ebuild 1263 BLAKE2B 06af9dd1cf4147e0eaefd80a71dde34f8099f62c4eb627bc8a40f665ecf98e422a6e75506ec5bc05366f2383cf8e2a1693b65cee64b6632a7c773358e9f22992 SHA512 dc5d5055d11dd5c3a2df6efc6790d274c3d9368fc96cc5b772f6cdffc224d3fe7c639c990aed551d7b9f5a8b0a03cd0a7a739791b9aa87249e4e497c41bbb7b9
-EBUILD kcm-fcitx-0.5.6.ebuild 1235 BLAKE2B 8539d5eea13ff564d0da5d4a44674d7410e23729cc210603dab55c5b0ddd966b2ba4d0def3f457a867fc190a51d9a9976eb98c7bc1f00b90bf74c65bcd727220 SHA512 c9e829291a8d2ada7458d3b1fbb82df2a2970519fa68f028c129c4012a068581e099d8581aeabf698cee78604dd3243b01405bce5f299ebaf9cd2c00c956a72b
+EBUILD kcm-fcitx-0.5.6.ebuild 1242 BLAKE2B 05e3e2d56c98f8180f7059d058348f26bed19822860ee7e69814af38156b1cf771d6fb9b76ae07853a9fd4d84cbfb6f10e2cb9045fb1721db352b4aa0a7b718d SHA512 04477dd3516116a388b2ccf1414ea2b75257e6f3efb0ad5510f7a85621ca601e6c7714aa3ba84c624b7ef4d1fade490aa207cc4f6959d3346d58202766e189ca
 EBUILD kcm-fcitx-4.5.9999.ebuild 1226 BLAKE2B d15fe4ee56ecc6ffec98601e0af3d1d122c32bc3e7b2257fba3727cd665282725ccb02d806e645579b6504bd560a132a96e20d4707866d126e31f0c2093ef666 SHA512 89b8471c0b1871088e4ac8e1d8cb773f2d05f6cfa3b51e5f87334a855c94c9ec1b084cad530abf3d7c820e358bf3eb24eaa4e91a4e3569bdf614add1729527a5
 MISC metadata.xml 462 BLAKE2B f57392fc4b8b85f1c5f17b4a3b030886e27ef9d9467c96c4a2b693133f6020737a61202553584efe42e0ebbb37944feb894d73ea62a37261e2a314e559785b88 SHA512 ec57180d4ab6589080d2e892a6f874fc239f6fbe67333be4e6c1ac5bd23a1fe8e9af56e9ae69c1cba190cd294afb5beb193d15392c4d0f6ca540e80249989eb8
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
deleted file mode 100644
index 8f420c466aae..000000000000
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2013-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx"
-fi
-
-DESCRIPTION="KDE configuration module for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4-plasma5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/extra-cmake-modules:5
-	sys-devel/gettext
-	virtual/pkgconfig"
-DEPEND=">=app-i18n/fcitx-4.2.9:4
-	>=app-i18n/fcitx-qt5-1.1:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kitemviews:5
-	kde-frameworks/knewstuff:5
-	kde-frameworks/kwidgetsaddons:5
-	virtual/libintl
-	x11-libs/libX11
-	x11-libs/libxkbfile"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:4-plasma4[-minimal(-)]"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
-	)
-
-	cmake_src_configure
-}
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild
index fb4c8ee97f52..0c4e4986e58f 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4-plasma5"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 BDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest
index 43051274f8ca..78cfc3721bd7 100644
--- a/app-i18n/kinput2/Manifest
+++ b/app-i18n/kinput2/Manifest
@@ -5,5 +5,5 @@ AUX kinput2-segfault.patch 240 BLAKE2B e8815bf5a3ca6b19fac492e51dea7faa98d3acacb
 AUX kinput2-wnn.patch 1726 BLAKE2B 034b74ce8de370d2088dbd77ac61f3268c5b28537619985ed1ad6896d011ddff31c1b9523f38681e8461b935b01239697606f3106cad521e5d1dc55922f1d760 SHA512 a8ea7756ca893b0bdd7d491c8e2a4187c5d34b084c567449597b8fa1d9fb9ae4437bedba9d771a7b88a3e621573ce6650243dfa5ff396bebb653cbf4b6f5712b
 AUX xinput-kinput2 121 BLAKE2B 34d40a7874ee79faff6f602bb32d705efdeac28a3d0a2bf89c68ba8f6e771eacc5878faf8347de171e813384e3bfdb113dcba7229ce1b5ecf6b1a293a6516b00 SHA512 09aaae3bebb062db82e8440977f58b9324e53262c6a9c95a276d305e87a2f9c0f9775077bd05c6ea069cceb6e45cb4efc4a6c412da7501b2b01825bc26799ec5
 DIST kinput2-v3.1.tar.gz 512177 BLAKE2B d67ca132fe3054d862c80b03b4665cdc5f4089745d848f6af9309b5896e0931182bdeefc621fad1cb8f1fd3686b07106cd6df5e703b3623f926cf83d637fa5df SHA512 5950f7294fa2bf915e6591290a3deb2c95f27706f3a180a084d14fbc008f3cf363b155b29c8103a8b999e44ae98182ff35bcfda85725b2c565f3e37f54788731
-EBUILD kinput2-3.1-r2.ebuild 1602 BLAKE2B fb1af03451d193f4a253946c72dda53ebd7c1d556e09b334b55d6d166d45362d596b740a41a094863918cfabf719731b54b0a5e7a04cec69f2a8b4f5f2ad7123 SHA512 6a4d1b8e7f2dd97cbfcf67186e11b05c5867c97ebad98ae1264b54a2b46bc2abae15bb15b69b27bfa5c2ffa049968408e0574dceafa97a66cbd1fd395bd868b7
+EBUILD kinput2-3.1-r2.ebuild 1744 BLAKE2B 04b183b6073c0a3ae2243aface8b6422e7fc8b0295ba8333f17eec89ed032f4f2586fe047a2f457da334cabe6e3c9dc3009b774fcc4d836c7467a3cd810e4166 SHA512 0a709551ce497d0b65e8b1c5bb6c2e5b3a3abf8f8a038d4846574874a1a83fc0853066d86b0fc9a8acb63523100c955065346a6410193a98032bdc24fe2e002d
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index 78b586f2ec09..2354479f0fd5 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,7 +28,7 @@ RDEPEND="x11-libs/libICE
 	freewnn? ( app-i18n/freewnn )"
 DEPEND="${RDEPEND}
 	x11-misc/gccmakedep
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
@@ -47,12 +47,15 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
 	emake \
+		AR="$(tc-getAR) cq" \
 		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
 		CDEBUGFLAGS="${CFLAGS}" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
 		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest
index ee215b1d1a40..e98094237b39 100644
--- a/app-i18n/man-pages-it/Manifest
+++ b/app-i18n/man-pages-it/Manifest
@@ -1,5 +1,3 @@
-DIST man-pages-it-4.00.tar.xz 349192 BLAKE2B 90f25e7abfd64d0f175c2596bc9203626d9e7e53218d579081d17aa01665be20ffa721e33379107814a57715a35f480bb1833a2d3965f4b86b3247bf70e9162c SHA512 6392b42254eba42bd76f3aef3b6206396a817019df61462e44bd0f7dc519768cb1b1107726c45e402a0cf27e6f2ca8c8912363bd9bec7562b10e8fd5dcc60ffe
 DIST man-pages-it-5.06.tar.xz 363716 BLAKE2B 57ac90d11a76217ead0f201ed4f8cfd0bc5f08b97662023a540f1150fc8fb6804980e6770cc7d707097d732645ebc9b3b85feb15736d7e925df2711a3f32ba6e SHA512 d4d89bba004265c70b6f0220b0172798677174e8034ece4a15c21432423ec904d0a3b7614987a165950c4f28af02c1b9374f536982771307b78617479139f900
-EBUILD man-pages-it-4.00.ebuild 716 BLAKE2B a1fbfdd982e84396a87b2c0d5ace02e9853c875a497a6206e2f6e6b83967011c56b3867fc21796df4a3eef05b6318edae89a38c39d60f85413c39dbea86504a8 SHA512 e0e3ccf3ce3eb3882e77c7fc3e030af7c560ba50208dab79009f23a6cfebf33cc63c7d4cf45a6d1ccf81956c4848044c90db9ecd646cc112d49e816b046f5b0b
-EBUILD man-pages-it-5.06.ebuild 668 BLAKE2B 775da27cf0f32e3237d7b978cc7d88a287142acde9fa7205e8699a980012973716e9b7c38627345e85a883c1b24064c16c4ef3e97a5334ff74ace11e5a2ed125 SHA512 f83a73811117b3567fd519afbbade347a2fa551eef9a9ba2b52d09cb636a2791507bde4192a91be5be25bce208af226f80594fbdabe6afc953fab33922c2f450
-MISC metadata.xml 533 BLAKE2B 82374dc037b8295768d934b59e9765ac7e228ef13c401abfee516a156d16c30c0d3d8e8eb3188ac766365a615baee0cc17c7daa3bb0a7760c311d73f7cff651e SHA512 9f858c0a30a141e95c2eda0d46804cf860b0df44b612099f283bbb32160da5a19e8f16b686ae88e32d1d6b638f45228f56f889fde0c1d5311aaaa8dd4f400e09
+EBUILD man-pages-it-5.06.ebuild 660 BLAKE2B 7b411bd8d65a865825c6ddbb2214278e26452e508912656bba90b794be16444b5f3755093ca28ac3bb6af5b14b011b7911b304ec7bab15dee89224bb47b4b712 SHA512 723c938e719172dd96938612df891bcaac2535c0237a7c98ca62b8039cc739415bb999498f016227aca65b83d7f5be8561be94fdb8ffd73d2ef27b4a517083a0
+MISC metadata.xml 557 BLAKE2B 0d94b1dc3aed2a023636a4c25ccc94880d651603767523607469c2b7a438eb8bffef168015910f626f9c340600d3c70f8fc42b95100a9c5fa66a30ee127ab268 SHA512 ec496ec5707c293b28e714f01315ee730b607550d4b3ab68e28a21dba4b08c93550a48e3f708921e27f11e2b27aab8ebf4274a356dce1ffb2b3f021976226931
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
deleted file mode 100644
index a906f31e90cf..000000000000
--- a/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A somewhat comprehensive collection of Italian Linux man pages"
-HOMEPAGE="http://it.tldp.org/man/"
-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 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_compile() { :; } # emake does bad things here
-
-src_install() {
-	doman -i18n=it man-pages/man[1-9]/* binutils/man[1-9]/* inetutils/man[1-9]/* \
-		util-linux/man[1-9]/* misc/man[1-9]/*
-
-	dodoc description README CHANGELOG
-}
diff --git a/app-i18n/man-pages-it/man-pages-it-5.06.ebuild b/app-i18n/man-pages-it/man-pages-it-5.06.ebuild
index 24887bb2acb1..aa8fa6c67c8f 100644
--- a/app-i18n/man-pages-it/man-pages-it-5.06.ebuild
+++ b/app-i18n/man-pages-it/man-pages-it-5.06.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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-it/metadata.xml b/app-i18n/man-pages-it/metadata.xml
index 9d8c38cbd430..b01eb9b00144 100644
--- a/app-i18n/man-pages-it/metadata.xml
+++ b/app-i18n/man-pages-it/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer status="active">
 			<email>giulio@pluto.it</email>
diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
index af2f92da3877..da56a7b4c592 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 2020 BLAKE2B b4fff45aef468771b13355b42ca163785bb9b40c9e1cc40697b768dbce9bacf4be75e35b0dff52f18719e5af3b813a2cc91ce2a7104ee09348e56302e7b4ad65 SHA512 7c168befe44895827165eb39472f03d3cbc952044bfe58defe4d5493e18eb5ff00605cc7e9400c8245b72053f1af27d6541770be4458238b385f42f975fb1403
+EBUILD man-pages-ja-20171215.ebuild 2021 BLAKE2B 50d5d97fdc3eb29a4c7351265b1b7fb3eb43a3490205aa6e9f120ea7b430cac6ae37b3a1e0e5709bea0abdb582edf23f9e5381d37c078c037f840380d984b714 SHA512 21c0be60d5af6fc85b21165d9d1b0cff49c30d028c7a3275c142efa1b8195026ee7c2683fe94cb5a7f7a273184784fad8ad05c8fdc05f256ba4bb62e7b2e73a8
 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 2b922228c951..de70fa027bd0 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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 s390 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-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
index eb514fd47ed4..b86170fac21a 100644
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -1,5 +1,3 @@
-DIST manpages-l10n-v4.0.0.tar.bz2 34796889 BLAKE2B 6413278ab2c9482ffdd2cf6ef1f4c6e05f2f1d7be8c8d556cb137ca4c5c2d6297f9547725f3afcf8023478c05e41d99d595a0b5a44da0d0188ed0287c630e5b6 SHA512 9c83363ffaa9ff9015934869623958594e64f1cbb52367dd8274425a5cb45dac06109d231fd7f165eb35248b4229f3bbf252a6a4630e7d5a47edbf41d4a646a9
 DIST manpages-l10n-v4.2.0.tar.bz2 51747352 BLAKE2B 97c3e3fdb11b47753c9c179751fb001af0a9f79324d594d297981735f82b3917bd31fc5c100462d6093e621a98773f23543548efb957113ade39e9c315cd4d72 SHA512 b2de542fdb97868b5fa96f24947c7a37216dc6a6a5ee66142023dd1036017f7128ca26ac8367b0edbd76cfa049174892749efafef9dbf4221e90dd9166b82652
-EBUILD man-pages-l10n-4.0.0.ebuild 1699 BLAKE2B b1b3d8eb90703a0e00939d7d967590794754a9fdf6fd2cbdc4555ea817f977723eac373aab3071c7360f7a319620b7e8ea1368d3a8a9d95345bbd4d3cf9da7b8 SHA512 8237b93e639111a3dd2767230240bebd3535c8c89cdbf5aab8b49efe2f253dcc4ec952c6aac7cb4f8b038a3da7570146e0d72011e1c7ce7d2cc223cb40c77b79
-EBUILD man-pages-l10n-4.2.0-r1.ebuild 1807 BLAKE2B 17a3ad712a4793a83ea42b33c9c6d5cdee519f4440d222ca9ad389a8ae754321dbaa1130f482b1a79436f0778b5388a663047bd85d69c2f36294ce4ad751207a SHA512 1c3d24bed8169290d533ef3c8e249d3f71fb342fbf24159521668b9ffe2de2c8944b54fe8779fb127042f451655438e21bc5b66cbf8aa1c1ceb45d57fc6d4654
+EBUILD man-pages-l10n-4.2.0-r1.ebuild 1799 BLAKE2B 16720e493e97ef1144b96919c70f965a3ee52a2d45cfcfff02677a44ae842ad464119ea89f0b820676481a6248f327c06570e3015a4300caf74400664fb4b814 SHA512 654b3e9ab65b6a3dd8c500066833e4ed33dc6ccc908b8ae4895e5922d35e758ed8a3b3ac8951c0cf3af6baf8d43a2516dc5a614a21f57b6dde09a9b9672cab28
 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
deleted file mode 100644
index 3cd9f132e0b1..000000000000
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 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
-	!>=sys-process/procps-3.3.17
-	!>=sys-process/psmisc-23.4
-	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/man-pages-l10n-4.2.0-r1.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild
index bf105e588ccb..5d58f5e413a2 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 # build failure for es and it, so omit them for now #769314
 MY_L10N=(de fr nl pl pt-BR ro)
 IUSE="${MY_L10N[@]/#/l10n_}"
diff --git a/app-i18n/man-pages-ru/Manifest b/app-i18n/man-pages-ru/Manifest
index 1d6a0f074052..3da4e27f8cb1 100644
--- a/app-i18n/man-pages-ru/Manifest
+++ b/app-i18n/man-pages-ru/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-ru_5.03-2390-2390-20191017.tar.bz2 1725818 BLAKE2B 8ab0e5e6c0b7a0bda8e80e99202a9de38298a743ea7b356abb7f50840f222c5ef5397c96e490bfb1b37858fbaf50704e38cae7b2df5f81e0890efd7f73d3a909 SHA512 959ea5f206674b1bfbdac944a391a8d183b02d67ac26a9f33abb11637157cff6c60fd89f87669e2561eaa1c6c0bc2565deceb6f7e72e381d202a93773251fe7d
-EBUILD man-pages-ru-5.03.2390.2390.20191017.ebuild 611 BLAKE2B 6c8f0e52d0b6564949c10b72a4e14f49a35fc38eff0c5114490ef7ff9d046e9e7d74985479c247a8b08cd39adeb612b6440cb704c1eb3f06a209a1fa649fcca9 SHA512 ff0837e2ebbcd2c646be58e68a99016dee1d27dd7b2b15039ea6d7fabd177efef0b10be13cb72d1d09d7880b96c5d0679efa95babb539a8794494bda263bd6a9
+EBUILD man-pages-ru-5.03.2390.2390.20191017.ebuild 612 BLAKE2B b567102f6b3ce324ceb3ccd33b7d440b9dfd197efdc7d90206c3a4971f25ec39a62cf602d08bbb7ba8abdcd3366e467131ab8086e3bc3e8184226580f1d9fcb3 SHA512 3b0e81d801cc8916e907f6de46f109d46a841021f24e6de40c0f18b7c8a3abb206375107d0f91cc1e692b90b67eacc6c74fd3682fffb47e3b683e6c7bbfc0c1e
 MISC metadata.xml 436 BLAKE2B 7e17e7dc25a13db3594b5a5e630e41ff08012b530736bcbb5f5a1cd302e705cf30025bf93afb31f3de631e01e9588a037d9213651f0ad358fd3a87ffb727ca3e SHA512 1f7c55f697fe501f62c9cde15f0f82cedf7cf62251efba961c4e236ec99974fe7345fd77a48d92eee9472fe519e7c4ea040fda5df31d743f2eddf09644ae81a5
diff --git a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild
index 2c369158deef..9fc6918f3025 100644
--- a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/${PN}/source-tar/${PN}_${MY_PV}.tar.bz
 
 LICENSE="FDL-1.3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
 
 RDEPEND="virtual/man"
 
diff --git a/app-i18n/man-pages-zh_CN/Manifest b/app-i18n/man-pages-zh_CN/Manifest
index 74b67a0dd570..90c250b2c219 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 831 BLAKE2B a54415ffcf5d2b40a6b067e43a7ca04b2a73a3d9a9d4903842a3e3abbebd9c362939aec587f83fc138fdcadfb52def30303087839e9258e31de0dfa33634a313 SHA512 ffff723fbe0bce7ae929612c70f7fb93e494a3345612db78b7ffd1ea70222d179321a76801f59673f36c425a010802cc630e8d8f9ddeb83023efb70b028b77c7
+EBUILD man-pages-zh_CN-1.6.3.2.ebuild 832 BLAKE2B f22d5af540573deec7a75e5390a75463190ac64b8406363415f35db9ebe9c60f1eb7608bd430cb3f394090a1172ae699a999222db9c87f5ab745f9485457c163 SHA512 4ccd643343fa74ebf7613fc94b0e8ad9555710c82c6a88b923489e7bfd1a1c92b9eb44fbe5933cd02f6ac626835ea1ee3676b85c76ddaae78735771fc26c8b98
 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 b83619576f59..506aaac3a01f 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 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/mozc/Manifest b/app-i18n/mozc/Manifest
index 22fbabe95f90..4997beb60052 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -23,6 +23,6 @@ DIST mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch 40296 BL
 DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
 DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35e3f7a9b024ac34204f483c69913a2d1ae6b771054548f7f81afde35ed3a6887c9f7503584cee0fc646653fc7cde6fd015158de9c3d3 SHA512 9d87947b9b9256a3cc66cb23ab6caf4b6974142090b0d315c101bdc700fd289c259d09cb7f02f5f9e7462f48d652cd2d5b4822a645751fdcaed88b939520c429
 EBUILD mozc-2.23.2815.102.ebuild 11247 BLAKE2B 6df0d12985da09fd920250c98a65e3fc4957ce6eefa9105fcee0f02e6f9ec49d8de629bae5ad08729bedc95138679f7887d986d027b0ae62c7ec5661fd6e281c SHA512 e4983c41c4623c2c8015d005af8ba261857caa0c5852b69af1640619e94e9f4e5f1c72a992831aa88b9bafa57d49ef0c049d9c3a14a6a495172578401f93072d
-EBUILD mozc-2.26.4220_p20201212102434_p20201219202429.ebuild 10396 BLAKE2B 1e16fc13c5e9720cc972938c362ccbd516b79fff938883b3f5c4fdd44d7ceb66ec8d4a10282fa2a38b7c9210cba986986f519f9016707b6c13bd6e1ed7841983 SHA512 5d33518117e203d44c352ac3133cca452d81785b4e220ab138dac203b1cc20c17cb39c561bee2f29b370423c91b6ff456d064cd5eb3bfa64abf68d4bcb8555a5
+EBUILD mozc-2.26.4220_p20201212102434_p20201219202429.ebuild 10403 BLAKE2B 1a6621eed2a51384d8e290ed4ff15905dcbae26b2d4c5f0ff2bf2d745861af38eea5fe0102be7882f72eb2a7585fd0bdd5bc065ab64224d31e1ea963ad5e11e6 SHA512 f1f9b3339307c4e8992273df51d043f66f7e2b06938e8177d3d32fc3c9a33b0e2a2c11f3a8c78f166a903cd5b21a8c3be6d5a45bd39974fb2c7fa0148c665fb9
 EBUILD mozc-9999.ebuild 10244 BLAKE2B 0d4c7ddd0473ef83919b242940df83d078875478113ac40e359c9520c38492b233afe34bbcd4e588b3b08218ad3566e17d1cfee71c2bd96f1bb2299b7bd8e522 SHA512 8af2b58ea4dcb680ff82106f0a4b9223346a4cd787c52726447c822a1890c7afc0d4c837ac952204a08b0b2a07972ebae2f721c8987b5e5ddb45cdfae5f98a5c
 MISC metadata.xml 1015 BLAKE2B c9938eb769bd18dd9a71d3be641126a20c756ebbc6c96901251257d668e942f102e7520c94d997a6206b5ba202e3a3760b75613e920c1fe5437d71e6a5124ccd SHA512 5174c831ea46dc3b71d27c43c5381cfddbb622d895d49fa25157f18e0d44670742ed037f97ad744d563da84223b945a37ac8b211b5042f19a381ce09efbf0926
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index d6d44a3758f6..e833a2cfb26d 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -41,7 +41,7 @@ fi
 # japanese-usage-dictionary: BSD-2
 LICENSE="BSD BSD-2 ipadic public-domain unicode"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="debug emacs fcitx4 +gui ibus renderer test"
 REQUIRED_USE="|| ( emacs fcitx4 ibus )"
 RESTRICT="!test? ( test )"
@@ -53,7 +53,7 @@ BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
 	virtual/pkgconfig
 	emacs? ( app-editors/emacs:* )
 	fcitx4? ( sys-devel/gettext )"
-DEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)]
+DEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)]
 	>=dev-libs/protobuf-3.0.0:=
 	fcitx4? (
 		app-i18n/fcitx:4
@@ -79,7 +79,7 @@ DEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)]
 		>=dev-cpp/gtest-1.8.0
 		dev-libs/jsoncpp
 	)"
-RDEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)]
+RDEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)]
 	>=dev-libs/protobuf-3.0.0:=
 	emacs? ( app-editors/emacs:* )
 	fcitx4? (
diff --git a/app-i18n/pyzy/Manifest b/app-i18n/pyzy/Manifest
index 9e000951978c..259b6a3a35d0 100644
--- a/app-i18n/pyzy/Manifest
+++ b/app-i18n/pyzy/Manifest
@@ -1,5 +1,5 @@
 DIST pyzy-0.1.0-patches.tar.xz 5288 BLAKE2B 9a6c86aeedd496ae8372bb0640cb1e03386408a0b00a4c51a6223c4fba23f59631267eb0b7c707a11662025ded410609d17ba39327e0ca5011f48bea3422cd79 SHA512 3a3b9fc317f1c5f59bbe83f3ce58fc76a50bcee798118d66571ba31d504e73fbe7a6976f03ae28f9712c0ba641386ac69390a86185464371728782a62b98291f
 DIST pyzy-0.1.0.tar.xz 752248 BLAKE2B 5f927cfea31f8cd67cb3e7af9b48c6f48a7707e8324b6b211c3baea0e07683df1da3c8683a5f9aa5073277229ee4d712174f95a764b4dcc5dc5f40330791561e SHA512 18d78bc70229caad44fdba4b7971014979da0aeb35841cea9577d05e5eca871dfe40d285a926ac05a247c8a0b8ab34fd721dcd34517200c5cc75b6b1ed545b35
 DIST pyzy-database-1.0.0.tar.bz2 9977983 BLAKE2B 86f9ee48d584f33ada1ee5380efdaefd85750290caada320c4c9a21206b8fb50fe6a43b931fb41a8c3bc24853bb7843e23d1778b40e6eae68fa4ec383f2b4dcc SHA512 5a7248870407f7f92c418ada49a275062325f2eb33a7eb4b91492e4b706ae70ba931b04377a758ce429fa64cd22e8bee2ac4279d4f205bbce406248eda1decf7
-EBUILD pyzy-0.1.0-r3.ebuild 1215 BLAKE2B ed7b82a68addb322b185a4854f8921e53b6e31cc101fff10aaf037773019ce2a023e589a13140345e61f042f1558308da2e2cf544b50a5012c02d50663cb1df6 SHA512 e9766216c2f0c070963ddb2ff7afd48442fbe4839ef781a470b7843e579055e06a1981bd12d528a680daa73ae9fb3567261de0045255c3b2a418b04e8279ba2b
+EBUILD pyzy-0.1.0-r3.ebuild 1226 BLAKE2B 99d225fec9a1d7dbcc42a1966fa2673628cd885225b3d04cc02ed35ed18922a50eba076115683af08d85058bd1e6240aa9ec5094e7382560d2bce8d692fd83e6 SHA512 8d82032c57c43ba072affc7dfab734b9ece0083ada9f59e98b1d9980fa0f0ec636a14770921525974eae15dda94ceeb3f74cf294367795125c36c0ca15dbca7c
 MISC metadata.xml 649 BLAKE2B cab621c7a04f8b7672825ecf49fc56c251afef71dcbb7d6c728815b7b56f8bf5c77650ddb91c704dd2b5aaf89d3d55c7e83bd9f7510d164fef13db118177c81d SHA512 46c86fc066ea686db8497ff7dc76361a865a24215b49d2924521235c5bf88f9b029c25597f1bd19399f965052c6b324ded0a2d287cdd29518a2f46cc6614c4a4
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
index 986a3e9bb94e..6bd7a06a0091 100644
--- a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
+++ b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -24,7 +24,8 @@ RDEPEND="dev-db/sqlite:3
 	sys-apps/util-linux
 	boost? ( dev-libs/boost )
 	opencc? ( app-i18n/opencc:= )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/autoconf-archive
 	doc? ( app-doc/doxygen )"
diff --git a/app-i18n/scim-anthy/Manifest b/app-i18n/scim-anthy/Manifest
index 14e42f4384b8..c0e22f0aa32d 100644
--- a/app-i18n/scim-anthy/Manifest
+++ b/app-i18n/scim-anthy/Manifest
@@ -1,5 +1,5 @@
 DIST scim-anthy-1.2.7-gtk2_build.patch 24547 BLAKE2B 22b20c7b34e83a9392fe89a2484d994364e12b5618fd7fac0e19af3c8988c1b3acbfe31872f98308c1c201d4e5c1ea598597bc15e04e77e54cfb2fedea7d9e4d SHA512 2814481606429228891cda1c70ed53b4014d2e192f6ab7859d5033a9353ab02dea044291ec8e5667853ac6db2da19f06c4a42ce6fe27d11110a5b0f6ee56bd0e
 DIST scim-anthy-1.2.7-patches.tar.xz 11236 BLAKE2B 5db168479db59bdd1a9a9561af8635e370a338620f4c4cb1676a707c60c0140e2ddd6517896ff5d8a90cd0fe9e2fe25eea7dca693c02e765fb6b8a584f9f409c SHA512 ff265547ea78912b3cb2519793fc7159d466da6bbd3cd47f63a67731207c46ba8932a5384899ffbe517bb3d91f14ee282906ee287025ae64ccee7636dd633f08
 DIST scim-anthy-1.2.7.tar.gz 680942 BLAKE2B 9f2b33d53e5ed14c806dcae50a73d3bb234ec74b820651b09ccf0e3b78924bb0331ec4f5b93f9b0bcb2429bf528f9ddc35d0cda9b3a4d30780f083493945c963 SHA512 4ece2e458b204a68392ed676134ff45f1e193fda00d5ffb219c4e947f7f069a0221b279f110bf4093a22e57c41cb1555c6be4d42bea1c9e848af06ad8e0bc2da
-EBUILD scim-anthy-1.2.7-r1.ebuild 1130 BLAKE2B 3f1afc60f5495a59991cee47af4d3b46ed0aa935e4a34922e90aa587c612de26c1b7ac0aee483116c3014e533b54ac8764e4710c4262de4db8999a988c96d68b SHA512 58763d4d14747fd986a84389362fd694e0ccd0c635e5e2ea493936c67e90d01c636628da1be0a6869a9add492f50e68bb9ba73c204f42ea22125a1664534453b
+EBUILD scim-anthy-1.2.7-r1.ebuild 1095 BLAKE2B 45e06090131200dd73d7a5a62a5aa1289c02b250ad5ae368f7bb5cbe146ad617eb223d58e920bb35569b4748f2bbcb384d9e87a8ad78ed7f2d1b6cdb5f0a890d SHA512 5a5e525ceff5c83d11f75ca65cd1308d0b1ea3fd16f450552b2a52bab324185fd46b7903a951d04d49a6672b2c1b1790f1d62b23e422df6b51617a8ac6eddfc0
 MISC metadata.xml 505 BLAKE2B 811e271383ea3c8f7f3ef772c8b97a395682e3f40c948d6ac09e9aed18b96e7ad0943a4e11e5e2f9fdd5615d86aaf3e5977975d02e5f6c2342d1fee3b563d3f4 SHA512 85aba6ffa284906fc8732242f5efe3563483930dd625871d670840c558f99e04e509080d0ff804746db8d5a3da9210680bab223dd78bcae79cc2ebcde622114b
diff --git a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
index 84ab4c38fa3f..46e72aaa0156 100644
--- a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
+++ b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Japanese input method Anthy IMEngine for SCIM"
 HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMAnthy"
@@ -30,9 +30,9 @@ src_prepare() {
 	default
 
 	if use gtk3; then
-		EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" epatch
+		eapply "${WORKDIR}"/patches/*.patch
 	else
-		epatch "${DISTDIR}/${P}-gtk2_build.patch"
+		eapply "${DISTDIR}"/${P}-gtk2_build.patch
 	fi
 
 	eautoreconf
diff --git a/app-i18n/scim-bridge/Manifest b/app-i18n/scim-bridge/Manifest
index 82689f81eaca..f33fb0822dce 100644
--- a/app-i18n/scim-bridge/Manifest
+++ b/app-i18n/scim-bridge/Manifest
@@ -4,5 +4,5 @@ AUX scim-bridge-0.4.16+gcc-4.4.patch 382 BLAKE2B 1b65d8c24dccd10b165a4716897b944
 AUX scim-bridge-0.4.16+gcc-4.7.patch 774 BLAKE2B 61b84631e8972558dba145b7c36108a726028755665720aa82e2dd9c76477536cb332c4c4d62e3555050bee898d8139a1294ce29a6c0482dbcf63ad0cb196576 SHA512 3349b93e71fdb4e6942253877ed1d84c59a099f5c3fd7d6148c780c6a8af65bb47431dde0a84995dab66bc864872130690b1ee89ee1e2db2c50591f94095c35a
 AUX scim-bridge-0.4.16-configure.ac.patch 5693 BLAKE2B bfa3fd40f07872ace34bf8fca2d3fb012e173660aab3a976c69dd2648003d79acf86b1d6da4c4a14b44e92d256f775fca44bf25b7c21beefb9c95ea545300454 SHA512 64fac34fc9d6982d61542af815ae6da5172d5e5208b938a386ad8fa67bd8988829e8c45412a47b9fef0c8b91b52d4f90b269266e49fb867a671cea1dc4581408
 DIST scim-bridge-0.4.16.tar.gz 508870 BLAKE2B 136a8e84b89a58852ff88a2ef632084f1f18c436fc96cd9192d4510b5e6a4adcb51a5a6f314f8c5e6a333b18ec36e2e154db161e1eb65cef0f3cd28fe47c8241 SHA512 8d40a931738f6130ab2fdc4e8dec70143874c53d5720a0403603b57c9f80d7c0a4802609e0446684fa5cba1758e78e5f333d01787527934ed7a19c9727fd66a6
-EBUILD scim-bridge-0.4.16-r3.ebuild 1712 BLAKE2B b0c83233ac349cecf9e462e0e42dfb07d61a3e7b5fe5adda89af35abc26cdf80523aecf475cce4c3472f29ac538dbe413e97423b4ff7f75d886c5fb68ade943d SHA512 26f648707b9b0b07cce3bc25316cc1afed3668ef190cb2b1df49ee615165984bcaf1001e676671baa33d39f25cd037eaf33cbd7696e61f18132a882c7fb3c5a4
+EBUILD scim-bridge-0.4.16-r3.ebuild 1705 BLAKE2B 8356b458404f8d7f5440dd21f70e22e76a0ea15ffac0e91072cdc0211f2816cec84fbe5c7b260de372417170ee2b64e8fe7affe6085d6d3aa8cc3c2693eab6dc SHA512 2f99043016327cbdec32847ac9409f1f4f047c23e29c7891d9a27b2093daff7fd268d365181c949cb7554493c29eb3e1e5460e053bd16e8d98cb7a965d7f00be
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
index 71d49a76ed57..334a65b9e049 100644
--- a/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools eutils gnome2-utils ltprune multilib readme.gentoo-r1
+inherit autotools gnome2-utils ltprune multilib readme.gentoo-r1
 
 DESCRIPTION="Yet another IM-client of SCIM"
 HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
diff --git a/app-i18n/scim-tomoe/Manifest b/app-i18n/scim-tomoe/Manifest
index a52344902714..b148c346dd43 100644
--- a/app-i18n/scim-tomoe/Manifest
+++ b/app-i18n/scim-tomoe/Manifest
@@ -1,4 +1,4 @@
 AUX scim-tomoe-0.6.0-gcc43.patch 445 BLAKE2B 7a6f48120398dd661a647914e9097dc69807a2c0d18ba9c56517c48df2a67dd7406cb13dea283ff5b9b8c64a19dcff4548453f0c47cb37f890cef0cf7a1794a8 SHA512 a27202fdf5be0d77d473674475ee99d2b0d1a6eba51ccc45c4c7dc6c3a9c3d1042ed3b25ae15a04fcff885aad7b84c42cac7462fcc739bf12076e675b413fafa
 DIST scim-tomoe-0.6.0.tar.gz 385126 BLAKE2B e211c97caab5221d80541cbc795d3559b9843df4fb03bc559a20dc34b510288aefde87251c35c0a123501192d8f4ffb9209fa3c6c74acbbba75ae3321dd58fe9 SHA512 d70a8838f8c82c76a8e3592ad712997189873cbc4ec7ebeba5d43d6583e24acf318299433c9342ee004c4ae4741cca7e0b88e4642cf46c43f967a47ec5ac9d4f
-EBUILD scim-tomoe-0.6.0-r3.ebuild 649 BLAKE2B 34d25c5980659a0382cccdf546f62e29bf5195deee4cd7e048a888d627e2c7c4197e23ddd1eef9a7e87d8bf60a71cc00afcef71fe8bace9eb95080fcb4b4c34e SHA512 a26f738925e51d5bd2caa4c647c3ab116f33bbaaac222881b7cda39e6e84cbd5bd426468027c3af6ad90eeddb17fd970d623f6def98e00a6d72cae5664343c24
+EBUILD scim-tomoe-0.6.0-r3.ebuild 642 BLAKE2B 2ddc3e118d9c729cbac6da294ea5d500a22e612e0efab1a5c440f29454aa8d22790676c6e4cd1e19d1cb4fcdb1441ac08d1678e590abc1694ac3d681798969cc SHA512 c872aed9b6854803fcffb05d34a8fcdbb0f8f1e9be2018582b000229a0d6377f007c9457d77195ddf3a633225579cf8a5db6ff97f68bcdc37f31b2df9ddd0883
 MISC metadata.xml 309 BLAKE2B f8126911d309ca51f6e56437d2c219026c2e50d854b62c44afc5e211cff957d1776b0fef17a64da072033c5df308c6015786feb49344be3c8c4c57074d028d36 SHA512 7d9c17a3c4279406d23064447a7370658c494bbc5eab2a05f048f58ac3e136804ad65dc2fafbfc132b1f82ca6a651f6fe34beb68ea370b5a0eb1a3f6c98d3c2d
diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild
index c694b18be27a..f1348027a755 100644
--- a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild
+++ b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils ltprune
+inherit ltprune
 
 DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
 HOMEPAGE="http://tomoe.sourceforge.net/"
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index d3efa453014d..f4216fee6fcf 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,10 +1,14 @@
 DIST JMdict-2020-07-01.gz 19735470 BLAKE2B 06126c07516241af6789c3427ebe68ce6da3a5116414f8d1cd5248c18319a4b302ec241499c36b380e3a49f43cac2b381e4130d2bae4a7b100de76724786eadd SHA512 08c3feed364666dfbf87c73ac5da20a7eaa414e7fde274f314b058a6b268cc197b834225aed57cea74f6cdc95f374031c1a87ee9e3023f421ed9f3f1af4ca1d0
 DIST JMdict-2020-10-01.gz 19845877 BLAKE2B f75e9cb1096c1f35276606119d1f0e1cf2687f69d9afe2bced55a6b75aa8ada0c8f245e05e8f7246d73463ed895cd232f1ee30ccd639cb32801c51cbc9a56dcc SHA512 4e6490eda15928a48cbfff59bf73d21dea19d2e80dffce70f65a247b0a9393bea787c8378b06b7e7c807eeb9a296971efac9f3ec2d3ab6771c7a016e0e747113
+DIST JMdict-2021-04-01.gz 20023736 BLAKE2B 57c2114550882729022cc639606f4512f7670e906f1e362e2fa3e40adb3fd10734e198f6703a7c372fe42fd61d620534c13fb702706e57cc9f40bce061c8218f SHA512 8791b7a1fa2a1e43c07b73d51395de2f1b0e52dfa84463b9e451b79e54a3af676dc0b11a99526987476b1ad167b1ace4d75134484469a927a8f8386e5478f7ca
 DIST kanjidic2-2020-07-01.xml.gz 1483010 BLAKE2B 7adc1d09bcddccfa549de92ff996c4d1e4ee4283ad845b50f5a453dd7f4051249eeb8fb3bd574b8c95f92a93ce7197f40226fe9046f7ab871f43f086c753166f SHA512 078ea54da499967b03c6eee75d629c9aced8c48381e8b6d1adf2d6440c81a26da8bc532f8db8d388588a74cbdb851bcb92846d1532b882f5ab9d65d653deeb3e
 DIST kanjidic2-2020-10-01.xml.gz 1483702 BLAKE2B 0a1aa65084f5d6e35ac188c77c4264449ffa0c07e39fb464760049740e70187252e56212e1b95a5be930f326b42f2ef8689dcf7d53dfcbcd9ef250e0e05e26f2 SHA512 f47f0f9b401e2f30f9669bc61417424ed4f423a542115d56b3b176f4c8253a7025c02ba4e28d1180effa558f6cd6fca7f07fcd47c716839cd48ac7f2c8b6ac78
+DIST kanjidic2-2021-04-01.xml.gz 1487178 BLAKE2B 81e05d3d80bea1eec64e4af80b195dce2f3396a3c70f359fb27e7db68ab6f5a177b732bfeef53d9ba6af8cfdf860f130d6077b853bfb6e7e3b7eeb4fe3028915 SHA512 c3e617878f1f9da46580a93e47a669ba90a84ebf25790fdc40ee56f6a39cd704941a6f068708bd106e81f63fb34ca5b5992c758cc3f898fbed038fd4181ac437
 DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
 DIST tagainijisho-1.2.0_pre20200118132551.tar.gz 3635265 BLAKE2B f8f831f698bf0ca56c57e8343adee92d3b42842c95fb971c9d8696eaf660ce458d8fd2108ab4568463bed6711c5295d27efc34f2fab512c3d0bc2a11a4f76c1b SHA512 14d6fc5ce891437159ca2b3db53c776420a6d4e305f6753c7ccf5ce773d43fa31f875ee9582c9db1fe05364b18772cec43dd046a6492b6eb45c12b62f7d60407
-EBUILD tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild 6662 BLAKE2B d0e51fac4398e2108660bc3a111b01c140be5237d7fbf2e2bf60ea2cdc7439df96df2233ca0b7ec02b2aa89feecbf35cf5601fd14b0ff15e8bf8d813c0917858 SHA512 7a7128adc528c86e3860ddb8ce7a1e6d039a1eb8b3659c21f9ee64d0e410d19f1225c8be2b644b2f367feb463c9c37c4869b0e0115dec84d6176d4a6a78a39ec
-EBUILD tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild 6662 BLAKE2B d0e51fac4398e2108660bc3a111b01c140be5237d7fbf2e2bf60ea2cdc7439df96df2233ca0b7ec02b2aa89feecbf35cf5601fd14b0ff15e8bf8d813c0917858 SHA512 7a7128adc528c86e3860ddb8ce7a1e6d039a1eb8b3659c21f9ee64d0e410d19f1225c8be2b644b2f367feb463c9c37c4869b0e0115dec84d6176d4a6a78a39ec
-EBUILD tagainijisho-9999.ebuild 6611 BLAKE2B 49eb2ad3a99a2cae8097c3fbe54f99b7d63fe1ba2b88793bfe9a57f38afc04ae4ccd5297642603cc55203ec461d2b56885cf0a504c75b9319194df878d27b752 SHA512 ff98dc941da2ae88e664564a5fbf674e75f5da2e8d1501dac23c294bc1ed718f6b8e7252c9e889cc9b3519217b9a2b37a5e6f38dd828dce7f269296af316311d
+DIST tagainijisho-1.2.0_pre20210313131524.tar.gz 3639618 BLAKE2B f2dbb376dddf76b27a01b9a06309ed048d8e6bae7022a027b3da3b93f39c9bce63d0e5e06dd04434d61742213e48930643c9a81ca9102ca4202f6261404179f1 SHA512 3775bbc34bf3bef0604b6b18fcee7d2698f567002e23707205d2ee256f518514ad16d27d5cdb1cc5e6d42063b1532ab4b59cdb49d2934973cb6557e77e9b7a07
+EBUILD tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild 6715 BLAKE2B e28afaae3fd0e81c806ee428859e2bb4d035a749608830378af3a7ccb5b5dde7d4838c2bc59e263e6f482a9ba6bc1542113e0d2da21ed18297e476270682b2a7 SHA512 941f9a6bfbc7beedab9d2c28a49de13e8b53db25cd5ecbb67c0436d3ceb86c7173320a58dffee5a6e7446fbc5c1351b992138a8146d2b0e31af4d1d566679e82
+EBUILD tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild 6715 BLAKE2B e28afaae3fd0e81c806ee428859e2bb4d035a749608830378af3a7ccb5b5dde7d4838c2bc59e263e6f482a9ba6bc1542113e0d2da21ed18297e476270682b2a7 SHA512 941f9a6bfbc7beedab9d2c28a49de13e8b53db25cd5ecbb67c0436d3ceb86c7173320a58dffee5a6e7446fbc5c1351b992138a8146d2b0e31af4d1d566679e82
+EBUILD tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild 6717 BLAKE2B 79ead4200ad6d1bfdc41c8a3a0199269ff575bf96f4ae3a61ee28e65aa92b032885900caaa87de38975bd8a32970ba2c22d3d4ab89a620a354825a4f421fb4a6 SHA512 fb786c1200ff3f986016dfac25ef01848da0cef5096f3c964e083dc155161a5c1cd9d2f219de3d63c3cbdb07e53d65dfbf83c19e8615860e5f4657297ac883aa
+EBUILD tagainijisho-9999.ebuild 6666 BLAKE2B 77c8872a93d3cf327a8b72d547d9a8827d2a2020b66b0c342b4fa6bac68896a968b7cd4dd26cb42a2d55ed436feffa6bc221feb18ac3f3a65ffb660497ebe922 SHA512 8165099dba86f85f9fd92521f65ab4c736d39c24ae3789e00ed5ba1662109223848d511665db5308103074c3ebb43552c3d0d39f8ecea489c7560dc0a965ce12
 MISC metadata.xml 1161 BLAKE2B c996fb26b11405d39539ffc2828893edd7607923c673da429da5d346568ce6f9356f16787484b68359916b38833b0ffaf52513b2a56a5baddaba97124fa2d804 SHA512 69342420a9792a780b73336ff3a4587752a3728f82e45f7725d33a788e9d9accef16b7fa079c18070867a46fa10f85794ab6fdaaf15e2b2f0eeef45df6d45fb3
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild
index 9d1700175eb0..9ddc9a9aa0c6 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild
@@ -50,6 +50,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 if [[ "${PV}" == 9999 ]]; then
+	# We wget dictionary files in addition to using git
 	PROPERTIES="live"
 fi
 
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild
index 9d1700175eb0..9ddc9a9aa0c6 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild
@@ -50,6 +50,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 if [[ "${PV}" == 9999 ]]; then
+	# We wget dictionary files in addition to using git
 	PROPERTIES="live"
 fi
 
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild
new file mode 100644
index 000000000000..0c1d1c997d04
--- /dev/null
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild
@@ -0,0 +1,201 @@
+# Copyright 2014-2021 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="54a7145903cadb0ebfa58c543553dc0931a36066"
+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: https://www.edrdg.org/pub/Nihongo/JMdict.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz"
+	# Upstream: https://www.edrdg.org/pub/Nihongo/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
+	# We wget dictionary files in addition to using git
+	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 https://www.edrdg.org/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 https://www.edrdg.org/pub/Nihongo/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/tagainijisho/tagainijisho-9999.ebuild b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
index ca0b9b195131..f40dcd4a2936 100644
--- a/app-i18n/tagainijisho/tagainijisho-9999.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -36,9 +36,9 @@ 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
+	# Upstream: https://www.edrdg.org/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
+	# Upstream: https://www.edrdg.org/pub/Nihongo/kanjidic2.xml.gz
 	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz"
 fi
 if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
@@ -50,6 +50,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 if [[ "${PV}" == 9999 ]]; then
+	# We wget dictionary files in addition to using git
 	PROPERTIES="live"
 fi
 
@@ -94,7 +95,7 @@ src_unpack() {
 			JMDICT_DATE="${yesterday}"
 		else
 			# Download file from today or yesterday.
-			wget http://ftp.monash.edu.au/pub/nihongo/JMdict.gz -O JMdict.gz || die
+			wget https://www.edrdg.org/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}'"
@@ -114,7 +115,7 @@ src_unpack() {
 			KANJIDIC2_DATE="${yesterday}"
 		else
 			# Download file from today or yesterday.
-			wget http://www.edrdg.org/kanjidic/kanjidic2.xml.gz -O kanjidic2.xml.gz || die
+			wget https://www.edrdg.org/pub/Nihongo/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}'"
diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
index ff41edfe7df1..3aae873799fd 100644
--- a/app-i18n/translate-shell/Manifest
+++ b/app-i18n/translate-shell/Manifest
@@ -1,5 +1,5 @@
 DIST translate-shell-0.9.6.11.tar.gz 76779 BLAKE2B 39748d0a2d7db504fd4c0bee516f703291dce93f19aa760fdae70b0551cb5f14ae5483314114f7e1141ae2231e0b128a79a9c05ec1fd08c970be886c4430e32d SHA512 d4d376b3750e43e3de5b95790fea7fc91e94140526ac15ee9f7818554f95d410772c8f8887433b6fd4547f569b3d6f510c1bc1497d8237223c344dbb8f0ae87f
 DIST translate-shell-0.9.6.12.tar.gz 77580 BLAKE2B 78e8c694edc03fb03facd8c705c7e703a106fe9f2d7b46d464a681d52523817b4aeaf023fdedf46a9792270daf758fde457ba30ab1ffaa778f8db3eba3caa892 SHA512 6cbdfd14b7004d0e37a4abee01bec87409137f1bb7a14a964936bf0a2ad704ea1fc04dcd8ab10404a5c2df105bf7a6a8b33ed02c75c1035a6900082f6dfbb20d
-EBUILD translate-shell-0.9.6.11.ebuild 1125 BLAKE2B 82038fffdbecd83785571132e127eb43cae6cc489a5659c875cc4118786271cbd5e49e091c01ff5cbce162a579a293495f2eaeed0cc80163273c2416bbbb1d5e SHA512 cf76ed4c4045ca16112cacf45e1b1d87db6346f7830408de72d2018bf4cbd10fe9604f19263db55226c37f5b186704ff2d845b3ab98117a8ff4b7ac73498c27d
-EBUILD translate-shell-0.9.6.12.ebuild 1125 BLAKE2B 5c84b6bdf1063c45a79cb92e0ee5c08f9693978dd3129bcd7b2dffb80bbba3ed8d3072e8da9d5d8c0de03f48368e856e716153ccfd7d7254d442be1d209a1962 SHA512 eac55e001c3cfd2c3f72169983b63f1d8058a4e6a7c4009fe7b7a548fa338d4aa03c07842df73db17565d83eb74827f14ec42f6842c8384f0af30b195da22b28
+EBUILD translate-shell-0.9.6.11.ebuild 1029 BLAKE2B c3322f3fbb4bdc26e9a2bc35e04ca4363a3e7dda9747e6c2ccd827ba84f32543471b78ffa6b8405be01d66baf4a9da8f65e6565a36c7131c1769d95dfdb3bcdd SHA512 f9cfc6d352d838445d96c69af6177cd33d468b503425bb51d6bf39b9d0145834beabddc927e2ffa714c0530328d10dadf6b65cdc6ba886850bb32c9e918929e1
+EBUILD translate-shell-0.9.6.12.ebuild 1029 BLAKE2B c3322f3fbb4bdc26e9a2bc35e04ca4363a3e7dda9747e6c2ccd827ba84f32543471b78ffa6b8405be01d66baf4a9da8f65e6565a36c7131c1769d95dfdb3bcdd SHA512 f9cfc6d352d838445d96c69af6177cd33d468b503425bb51d6bf39b9d0145834beabddc927e2ffa714c0530328d10dadf6b65cdc6ba886850bb32c9e918929e1
 MISC metadata.xml 824 BLAKE2B 0848a54cad02e34ccea83ffa2cbb40653f5bfc72ab29960b5d0de7bdef30127f85a7247631bf5730e1dbf43d657db86be9efdd344a6d2a384e69941cb338d78f SHA512 25b2be5296505f4c73c5f46c7aa8eb4917ea426579774f72df9d7337902a3c11819a6668cf542b58b391eda4bf39898a35bfe1fa622d043c90da0f93fbef00fb
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
index b91284b3e3f4..68425a1a688c 100644
--- a/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,10 +31,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "You may need to install the following optional packages for full functionality:"
-	optfeature "Support all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl]
-	optfeature "Display text in right-to-left scripts" dev-libs/fribidi
-	optfeature "Text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer
-	optfeature "Interactive translation (REPL)" app-editors/emacs app-misc/rlwrap
-	optfeature "Spell checking" app-text/aspell app-text/hunspell
+	optfeature "all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl]
+	optfeature "display text in right-to-left scripts" dev-libs/fribidi
+	optfeature "text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer
+	optfeature "interactive translation (REPL)" app-editors/emacs app-misc/rlwrap
+	optfeature "spell checking" app-text/aspell app-text/hunspell
 }
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
index 29d458406177..68425a1a688c 100644
--- a/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
@@ -31,10 +31,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "You may need to install the following optional packages for full functionality:"
-	optfeature "Support all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl]
-	optfeature "Display text in right-to-left scripts" dev-libs/fribidi
-	optfeature "Text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer
-	optfeature "Interactive translation (REPL)" app-editors/emacs app-misc/rlwrap
-	optfeature "Spell checking" app-text/aspell app-text/hunspell
+	optfeature "all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl]
+	optfeature "display text in right-to-left scripts" dev-libs/fribidi
+	optfeature "text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer
+	optfeature "interactive translation (REPL)" app-editors/emacs app-misc/rlwrap
+	optfeature "spell checking" app-text/aspell app-text/hunspell
 }
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index a2556ae83f5a..5b32ed3fbf68 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -4,7 +4,7 @@ DIST unicode-data-12.1.0-UCD.zip 8410738 BLAKE2B b635b449a04f3ffed8ec7311064cf20
 DIST unicode-data-12.1.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
 DIST unicode-data-13.0.0-UCD.zip 7537310 BLAKE2B 5bcc8f010f81fea22cd0b5806ee190bbe9e58348c5cc3627141de3b1df5a00cbdcd800ebd0eb3bc0499b2c26920f6cadf42804b539e5be0aeeeb9eaee334a817 SHA512 aed6d06c370dd87bc5713e19ff4cde47b065b76a18149194fa843e4efc5269f749ec8905cad9132d3b803ab621a46e372052b8f3c3e9b6a65afa6516b0f2b4f2
 DIST unicode-data-13.0.0-Unihan.zip 7044963 BLAKE2B fffcd322c87c607e9e689bfef4ec79b4ec576b4ffd84465ed6d38f485ac4fccc7d0f46662f76dbb79630e070b12bf9e1530bbbd5b32c043b71f696018e1f3ad2 SHA512 87238202b5da069ab1bbc4672d86c6fd0711e354fb17f53b0b4152850c56c0fa09e6e45820ae52d49756b25fe696518ceaa34cbfe5366ff60688c9a5c3a2d5be
-EBUILD unicode-data-12.0.0.ebuild 777 BLAKE2B fd8806e48c3c1a1368dd4db416a7c0b8e85819cb0174b250932b0258b8b21611401cf31aa3575471888969fe06b621f4acae03728d6ec6976ce12536fd295a55 SHA512 15673e33060bbc37eb4da94b7887ebdec3c0641e08e05b356dc29a776948c36f1c7f2f9ef9280c948d63abd455059854ca44889fdf3d5c054362b6e767c7f1fe
-EBUILD unicode-data-12.1.0.ebuild 789 BLAKE2B 53712a51a60f329af8ae58974407987407d6a4245c1abd44a4e795a80a765503a41423f7fa8ba8d44c86de19e314076fa31469f9a5a2701cea3f9a6e148b83f7 SHA512 abc12447244d4c387aaa3803405b57529a391b96df8a66b79abf54565d64dca65055fd1dc70c617a327af7235f21135e3b721502de145ef8f8165048705a3056
-EBUILD unicode-data-13.0.0.ebuild 769 BLAKE2B 554679ddd4b7bff7a5e3c163b140fa00949c9e780588c5ab158aca1b7b43e750f1fc5d02ff091942f15efaa5704895236bb70ca5db830b1facda8aab7ad7e4ad SHA512 8ffd93c66172b2c6a91b11de49582571868ed67e8e3e25eecfbbea81bcea8c88ed5f2fdf2ad1955d6c4ed6fa4b23bfe8ec82686c6ca553b48e2b4bbaffb690bd
+EBUILD unicode-data-12.0.0.ebuild 760 BLAKE2B beefa6fc74ff1a1321714103d948ff3fb24fa07d0d65bb3c75b3e48cd08ce151f3eaf85dd14bbdf3507b6bab4a899df3929ff77d7d5eddc7f5927f2620db1c27 SHA512 a62eca3cfde5f97e9c016aa9849e89fc0b7971af60584373bf074c97563d7aee14fef58f909f0c4891f1b16206a99a8219b6d916ab0ccfe435ed83de62f77760
+EBUILD unicode-data-12.1.0.ebuild 771 BLAKE2B dd6af401676af571b01d33c42fda0f30e3408a7781864eb31f7c34e8aac77f773df526192bfd7d8f8c2dac938f4f2beb90b4b1d55fa674efe9080668e60cf246 SHA512 bd35048a1ab835ec7ae8d3917cb988cb73aa2625f9e95a351d22b5c33a8429afdec1e48a8f82c6be4ca2b201ccc638d1fc0ccea10647c9861dec26a21797041c
+EBUILD unicode-data-13.0.0.ebuild 770 BLAKE2B a2109d5ede71d1fd74117651202f5eaf4937a6ef053c6eec5c1d5b9cc8c1f2a45cfa06dbfaa00791afce8e4838fffa6d0e3729b26895a6a5d57af4e61010c542 SHA512 cd1c290d709e45ff1c4591a27d60b5b7c994b021dda576c06e9a3bed0fa400b1b3788aee505c0c5ff7fabcf411c33de7c59cd899fe115252c47c5712ea673176
 MISC metadata.xml 347 BLAKE2B 6d5200dae7279af5ad9ae629ffdde919d239d868bbf90592f33ffd7b4d26ae911f5cb21b9dea7d2b0bee3ae1f78c0703e1b2e6e56e91f365611c1ed5be54c3c4 SHA512 cd88c99ee7b72bf0aca6ba376f0e07c504fbe5bcb8e2fb158404e4d46e50f18de351577b2629e0a8449541412536a6566b8943a96e57f5d5ec6f5becca767433
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 d61241208f21..90545a676bfe 100644
--- a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,11 +10,9 @@ 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 sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
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 77cce03aea3d..d5f7f27ee193 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,10 +11,8 @@ 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 ~sparc ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
diff --git a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild b/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
index d7236ea9b467..df4a20d9eb03 100644
--- a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /app-i18n
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)