gentoo resync : 08.07.2021

28 files changed, 87 insertions, 101 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 4f04ba5c7d7b..4e3f749953cf 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index a019b1a5a011..1b31b4ba72df 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,4 +1,6 @@
 AUX cmark-0.29.0-python38_tests.patch 1136 BLAKE2B 788a0022fb2d2575ea18133f57863cd8c12958b4fb6f79ea8611c6358ed66531a3b923e9959ff2b29348a2506f5ad7b0fb7a5b4402cb299feb1c6939e1160a62 SHA512 bb07e53f4ead6022863edb738986761a1e7b5184737265166fcee9f9bc00124c71eb49643bcb4ea9d0634c08f1c1ca3916e3a4c76b0f801dd011a184bdc0f39e
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
+DIST cmark-0.30.0.tar.gz 244190 BLAKE2B 71061a472aed262928e1dc9103241d5e73465781238af4c366e79d818c82041932b534015758426c2b2dd6313acadfb6d9be0b931701c67577e8b4421a781ec4 SHA512 53bbb8cdcac5431b88000f69df0aecfc7bd0d9ec0f7bc5a343281ca75e98304ef2674f55f76733acd81f8e8b9079eefabc9b3f3ef7dcd64087497282f17034a9
 EBUILD cmark-0.29.0.ebuild 787 BLAKE2B 027d8eb0f2f1250a6af14bf310ab2cb1a1cfb95550dbdd93205d718b98d80dc32713cb0c81c827b3af4fe37e123bb68681dd1b111c0304a6a3052c732b01920e SHA512 b22bddd41344a49b331f3ba1ed7a8ac2d5f38bdf5d89916a5576363ca89bd58c456bd0ecbfa9e50bfac9a4ab37883f9a0ddcd70416f18a4e7284e2c2c9f0d902
+EBUILD cmark-0.30.0.ebuild 737 BLAKE2B 1e33273dd111a45238914a8e832f68d5951c4d65eb64cf8b4b0ea9e71e2f2301058dc6f1527fbbda8f8c829e0a0214bba63eec5eb653f705a5257813fbc83044 SHA512 f04d3142888d705b263213e0236325a4f52e34f9d5eb1b42bbf91bf5037c8781fade7f608434162971060a28a2ebf056a168bac0e5b4efdcabe99f12c52c5154
 MISC metadata.xml 503 BLAKE2B d319f79c36b1fa299ba12b92c2e0a6e240d445108b84c5b8af68903d6ef59f7c7676ce10032924c201e4fd8b9256ee47c38dab6f108c6ea33e1f709a7ebb3e1d SHA512 39ad79bbbae29227109bfe2c8dd5431e7ac76ef8d71a8105ad6adfa4fe80c04b42e7183907443cbdcb4ca039a362f90b6d627f3fb46a3af7c6e06c04f0ec138c
diff --git a/app-text/cmark/cmark-0.30.0.ebuild b/app-text/cmark/cmark-0.30.0.ebuild
new file mode 100644
index 000000000000..9a1437df5f0d
--- /dev/null
+++ b/app-text/cmark/cmark-0.30.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="CommonMark parsing and rendering library and program in C"
+HOMEPAGE="https://github.com/commonmark/cmark"
+SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/0.30.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMARK_LIB_FUZZER=OFF
+		-DCMARK_SHARED=ON
+		-DCMARK_STATIC=OFF
+		-DCMARK_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 8c8816a460f7..0cc4b8cf1e88 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,3 +1,3 @@
 DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161
-EBUILD coolreader-3.2.57.ebuild 1838 BLAKE2B f5c912d33d88c0a9040ca6b495aa7a202b4d1f0eb043a57275fe1e9ff61081ed069acd9ae2c86381d7299a13ebfcc46f4eeb5f5bafe92da6c04c86750b8ea8c7 SHA512 50159e31e21ded5890111091f26ee10d91aab33714130be060d8ba7f4510ea90de2eb5f722be9007f67a2bbb71096ec39df3367f235643dfb97d02b3ecd37f4f
+EBUILD coolreader-3.2.57.ebuild 1838 BLAKE2B 4102bd201652798763151becd33544ead1797676999f2365fb73edd4164bc732dc1402ecfa7e682c51d4d51247485cbb0f929d00862bfdc59a8db8c47a65afbe SHA512 be37d6dcd3a81c8fddd4ed6cc23d210b1d718dff8a1a572c9046789eb50d961766755e1c064603bc59a9827c20bc876bcfe4cf34603058cc85c251e0f02769e7
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.57.ebuild b/app-text/coolreader/coolreader-3.2.57.ebuild
index 115cf9e91673..7e824ab85bc6 100644
--- a/app-text/coolreader/coolreader-3.2.57.ebuild
+++ b/app-text/coolreader/coolreader-3.2.57.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 WX_GTK_VER="3.0-gtk3"
 PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake wxwidgets l10n xdg
+inherit cmake plocale wxwidgets xdg
 
 CR_PV=$(ver_rs 3 '-')
 SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
@@ -38,8 +38,8 @@ src_prepare() {
 	xdg_src_prepare
 
 	# locales
-	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(l10n_get_locales))|" \
+	plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
 		-i "${S}"/cr3qt/CMakeLists.txt \
 		|| die "sed CMakeLists.txt failed"
 }
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index d465eb3c1866..c874e965ebe8 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,3 +1,3 @@
 DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
-EBUILD dos2unix-7.4.2.ebuild 2136 BLAKE2B 66a7561e3fa2d5f498c221fd4e2291d840e1779dcf3f138bc3668d0542459c5c286a652ce12f2bdf076e7fc2e3a16941df1487036a81aedfd543e9542e318bff SHA512 6082dedaf500f71c19efc7c338680eda4f75aff4656f31fbb209ffcaaa8cac8f93f159d0862fe6cd306dd939f9d0b17166650e03a45e6bac809b590bef7a8537
+EBUILD dos2unix-7.4.2.ebuild 2139 BLAKE2B 69b2c6a53bed341e10ff4d909b82f28509a44db1a80e124d6b5934a169d7e8c79294435d2dfb28c8736f1559f6226aec5eb2b4a3a980142b88acd4ec9c9507b1 SHA512 22e59c18061e231d5d400393447e4a6392c050a013fb10a30a95ad13019c518a8ff9794db51442c9d6e20cc778d3231b838a6b7c7780ad29f1f1bbcd4c7fd474
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.4.2.ebuild b/app-text/dos2unix/dos2unix-7.4.2.ebuild
index 23c78b39056a..81b5caa70133 100644
--- a/app-text/dos2unix/dos2unix-7.4.2.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PLOCALES="da de eo es fr fur hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
 
-inherit l10n toolchain-funcs
+inherit plocale toolchain-funcs
 
 DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
 HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
@@ -50,7 +50,7 @@ handle_locales() {
 
 	# Deal with selective install of locales.
 	rm_loc() { rm po*/$1.po || die; }
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_prepare() {
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 094541d4040c..a9e1f743112a 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -4,5 +4,5 @@ DIST enchant-2.2.15.tar.gz 990693 BLAKE2B 09d380fc90cf8404345e88fb4e676f92e795b4
 DIST enchant-2.3.0.tar.gz 986837 BLAKE2B 57859d41d1e605ba5b89a264e3b6f53bab7a2f060c2b306a1ac51c55925d5b30a5d40fd121be7d3df22395cc11ad4808e63627f7e0f5ae9f3c1d2f2939dc2f68 SHA512 ed25d74176aefe4ab3b1754ea09356d04c844f8e7a50441d331fcf6a0fefbedaffa21df7296b7947ab1fcd44844c1d8567d39d67ebc4381ce8766577c0269d43
 EBUILD enchant-1.6.1-r1.ebuild 1618 BLAKE2B 339676eff2871a9abd5bf85a3509924677ec5d9939e49416d4d09b71d4d228b45e81f8ac6b207c449c8ca837aab0d8d63add052598a0ce9430873bf0ea3df250 SHA512 eedb24e76290dffa83a68a565e2f5dc10544360a62617bea107a4270d13b5a6dbb19418a245c84923ad3dd5d6e77dda2338f14bee2b3a17ddeff1b7c2414ad2c
 EBUILD enchant-2.2.15-r1.ebuild 1234 BLAKE2B 581181d56ebf49b2d414dbbc9b5b10978b00995af9c1351fde61323c7a82037f7d1ad9bf04e45fab52d493724d77c1b722d363c5dd83e7be9bf61d674c8f0bd3 SHA512 ffd97fbf9221420bce5cac19b147c65f945ee5c612728f7e400a9172fad1b62aae24ddcf811a6ea12fe9bdef9fb73fc1bef41d50a11c012db75352e253d48c91
-EBUILD enchant-2.3.0.ebuild 1241 BLAKE2B be853d1f72faf5dca852318b15cf3c61c5b0b2938a76863df67602dbc244a58d651c080e5f367a8e6ad226367808de6415b931781a2507a5d0440c27de635f1b SHA512 3f4176267b8e7cbd0278bacccafc89c4ee3210947db628a4dc919c418541f47ba46685c31eb5378b978205c30de406c424507dadaa01ca7a506844fcc1b054a1
+EBUILD enchant-2.3.0.ebuild 1240 BLAKE2B f365010c0770733145b62739581d04fdba7f4d5a7dc1566154e2d91000e2b3ed2695c307b0e4502b2ec0b2166a0b9b8e9fd96d2940bb5d4480490b8ce3a003b2 SHA512 419fac47d259304440a47d6afcf886a192a51acc75ec6549e813adbbb86ef037ea917a86d4f4615ead43501b62dd9c44aa4b8e70a6e1ce62679b182d764fe7cd
 MISC metadata.xml 536 BLAKE2B 5f66bf0da00c6cfd8d6e22b9644486d0df8cf81cf5875768572965f60927edbe4d46ed2502659bcb71431c715129d1d7da051f9320b3f2834905a0cac3c2556b SHA512 920c2056608571d6a2e52d0c52b995b664c95aa53c8f8cb51129b059c32180d977ab3c840ef7fb59af3dec5f984f3e1488de26cf3ba4d93c2eb81c08e6688d5b
diff --git a/app-text/enchant/enchant-2.3.0.ebuild b/app-text/enchant/enchant-2.3.0.ebuild
index 1c7845af2065..ece2882ccb85 100644
--- a/app-text/enchant/enchant-2.3.0.ebuild
+++ b/app-text/enchant/enchant-2.3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell test voikko"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index ca8e01556619..b76cf7a96ef1 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,5 +1,5 @@
 DIST foliate-2.6.2.tar.gz 4760966 BLAKE2B 299dd8ab9f489772d18b85749cb312c8ddd4b21855452f87176ddfe068ff9e1e78cb5465fec97dbf70de22e7a773cf0910c11c3be7d0adb19279f4d9813249a1 SHA512 30bff00c34f90bfbd26b9e2b567a7cbcb1243cc5da17ff060762b7f1aafa4159daacee615de7f9bfef7d29d8209c8191094a154564f04321280037d2ec76a63e
 DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb
-EBUILD foliate-2.6.2.ebuild 1220 BLAKE2B 516426a8ea456fb55c9d7b1cddeddf6ff5c0254f651f859b6b109d0944214765cce2419efb6113a51c61d4a218cabfd5b28290d4a16c9e229915fab4fd926f31 SHA512 73eadd416713d9ca5d958e0e5af4b4cd55e58c1dd5de38036b1fed776e702b1a136b08d26ae3691e473ab4473f077684a5948c785c374c70bb236221a68f0d29
-EBUILD foliate-2.6.3.ebuild 1205 BLAKE2B 304a2b902ac9907c4742739ef6d7b26da0471c0f3b96b7273f07185c4a29e01504e4741a564bd535e581ec77239a96478562aafc39cddcc9ef890b3932a46870 SHA512 a59b1104d80a96fe716399a42b8b23d7b32bae607657e671b4b25c091a00e3c52d5ed20bb0752e14e75164623a8879ecf300ad70ca6d292ab1f2a69741830391
+EBUILD foliate-2.6.2.ebuild 1217 BLAKE2B bad2c61ebe50ad2780fcf432273ce882f04eefb16119d6627b185db713717ef68d408e08cd18b5af63db2d94971291744b734fbad43ae2e20ba66e3ae78aec9a SHA512 253edf5d06def6414bc22ae06a834260609b065a292dadc5a038fd8e0a44116f7ed68372be55b731a97f1bc4c12a002a247a6886d1bbc0723f923cc3748cff7a
+EBUILD foliate-2.6.3.ebuild 1202 BLAKE2B c3e662e2218eb04cb4be8090eedeea2325c49d586e52040f5dcf976cfbdd9f029e0c9d41fd5b9165d9d760d46d3afcba116b85063b76187e816017f81148f9c9 SHA512 4e2c3de331b47ae613dd90d5fba956a4c7ed80788737a321e9a91612004328cf1f6cb6c286964431bbf8d88712c98fc219aa91efad5fa6ca358a5f4a70c5d6b7
 MISC metadata.xml 606 BLAKE2B 122522b577e0911c008bdc8f6a2b52dbf5514c30011d6a57cebea044e157c26f0dc0075d92ddf70825b26cbd8291c858077a0bc467eeb64c050eee0734125d75 SHA512 ac916591078fae44e77faf87571d7d34eeeebb0253f243a7a560e52a0c3c67276871f7b7f48e9649922ecad13c54cce43c2cc6349dbaab0131a190dee7918208
diff --git a/app-text/foliate/foliate-2.6.2.ebuild b/app-text/foliate/foliate-2.6.2.ebuild
index 3352adbbf96b..685d66123a4f 100644
--- a/app-text/foliate/foliate-2.6.2.ebuild
+++ b/app-text/foliate/foliate-2.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PLOCALES="cs_CS de_DE es eu fr_FR id_ID ie it ko nb nl nn pt_BR ru_RU sv tr uk zh_CN zh_TW"
-inherit meson l10n xdg-utils gnome2-utils
+inherit meson plocale xdg-utils gnome2-utils
 SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="gtk ebook reader built with gjs"
 HOMEPAGE="https://github.com/johnfactotum/foliate/"
@@ -26,14 +26,14 @@ RDEPEND="dev-libs/gjs
 src_prepare() {
 	default
 
-	l10n_find_plocales_changes "${S}"/po '' '.po'
+	plocale_find_changes "${S}"/po '' '.po'
 
 	rm_po() {
 		rm po/${1}.po
 		sed -e "/^${1}/d" -i po/LINGUAS
 	}
 
-	l10n_for_each_disabled_locale_do rm_po
+	plocale_for_each_disabled_locale rm_po
 }
 
 pkg_postinst() {
diff --git a/app-text/foliate/foliate-2.6.3.ebuild b/app-text/foliate/foliate-2.6.3.ebuild
index c7f653b4b7a7..9aa32642596b 100644
--- a/app-text/foliate/foliate-2.6.3.ebuild
+++ b/app-text/foliate/foliate-2.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-inherit meson l10n xdg-utils gnome2-utils
+inherit meson plocale xdg-utils gnome2-utils
 SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="gtk ebook reader built with gjs"
 HOMEPAGE="https://github.com/johnfactotum/foliate/"
@@ -26,14 +26,14 @@ RDEPEND="dev-libs/gjs
 src_prepare() {
 	default
 
-	l10n_find_plocales_changes "${S}"/po '' '.po'
+	plocale_find_changes "${S}"/po '' '.po'
 
 	rm_po() {
 		rm po/${1}.po
 		sed -e "/^${1}/d" -i po/LINGUAS
 	}
 
-	l10n_for_each_disabled_locale_do rm_po
+	plocale_for_each_disabled_locale rm_po
 }
 
 pkg_postinst() {
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index 6da868883013..fc06baaabb40 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -2,5 +2,5 @@ AUX hyperestraier-configure.patch 12359 BLAKE2B 52fb2210ee4945c07fcd4e9812be052a
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13.ebuild 3590 BLAKE2B 35e242377f638faac4b8d8405d65a03fd4aecbf11a59c3101cee4c950adf5986c743e93fbfd3c3bed863134154392fcec6cd22e91b03043602d8b50488d2a3f9 SHA512 efb5fa77572f8bd61cb6f38ef94811bb7ad3ffb6da204f8946a11d2b9927e5c5717e3908ef334b13aeec5c94dcf75da8e4f940635728a1349798c3f8acaf39b6
+EBUILD hyperestraier-1.4.13.ebuild 3597 BLAKE2B 4827f592b08c0e3ddd2352f07e373c937600a4e5415b3b1c9c4a8e939fb88d3e15be6230f2c9c447ac3ffd3ff109e5f3c7a57d5ccab3241389c771a54976c642 SHA512 3be73c6f34d158ddaf1b4948f5460e6f4e6b2e667b2f891591028e229c1d2e8e95db7a9418fc9418ca28a593326d4d81ae813f62f5ec5ef0fa99e79a2209dc43
 MISC metadata.xml 440 BLAKE2B 5c3edd49e5590ef45d48db13de2f18aa00f332fe955b03b58439a05d3cf8d4ab623b1df6fb39aad7a6f74bef0f8072cf3a097c30be66793957b3cfcc5c35ae9d SHA512 421891e359bfbdafa6759bbaed59a430cbb6bef6bacf0109bb523fe17a19a5804fbdba26ff6cfd00ba19b5fff3d6aca60bd56fd5facbd0e3831f8a34368f142a
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
index dbacdc014acc..f759094eb85b 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.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="7"
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 RUBY_OPTIONAL="yes"
 
 inherit autotools java-pkg-opt-2 perl-functions ruby-ng
diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
index 0c67ca7ede04..93598ec38c6e 100644
--- a/app-text/kramdown-rfc2629/Manifest
+++ b/app-text/kramdown-rfc2629/Manifest
@@ -1,3 +1,3 @@
-DIST kramdown-rfc2629-1.4.18.gem 47104 BLAKE2B 692071c3182703848a6a6629454e06487919657ec0a0fdf33a7a4ef53421751fad81f67167c33fe0d9a5397bce270c660bf9091862739ecb42dc9adceefb6c50 SHA512 e1bc0537ef936f3519ecbebad055f3cbd136c117a62e84878fdb5a63ad224e2256dfe51285abc84345e6e7322dc3f131c9577d7cf3340c32d224451dec27b323
-EBUILD kramdown-rfc2629-1.4.18.ebuild 615 BLAKE2B cefdf9146f455535b25cee3168dfd48770e2710200dcd6f7d1b5a65a73c653a76cb266f09fe952bf481f68f647ac1cd4794c67eae7a98bdcef4556cb0f342998 SHA512 92f772c80ccf2778c80542ee189f8f2528e85657bc4519fcbda10b3c9083fc4a55336d7a7d10e7fe4a211510d6d95099d0180e513e696ca50740e097bf5f0951
+DIST kramdown-rfc2629-1.4.19.gem 47104 BLAKE2B a967987f34b0af0bff964488d640a8ca830e55b8a1955442896ed0bebf2cd4d9b902699e1347bd81d82a1b10e085ad2f2827968ff62e96cc4ea7f023f8336af1 SHA512 4843690fe10ae02d90a4dde9ade086308b8081155bd6fea1d83c38563cba1c2d447e337f658666fabb57ca9f85b5f4d5687db2503b0b28b5718b978b1db2714a
+EBUILD kramdown-rfc2629-1.4.19.ebuild 615 BLAKE2B cefdf9146f455535b25cee3168dfd48770e2710200dcd6f7d1b5a65a73c653a76cb266f09fe952bf481f68f647ac1cd4794c67eae7a98bdcef4556cb0f342998 SHA512 92f772c80ccf2778c80542ee189f8f2528e85657bc4519fcbda10b3c9083fc4a55336d7a7d10e7fe4a211510d6d95099d0180e513e696ca50740e097bf5f0951
 MISC metadata.xml 246 BLAKE2B ddf176ab07cd3f2a14f81f4df1a54fb58418eb8e1a916899898d00c87d175f881add29c9d5f7992b1c5fe7626afcfc3489bb04ef446a67c204e55d377e88d5be SHA512 a7bcfa33f9a281be74f28c1982f204eabbd847bd314872fcc2a546f1358d84376517812e0740480aef662534d4ce6c2da9b38d767d682421dee801f5b7e89724
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.18.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild
index c3777b12f31c..c3777b12f31c 100644
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.18.ebuild
+++ b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 56a57f01542b..7310f96e235a 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -3,7 +3,7 @@ AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
 DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997
 DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
-EBUILD po4a-0.57.ebuild 1297 BLAKE2B 42de8293d83f2e8dcdead27369fc17dff75e08aec9e3bda5bc5d6e9e5f9b5364bee5d12beb35f34bfe82e40d12cb9cc886f3dd1f8a7a13a11412ef5e3f907f86 SHA512 d4d445c964236cea24b8994fa2f2a04ed0f378fed6013d0ece1af582cbdfb17563ebed3de951cc8523de69b56ef28b04b00fcfae01a7198a6ebb48b2ed2b777a
-EBUILD po4a-0.62.ebuild 1394 BLAKE2B 14133ffae133b8ba2fe7821baba4826cc304be6449b4e6dc3138cd19d9f4dc591a41d61a1b72005dbab2906e65043c188e23f3898546460c20a0729f27934a6d SHA512 99f4070583570247cec9e2345546ac588f0805828b67179d8e86b998c7bdb752fb899f6942325bebb796130259fba77ea97fbecb04e5759dc77980ab4318bb84
-EBUILD po4a-0.63.ebuild 1394 BLAKE2B 14133ffae133b8ba2fe7821baba4826cc304be6449b4e6dc3138cd19d9f4dc591a41d61a1b72005dbab2906e65043c188e23f3898546460c20a0729f27934a6d SHA512 99f4070583570247cec9e2345546ac588f0805828b67179d8e86b998c7bdb752fb899f6942325bebb796130259fba77ea97fbecb04e5759dc77980ab4318bb84
+EBUILD po4a-0.57.ebuild 1294 BLAKE2B 99bc832e107366ff1f49adb1ffe74a0daf7f3ca64096f346bfc24020b373059d97d2be306eb5bf7b8bb87a95bc94758ffada7abd7b44c480e3debb1a658bffee SHA512 1ac41b725531ce40e1ccae1d6034d94f57b3ae2e9591a06ff28c40335722d143c065600268a7fd1c60ec1ad2c643440eff2cf8feb08f0d01eb62b8cb7e2d9803
+EBUILD po4a-0.62.ebuild 1391 BLAKE2B 45c1a482176dccf701cf754f4814faafa7c2a15be167bbf80dbbed11f71be76fc392774131bf8b41a35c3473d84541d0c18d08e2ae1e072806ad1510b4669956 SHA512 accd7452be3a2810fbaa7398efd0cfe5e45b3a0178ed4fbaa0c7a47166d57137012c83115c4a83770cc385367dbe6f26bd77cb575454f459cbf2e70ab58f5790
+EBUILD po4a-0.63.ebuild 1391 BLAKE2B 45c1a482176dccf701cf754f4814faafa7c2a15be167bbf80dbbed11f71be76fc392774131bf8b41a35c3473d84541d0c18d08e2ae1e072806ad1510b4669956 SHA512 accd7452be3a2810fbaa7398efd0cfe5e45b3a0178ed4fbaa0c7a47166d57137012c83115c4a83770cc385367dbe6f26bd77cb575454f459cbf2e70ab58f5790
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index ba809c6f215f..08593f0289b0 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sv uk vi zh_CN zh_HK"
 
-inherit l10n perl-module
+inherit perl-module plocale
 
 DESCRIPTION="Tools to ease the translation of documentation"
 HOMEPAGE="https://po4a.org/"
@@ -44,12 +44,12 @@ PERL_RM_FILES=(
 DIST_TEST="do"
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/po/bin" '' '.po'
+	plocale_find_changes "${S}/po/bin" '' '.po'
 
 	rm_locale() {
 		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
 	}
-	l10n_for_each_disabled_locale_do rm_locale
+	plocale_for_each_disabled_locale rm_locale
 
 	perl-module_src_prepare
 }
diff --git a/app-text/po4a/po4a-0.62.ebuild b/app-text/po4a/po4a-0.62.ebuild
index 6cb82437a08f..dfa0d2ba8699 100644
--- a/app-text/po4a/po4a-0.62.ebuild
+++ b/app-text/po4a/po4a-0.62.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
 
-inherit l10n perl-module
+inherit perl-module plocale
 
 DESCRIPTION="Tools to ease the translation of documentation"
 HOMEPAGE="https://po4a.org/"
@@ -42,12 +42,12 @@ PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
 DIST_TEST="do"
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/po/bin" '' '.po'
+	plocale_find_changes "${S}/po/bin" '' '.po'
 
 	rm_locale() {
 		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
 	}
-	l10n_for_each_disabled_locale_do rm_locale
+	plocale_for_each_disabled_locale rm_locale
 
 	perl-module_src_prepare
 }
diff --git a/app-text/po4a/po4a-0.63.ebuild b/app-text/po4a/po4a-0.63.ebuild
index 6cb82437a08f..dfa0d2ba8699 100644
--- a/app-text/po4a/po4a-0.63.ebuild
+++ b/app-text/po4a/po4a-0.63.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
 
-inherit l10n perl-module
+inherit perl-module plocale
 
 DESCRIPTION="Tools to ease the translation of documentation"
 HOMEPAGE="https://po4a.org/"
@@ -42,12 +42,12 @@ PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
 DIST_TEST="do"
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/po/bin" '' '.po'
+	plocale_find_changes "${S}/po/bin" '' '.po'
 
 	rm_locale() {
 		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
 	}
-	l10n_for_each_disabled_locale_do rm_locale
+	plocale_for_each_disabled_locale rm_locale
 
 	perl-module_src_prepare
 }
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 169fc93714f1..6223e9e3e07b 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,6 +1,6 @@
 AUX qpdfview-0.4.18-qt-5.15.patch 342 BLAKE2B 34ecd868ba9f38f43433f425c173b5cf07c0c9a2c7097e62d0af1b85bf49a3ef2f68064be88a12f300356633471ea8f04b69b66f9874cb5a8dbae3962021402b SHA512 ac6a742b957eb192117aece45cef8f2a9d76fe45d4cc87246dba8e52a15ac11c6892175fd73c8af3bd22a34ff36645828a5f12d66c240b6305d9621387fc3261
 DIST qpdfview-0.4.18.tar.gz 786577 BLAKE2B 07ef444ba39435578481e549fcbbd2d97362c6bda3092a17f1daa8b8437febf50cd2f145cd5e80cc1be565c5a658e85a428314a1bcd2a5a38efce0830f1cffba SHA512 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66
 DIST qpdfview-0.4.18_p1.tar.bz2 448818 BLAKE2B 690f93c7f0af376e2b60d69a9802cdb159a97eb66b572a913badcd7ce3b9303d69bf8fbb359b5aa09ad1c63b1b6865e3602c8dc9cdad2506a43273d410a64d89 SHA512 41152596e39e6084e4e46c1aca28dfa4c619bf31068ee3272c6119793da5d99c58868ecf682ed0dc81e740f20193372e2780cf7d7fb917545662c93e6a2a1b4a
-EBUILD qpdfview-0.4.18.ebuild 2259 BLAKE2B 4ef4c7f26903e1023a994906e37cdac704917ca93faebbf49954f668ba50b98d6bfa93f0cbd790aface623178da599a06f8c8e335fe6dcebc36c81ce3b638c98 SHA512 a104887cc16e4e36d087c462033c48ffebec60ac647019c48e8e81c07095330d23e2b4893399907cdc4a478061923d62975fe3f84eab40cde9dd8defd856a9b1
-EBUILD qpdfview-0.4.18_p1.ebuild 2204 BLAKE2B dc2999067507e3d0eda29812be4cc738f3ea0f46253b835970a8ffc0008893bdf8f13feeae42897a20aaa087ba39b567ef5ce72696866bd1ceb6aa1aacef00f2 SHA512 8a9126fffa6e382f63dc29303d4d672affdf2c68c11c7b6be98d9d01c68681bdb6bf6d097f148b43ed6f95acd8f128327943cebdc5a9fca45c3e9da1b8dc6e2c
+EBUILD qpdfview-0.4.18.ebuild 2256 BLAKE2B 2a3ba1b9b2b6d7bfea784f5776dbc1b0969fb51301b329d2d640f28c07379c53113ee0d2c246052edc890d393bbd76d6578c472663664d358a5d29bf0f64dff3 SHA512 60d1bde1f4009dc53ab577e8676a1b4c77dab3fcffeffdf71b3352ec98dc8b025f3287f269d5b297f3a7fdbccdb18b00263fabc53527193f07f951f61b11a781
+EBUILD qpdfview-0.4.18_p1.ebuild 2201 BLAKE2B 380ebb01acce606eeb450f4f5a33c8a50bd74c1c96135d5d4537d8501a52bf74175c943b7fa63905cddc3c29b19eec3300a64dd929bd47deab5a506209a1d634 SHA512 725a38926d92f200c2da39bdb9cd1d80b495e12c1216772435145b36a19db6af95e02fb85c1768b0cdf6a33d87166ae3f188eaea65d144e981b2d5111900d3b9
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.18.ebuild b/app-text/qpdfview/qpdfview-0.4.18.ebuild
index 4b30af5a4a67..d180343f34a8 100644
--- a/app-text/qpdfview/qpdfview-0.4.18.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
-inherit l10n qmake-utils xdg
+inherit plocale qmake-utils xdg
 
 DESCRIPTION="A tabbed document viewer"
 HOMEPAGE="https://launchpad.net/qpdfview"
@@ -56,9 +56,9 @@ src_prepare() {
 		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
 	}
 
-	l10n_find_plocales_changes translations ${PN}_ .ts
-	l10n_for_each_locale_do prepare_locale
-	l10n_for_each_disabled_locale_do rm_help
+	plocale_find_changes translations ${PN}_ .ts
+	plocale_for_each_locale prepare_locale
+	plocale_for_each_disabled_locale rm_help
 
 	# adapt for prefix
 	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
diff --git a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
index 7587ade6b21b..6422a16977ea 100644
--- a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
-inherit l10n qmake-utils xdg
+inherit plocale qmake-utils xdg
 
 DESCRIPTION="A tabbed document viewer"
 HOMEPAGE="https://launchpad.net/qpdfview"
@@ -55,9 +55,9 @@ src_prepare() {
 		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
 	}
 
-	l10n_find_plocales_changes translations ${PN}_ .ts
-	l10n_for_each_locale_do prepare_locale
-	l10n_for_each_disabled_locale_do rm_help
+	plocale_find_changes translations ${PN}_ .ts
+	plocale_for_each_locale prepare_locale
+	plocale_for_each_disabled_locale rm_help
 
 	# adapt for prefix
 	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
index cfe1a09dc0c5..6f6ffe77a64a 100644
--- a/app-text/ronn/Manifest
+++ b/app-text/ronn/Manifest
@@ -1,4 +1,3 @@
 DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
-EBUILD ronn-0.7.3-r3.ebuild 1163 BLAKE2B 69f0e58f11eeac58714bcef08c6e62ec182ebdd68c21e0b589db88eee8209a696f6d62da1ff1a6a78c08ecdcfad892966af16dcd53fb77d4ecbfc2a756706ce4 SHA512 6714f18e70c27e9a67a6dfab82a34d9505f5b975204f57ef0bf9c843872fc18429a592d8d762fde9877145977fc5669d67cd4da009a6fc8364b9e755a607409d
-EBUILD ronn-0.7.3-r4.ebuild 1162 BLAKE2B 00ff26318e4644f3eb0cb90939820c0dfe6af8e7e1772ceee6ac4c50f398d8087ef413982249d4aba39fc970ff7ed0fafc2f92660921746b0bcf630a234f4faf SHA512 aac2be29211f89280a53690e0d27fd56103db2b097beac2b07d41ee7b390d97b78bd89f2c4910992b8ad3b722ad02fe9e720815577fbd3f22db366c87ddeb153
+EBUILD ronn-0.7.3-r4.ebuild 1156 BLAKE2B cadb454d4f1ac2cc97e3fa43a1c6a9941b93d9f4ea05536e8a465e5ca379a91485c4382d86494c92acc3951c3615cb70ee4206096de14448f7583732a7f90449 SHA512 db397929a4506600c29dcccba09f0e8862795c5601c5298126d74177521276b1834fe5122525f15c68b992e15d017ff5ea6fe800a94760afb884824f142cb0b7
 MISC metadata.xml 339 BLAKE2B 2a1722a0531a1ccaba0d29a1ace114b95789ba4b0c692e8efcf38605f81de4dd1210671331fcdb5baa6536cf38fbf63f11b85fb13bd6a067be56f22a372fc5b6 SHA512 0be4072cf3514eba60569138ed409362b318616ad4514e319d9b4add120e74fd7655e2fc5c3ab8d7b5d813cfcf8e1054fb98395a1a89d9fb90e447a825ee9439
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
deleted file mode 100644
index c5fb5a2862b9..000000000000
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Converts simple, human readable textfiles to roff for terminal display, and HTML"
-HOMEPAGE="https://github.com/rtomayko/ronn/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-IUSE=""
-
-DEPS="
-	>=dev-ruby/hpricot-0.8.2
-	>=dev-ruby/mustache-0.7.0
-	>=dev-ruby/rdiscount-1.5.8"
-
-ruby_add_rdepend "${DEPS}"
-
-ruby_add_bdepend "${DEPS}"
-
-all_ruby_prepare() {
-	# Avoid test failing due to changes in hash handling in ruby 1.8.7:
-	# https://github.com/rtomayko/ronn/issues/56
-	sed -i -e '81 s:^:#:' test/test_ronn.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure that we always use the right interpreter during tests.
-	sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb
-}
-
-all_ruby_compile() {
-	PATH="${S}/bin:${PATH}" rake man || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/ronn.1 man/ronn-format.7
-}
diff --git a/app-text/ronn/ronn-0.7.3-r4.ebuild b/app-text/ronn/ronn-0.7.3-r4.ebuild
index ae854cc60751..6ac4adfb937d 100644
--- a/app-text/ronn/ronn-0.7.3-r4.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 IUSE=""
 
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index adda7d3565af..200802aaaa1b 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -2,5 +2,5 @@ AUX sdcv-0.5.3-t_list.patch 592 BLAKE2B 7f1618750a8d9c452f8db257a2b4791b803f45f1
 AUX sdcv-synonyms-bin-search.patch 3409 BLAKE2B e40f32a2e0e401ae5b996992fa227ef70a439f928d762285094237871b7dded242928bab8206a146acf1abf716cdbcaa8a8d0ed5a430ec4dff5cae3a3a014b34 SHA512 bf4cf297abed05f4052cbff8decac2069a52657b3cfc21435e72731536ab9605ddde9053fa8b39d9a2f1dc67416126b1b10a1c31cabca37a6fb31d2272ba5e13
 AUX sdcv-t_interactive.patch 324 BLAKE2B ecdb0d89c4a26050927272f244e43b28e945e3ef5cb93167eaea7c09912e504af2061ec34c2b5f5a32665c784093e2d35ed92e10a00824b619da71e53049e5dc SHA512 9067330c6fa95910b5dd67716c9bc378d29a9ccc5d60c1eb0c1aca12e58478ea381b91c5122c1951bd2f4c9e8b629243ea885bdbbc87a2f88174340919f5cf8d
 DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f SHA512 73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442
-EBUILD sdcv-0.5.3.ebuild 1596 BLAKE2B e45bda9e49c25cd7d0e3ca101d785186532f2ec2a024736b083f51ec642f34997713621eb15d5d6483054564268db136db0a843197a7b7928d40fde44d17203c SHA512 7691748f8948ca750e2d0a3c4291f2ccbbd0bafa0e2a5ad1a268fbd655772149c5cfea6cf1f751ba8b33f898e29411f5938f098171f806de12f6465d8918d313
+EBUILD sdcv-0.5.3.ebuild 1599 BLAKE2B d1b997b6d9b39686690b1cecf6f51a79144e90d3a6f398a84c720071b99e5f707f286b58c029dd6d452632f9408aa156aefb5dbae5a9671532d5beb53222b5d8 SHA512 2ee3c48aff47225c46f9767d22c671db627a939168d20d1ab462266da12712b0c04933fda126479541811c78923d461cc48ec81d8a237ffa37a7da02e392a6a5
 MISC metadata.xml 448 BLAKE2B fd8196b4fb4caf645780c9b9c3170aa2f6148d17c359d2ea5579eff73f91b7eed8507ad8ed99a93c02ea7bae327bf6641dd1b6863539be379f45b4258aee1342 SHA512 f265fa0f3215a1effc00060394e942f10b7f5247bf6c1c55f9cbeb28ae26bc7398bf97acdc877d545a1e90a83b8ce41eb9780beab1267c99061f2b391a59acbb
diff --git a/app-text/sdcv/sdcv-0.5.3.ebuild b/app-text/sdcv/sdcv-0.5.3.ebuild
index 838b28af56f0..8f7ae8fc46d8 100644
--- a/app-text/sdcv/sdcv-0.5.3.ebuild
+++ b/app-text/sdcv/sdcv-0.5.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="cs fr ru sk uk zh_CN zh_TW"
-inherit cmake l10n
+inherit cmake plocale
 
 DESCRIPTION="Console version of Stardict program"
 HOMEPAGE="https://dushistov.github.io/sdcv/"
@@ -41,7 +41,7 @@ src_prepare() {
 	rm_loc() {
 		rm "po/${1}.po" || die
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 
 	# do not install locale-specific man pages unless asked to
 	if ! has uk ${LINGUAS-uk}; then