gentoo resync : 14.08.2021

35 files changed, 215 insertions, 140 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2dceea24f367..564e94d212a6 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index 3aed1a0f4f84..fb0285e7b0a2 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 DIST tl-dvips-2021.tar.xz 58076 BLAKE2B 23105928a22ecb0fb9d9b3b9bc8e5edb2eb42c7cbcb48e80d9e72ea613a30a82c2d825eb4caae00bd04241260257e6feb400767fa3a12c55522799272dff2996 SHA512 1eec2ddbbc5d211f1d38237289a2bcfe716fe41210d47f6f9111a009dc179ca3dcaefde11e49d28d4cdd26b992dfed7fca3bff3178a6ca273f396afc45118013
 DIST tl-dvips.doc-2021.tar.xz 521496 BLAKE2B 7c366af47a1ea967e871e5740d8debb1751b67b9e41a35aada0327c1aa26c04a90baf1898c1c50965ab766006028f5fb13264f5d7cda87fc630dd99300995b5a SHA512 07b00a4bfe557a04a93b22667f4854e2d55f76f33d2fa767d445b3301835aafafd4b8046b7126d5f516b65a743b1d0fe32a8fa3d0dc9b7b29e47bcfdfc790138
-EBUILD dvipsk-2021.1_p20210325.ebuild 1570 BLAKE2B c78e39014e5664d0ad169ba169fe6be609a656dc649e1e24a4bcde60cddb71121388d8b04db0c01b9a4b7fb0b4980dce9cdc081f3727c923da224116672e9dd8 SHA512 2de9abcb7c94b46635644f0541a189fcd278ef4375f74151c7f937b858cdf61449f82f04e054d990b5ec17d2a95c7dde0e39738c072b5f33160088323855b3a3
+EBUILD dvipsk-2021.1_p20210325-r1.ebuild 1572 BLAKE2B 37a83edeb504905c55fd930e1f4135d702ac6400fb2976df8038c1090724d5fd7270798a8bb83f74fe2d5112452824dacb36b55535e37e7c0d0e13bc397740da SHA512 e65243b4034161fabf3c60b27c6bb0b646226a1c82e431d9ad0ac489e8018d191679f3a857745e38d16e89687767e2a07520b0d16fd96a4f360e736d94606d61
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild b/app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild
index ee98901e5704..84f1ed701a17 100644
--- a/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
+++ b/app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild
@@ -28,7 +28,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
-DEPEND=">=dev-libs/kpathsea-6.2.1"
+DEPEND=">=dev-libs/kpathsea-6.2.1:="
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 8e2a48b27c09..35cd3ae42cca 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,6 +1,8 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.3.0.tar.gz 986837 BLAKE2B 57859d41d1e605ba5b89a264e3b6f53bab7a2f060c2b306a1ac51c55925d5b30a5d40fd121be7d3df22395cc11ad4808e63627f7e0f5ae9f3c1d2f2939dc2f68 SHA512 ed25d74176aefe4ab3b1754ea09356d04c844f8e7a50441d331fcf6a0fefbedaffa21df7296b7947ab1fcd44844c1d8567d39d67ebc4381ce8766577c0269d43
+DIST enchant-2.3.1.tar.gz 987361 BLAKE2B 86d6f384ada861a1df40a3241d2d32ef8513784c9dbca3b71bfdc52e2efc94c4d9cfb38e752970dc31a36545c1f9bf32f0550316b969d9170363e8b52c030819 SHA512 c6fb8498d34a55040c2791124c2975952497e5a1b8999958691279b1a60a37473a1d2e3e11504f7cc877370be7772c2db621022040ea7035b21e40e8367606f5
 EBUILD enchant-1.6.1-r1.ebuild 1618 BLAKE2B 339676eff2871a9abd5bf85a3509924677ec5d9939e49416d4d09b71d4d228b45e81f8ac6b207c449c8ca837aab0d8d63add052598a0ce9430873bf0ea3df250 SHA512 eedb24e76290dffa83a68a565e2f5dc10544360a62617bea107a4270d13b5a6dbb19418a245c84923ad3dd5d6e77dda2338f14bee2b3a17ddeff1b7c2414ad2c
 EBUILD enchant-2.3.0.ebuild 1234 BLAKE2B 581181d56ebf49b2d414dbbc9b5b10978b00995af9c1351fde61323c7a82037f7d1ad9bf04e45fab52d493724d77c1b722d363c5dd83e7be9bf61d674c8f0bd3 SHA512 ffd97fbf9221420bce5cac19b147c65f945ee5c612728f7e400a9172fad1b62aae24ddcf811a6ea12fe9bdef9fb73fc1bef41d50a11c012db75352e253d48c91
+EBUILD enchant-2.3.1.ebuild 1241 BLAKE2B be853d1f72faf5dca852318b15cf3c61c5b0b2938a76863df67602dbc244a58d651c080e5f367a8e6ad226367808de6415b931781a2507a5d0440c27de635f1b SHA512 3f4176267b8e7cbd0278bacccafc89c4ee3210947db628a4dc919c418541f47ba46685c31eb5378b978205c30de406c424507dadaa01ca7a506844fcc1b054a1
 MISC metadata.xml 536 BLAKE2B 5f66bf0da00c6cfd8d6e22b9644486d0df8cf81cf5875768572965f60927edbe4d46ed2502659bcb71431c715129d1d7da051f9320b3f2834905a0cac3c2556b SHA512 920c2056608571d6a2e52d0c52b995b664c95aa53c8f8cb51129b059c32180d977ab3c840ef7fb59af3dec5f984f3e1488de26cf3ba4d93c2eb81c08e6688d5b
diff --git a/app-text/enchant/enchant-2.3.1.ebuild b/app-text/enchant/enchant-2.3.1.ebuild
new file mode 100644
index 000000000000..1c7845af2065
--- /dev/null
+++ b/app-text/enchant/enchant-2.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+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"
+
+IUSE="aspell +hunspell test voikko"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )
+	voikko? ( dev-libs/libvoikko )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/unittest++-2.0.0-r2 )"
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="test" # Tests fail
+
+src_configure() {
+	# TODO: Add app-text/nuspell support
+	econf \
+		--datadir="${EPREFIX}"/usr/share/enchant-2 \
+		--disable-static \
+		$(use_enable test relocatable) \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		$(use_with voikko) \
+		--without-nuspell \
+		--without-hspell \
+		--without-applespell \
+		--without-zemberek \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index f8de800c95da..b439993b92a0 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,5 +1,5 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
 DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
 EBUILD gtkspell-2.0.16-r1.ebuild 962 BLAKE2B 3b1b2c8698e33546a966d52540f5bef5e2530bd1f243a7e535df2d0c7875b1090acff688a9caa5cafc8deef8adfb4fbaeec92c13f68ac961b8fa4adc78cc251d SHA512 ba597329153e1c094e47332052cbcb558a807f18ced4cabe315090d03948ee45064453e3033d470124cf014272d5700ca9d9a7febcffdec46679701eddecf3da
-EBUILD gtkspell-3.0.10.ebuild 1049 BLAKE2B 571ae5c4eb78934fed4a53dc7c882c598f75318d472fca3b9e29ec0baa87bb999ab3cf00a2bdc23b0252db43fdad249840100c5c938f7dab1f9d422fef3cb0f1 SHA512 4066930b06f1ffa693a339460af9f73e426994dd55361c13b198d3ae227736ad15b91c2d53f30890256cf35b250b05b58d47d802a87bfdefe30a2966070123eb
+EBUILD gtkspell-3.0.10.ebuild 1056 BLAKE2B b67483668cffcec1745ec6cfe994630f46f8d8e9532e62194919f53785497039050df7a71cd5b9e606c2697fe7869a12812cb9912945c08b59afa351c7d676c3 SHA512 9aaf07d5b94e22bab319b3908079a4de079647e0213e8447d3a5e3f7d904bacefb25ee594b37fc71a143e18cd8172e8f00e5d3ba68f8756d641a47ee55d89faf
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10.ebuild
index 679cc5564c86..9e36430f1a65 100644
--- a/app-text/gtkspell/gtkspell-3.0.10.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index de85d5fd756b..030dbba9e00f 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,3 +1,3 @@
 DIST htmlmin-0.1.12.gh.tar.gz 134130 BLAKE2B 5a9996bfea469f273c37bd0bd72c0e27b8636cb4552681de1b7e9a4849ab215815f7fc8ce430392b8ca3a849b3e51d8188ca248a8ce23242905799258ceeae29 SHA512 6d9db4b6bcdd6d223be8b4e3830da4d63ac6d7d28ee83abd97809b0b901968c994c8434c992fbdd148101ba25d8d786c93657cb5f82881af44dadbba40bf3252
-EBUILD htmlmin-0.1.12.ebuild 687 BLAKE2B 4a8633cd11e7fb60437dba31dd8b59fd7e700f036f6aa07c9e1fff10f94aafc69772053a8689917a41c819e2ca38d5f1fa033988d6a5e142576d2f46b501d7d5 SHA512 d6826148506e788755c19e8d51db7d633eb2016f1af5fe37d000e8415864ba9a877d40fe25b6fd84110fc904eafdcab80d2a04900e6d2b6353589586e3279067
-MISC metadata.xml 478 BLAKE2B 781aa02d2f61dbd03e9d20713185755b0928199656d6cb7694feebd7e383043b1f2506210dd718a440e473c549bb4d85bc90dd1273eef5d769e65e1fc5186faa SHA512 0565add7d5aee2a81c7e799c695f29fe6d2054fd1fdab26eccef7a7b746c59806872eb537862b8e96ea31fae0cc9eeccacfef270e59b1ee29e8868cdc10a977b
+EBUILD htmlmin-0.1.12.ebuild 655 BLAKE2B 692cb8f94b95d5a852acbc75b73a9a3d5bf23b7a6dc787deb4bf9620ee68015a9e9b2c248141e40ed46021043066fdb4e5745cf588a9be2670098412ac018b08 SHA512 efd7a16fe7d9d062464042e08c2e9dc717ee711172b05fb4f8b23bdee8f5970c58aefc524f4e1f9b09ec818e055a242724873f88f53c3b30dd5d208557c08e3a
+MISC metadata.xml 502 BLAKE2B e71b708608cfee5719f8db0e020dfd52815e7720377c13f5544d68c63ddce29cf12c2e2c673210d35aa80d1ba73b9c31b69e5be36e8780e5d31e9b83314c81cc SHA512 ac23b65f0816a818a116c5ee45c850ac946ac419da0205a9d1668f320d6d404f0158a9207a24c35a75d9c575605be174393178b89ff81d1b8d376fabb398a923
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index c58e6016ce1d..75f74c7c325e 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/app-text/htmlmin/metadata.xml b/app-text/htmlmin/metadata.xml
index 86d2c7f7283a..e0e92c8771d5 100644
--- a/app-text/htmlmin/metadata.xml
+++ b/app-text/htmlmin/metadata.xml
@@ -9,6 +9,7 @@
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">htmlmin</remote-id>
 		<remote-id type="github">mankyd/htmlmin</remote-id>
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index e5daf21e9b84..f961e1815450 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -6,5 +6,5 @@ DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fc
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
 EBUILD htmltidy-0.99.0.ebuild 1970 BLAKE2B 3070aed3a7fd97500449b0a9d15e94310d0fc6e1132031eb780c219341906c9c28d18c17510768a39f7c0abeada96ba536281d4e363cd9a5dee333cf05d80ef5 SHA512 c2daf06a319549320e4510df60f240e9f6a9504657fc230ca3d6af535804b1daf47fae2c6f92bab84fdc31b3968683e30228196249b60e92d480540006c89c2d
-EBUILD htmltidy-5.8.0-r1.ebuild 1673 BLAKE2B ba7ea7bc6a05fc3d21c31bae0d7fc2d57b1382920b4d98acd04283aca7c65fb45096b759d41ed1940f2cd77c64b559964d558f688d5b6488e6c74f519e5133d1 SHA512 79f2fac07b6d4a75a2b128e5834799737270a5c23b864f02d76dcc78ffad3751cf4342c324565b31b3478413c6075d83f440d89ed3fcdf328db02b1e45ce475d
+EBUILD htmltidy-5.8.0-r1.ebuild 1497 BLAKE2B 2708e7b4d932a3938fc06ffd4b0322e3863e64b7f986a3fb940e3c25d32e97f21d7f0aa2be8bb779fa27ca637052aeaf0a8014f300731308829a87ec18fca954 SHA512 63cfa9d65d64fdfa41209358424620fbab4eaf934841eb70c39f9fddfe9efd88ec870f3534a6ecf2a6af5b9027f115919a6d32dc0292b1b931cb993404eb0727
 MISC metadata.xml 495 BLAKE2B db90fdb2d6e42059e23252b6be26e4d010c2bedbb522fb247b18a06b9f4328f8ef64a170e170cd510e7a677da4c046217914637416e37b0b31bb342362915efd SHA512 c83ecc62f8023d8a9d2ff50580e2a43879c0a99e1249e720ecd5bc90cdb9c33f0a86d4c65db580f25f2061f409ca27ba196b0088670367e40d2e29522e1f704a
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
index 3ca575025b3c..c4e20905155a 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -20,11 +20,8 @@ SLOT="0/58" # subslot is SOVERSION
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="deprecated test"
 
-# TODO: in principle this works but the new dependencies have got WAY fewer
-# keywords at the moment, keep tests restricted until the situation has improved.
-#RESTRICT="!test? ( test )"
-#ruby_add_bdepend "test? ( dev-ruby/thor dev-ruby/tty-editor )"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
+ruby_add_bdepend "test? ( dev-ruby/thor dev-ruby/tty-editor )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.8.0-no_static_lib.patch
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index 2d3f0c02cc2b..bafecec02676 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,3 +1,3 @@
 DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
-EBUILD lcdf-typetools-2.108.ebuild 856 BLAKE2B eaed248a466a61da725672885f7a2cd3f4161f981a4cea0c78e942f57e77b9b6b96908031cda67e9736199bb167947b70a8cd37cc4f9c51f0c0f45a5495547d4 SHA512 20076b57267e515c108eeb7a0e0aa404ac516295d04ee62a675d50956816f3ca124220289f4322dec02a44af83b9007990f5176154d57636c2656504f7303d66
+EBUILD lcdf-typetools-2.108-r1.ebuild 858 BLAKE2B e8fbc3b951c63da38fad8cd2cce2096a3d6f3f936d1d822a9a535594134f691633a8ff48170308ac98eaf0a8211dac3b41f22a083811a7b40474dfc23a1aa03b SHA512 518ba50d5f15493ee610baa2564d019669bdd05c065dc913f99c198bb1cdc96e7ee58231f237bd64e346a37784b133c4167a33b2fad739abd06b7c2d95b74ef5
 MISC metadata.xml 794 BLAKE2B c611036ee3c2daf88b72b026f0d8bec0e05595db2f73df051fb37793eda6304e1a32137e7759028ef4eb75bc56426d6ee2649d5384bbcc41c2da56d32a647b8e SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
index 8d0afc264b77..b1b8d8ccf1f9 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+kpathsea"
 
-RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
+RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index 031875ddd963..9a34144c749b 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,4 +1,4 @@
 AUX libwpd-0.10.3-gcc-4.8.patch 470 BLAKE2B a77e5a6fdc4dbadc716ed3c4bdb5ce04e2e173a9ad6dd57def6e622ab68db2e5d386a21d653a515b069c4982df83ee99ceabd80ce36ef6ab0605351beaafec5c SHA512 9bcad3f4ae15213c26d9730e5a496dffbb1c01b1ec85fe4eda8edc5bda3ddbc0df5b6d6a9eaa3d9c944f3f5900c189197cc0925df5adfc6523eed3e4ea327564
 DIST libwpd-0.10.3.tar.xz 534712 BLAKE2B a7b39713c0df908912d0f6f94c6c0f7056a685dee7542ea88c441f055ad7cc62c1159985c459a4ff67d5b5fe4c412c31c9a9a2924702386ed5b8250147f071ff SHA512 df14f11e885a583218afdb0aafe8a15d01890289af8b316cd1d225e4a83996c82907fbfdde83257dc71d99bfbc5b21b2c96536f5a783748388659155dbdb8949
-EBUILD libwpd-0.10.3.ebuild 784 BLAKE2B 2abbee6df35a3034e18b2ed89e14ca67ce433c31a4905d522983e68b883a7dc66fa08c45c57237ed2e4d4029714cc3ba007ba07d0093bc69e7abd50d629c8aa0 SHA512 c349c45c997b1a639c1f222edf7e5bd39c9ddf015da03739d4247de0c1fdf01752af665879c1f7642e255d558bda66c304c0b85b0748e74b69cd319651cae7b7
+EBUILD libwpd-0.10.3.ebuild 791 BLAKE2B d806ecef35aefb4950af451b3442aaa35d8f3ddf11ab35b5c354468495d36006286c2cf432f4b0e0a02cbf1b5e1142f1339d4844e6103912567448ad1beaf73b SHA512 19cc1d82a5f1b244cfb91cf38f7350354b9cafb2e2ebf7dbf25c115f58f2401dc54e04a11dd015b8f0dfca39dfea429bf36e509d04df40d3e7e6a04149bc5176
 MISC metadata.xml 402 BLAKE2B 449d3fa4ee2b0be84bca5eca7708b2e318060e7d85c84369ab16923edfa4bd3a19eed80b11d3cbd7c4d9a12e2d3d07df6b0aad95f011d1ce100fd9a6fd22206c SHA512 af33c7d44f5766cadb1955928210dc6f28171eef00cfbdd96a0257226bb7eee560fb05cf58673dfbbef932600ec3e8fafa666db3f9c3ddd2bcfa5a2a90cd77f2
diff --git a/app-text/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild
index edac8b995a8b..7031422c057d 100644
--- a/app-text/libwpd/libwpd-0.10.3.ebuild
+++ b/app-text/libwpd/libwpd-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv x86"
 IUSE="doc +tools"
 
 RDEPEND="dev-libs/librevenge"
diff --git a/app-text/libwpg/Manifest b/app-text/libwpg/Manifest
index da1cbaea0b5e..f0c42ba5eb8b 100644
--- a/app-text/libwpg/Manifest
+++ b/app-text/libwpg/Manifest
@@ -1,3 +1,3 @@
 DIST libwpg-0.3.3.tar.xz 328664 BLAKE2B 02ffaf8ea96e66dea94d847c85e17db5b7efcc5891bb1bf4069e664ece09f808b7462fcbb08a75d6ab17fff4ea51a8e494c48fba1540aed132f47d05b746e1a5 SHA512 99f8346b336eb902626fe07836c73870a57e100620ddd242ce7c2866e564483ed024a3a0b2804f81a0f59a0873310c3a93c005d306437a27818a6f4374c0c491
-EBUILD libwpg-0.3.3.ebuild 774 BLAKE2B b460bed9645b23cf216d0ec407f1c1c509fa875b466c9f47dd409f8d154f262dfaa69010db9725377cf12506ccc20a771d3859213d09dfa71ac6f90afc5493f0 SHA512 a101526ad894f0c6113ac2a85ee5ef2d43577bbad3880290013034fd6de83934173d6439e666dc5f7c118683bed5418506a3d53ceea0ed63193edcdb6d9c6992
+EBUILD libwpg-0.3.3.ebuild 781 BLAKE2B 4a5ff90dafa6cb864d3c3d94b36e68fb2171f1e6287807097c34f7c9a77b2973356cd4d36dacc0772022e7dc67039537293a1e0c7ae2b346159b73858c98e71b SHA512 4dae25a80b57a98eeec5cc9da8711b2eeec1a13f234134d7224ce9a0c8628973e1ffa24631832db732a1baca831709aeef4eab6ee544c54e0986cda10a948c6a
 MISC metadata.xml 441 BLAKE2B c04d84af2f7d50d0c2ccf2b134b90de33ecd52a1be37e018c2c4ae071f0a54628b16c3da82398bddc4b9d53adff5f0b5da0356d12b9138b19cd4bcc7433a1255 SHA512 9725ace7bfceff2309f836bf01ab5da588f24da56d85e1130c098353e617945b820b7763cf0932e15e2b5d7ed339929fed26e8defc6a19bcad17235fe01bfc3c
diff --git a/app-text/libwpg/libwpg-0.3.3.ebuild b/app-text/libwpg/libwpg-0.3.3.ebuild
index 79b75e002d3a..c2c69bbccd14 100644
--- a/app-text/libwpg/libwpg-0.3.3.ebuild
+++ b/app-text/libwpg/libwpg-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index a918458fb898..8619d8a87b73 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,4 +1,4 @@
 AUX mecab-0.98-iconv.patch 302 BLAKE2B 3644a66b1bdf9099ff0258a057c930c1b2e065836b0e6332211e4d04efbbf39da1de2788d90143826a1c9d887fcb63042e533864e746b7c385baea485cb93490 SHA512 c0dcaa8637f1c16a33bd4dd4007225a4f1ed3f0eebcda28dc7d92ec0a66ea16b5bdd956fb3a904af8070ce0ac2d6c9090b602b4705e73fac1100a845b3a756ce
 DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
-EBUILD mecab-0.996-r1.ebuild 1158 BLAKE2B 8239923e2cd764ba3ea77543f070fdf19d2f210c70f36f469d3931d97908e9f977e9a6a875381a78c1e13231236cce8718580a0977a5e5c08b09a97a2a4964bd SHA512 d25196718cd63a1f4349375e735e5e8bdbdb8f7a4c3fa1297e750df584c3134e70e2e6fec0f59865d75a015c3036977543d95f31f262f23c9e67a1666f846878
+EBUILD mecab-0.996-r1.ebuild 1165 BLAKE2B b90735226421ed6a6346fbbbff16a5057f90a79db774289df4992cecbd78384870349e8f7dee510e2887bb9cf302fd8f1ee50b226eaf8206dd51d9163bb37147 SHA512 2d183fd19337f722869cdc36aa293b31319939bdc306cfb6e836d7b54dc29a75da425fa2a576fb7e7c30be4479ac5d04b1402915a9ba3536ef6fe0f458a4234a
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index 6db5fa57b549..68305e1647f7 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://taku910.github.io/mecab/"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE="static-libs unicode"
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a2c51d7f963a..ae84213a48b9 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,6 +2,8 @@ AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 AUX poppler-21.04.0-respect-cflags.patch 5738 BLAKE2B d09ed8ca5211b89a06b56d8e7f3564ca6b388f36469d174444a5b974ef0403e55061900b79049ad9192a0a5e2baa0bee295904c3ea27a74dfba7eb8813501600 SHA512 f9f915f3343f42f504080320fb1e35164f489abfa55bd7bc0889dffe05db56f49c8a528bc253e315e5616e6baccb413710a562021538ad4fa7f081b673bc688b
 DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
+DIST poppler-21.08.0.tar.xz 1717372 BLAKE2B f617b41ebacee183730f20233273a2cc773c12b6c9d045850f8e738985b9079338c0e86b66d598a5dd4fd0227f70989604164a38fd45150b239e603c4da7e42f SHA512 266583279fb5c6b5300d23f8ba5b9da3e1f475fe21341a82ed7350dd9e321e243f3ef051944006c4f242c2d63a8c46bcda565a56017eb3a68caa5680ce719211
 EBUILD poppler-21.07.0.ebuild 3339 BLAKE2B fa5a0f1aee4edc405149d5573b917320eb8748054687222ba9dab6c61105af7286022bfc7d7b685aff174966a7d0db1274dddf9464343fd4e35a4dd6d5c53921 SHA512 c0f8caf6a63c76024c668e8f98cdb67ddd5ff3a0798cd54d1276a1aecae54324dcbbd291e308a4e322eefa61ff13a34027fe86bbd9f464a8fc9873da6a41af48
-EBUILD poppler-9999.ebuild 3340 BLAKE2B 916235fb20cb98652c0f5fe4f738b513d8a987e2f9c94965ebdf7a7b284b2f317977f0cd43c2cfb0786db4b5bf90ec659dbd7f7b0ba401a63d139c892a396ec0 SHA512 17b37f071e8136c0b8be0924909e5000ff7f36af97e8917b282ba08536aedd6c1bf32674be101e48585a5e4744e36238565bae7fe73f96c323abeb816f39cb54
+EBUILD poppler-21.08.0.ebuild 3347 BLAKE2B 700214c4ab1e71cc530bb084915ffdae2dbb4b56a30eed2ae599c0bf8f71fc03f5357ab105c41123c075397743ee86b0cc920b0356c642ca7e4ad1ccc663e293 SHA512 2964d203250ad578b09895582fdf02e855b2355944bc318384db76d39701582233382c436f9d2f22e643a88db98dc891070edabe3a11c94614ace4fc224cfb95
+EBUILD poppler-9999.ebuild 3347 BLAKE2B 700214c4ab1e71cc530bb084915ffdae2dbb4b56a30eed2ae599c0bf8f71fc03f5357ab105c41123c075397743ee86b0cc920b0356c642ca7e4ad1ccc663e293 SHA512 2964d203250ad578b09895582fdf02e855b2355944bc318384db76d39701582233382c436f9d2f22e643a88db98dc891070edabe3a11c94614ace4fc224cfb95
 MISC metadata.xml 1077 BLAKE2B c49251ca6f1d793da24746e5161d43b01550c560fb942d64298c19a889c531f4c5fab967cde87f7063ecb4789a6586e40ca519b196633912ccb55ed568a650cf SHA512 c09156d438acc9cf85e77fd1f57262596c28f305559d9635d4a457189f88e56e0689e102ad60d2be998b9e286c36ed45227e95ae5e9ce6a247662331d44f2076
diff --git a/app-text/poppler/poppler-21.08.0.ebuild b/app-text/poppler/poppler-21.08.0.ebuild
new file mode 100644
index 000000000000..be72663ad68d
--- /dev/null
+++ b/app-text/poppler/poppler-21.08.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/112"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND+="
+	boost? ( dev-libs/boost )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DBUILD_MANUAL_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index a7d99002f542..be72663ad68d 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/111"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/112"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index b421a41be2cd..cc213e8279b5 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
-EBUILD ps2pkm-1.8_p20210325.ebuild 785 BLAKE2B de32e7f98c38797d5fdcda4b77ad942d770ee5d6069566305044f7b6ce6c854a93bd01aa485aec31f6f57cd915fcaaa39003cd753734b0663c528a9c03fa1a5d SHA512 04332f0df8002f5b69f6d0c6da226c2a26a3a59b28fa4e92e08e9ab05c4e37c0b55d75ce5fc2c75a0aa798e9c95f17b6566d7e8ef0261a73b590950b23f398ca
+EBUILD ps2pkm-1.8_p20210325-r1.ebuild 787 BLAKE2B f700a133a2ceb6945bb4ceb612d3a728e799426019318c2f72fcb9312bf3bd37af38a13e888870edcbe24dbcdd4e986fa3d49fcbe45491b1a17b43811a43be88 SHA512 4c54c0fb50730dbe643f9b7dc8e69794c80f1490f11d73cefb1d25a8a5cba4eff7a4fc273bce00e3febd6b0de297de2fa06b821925a61be73333bf727b11b414
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild
index 5296e0bb44c1..c1d0a1b552da 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild
@@ -11,7 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
-DEPEND=">=dev-libs/kpathsea-6.2.1"
+DEPEND=">=dev-libs/kpathsea-6.2.1:="
 RDEPEND="${DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index e8d284fc3428..8c2ab9c51f71 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,7 +1,3 @@
-DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
-DIST recode-3.7.8.tar.gz 2230154 BLAKE2B 853a53d86a3a3600e5d70a8dc67bab9b0fa7a9dfab79e3f4ae8611f54c955802862689077774f7b21ce360f2d91c65ee238406ffa137a84545157e3a70853f42 SHA512 e6cd9c7d3eb5c179d3f62804018d1d19b71a3fae72b0d76aec730c36e64c50a571cbfda5340ac50244a16ccdd9265f5610deadb8908067c3866fa68cbbf0ac70
 DIST recode-3.7.9.tar.gz 2230259 BLAKE2B 36039ba9e62c5113231764dfa9cffa73b7ff5cd91bab622a0daf0a48a73ab8a62afd16132cec2590eed14623ce5b86ad057e8ca8454cf8185869f0780b3523e7 SHA512 277074dee63cdc7f1a1be2acca67481b8fb816bd4319fe8e882696e42d15309750b930fa9e8d6286e714132a976f0eaf87f718560d6cb86eeaa79b86f0700a6c
-EBUILD recode-3.7.6-r1.ebuild 1006 BLAKE2B 23141789d5bbcc6beabe28c9d45b29f9f0c984c5d8145351dff53cf73cf97192b6c022d74b864a5265d1b90eccf28e0dfdda7aea0d28ffeaf7923bce8655207b SHA512 4d598eacabba0db13ceee3101e738855f8f7bf5560dcfeb18f9bd11433c65c053cc2f79c36a63025297b6fa7309a23962d9340eb6bdeb7bcdcf1c80cc42bbcef
-EBUILD recode-3.7.8.ebuild 1299 BLAKE2B 5f507df510a1d03d4acc5ac5393bedf458db17a8c080ae3596b3a4f269d873ec56312a502cbc085d5b1669f0b42a28ab96a952e2d707c80b5dab97802f1f7989 SHA512 08ce3bfed0aa9cc49702b0390365cc3c962eb1a63dd32e6d673460de13e0cda7af7adfa8d4aa72e8f23deac50fd5a3d41f570fe7feafc23fc305f11020c07ffc
-EBUILD recode-3.7.9.ebuild 1300 BLAKE2B d228f266aa162603118fba47366bd92fe7bd22f2fd4bbd5cb02832c6cbdeb9fae82916019e22dc71020819a0fceaae5ec699f27b32e1f3aae873e6ab62e4e502 SHA512 d33520a845d48b5dd04184c0ec37510b741eea161835be6c556122b11a04bac838e8f6278e633402bdfa9c4f2ce04e3279f9e22e980d03d20ee2198ebb0a48a8
+EBUILD recode-3.7.9.ebuild 1301 BLAKE2B 2303740e5d156d369dd91bd76c31c3e22095df1e18a4b96dd994e9fe9f5be532cf999848b4d3a75d33bf7e2fbc515748b331073a3fb1aa771f130499443d2fda SHA512 0aee8d73e372e6f81ed80800336ed7b253f0cd79448e531610f1a5edfbe6d1bd3d4088d6a5081329ce70b1aaa884a7753df6eeb1553f6042d23a0f6f0c2ea372
 MISC metadata.xml 430 BLAKE2B 2df5bd5e46e37f7e60a6064a2f13876bc190121189057c703d98354a24de68e49b3a67337bb10a43c419b777af014fc0238940b44ef812862da5eb2250a06a5e SHA512 796421baea5a32814112194ac554251426312280ecd1517076a1b73b4e21026cb149e294df50a00e0c4674066640d0f5fc9f650198cde5b1a44f8f1446715d3f
diff --git a/app-text/recode/recode-3.7.6-r1.ebuild b/app-text/recode/recode-3.7.6-r1.ebuild
deleted file mode 100644
index 52086b8a4c8b..000000000000
--- a/app-text/recode/recode-3.7.6-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool toolchain-funcs
-
-DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="https://github.com/rrthomas/recode"
-SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-# librecode soname version
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls static-libs"
-
-DEPEND="sys-devel/flex"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	tc-export CC LD
-	# on solaris -lintl is needed to compile
-	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
-	# --without-included-gettext means we always use system headers
-	# and library
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -v {} + || die
-}
diff --git a/app-text/recode/recode-3.7.8.ebuild b/app-text/recode/recode-3.7.8.ebuild
deleted file mode 100644
index 15bed5b9e88d..000000000000
--- a/app-text/recode/recode-3.7.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="https://github.com/rrthomas/recode"
-SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-# librecode soname version
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/libiconv"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/cython[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	if use test ; then
-		has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-src_configure() {
-	tc-export CC LD
-
-	# on solaris -lintl is needed to compile
-	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
-
-	# --without-included-gettext means we always use system headers
-	# and library
-	econf \
-		$(use_enable nls) \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/recode/recode-3.7.9.ebuild b/app-text/recode/recode-3.7.9.ebuild
index a2c22925674d..84f579555f3b 100644
--- a/app-text/recode/recode-3.7.9.ebuild
+++ b/app-text/recode/recode-3.7.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
@@ -11,10 +11,10 @@ DESCRIPTION="Convert files between various character sets"
 HOMEPAGE="https://github.com/rrthomas/recode"
 SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 # librecode soname version
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 48eefad949cb..f1d03a244ca8 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -191,5 +191,5 @@ DIST tl-xindy-2021.tar.xz 140664 BLAKE2B e433084708433d1a40216a63a31fe64ae0afa0b
 DIST tl-xindy.doc-2021.tar.xz 461176 BLAKE2B 602862a30d0c2fed12df2b2c9e1f12014a7f64f87c82525ca275f82abc2edf4b0e5a77b789d68bd7f56916c16932174c973df7721464b25e9d2ec82962dd5a90 SHA512 4404d43c524b2d13a431ca5691031bd06ffee316025a6521d08f8ecc18d7e6703aed8a714fc498e7dfe8bb7f1971562adea96c637530e612b486ca015c3b1e23
 DIST tl-xpdfopen-2021.tar.xz 560 BLAKE2B a17eaa3fe349aef2d5a192040196e1fce3b729308616e749447aacfad4b63254b7c4bbbde79a053c20caaf4abc4636f8276c8e60f5320fd3e5305444d0f5d197 SHA512 fe873bb22b94a26720e37671e283e0085619c2129a4568399544ac0df1e5c443a9476590ca7ef76a21409589eb2416a14165b8a48a6182f3773a3009cb7c1a47
 DIST tl-xpdfopen.doc-2021.tar.xz 28180 BLAKE2B 2b247fea8d1901ad91cf19a197c17b5c0f4cf1ce817e07ac6dd3bda1e28019b7c296e07e567a55d530da4a898a6ccadc2e637f85aad401a99dc1f02f8020048a SHA512 bb4be8fe1b4590e74a7573baa1d699895fb62f6b30b05c9c81655001c75ffb43a6d7f92deca337072690ce3297d4ab06f1aca389524c5d5d500a9fce4abd8404
-EBUILD texlive-core-2021.ebuild 11773 BLAKE2B 6ec63a6eea18ab96e66ce6cf65619eae76e71edf09d177d19bc2ce20ec615fc85e8d8d4238cec8d81d79148b17c33137c59255dd1f3790417dae9d8bc6ce3076 SHA512 cb4e4c6fa4332f3a6c141d0f92bef6bf89219361270345eec38f0700282b4d67f80045f1bc1d80066cd3dfe4b5f05cddefb3f47510248226e47ad5a8904df380
+EBUILD texlive-core-2021-r1.ebuild 11777 BLAKE2B 8e1cd6b87bc2dce41c8d4cee410aacbabfaf552b4077c8db962cb70e854a8976667d727f37b49835a8963b7601704add7ba60a6ece1d3fa7a5169f5f376d1322 SHA512 8e5e5327cefbf6b4768979a29d3e82a8feb63372bd524250d8b6e9dafc58c6fa5244b001d5d2e87204bb22e9e99baa8656bdca4d080dbfb87a8afd095ca4c115
 MISC metadata.xml 674 BLAKE2B 4bab73d192039ab8cb3952877ced5e1b7b329f47d2a5b96e72ec82428dbc2236629abb7e2de1af1997bf577fc81cc91ada9f173eadcd2a2e726acbd79b9607bc SHA512 6faf1b433b9236aaca1fc07aa5679752b2d0214b5bb5f7aea03aa6c21e8a1880a103dea2b9a4c87ea84e85d91d259a2c01f5906190c96c7467f8b0a4863d85c1
diff --git a/app-text/texlive-core/texlive-core-2021.ebuild b/app-text/texlive-core/texlive-core-2021-r1.ebuild
index 1372c2a1984a..58d08c4cf2bf 100644
--- a/app-text/texlive-core/texlive-core-2021.ebuild
+++ b/app-text/texlive-core/texlive-core-2021-r1.ebuild
@@ -89,7 +89,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	!app-text/epspdf
 	!app-text/pdfjam
 	sys-libs/zlib
-	>=media-libs/harfbuzz-1.4.5[icu,graphite]
+	>=media-libs/harfbuzz-1.4.5:=[icu,graphite]
 	>=media-libs/libpng-1.2.43-r2:0=
 	media-libs/gd[png]
 	media-gfx/graphite2
@@ -107,7 +107,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	xindy? ( dev-lisp/clisp:= )
 	media-libs/freetype:2
 	>=dev-libs/icu-50:=
-	>=dev-libs/kpathsea-6.3.2"
+	>=dev-libs/kpathsea-6.3.2:="
 
 BDEPEND="sys-apps/ed
 	sys-devel/flex
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index fe5f3e8eec00..b1237b25dc0e 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,5 +1,5 @@
 AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r2.ebuild 2904 BLAKE2B 246ce0f4f9ec234423a27478ac9f5497e62707ba92a8a4ef7739180f8cede27feb16067b737e7ba28328ceca7fa5aa9134e2c46ecc09e33556ebae48b97992d1 SHA512 299fd93b027f89e00a6f973f00431fd434b969a8b719a76eeabf2bb971ad5cbf65c0b90072428084a58c7c83659b52898ff0e0a662a21d2fcb5e86c18c610a1c
+EBUILD xdvik-22.87.03-r3.ebuild 2906 BLAKE2B 76b622e4f73fb0bb510950bd78e53369d6fd1792aaecc4f86710daa00039122de35a8c2e69ff6543004e8ef9a6ff1f195061c49722ab6f2f86b29a6b01b686c5 SHA512 ce04d1adbc8e0dec5db0b0127ebe99bfaefef931c28d66c0512feca66c04b6934e46fdc547fd2ae6229ba9cae4e31834a1d33f56cd02736d22e2ef58a41bbc0f
 MISC metadata.xml 594 BLAKE2B 338b1aedaaf7426ed8bc2b9ae08e03f9fd6170b0714f938fc97a0f4555e8daa385635200bcbea4d0959604fad44db3212bd7436ac70b2e49ba353dd48713e7c6 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r3.ebuild
index cf67026a1772..113fe335056c 100644
--- a/app-text/xdvik/xdvik-22.87.03-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r3.ebuild
@@ -29,7 +29,7 @@ CDEPEND=">=media-libs/freetype-2.9.1-r2:2
 			!Xaw3d? ( x11-libs/libXaw )
 		)
 	)
-	dev-libs/kpathsea"
+	dev-libs/kpathsea:="
 DEPEND="sys-devel/flex
 	virtual/yacc
 	virtual/pkgconfig
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 872d9ee5c463..89706469f1a3 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,3 @@
 DIST yelp-tools-40.0.tar.xz 38708 BLAKE2B d9533fefc6a9416ed6f887971db62a7db6baed4f65aaf1e03d20c98fa23efb3af9f10189af0284bde3837f58f662f4ca4be8275d597a7c799a14585c87e6ec10 SHA512 b89e514cdc2c6ff96097af0cab5694e9f1dfd2a125e08f99a69c0e7dd51e1e1a859c2e6eec656ecea6103bfc65733e1256a77ef992454db4a554567b46fa2628
-EBUILD yelp-tools-40.0.ebuild 930 BLAKE2B ae69d549479ff89b360cfe046bddb22459e38ad6cba2d5da38a0b8e5f5b2d9bbc4425f6de60975257446857196c088e467344cf0e7c55187a0bca0a61526bd47 SHA512 789e8f4141f3094d47f835359b8d495c62436bd0063f96b0cd9ac5ab6f70302de08790aad0375d352f33099a092d0162a1335f0e9cdfde23aff8228a2c4a3855
+EBUILD yelp-tools-40.0.ebuild 937 BLAKE2B f75b502ec89e0df1374a672cfc8057c0c241184f3f37f6de997c2c0f0399d783a0ad359ce5329ab82f98c087beb05ff02b00658d27a52cfc8d5aaa6f7e8a26f0 SHA512 23f645c242c76969e463b91e9e4d462120aae5a3a78624e1e747c078d8f3ae4c0e9b593acd80fe5d29cd933fb929c6db272d9bc04915c0f5396ee6b9fc0b2238
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-40.0.ebuild b/app-text/yelp-tools/yelp-tools-40.0.ebuild
index d1ed655e2e81..6cef89d63181 100644
--- a/app-text/yelp-tools/yelp-tools-40.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~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"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="