gentoo resync : 10.09.2021

33 files changed, 249 insertions, 39 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5f6e5446d406..b7bd5ef13246 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/agrep/Manifest b/app-text/agrep/Manifest
index eb7784fd9ad7..4e886256a84a 100644
--- a/app-text/agrep/Manifest
+++ b/app-text/agrep/Manifest
@@ -1,3 +1,3 @@
 DIST agrep-2.04.tar.Z 62351 BLAKE2B 7856c172aff84d188cc38e83fc8eece63f66cb30a8a1753ec5f54d98fbc47a33d9caad69520c531c66f2958c762f26312032ee7a9e4e4040709f4d366fdbf4a9 SHA512 4524250c2c0b309243fd245efb04fa8d867f45a92b0d977b29d2ff8ec99586c16c35b8a78cdd5aeb4c529fe0270c8b1220d6ddf52d947e6181a5f04bdbed5aee
-EBUILD agrep-2.04-r2.ebuild 767 BLAKE2B 8bec43c8e889884f6dc771ade019a90d082ef75f20ab841e68737de307ae7c2108bc82a8d4c45c744137d1ef9f5415d39576f0c1a1b5b5d8f2c4fc4927f4c45c SHA512 7feeb33bf97fe3a6763afce7791979b6f8562e7a067523ace0ee3f9d8cc62e5250ff95795ea5cff38950ee026c3a3b137dd01aad2015a7bbee2147cc44e01cbc
+EBUILD agrep-2.04-r2.ebuild 771 BLAKE2B fc5f0c0b084856f8cfae2a8808623aa2b640cc3978c84e622458188aa8fc5ce2f890c17002182f0c6a84529d91dcdb84ff9016407707ceb704561c4465875f8b SHA512 013fe2447495566f531f8dba96d6189dda0e0ce41f7e46fddad96158ae0ae0e03399a6b4f9ffb53fa26a1097b5662440d7c1162a4510107f8ab88ea78966ff1d
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/agrep/agrep-2.04-r2.ebuild b/app-text/agrep/agrep-2.04-r2.ebuild
index d2ff1e0dd621..522dc26f746a 100644
--- a/app-text/agrep/agrep-2.04-r2.ebuild
+++ b/app-text/agrep/agrep-2.04-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
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cs.arizona.edu/${PN}/${P}.tar.Z"
 
 LICENSE="AGREP"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	!dev-libs/tre
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index c1db0a840805..a47b30fc2259 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,6 +6,6 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
 DIST calibre-5.25.0.tar.xz 36849112 BLAKE2B f9cb423317ea1f5b22e7f3540708fd4fa6e7dff2d6d2c667755c74c4f46b72f52aac7672933c51efaf56a5ef57e573c8927649fe30570481c2057e5f757cdfde SHA512 7913fec188d8a8c40cf2768671836f6431d233ac53d1d683222a12f8a753a11cc4023fcfc1dd5ca8b27fd049fb579563b1cdd89624b824ce4eec7b438e25006e
-EBUILD calibre-5.16.1-r1.ebuild 8635 BLAKE2B a2b4d0148c21f404b43af87a91dda4145a71ccf36f8bd0ffa5b519fc1df991c2bc7fa2317bc48b86ff0614452e3ad75f09644dbbc5077492b3561eedde2fc389 SHA512 a9f8664dcd3132122f396aa8556ed42f0b0c8d071d053a00427a71d9a847ca04d12f3e3d65a6cf7251998ff720c6d6a51a4178d4444a683b905657f9fbcdd1c4
-EBUILD calibre-5.25.0-r2.ebuild 8506 BLAKE2B ed2aef65b483cad81b5efaf2fd855ce3a04d1e7ee4fa0dc68eb5c9c5ff0b2a84337975c54a76d4eb9128d58cd87fd92cd1b914a42365f1e80d6e48bbb8d269c3 SHA512 2686d8072c4f72fa59f34e8d8d2793056c88d09720ad9bf3b43411e2ba5a303302c12676a5f14f31465a1a07f63f9677e5e5d4e759a346d6397a714280c0ea78
+EBUILD calibre-5.16.1-r1.ebuild 8634 BLAKE2B e1f1420019a36ed08b72b4ea29c542824a02484133c0e400c25e6df535eb02cbd45d34b631196b4ffb1b616a920af8441cff028bdbe84163663abbea924b859e SHA512 ff2e79c6b2275782c9e3d0b24698f96c87489f67328df3894ebdf85ee4d1edce33e34bfbca19d0791a76bd82150d57d1f36f526def18ce0ccb41c600e943e81a
+EBUILD calibre-5.25.0-r2.ebuild 8505 BLAKE2B ee97e40be431c2fa039f20975c67665cbc7fc0cfb2a0e9162cb00b1dcb3f689055060ca73bc3de414c50512856d3c1f02f4f4ecee679c9d46d770a96be55aecd SHA512 4c08bbf5dbf5febab5b0368619e26b63acbac4513fe6249c52f137d8257d8cecb0869c0309ca3408d727eca4522954225c3d023271562620a7098401a9c92943
 MISC metadata.xml 303 BLAKE2B f50da5b3e8c1e9b4553180ccce38939e7c8e11e5a0527f94c3df7ac4d93a37d5e838c633e58b3fe960dc60ce52c6c6ec6901eedbcd99039c0cc1ccf6dc8a0a44 SHA512 38da4e43d91a3a1d1adf6daf32e4ec69696ab7df6179788fbda75a40219acf01cedbff28943c0b169b2de9f490f3a324285294a9b2783c90757c8cd23aa9e847
diff --git a/app-text/calibre/calibre-5.16.1-r1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild
index 97757b4f3eed..023d6a32a358 100644
--- a/app-text/calibre/calibre-5.16.1-r1.ebuild
+++ b/app-text/calibre/calibre-5.16.1-r1.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=sys-apps/dbus-1.10.8
 	$(python_gen_cond_dep '
 		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
 		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
 		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
diff --git a/app-text/calibre/calibre-5.25.0-r2.ebuild b/app-text/calibre/calibre-5.25.0-r2.ebuild
index e0bb47f48186..475b78a4790c 100644
--- a/app-text/calibre/calibre-5.25.0-r2.ebuild
+++ b/app-text/calibre/calibre-5.25.0-r2.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=sys-apps/dbus-1.10.8
 	$(python_gen_cond_dep '
 		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
 		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
 		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 1b31b4ba72df..61b866cea66a 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,6 +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
+DIST cmark-0.30.1.tar.gz 245126 BLAKE2B 4b6b7bcd87f931a50849d70afdd8593131fec6d937a804432444045b90eb6813a56c50e08dbb94bd424e0d5d53f9323f596d1bd2d1ab363bef742fe8d24971a6 SHA512 883bf559874f05af501de9dbce7e08c7297c09ebb26b3e08f55a8a5c43109e47ac14d129a2db31d7f105803e7259e3e104fe4241fd5c1248820a96e5228008f4
 EBUILD cmark-0.29.0.ebuild 787 BLAKE2B 027d8eb0f2f1250a6af14bf310ab2cb1a1cfb95550dbdd93205d718b98d80dc32713cb0c81c827b3af4fe37e123bb68681dd1b111c0304a6a3052c732b01920e SHA512 b22bddd41344a49b331f3ba1ed7a8ac2d5f38bdf5d89916a5576363ca89bd58c456bd0ecbfa9e50bfac9a4ab37883f9a0ddcd70416f18a4e7284e2c2c9f0d902
-EBUILD cmark-0.30.0.ebuild 737 BLAKE2B 1e33273dd111a45238914a8e832f68d5951c4d65eb64cf8b4b0ea9e71e2f2301058dc6f1527fbbda8f8c829e0a0214bba63eec5eb653f705a5257813fbc83044 SHA512 f04d3142888d705b263213e0236325a4f52e34f9d5eb1b42bbf91bf5037c8781fade7f608434162971060a28a2ebf056a168bac0e5b4efdcabe99f12c52c5154
+EBUILD cmark-0.30.1.ebuild 737 BLAKE2B e2d3e37ed26d7f63b540f63c41340ef2aa709c33ffed5ebbd50e3c3da6f77326b84cffb5d4b606d7e6f527f6f54b9553d0272ca74ac8cd1cd9c8af5356b06ca1 SHA512 a9fd3592777c9d6ff85733e27b0fb14062da5a235b0c9bb3a6097a77be8f1c7c1ca4f994df269a0d24f4a251c794ce5837188ddc8b9c12f17613da926d93379b
 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.1.ebuild
index 9a1437df5f0d..6dff7a3f62ca 100644
--- a/app-text/cmark/cmark-0.30.0.ebuild
+++ b/app-text/cmark/cmark-0.30.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -12,12 +12,12 @@ 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"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( ${PYTHON_DEPS} )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 5168f2094f9f..a3a87266308f 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -8,5 +8,5 @@ AUX dictd-1.10.11-colorit-nopp-fix.patch 244 BLAKE2B d93eddba872d67b2b5ce0ab9e4d
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
-EBUILD dictd-1.13.0-r3.ebuild 3155 BLAKE2B c14c1d13b358462504a48b7f9c011182f1f2b708cf4cdd3425ddff02c38983dc5b29f978ac0026f78fee5c6fd035330c6f43b7932cbc10b47013899dd2ae162d SHA512 001813b5ac6ee289a8f8459e13226405e0fe31ddc36a30f9f638b2b5a03fa5e21b90e40aeb95e063e61cf1f3d9e9e51efef827986888ba42a3cc8499115775c4
+EBUILD dictd-1.13.0-r3.ebuild 3171 BLAKE2B ce9094871130dce076ab5967279e702feb8b7c85fd19bb77fc86a4b72ce8ce2f1e7bd8b50232da73b0123527f5e0015c784163e817d642d9c9077792e453c299 SHA512 bf78e375e406bec8057977a8071de75e83868b7a014b4e488d6947a8027a70c0c98206eaad6105c5f425364ec76079083e3b1d48fd2b45a98836298eb9776dbc
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.13.0-r3.ebuild b/app-text/dictd/dictd-1.13.0-r3.ebuild
index 342d7ec8462a..81eadd890466 100644
--- a/app-text/dictd/dictd-1.13.0-r3.ebuild
+++ b/app-text/dictd/dictd-1.13.0-r3.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=sys-apps/gawk-3.1.6
+	sys-devel/flex
 	virtual/yacc
 	test? ( !~sys-apps/gawk-4.2.1 )
 "
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index b439993b92a0..afab1f61e684 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-2.0.16-r1.ebuild 969 BLAKE2B e738ab3471d36c2e6481766fc0dc53b61fa5b4d37f67816bfc37e214214cd3650edae0931ba70762ce0c04b06df80cb239a953e888570a70d31a18c3028a1ec7 SHA512 d7bbb41b8f69a769ea699fe2c6e912d356bffb3d71e299e18806dd18798ef5b71ce9613a514921e107593b3e5bd733d7a646c75089d559cdab20f62863f67a0d
 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-2.0.16-r1.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
index 4dcc29ecf4b8..d2a9465c87c3 100644
--- a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-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=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 7674b597676c..0046c1915de0 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,3 +1,3 @@
 DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
-EBUILD libgepub-0.6.0.ebuild 674 BLAKE2B 9a8f6217635433852ee833990339d46548bccac0c7d7798a7604cc6f125f8cadff8b0363cfd1dc83cdac2073bcdcd353dbc36b63f8e34621f924523cc901f3d8 SHA512 6d7df451228410bf760b71f7fcc75bec973583411a596d6cf5097d2d6882c5b78f306184020c6c129b1f9773407de936b42356cf74dc6b5963f2a6c7f838b574
+EBUILD libgepub-0.6.0.ebuild 689 BLAKE2B 2f95b4642b49229b6dd509385819534bf80917f81b3136144dfd919d12c5a922d4b2a13837ddc6c5525a7b9ac70abd21c3a5d8951f8e0fa9dbbf03fe0207869c SHA512 be3313c7d72e318747b95fbf4f31c640a28827f7cbb49fe8764dc7dfc4b4f43a566e11e6fe0cff279c99c9351f0ad578fd553ba5f3aebdd4523cc0a31d80d002
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index 0ba428309172..a00d54d6d7f2 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit gnome.org meson xdg
 
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgepub"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
@@ -22,9 +22,8 @@ RDEPEND="
 	x11-libs/gtk+:3
 	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	meson_src_configure \
diff --git a/app-text/mathtex/Manifest b/app-text/mathtex/Manifest
index 3c19d498ead7..a5e5416598ed 100644
--- a/app-text/mathtex/Manifest
+++ b/app-text/mathtex/Manifest
@@ -1,3 +1,3 @@
 DIST mathtex-1.04.zip 148443 BLAKE2B 6632d30536428f6f33fc13a2b5b38651f2ab7a938381166b79c009ab3d95788fc69e8ed824dae64dca00d32bb79ccd00a73b772f9aebc813d54fd6e0f18839f4 SHA512 4b299a6dc503a01d6be3182ad982e38c0b6d926f09a09bd5169f8ad2c947c020ad532b15146379b4bc2158cfceec4cb4a0b7bf902423e0a8ad9b0b0190a99601
-EBUILD mathtex-1.04.ebuild 896 BLAKE2B 3006c7d7502eef0620f7d2cfca7a358c3aa777dc5bf15caf897a9dc636262af13fe9431cb3bed5fe2bbcf72d73037dbe7eb3ac5c7392114bb6ac4b30472d0ba3 SHA512 5eef081c961928e5d662ddece03623a372bb1e6e85a3624abbbfbd6218fbdd2f0e0740e208c22e600795f9ffd8229934e63ce6e6f5fddd0633e1e8ca5b6ef40e
+EBUILD mathtex-1.04.ebuild 903 BLAKE2B 1b410976032bb2cd416333f8c0dfc6540578af989336cf8219eea36b3f358a08c4c95d0fde4bc6fb2dfbbb8ed7474986a0a4f1835e5555c1e2c4d10725ef0cfb SHA512 bec772a76171828bfba8344b0f2a9292ffa23b803011b0975f2b872b56c7755d285ee7ba06a82c763ce12d42832a098b8baf0d199b78ffddda89a4b6506a0d50
 MISC metadata.xml 633 BLAKE2B 0b7f70957a2eacffe8148ad27186334c9f6a0bb4f2f0142a132eccdbbc6c1a4f96a7cb40f927c29109e2046c5bef23af4c64b1991f9fb2984f4e76ecf96f8264 SHA512 9086dbde5cbad1aebf2b0ffdf011db515befe5bff5c40e37726a0fce358f12875469d0afa70f410e273f3ec1f80a4980c77acb888b7aa5c83cd7ecb28afbb21a
diff --git a/app-text/mathtex/mathtex-1.04.ebuild b/app-text/mathtex/mathtex-1.04.ebuild
index 597f3f4add0f..ac93ae93133a 100644
--- a/app-text/mathtex/mathtex-1.04.ebuild
+++ b/app-text/mathtex/mathtex-1.04.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="png"
 
 RDEPEND="app-text/dvipng
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index 347e69a7aa42..bd8cb2d27447 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,3 +1,5 @@
 DIST poppler-data-0.4.10.tar.gz 4497684 BLAKE2B 2c262223a971fe49b7f9848e424ba78a6d96e193d18b0bbad4eb343deea7808a6d9e234ebbb252c5becd40840221ba86d2b87ad36595fe982546b32ea6201f0b SHA512 4bebad0791b55b5e2805cf864393d1f777a7996c962398fc178211d2abbf110f75ef2fa6699e275b126aca0540eabb89542a672e0587248db9414e357a32bfd3
+DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32
 EBUILD poppler-data-0.4.10.ebuild 746 BLAKE2B 1d2428e3dd1f7c1e1e1dac88b44a42b3a2f13528300db22b29677e10d628fdfdf537f4f274e9e02429a20da2d9d9a5a432dc618bd3a60df6112aa00c541f0a4e SHA512 dd910001f1d884c6d78d4a0fe865d8e68c462ad26ec32e9e09294f9a36cc1261443f41f78deea135cbe7c980c2a9e2851b3cfc60b96ce4bf96409012314c7bd4
+EBUILD poppler-data-0.4.11.ebuild 737 BLAKE2B 6a874c1e95c6b33ab923819fecc059001edb4ab56c21311a8e3173f3362163d1f540b94e0a2245e176263cd73679d5dab29ed1bd11ddff9474b51733cf49d583 SHA512 b48307a18005d43c0baa158cd457d8017a7e1b703c775b7922881ecee7c3152a0154920fa937c29437fc510bb2730c63877dd6114df55b7012c3dde0fa1da7ff
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/poppler-data/poppler-data-0.4.11.ebuild b/app-text/poppler-data/poppler-data-0.4.11.ebuild
new file mode 100644
index 000000000000..bbc24bd33be5
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="BSD GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+src_install() {
+	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+	# bug #409361
+	dodir /usr/share/poppler/cMaps
+	cd "${ED}"/usr/share/poppler/cMaps || die
+	find ../cMap -type f -exec ln -s {} . \; || die
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 573a90c8c7c4..7baa578b5454 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,10 +1,12 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 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
-AUX poppler-9999-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
+AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
 DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
 DIST poppler-21.08.0.tar.xz 1717372 BLAKE2B f617b41ebacee183730f20233273a2cc773c12b6c9d045850f8e738985b9079338c0e86b66d598a5dd4fd0227f70989604164a38fd45150b239e603c4da7e42f SHA512 266583279fb5c6b5300d23f8ba5b9da3e1f475fe21341a82ed7350dd9e321e243f3ef051944006c4f242c2d63a8c46bcda565a56017eb3a68caa5680ce719211
+DIST poppler-21.09.0.tar.xz 1722828 BLAKE2B 02bb35a051fadccd6e6d071b74f169fa8aca0f83aa27aac420fdb7998537b42747134efe6562ee2a09598761c55494e30dabf5785f70f84029c5662bbd7311a2 SHA512 e63181b98cbcb71e5b1beefce3aa7c196f69a7adc4304c8ced70eac7ab8a7edf918988faeb2a23727ecaafd6f4a809f561fa1c86f1fda0ab7e5e2dc882a5ab55
 EBUILD poppler-21.07.0.ebuild 3339 BLAKE2B fa5a0f1aee4edc405149d5573b917320eb8748054687222ba9dab6c61105af7286022bfc7d7b685aff174966a7d0db1274dddf9464343fd4e35a4dd6d5c53921 SHA512 c0f8caf6a63c76024c668e8f98cdb67ddd5ff3a0798cd54d1276a1aecae54324dcbbd291e308a4e322eefa61ff13a34027fe86bbd9f464a8fc9873da6a41af48
 EBUILD poppler-21.08.0.ebuild 3347 BLAKE2B 700214c4ab1e71cc530bb084915ffdae2dbb4b56a30eed2ae599c0bf8f71fc03f5357ab105c41123c075397743ee86b0cc920b0356c642ca7e4ad1ccc663e293 SHA512 2964d203250ad578b09895582fdf02e855b2355944bc318384db76d39701582233382c436f9d2f22e643a88db98dc891070edabe3a11c94614ace4fc224cfb95
-EBUILD poppler-9999.ebuild 3335 BLAKE2B 83ef2335947c97d172e5e26e46cbf6ffab1759d0a40960ecd2fb1ac2f1ad67328b5ed92179adea80ad49ab0b06f69dfe48620e6eab586d45b798ab2453201ca1 SHA512 60cefdca9a7825cc60d5fc6a4180f58e9c649d7a08441d60f994118956daee2d08b12a3c3c65f0fd0042a9946751121179fd7cb365ceba784ebb7cb15fcbc9d2
+EBUILD poppler-21.09.0.ebuild 3338 BLAKE2B 19302304b8554918ccda77631c54210be4725675dae60d03a9d2b42e92d8de25d699d1f92ff90537fa74a262952cb6b9e99c055e5ad38148ff8c28853d1792b7 SHA512 cb51c79668fbe081ee739f30f31baad7ff189e887d83ef5049cb0842dfe432a8e25d43414560e342ce366f937bd44e9ca49b25c387809b7b0ea4b4d39c667ddf
+EBUILD poppler-9999.ebuild 3338 BLAKE2B 19302304b8554918ccda77631c54210be4725675dae60d03a9d2b42e92d8de25d699d1f92ff90537fa74a262952cb6b9e99c055e5ad38148ff8c28853d1792b7 SHA512 cb51c79668fbe081ee739f30f31baad7ff189e887d83ef5049cb0842dfe432a8e25d43414560e342ce366f937bd44e9ca49b25c387809b7b0ea4b4d39c667ddf
 MISC metadata.xml 1077 BLAKE2B c49251ca6f1d793da24746e5161d43b01550c560fb942d64298c19a889c531f4c5fab967cde87f7063ecb4789a6586e40ca519b196633912ccb55ed568a650cf SHA512 c09156d438acc9cf85e77fd1f57262596c28f305559d9635d4a457189f88e56e0689e102ad60d2be998b9e286c36ed45227e95ae5e9ce6a247662331d44f2076
diff --git a/app-text/poppler/files/poppler-9999-respect-cflags.patch b/app-text/poppler/files/poppler-21.09.0-respect-cflags.patch
index 08eb5beed26b..08eb5beed26b 100644
--- a/app-text/poppler/files/poppler-9999-respect-cflags.patch
+++ b/app-text/poppler/files/poppler-21.09.0-respect-cflags.patch
diff --git a/app-text/poppler/poppler-21.09.0.ebuild b/app-text/poppler/poppler-21.09.0.ebuild
new file mode 100644
index 000000000000..20065b9bb13c
--- /dev/null
+++ b/app-text/poppler/poppler-21.09.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/113"   # 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"
+
+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 )
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-21.09.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 tc-is-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 2013baa8c3f7..20065b9bb13c 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 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
+	SLOT="0/113"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -24,10 +24,6 @@ IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss
 # No test data provided
 RESTRICT="test"
 
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
 DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
@@ -56,12 +52,16 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	boost? ( dev-libs/boost )
 "
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-9999-respect-cflags.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 6223e9e3e07b..9511913ef563 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -2,5 +2,5 @@ AUX qpdfview-0.4.18-qt-5.15.patch 342 BLAKE2B 34ecd868ba9f38f43433f425c173b5cf07
 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 2256 BLAKE2B 2a3ba1b9b2b6d7bfea784f5776dbc1b0969fb51301b329d2d640f28c07379c53113ee0d2c246052edc890d393bbd76d6578c472663664d358a5d29bf0f64dff3 SHA512 60d1bde1f4009dc53ab577e8676a1b4c77dab3fcffeffdf71b3352ec98dc8b025f3287f269d5b297f3a7fdbccdb18b00263fabc53527193f07f951f61b11a781
-EBUILD qpdfview-0.4.18_p1.ebuild 2201 BLAKE2B 380ebb01acce606eeb450f4f5a33c8a50bd74c1c96135d5d4537d8501a52bf74175c943b7fa63905cddc3c29b19eec3300a64dd929bd47deab5a506209a1d634 SHA512 725a38926d92f200c2da39bdb9cd1d80b495e12c1216772435145b36a19db6af95e02fb85c1768b0cdf6a33d87166ae3f188eaea65d144e981b2d5111900d3b9
+EBUILD qpdfview-0.4.18_p1.ebuild 2208 BLAKE2B 1cdcc1d8e7a62db216e3159a9d37cc80d5ac35ca9b76d0dad26c9fe116357ee8903cc765c15e49e6af7811a4bc4fd52de4f463238bc38b52dd381b8d3803ed79 SHA512 5cd4c0f412b73a25157833b16a83c6305493c75ff22361b27be35e3cea1905f93b9aaa2066067e4c41e79d85593b8ad376737a3e09ad89907e97db27e32c6d90
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
index 6422a16977ea..c0030735c539 100644
--- a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
 
 REQUIRED_USE="?? ( fitz pdf )"
diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest
index d3ac5d480b61..58bc60ab9084 100644
--- a/app-text/rnc2rng/Manifest
+++ b/app-text/rnc2rng/Manifest
@@ -1,3 +1,5 @@
 DIST rnc2rng-2.6.4.tar.gz 18005 BLAKE2B 4725f9a8dfcc5e7ed26c4560d9198939d51376aad8feaa5e592bf28c9014d1abe0e90c47f6aff9ec0d7cecc815660a3a41270c118e4db87030e5a1fa208f3177 SHA512 c26103943ecac440dbeb4db6f913e57c2e4b1f84f92d7e8693e66b6a1e5af051c49ace8172fb94dae2d447ee042e432af15cc578e606452b50ca843d8bd85378
+DIST rnc2rng-2.6.6.tar.gz 18089 BLAKE2B be9b2a22770bed034b4ad93bba23dba7e1f58c553cef4e1a507a00ffb62c6f6e937df22e4d5f2fd3c542acebd72adb82320cddf34f873d35f442be0d457b3cba SHA512 a0f108383ad927c2d9e1cc11960ddaab99a8cb4bf0417cd8e7ccdbc7925746b2fa8c1cbd96a74e89f7166eb8e330c224a49d97aa2ef5d83d7a0c4254240fb308
 EBUILD rnc2rng-2.6.4.ebuild 556 BLAKE2B 89697fffa568d6535ab6a188dca657de7b60170817f32efe22c4d37c98a9992a3988e047c4a23f04118df46397a7bd85c953dbda1022ae8c0f6020326eb80b73 SHA512 fbbf384237b5825a3303310c6770a949e5809e6b2e733dae2abf767533a9cbca5cebb556bb8abd3e56cafed2b457a7d2db79227649a728fce7dcfcfd1b0205bb
+EBUILD rnc2rng-2.6.6-r1.ebuild 522 BLAKE2B 38073aa63f4288e8e736529fe8fbdbb101e492703864005a06c60ace861336f9ae0117738de89b3ced894e259fa3c332eec21d3b568a7c4484ed8e47010aa612 SHA512 d500129273b0138b25a5e6e72143c825d17f5f6eac1f11f6b503fb9cd28313636c204e20cf34e4fe0254d6a04ed99d2f20f1cb8f75ebdb9a16fbd873687db180
 MISC metadata.xml 366 BLAKE2B 070e33036f9d25fc5c34b2c4605f1c1eeef1d108a439c2356ab8bc6a3010865e7f72d8cf4021a7644336d34cd9bd11114af0b9eb8057be0ae8e7bef7fd6a9462 SHA512 0ed8a799683a3e54b6bed7d5bdc0373db115baaf7ade3118158792b6c3f93ae9ddbf3f3f8770b43b2f526abd7624422d45b8c844d8bfe2940c94f12b8fb9d872
diff --git a/app-text/rnc2rng/rnc2rng-2.6.6-r1.ebuild b/app-text/rnc2rng/rnc2rng-2.6.6-r1.ebuild
new file mode 100644
index 000000000000..2c7a835ba983
--- /dev/null
+++ b/app-text/rnc2rng/rnc2rng-2.6.6-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
+HOMEPAGE="https://github.com/djc/rnc2rng"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${PYTHON}" test.py
+}
diff --git a/app-text/rpl/Manifest b/app-text/rpl/Manifest
index 0bf45be2a6b2..ac476cbf0c99 100644
--- a/app-text/rpl/Manifest
+++ b/app-text/rpl/Manifest
@@ -1,3 +1,5 @@
 DIST rpl-1.6.7.tar.gz 21867 BLAKE2B ac523aa836312d6ed6db9eabaf9b6499ce00047ce1a4d35bf398f769036d65aa5b52c410b2110cf5bb14c31d782bc1c424bcd1b2a26692de28ca70fd452b18f1 SHA512 f853eae0ce0a82d864e72ecf3fd3f20fba10553357b23d0012ed22ee0efd57bbefea71095775f7215323d829057f6579aadfc006b6a893972e05039784dc5add
+DIST rpl-1.9.1.gh.tar.gz 22858 BLAKE2B 583a29fd34d7a0d2b3a35b0966a6bd42ac2851750806a97846785dc0331bd5d2199ffba3309184e64a4aa7194f9ae4b9ecb2acc500830b841bd34e2184ec1798 SHA512 be480c6788fa1eb672b892d798deb7d263eae227dac5d93a55f28ebf3b4a43f896eb10edd00e52aad1cd57f4a80faf4a4552b4762b26da273cd05f0c5bce754a
 EBUILD rpl-1.6.7.ebuild 699 BLAKE2B 96252444486478f421942989476311710b3fa8925bfd734791984675d01b091aeac2a5216b390edfede919cfcbc6ec24854016a3355b674bca880bb1da8cd56f SHA512 0ed10c86134712b76464a8ef40faccde42dfecbb2e2098795ee7d6520b40509db300c00cfd196e8c84d1222110b3de5719fa8f06808d5bb94785833c9df9dfce
-MISC metadata.xml 338 BLAKE2B 64a9c58a45097871d3d71b78a46857234cb27a5db16cd80b1dc9e7d9f4dfe650f605d1e8f1ba8a645d50d67b4e2ba21b56308e06aaae3cd264920705e5c4a8c3 SHA512 e8231d1fb1b810948ec4ff31afceaaffa7b6d3f0ed565118f8555cb0721de20dad9a845e213162b3b1619e2b20610e4df0843293df049e17f8e4e1977957104a
+EBUILD rpl-1.9.1.ebuild 639 BLAKE2B 8d88f8f1c50215ace0a732a742d7a2569eb572782a7458190c37d02759d54769b7aee818afe56b76a9297015a4a3f0654c8c727219fcb3de874cb2ca6ee6aa04 SHA512 cc90855316ab3fe93a0dec1973084fcfffeb01bf58d54d299445406b01bee1a16fdf23bdf1d7ca6893fcd22881059ca36b6668126a397bc2721700a010049249
+MISC metadata.xml 414 BLAKE2B 775bb8e0223d3d328d1ef12e9343d25ba343ee4ab602350e3a13b62c9ec65be46f22861d8fb56cdd5022e8acc1b3444e755f3724195ac50a09d207484b8e4463 SHA512 15cb990515a832bbf5fb925742a830f011e49d839e24eba606f260351fd6014d9038698f099cd7cba4a5e5e39d5ca0fd9ea516953c21f33aff778c128e893430
diff --git a/app-text/rpl/metadata.xml b/app-text/rpl/metadata.xml
index 4962fc76aac4..7f9ce6a706e0 100644
--- a/app-text/rpl/metadata.xml
+++ b/app-text/rpl/metadata.xml
@@ -5,7 +5,9 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">rpl</remote-id>
+		<remote-id type="github">rrthomas/rpl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/rpl/rpl-1.9.1.ebuild b/app-text/rpl/rpl-1.9.1.ebuild
new file mode 100644
index 000000000000..039620d83337
--- /dev/null
+++ b/app-text/rpl/rpl-1.9.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Intelligent recursive search/replace utility"
+HOMEPAGE="http://rpl.sourceforge.net/ https://github.com/rrthomas/rpl"
+SRC_URI="https://github.com/rrthomas/rpl/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/argparse-manpage[${PYTHON_USEDEP}]
+	sys-apps/help2man[nls]
+"
+
+python_compile_all() {
+	# Compile man file
+	emake rpl.1
+}
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index 8c2f740fccd0..309c754bd0a8 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-2.4.ebuild 12296 BLAKE2B a5dba995350760d1b2b6fa40ba23906ab5c56a0ea46a93519ebbeb6d9d89acba79d4f447c473f0217ed2d85b9b5d2cb65138493f1191c36f245dfc6384378512 SHA512 7707037bed3b30636bd9a050be95452f3e466da3c09d764a40df048afbc172ba94eff0a3a773a29a4fb61476ea249b74cd77cac31766af9659c8872b3c5129bf
+EBUILD sword-modules-2.4.ebuild 12303 BLAKE2B 69b27b1b7bf611714f57695a65e82bc5219e94c9b6bb8260fa83ac1df8571e93d7e4e6b3da34be9bfa9d55cbb02a0e7b1d47a4ae39f3392dc117c5e6113cc738 SHA512 3277ad2bc5551880817804c2db07508671124d53a8019d93ebac727b1b18d370fcbb04c73c6eaeaacbc43edaea1881154d52d4477cda950fe5287c476c6a6dbb
 MISC metadata.xml 385 BLAKE2B 58e3a018c64e0068b39c728415f94cf05afe3c63e4ecb340ef47e6ecad5a3c8aa0776b6390acfa6eef8775e5065d5a65c3ea8ebc07219a0a990be36e3bf305f3 SHA512 a305a1265342a3674f5bc0f2b5adb788732ccc78c5e05cbdb116fb4a556ae099d8394c10572e5e01e3dae70bf9b4eb982079bf130b4567f4aadb55d3e76bbc1a
diff --git a/app-text/sword-modules/sword-modules-2.4.ebuild b/app-text/sword-modules/sword-modules-2.4.ebuild
index 63f79eb5b4df..e2691353a332 100644
--- a/app-text/sword-modules/sword-modules-2.4.ebuild
+++ b/app-text/sword-modules/sword-modules-2.4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.crosswire.org/sword/modules/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 
 LANGS=" af ar az be bea bg bla br ch chr ckb cop cs cu cy da de el en eo es et eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
 IUSE="esoteric ${LANGS// / l10n_}"
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index cd1d94f1f4f3..9a3f03ad0faf 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,3 +1,3 @@
 DIST sword-1.9.0.tar.gz 2606652 BLAKE2B cd0fd85267c81410dc6acdc45594688ac1855a6160f5d39d38e225982e1440433fbdc75f22eee52291fcbf1ef92b8ca5a40652a98d7cafbfc9186e6d132ef236 SHA512 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f
-EBUILD sword-1.9.0-r1.ebuild 1055 BLAKE2B 3fcb94f066b0b7fb9970342240e07e50e36022a99e933c7b2961d08ec204420ced6a9592346c58cefcacc51426cdcc570cdc5b3186029917619ba0a9af9f1e16 SHA512 d70d86248e9db5a0ac80b7f66ec6d2033716145b5056e91a57dcd76b16c73b398a38198b2821b8659b87a78fea4a0f1a061ba69f85422eca4eb504a2eedb94b5
+EBUILD sword-1.9.0-r1.ebuild 1062 BLAKE2B cc3a8ed7de38ed4eb92671008b45d52f7e74a7dcde9cc04135453b56f40c58dac4e57f05b9d85e3b6f1de6af7a39df5731f4de3f1a439accd85e96344884a8f1 SHA512 160579b921ddaa085ca4161a6270cb4e76c4aaa5c2db89b045ae78cd156d69440ca020cbaade586ec34919dc2ea5597114b83367d7abb5baeb45f727da44facf
 MISC metadata.xml 593 BLAKE2B 945677f76cbe16a77999ede8bd2c7ee6926c2aade70dbc1a8125fa30c73130601f21a47e4ec34a70121ea7b61c98c10748ec17933bde0d98d7d32cd5e28cb37b SHA512 4c11d1b66bb60f21d8706f25f4541147ece1a75f5a1676c75d7be39b8af982bb35fd743fe040204415c3a89f8729c7bb6e83e3bd66ccd5114b4d3739b876a4d8
diff --git a/app-text/sword/sword-1.9.0-r1.ebuild b/app-text/sword/sword-1.9.0-r1.ebuild
index e07a03691560..60349d5cfaf7 100644
--- a/app-text/sword/sword-1.9.0-r1.ebuild
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~riscv x86 ~ppc-macos"
 IUSE="clucene curl debug doc icu"
 
 RDEPEND="sys-libs/zlib