gentoo resync : 24.07.2021

49 files changed, 222 insertions, 116 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 7758b31adf55..2a88689b9027 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index af9bbc716e4c..96b3694e8601 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,5 @@
 DIST ansifilter-2.17.tar.bz2 436116 BLAKE2B 94a1788cffa66343643f48a18748d5359b090803cde723a02bc38f908c262631f1cd2eb150b6a743d66caa04983ea444ba150cf34ce07bdb456979e19631582f SHA512 ab9d590189482f2a27affd62b456c96b947b04d8c8b1214f1ea967971c8ed7df8a7c15d1079f957164d01916d144dcd5dc4b0ac05b452f9f4b8095273d3d3162
 DIST ansifilter-2.18.tar.bz2 436432 BLAKE2B 43c592e83a967ee86404332a464d57d202a73651b2e29da2d1d21163d295b6efba96ecb5861dacfa89b8f567c0367f7a32b8e658f8cefad82c5982f2f2bf70bb SHA512 ef7febed1fc31f5c7503648e4fc0a7aefc3da8e30ea649bd6f03eac2904667fb779049106ccb77ad16fbf655e979f6651b25b84ab126c940c66bedee115a28e2
 EBUILD ansifilter-2.17.ebuild 1124 BLAKE2B 89f6293eac8b6e77fdd676cb218f5d8858957ab61845b90f164a104510fdacc4e0a832f54a30a0c7f0f2d7a48fddd8f8654c4c3aafac5dbcaff820b371d64831 SHA512 e3607267879b723f3cd989e78fcf352c91cddf0e8a0b75756d3e54bc3b672e2c1d2ad14c8f8b59afad44b14fb5dbafaf49caf575f3d3a9ce32f89aae4e33ede7
-EBUILD ansifilter-2.18.ebuild 1128 BLAKE2B 73ab3b956a4baaa37bda981acf6c5161475239fb8767e464b4575a1ced7c24effa499a45d39935daca192d7fde0f797e3bb38692a2602c5a9ca8f2166f2c76dd SHA512 a47abfafd79f627350640e729769232fde9cdb7a25df4c137d3fa92a2d9613f32d21493fb69b1a0463d0c2069a658bdabd249ed064975d25b47df7d7f698ccd0
+EBUILD ansifilter-2.18.ebuild 1126 BLAKE2B 66cc5c6957c567eb5f8478d42275291a750069656c2b1a4d613be5edbb7bd0150aa13a71f94a575c322e62c4a20dac0c19edd585a6459c34cd08b45c163568bb SHA512 45e22b73d462c7b9d1a64640d182dfbd875a9913fc8da6385bbd8875b1b5991886669e4c70c6d69bbf782d85252b7c0c28124d203f7e207a3c0eee50bcd4a889
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.18.ebuild b/app-text/ansifilter/ansifilter-2.18.ebuild
index 28c39b8bbaf6..89c063d0a69a 100644
--- a/app-text/ansifilter/ansifilter-2.18.ebuild
+++ b/app-text/ansifilter/ansifilter-2.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 75f18dd0a2f8..05d25b6e3e20 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -3,6 +3,7 @@ AUX aspell-0.60.5-solaris.patch 538 BLAKE2B bafba6f85217bca2f27382ce6f25d511e2db
 AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbdd34d611ac1647828fc9ee7afdc70bef326bb11794e80ecfc1b14166fcedc199d880fbc83e54824d333cd2590873a14ae03e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
+AUX aspell-0.60.8-cve-2019-25051.patch 2880 BLAKE2B b181caf27feae7eae908c92496a5f05f7e7f1f1a089c460b757c2f745b97f5339d4c8e13cf851e704cff7952c5dcd5ad0a8496ec1ae45c1e83fb1fa577134c63 SHA512 529f3f4737d2e19f7571f4c8666b1cd089cc4e9dfdaa52dc468919f01ce9f8f8112d8fe8afda295b3dfb92f5e0c2bbd79bf1ec69f06c163c32eb28f0168ab263
 DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
-EBUILD aspell-0.60.8-r1.ebuild 2785 BLAKE2B 00825b68a63d55438388d5186910efb724e2afd6a4bd8bb2973f75b136a754666753a1ed43bdeb906e9fc1051597eca1129c99496cb842a08d2d3672cc1ccc76 SHA512 48ce8e82a61f1180f81e87826f9c97ba9fe7c44a70f082a5dfa76cc9797c54d6d5ace73d2e3198e008772e9b82a614987415b8c02016759e5be108c30def6cbb
+EBUILD aspell-0.60.8-r3.ebuild 2836 BLAKE2B f263110d907b5d3906863e2196f873073b209662d4a885fd5d2dd0d58e2f4fc81f743f0b7b9d28506656ac350ff4a37419229870897de24308eb465ada95c32d SHA512 f2275e2d87c00600d7ad265db2a6822f3ac7af84b0474fb500acdf70ed152cb48969e8d41c0e5703e3a6a2aaa4f26e6be6b17c03cb1a71f9cb8770410dbd33d2
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/app-text/aspell/aspell-0.60.8-r1.ebuild b/app-text/aspell/aspell-0.60.8-r3.ebuild
index 8f4ef0b3e3ce..499e003d437d 100644
--- a/app-text/aspell/aspell-0.60.8-r1.ebuild
+++ b/app-text/aspell/aspell-0.60.8-r3.ebuild
@@ -47,7 +47,7 @@ done
 unset DICT LANG LANGUAGES
 
 RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	nls? ( virtual/libintl )
 "
 
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
 	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
 	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+	"${FILESDIR}/${PN}-0.60.8-cve-2019-25051.patch"
 )
 
 src_prepare() {
diff --git a/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch b/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch
new file mode 100644
index 000000000000..2f15d380ec0b
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch
@@ -0,0 +1,96 @@
+From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001
+From: Kevin Atkinson <kevina@gnu.org>
+Date: Sat, 21 Dec 2019 20:32:47 +0000
+Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk
+ to prevent a buffer overflow
+
+Bug found using OSS-Fuze.
+---
+ common/objstack.hpp | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/common/objstack.hpp b/common/objstack.hpp
+index 3997bf7..bd97ccd 100644
+--- a/common/objstack.hpp
++++ b/common/objstack.hpp
+@@ -5,6 +5,7 @@
+ #include "parm_string.hpp"
+ #include <stdlib.h>
+ #include <assert.h>
++#include <stddef.h>
+ 
+ namespace acommon {
+ 
+@@ -26,6 +27,12 @@ class ObjStack
+   byte * temp_end;
+   void setup_chunk();
+   void new_chunk();
++  bool will_overflow(size_t sz) const {
++    return offsetof(Node,data) + sz > chunk_size;
++  }
++  void check_size(size_t sz) {
++    assert(!will_overflow(sz));
++  }
+ 
+   ObjStack(const ObjStack &);
+   void operator=(const ObjStack &);
+@@ -56,7 +63,7 @@ class ObjStack
+   void * alloc_bottom(size_t size)  {
+     byte * tmp = bottom;
+     bottom += size;
+-    if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;}
++    if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;}
+     return tmp;
+   }
+   // This alloc_bottom will insure that the object is aligned based on the
+@@ -66,7 +73,7 @@ class ObjStack
+     align_bottom(align);
+     byte * tmp = bottom;
+     bottom += size;
+-    if (bottom > top) {new_chunk(); goto loop;}
++    if (bottom > top) {check_size(size); new_chunk(); goto loop;}
+     return tmp;
+   }
+   char * dup_bottom(ParmString str) {
+@@ -79,7 +86,7 @@ class ObjStack
+   // always be aligned as such.
+   void * alloc_top(size_t size) {
+     top -= size;
+-    if (top < bottom) {new_chunk(); top -= size;}
++    if (top < bottom) {check_size(size); new_chunk(); top -= size;}
+     return top;
+   }
+   // This alloc_top will insure that the object is aligned based on
+@@ -88,7 +95,7 @@ class ObjStack
+   {loop:
+     top -= size;
+     align_top(align);
+-    if (top < bottom) {new_chunk(); goto loop;}
++    if (top < bottom) {check_size(size); new_chunk(); goto loop;}
+     return top;
+   }
+   char * dup_top(ParmString str) {
+@@ -117,6 +124,7 @@ class ObjStack
+   void * alloc_temp(size_t size) {
+     temp_end = bottom + size;
+     if (temp_end > top) {
++      check_size(size);
+       new_chunk();
+       temp_end = bottom + size;
+     }
+@@ -131,6 +139,7 @@ class ObjStack
+     } else {
+       size_t s = temp_end - bottom;
+       byte * p = bottom;
++      check_size(size);
+       new_chunk();
+       memcpy(bottom, p, s);
+       temp_end = bottom + size;
+@@ -150,6 +159,7 @@ class ObjStack
+     } else {
+       size_t s = temp_end - bottom;
+       byte * p = bottom;
++      check_size(size);
+       new_chunk();
+       memcpy(bottom, p, s);
+       temp_end = bottom + size;
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index ca8319b76221..c95dc7152862 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,5 +4,5 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 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
-EBUILD calibre-5.16.1.ebuild 8750 BLAKE2B 128ae61e290363b2409e7b8bef448b1b91f66c69cf6ab9cf9116a8978e17a553e18e237cab21d5f6d83f6e9e21bd87c270391060fb5fd8839d4f958765261860 SHA512 f1d3b025ce5e9426f773520613b434d66a211ab5bfd4047dd2c3b4cfc96300d7dcdd5de58b88f37c8e44218db44bef99853cec4b17e8140708766e7095e41657
+EBUILD calibre-5.16.1.ebuild 8594 BLAKE2B fc44679327343cd2ea1942bc079f83128e0cb7a3992358df5f1a443828aaf4482b7d2943735a1afe28b5a2331970acd517fef5f28a8503e57e87aeba138a60d5 SHA512 90de7afbeecc7458302b68b5a02125b6b23bb027aa2c1e95d4eec1405cf08ef461d7a46bb0cbd71b4107e20aa8dcea8af6b25310aa39d926536c663a1c0356e6
 MISC metadata.xml 303 BLAKE2B f50da5b3e8c1e9b4553180ccce38939e7c8e11e5a0527f94c3df7ac4d93a37d5e838c633e58b3fe960dc60ce52c6c6ec6901eedbcd99039c0cc1ccf6dc8a0a44 SHA512 38da4e43d91a3a1d1adf6daf32e4ec69696ab7df6179788fbda75a40219acf01cedbff28943c0b169b2de9f490f3a324285294a9b2783c90757c8cd23aa9e847
diff --git a/app-text/calibre/calibre-5.16.1.ebuild b/app-text/calibre/calibre-5.16.1.ebuild
index 6f924cf6720a..497d11873043 100644
--- a/app-text/calibre/calibre-5.16.1.ebuild
+++ b/app-text/calibre/calibre-5.16.1.ebuild
@@ -49,30 +49,30 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/dbus-glib-0.106
 	>=sys-apps/dbus-1.10.8
 	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${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}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/zeroconf[${PYTHON_USEDEP}]
 	')
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
@@ -104,8 +104,8 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )"
 DEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+		<dev-python/sip-5[${PYTHON_USEDEP}]
 	')
 	>=virtual/podofo-build-0.9.6_pre20171027
 	virtual/pkgconfig"
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 510f3f024b3a..cd570cfa0547 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -17,7 +17,7 @@ DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b48
 EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1239 BLAKE2B 239eef1bf4f81b163dd02f064a27ad55c5a180d627f674bbf76fc9b1936adba5d13df8e8dea08ca7eda35e6ca37bdcee932eac3e4eb6d61f9104ac6aa8870e8b SHA512 a638ef7cbdab3f3189a8cff6b76bf15db2d94aa1ea41761c685c3cf963c0b48c1393b40ec0f823991b29abc84df82baa4397e11482954ffd930c65e0f4a2c0c3
 EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1239 BLAKE2B 239eef1bf4f81b163dd02f064a27ad55c5a180d627f674bbf76fc9b1936adba5d13df8e8dea08ca7eda35e6ca37bdcee932eac3e4eb6d61f9104ac6aa8870e8b SHA512 a638ef7cbdab3f3189a8cff6b76bf15db2d94aa1ea41761c685c3cf963c0b48c1393b40ec0f823991b29abc84df82baa4397e11482954ffd930c65e0f4a2c0c3
 EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1232 BLAKE2B c2483720ef4ef27504127501af5f7d44a03f9f9333af5145a84c60153c017d6eb663fb6a0c50433ae2022dc5d71e0051994847ee20c35c15f5fbe3cf38a2469e SHA512 edf606fed086249b923748496c04ef5a74f20e3143c1d0669184646d8ce663361eb498c45618258551ea6b59ad365b855a2077c28ce25824436cfe6b68baf575
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1273 BLAKE2B 3f84dad5ef3a82aad8a9fc62fd05d309943f65a1138d136101d5c5484ac2e97125fed7dd68206510a99822edad7174aea10dd056c92c883e30540873b2cadd7b SHA512 c42a392feec6611b34d2d4b18a423a8634021986020449207fa3f28e329e08d8399c938ff79c18da39266a3dadf7f25df38b2f4e41f1b77e32ca4b560fee58f5
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1280 BLAKE2B 49ad5753228fe65e7543dd297eeabc1ebc5a89518614c146df4f563df61b1d5d19aa839d9d73cd5ae906c23a92807bdf131b1f83dfaa519478ad8e1bafd4c405 SHA512 5eb01d5fbf731b15a7c6a75395f2bbf629cb00b2798b2572063fb990cb154f8285fdbf0836be5435611b311f6d28e2967d14c9d085824dbae7e20ed7582f6e64
 EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1243 BLAKE2B 99c9f189727a9888950cdb57444ed4e828449119ce6cc316e01eeac1771b0db8eb7759fc4490cb70a0132206df2a79d5996b853f110459ff9c21a36494a7d19d SHA512 b9b45a3902358fc2e339198bb0c158375b0e793ec991f50d78d3e4b80cc032d02ebd92736ea64afe1a6cf3385e52ceb636ef7a54ebb06e0f2f0d7ae10c1384d0
 EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1228 BLAKE2B e52d47ea5e1b6e293d0db85fa22cf97e37d337dd995327426c2b5039436c050648f2f82aa9e2b250fb67dc61ca604aa73c9df6e9554a22bb8a5cf38064f36cde SHA512 bee5d2c27aaa39ab117a2db8a87583b81cce96498b3651e1d2c26a000b90a30d96f4ce4d3301ebebc1c9caf8b2c4140788a53cc1d37404b7917b8f5498df4fba
 EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1228 BLAKE2B 86ee53c87d3b24c59dc396bed4dfdd92606737fb66048617f6c5d44e5bd18401d3f2c6cefe10402147b2a29c26b1959a6f7a02fa1cb971dce6f2cc3277d0aeb9 SHA512 284353f760b4de149db6516ec0a82357353837a27cb1855e2ca2a5b6e5ae34a2421e2c689512f627ddf688d3b1ae6a636b06a76f9afda47f87e2316bd195d790
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index cbe5e272c54d..7a62740ffb32 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 61ee3230eb24..c67084913ffa 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2118 BLAKE2B a2aa3f6567ac4c3894d43c793e36ea75583e18260b33957bc45d3ee21c9c1b30886ec15dcf297d97d8b156ce3e8eef7d4a4596efacebe70f2fe6d37ef68d2907 SHA512 86572fa6c4d1d864fda79ac9426a95a5207a7d7e1ecc2baf3681b39311cc4b4dd4799bef74f5f6746337f7b05714a2b327c3679457cc49b1058736298430e5ff
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2118 BLAKE2B db74883504a3e5690f3b01ef19daefc2d8d1436e2b4681a4926881b8323aad69d5ab69751080ed1b9abb60e61566ddea8f6bb358a1476aeaf4bcdd612681b5c4 SHA512 a952d27cef1b2970f7c312029575c4591aeb649b7319f41c581e627ccd3d33adbf8a70580b40f6438c6494155d80f0b9dfd4d80fafda6b13db21a282e2bfb3ca
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index c09f42d5032a..572429784248 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit ruby-single
 
diff --git a/app-text/docx2txt/Manifest b/app-text/docx2txt/Manifest
index b8a76d82ca73..d229c3b6e2cd 100644
--- a/app-text/docx2txt/Manifest
+++ b/app-text/docx2txt/Manifest
@@ -1,4 +1,4 @@
 AUX docx2txt-1.1-paragraph-newline.patch 220 BLAKE2B 0eb924a1d303058952947daf449cc74969094a57b5c4c045ce991a48394543982595d0be3c72d9845893a5836af704b244a52a974bb676ae569fb3f8758cfa06 SHA512 07d8686e1bd1f5ad1b18a5a3559667243dd9e580dff52711090843d5814736a371c382c2ad12d2dd01bbd827acc9a6f420d34f3ff4d02f9fb5864c07e86ec39f
 DIST docx2txt-1.4.tgz 31302 BLAKE2B 3f57b95e40eb92f5b16f38fab7122cd75b23be0f1489bc83ea68f6feb16c14ad524119468da44ac5bc3989a1d61336c436a862b58bc3d83a565bd61b031c8f4f SHA512 5e59cd4065f409c20e17b29d3935a2637147392e86a325b28b78748d3b3867ce91f14f3349621b3c95b2ce6a8e38e33cf0816d1f9dccbebfdde9ba29fbd7f5b3
-EBUILD docx2txt-1.4.ebuild 541 BLAKE2B 1681156aa250f3f96e2f3fd468e8dff7e9be426e447dca729e5bf41cef178724b35ce238caa94fbfe8a5690945df9227d21c320ea4423e6582f16f6594605533 SHA512 9118f31eb80e1937b4ed7a9072452100cfbb90d7934ae00015234e0423f3bdb5f34991834ceaf91511f09ec5046c2118b6f61f9ed3ef8e34c582a043bc3adc70
+EBUILD docx2txt-1.4.ebuild 539 BLAKE2B bcda467052d94bd2f0b060022a6659065aae74b4ca052ed4b5c35503e8a721b28327b41b9d83a0a70ecd3507d596ec9b36630a8e0a324830eea0c8ba70a4a83f SHA512 7e310a73d126509352f3cc2eb6240c0e06b82b40513481457f4df3265d5716ab69303b1b9f2cbe538fd654bb24f2a1f271b0c6d093b77960ff5b8da8594174ce
 MISC metadata.xml 245 BLAKE2B 83f8ac378d6bc4be2dd739680a7e6ad6264169b8b221be6310eea6f8f97c99575cd2895917562bc3239714a6a23a643d54a1bcc97d343e33c974d2378298c973 SHA512 51572585cfc018172e522db2e217ff0d465cee65ed298ff90df88f91b644c16da16a7e9b7a472b75c5fea263aea8614a07ed30422e879323108a0d098c8dab0a
diff --git a/app-text/docx2txt/docx2txt-1.4.ebuild b/app-text/docx2txt/docx2txt-1.4.ebuild
index 1a94e8e4c98a..7cad88250407 100644
--- a/app-text/docx2txt/docx2txt-1.4.ebuild
+++ b/app-text/docx2txt/docx2txt-1.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="app-arch/unzip
 	dev-lang/perl"
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 2060ef36acf7..a510520abcb3 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,5 +1,5 @@
 DIST dvisvgm-2.10.1.tar.gz 3110061 BLAKE2B 3f3bb50baa587c1d20061d235885b4c921efbd3400aa7e4d2df872e37e0ef57d57ae4713fedfd0587d7fcffe7e0286ca55e319e6e82b3b72b49c5df5fa08f633 SHA512 8faa68b13a0e351ba54b5c9acb1dbda6e081eddd167b2cc599208cc2e7967c116c3d105d29df224165daff88f81acb3135d936ec9b2da4dce2c82c197f6a4e78
 DIST dvisvgm-2.11.tar.gz 3111889 BLAKE2B 7944b62bee48173f1ed0e2de5ff0c8090322da925abdd4a57611ccb5c055ba602a76ab4e3dbddb83d73ac19a23ce4b657d96a3830f76eb8939f3e3a9c0890cd1 SHA512 bbefff027f710a0370d179e42f1775cb37765836969fcf9e27e5e05d46565e6db74414440823068b04dbef0dac768b70b2573359fe729c12b27f6d678f41d55f
 EBUILD dvisvgm-2.10.1-r1.ebuild 1166 BLAKE2B 26e6a705af966e996d370e139cfcc1e4568b5d2473923ae9d5ccd938703e832c32170779536ca893fb19f066feb931620cedca2a85ad24e809264e50cec98693 SHA512 0820393c43f6358e1e851ade6b2e33d14dec9b35e42566f39d6aeb0b4001db6609f626c2456c02b9a8a1fc300c3641010b28432de4fdbb3a1c79eda93651009f
-EBUILD dvisvgm-2.11-r1.ebuild 1167 BLAKE2B 7321b97eff0658d9c98ed1c992ce628345aa303af5bb47b54eb01e86ba6f71c263762f3393fe3064eac3eb7b8377e94544c9b2d4491b6343f122ee34abc564f9 SHA512 7e700ab1782124c6ab613d929fd813336aa0553d4d4b1ad8c5387e40159ca90be721a46e0efba1a13b87a2154391cec317fd5f58ecbfac4282727fd114e075e8
+EBUILD dvisvgm-2.11-r1.ebuild 1174 BLAKE2B e4993aa5e154933dce24b7da16fa968e36922b58659f23199391b1b04933ec1cfab75d265cc0479b9fd2203ecdd4037131b7989b87971739ab347b18d15c35c3 SHA512 82b42b4d29502975215e88eba5067087db20fa7c9d301d438b634acc242f82bb35f0d90b607117508302212306bfd4a599aaf3cbf6656421d98176fbee50aaf1
 MISC metadata.xml 382 BLAKE2B f53c90248d27a826350a572fef359f9cb4ba83ac99ea787db1a035bd1e1e63e757566fefe0e531732900cbe32fa02cad6894d8b038019db88e147398df24e39f SHA512 6bee249b741358b1c82d1e2ec8bde902f260c3f3a506be1652a50f96cd4e0b1f6047f2527942f8df83a3be55c53c9a49c13b528c464016582302165bd01e48bd
diff --git a/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
index e662f33b53bd..3bad4b3c179c 100644
--- a/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index 6fe9698085c2..ff2e5d21b2fe 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1,4 +1,4 @@
 AUX fbpdf-0_p20190202-use-pkg-config.patch 1258 BLAKE2B 7542773b6ecf8fed73abcca526d41cfbc7629da44bd3e50649951680469ac7a5f1392a75b4849a8626fe740436bf1bdea9a0131f9e60558f37bb7cdbb1ed89e7 SHA512 6086ff1948ba000c8330aa5fe510b84d74a91254a75ac07c326730c371a4ab47cd2f936ceb888bed4c1520b9fec61a823fb1656533374586cd4fe2466b3160bc
 DIST fbpdf-0_p20200614-27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz 8432 BLAKE2B 0004f8558b86c349744a37099ef86963d368ee9dedeefca861761f88adc3c94a3db9f46c9e1a6f6026357512a8320b956cd7c48108aa6c6657b84193fd5d4b49 SHA512 e037cd536e3a26b6d2364eb52803de67606bac418db8691c7530a889c95dd1f8661985021237ce7fea95f56ab5a308caf8d470c6c036b51b17211f9c200aba51
 EBUILD fbpdf-0_p20200614.ebuild 848 BLAKE2B 949f4773cc367a87c78f498d90ef810629b4a2cc342bf8b9008db51d76eab9d75a1ac168b0f0c207b2edcdc4c0a4c6dbe0a460b6b2b7e5908609d1e75ae582fe SHA512 c565fd79821adc8c19435d7fc65c779b673a851899d45eb00016dc776e1ddbf4854a97b570aaf9577e717053430b562f648f74bdd483eee30215e530ec28ecce
-MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/fbpdf/metadata.xml b/app-text/fbpdf/metadata.xml
index c5298995d2d4..7a38bb900964 100644
--- a/app-text/fbpdf/metadata.xml
+++ b/app-text/fbpdf/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index fd75f35b6bb9..825daa0927f0 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,3 +1,5 @@
 DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
+DIST lesspipe-1.86.tar.gz 120910 BLAKE2B 1065bd95707991380cee8b1be917ae66a6537fdd721e9ec0c326b1ce3358ae518dd28902505967fc086e57e9d3e603e27a328f38c79ae38fe70e5e2a8306b59a SHA512 88a890b91ff3d889f32f23d85d76ef96947e8f1175d54d4301e8891587e87bf1c0a147f1fd5391e52badf4ee31229d337b97c5d5e5f74f4dde966eb93294cfb2
 EBUILD lesspipe-1.85.ebuild 1166 BLAKE2B b4f5ad06062203f195b36dc874c2d91f30f4222ecc94940687225b94a84129e142838c12938cb54ad35d248a3ea48bcc8ceddeda5aad0154b19ee8be6dfaad38 SHA512 7c7c0b9e6e95c1a6821338ba67f9869154b86ec9ab7d9f5e24e027a72c71ce6510da7f7d824dfea3e8e02bd9101111e1d75d45f1ae5518ef7aa50770904f3034
+EBUILD lesspipe-1.86.ebuild 1166 BLAKE2B 80ddf411639e4d6acb5e903ffab5a7c0d5cb1ac9d579eb900f543f145701f0c1ae66c58292501a373b7d2d83cb0f2ba4c59ee324c253221aea0d5e316af60ecd SHA512 4f0ea8a65ab014a91779884f47f4b8538af9fb4a9b55a4522f005f0fbaa91e1b3f85c59c683f84bef3a6cb54ac09d354cc9e1157a63c49e7039afb68e15b9266
 MISC metadata.xml 303 BLAKE2B 994cf3fadfb22f368dc6f14707fd56a6a4dc019b335d0d241a5f5f6ccbc221bdd284a3544c3171cc10c107ca01248444c23ca5c0f1386bd0d344fa1c13618699 SHA512 079c0445d27021945507ccc075775236d1ddd6f60cfa669928d982ebbff394f8185de0f8e092c3cb3bf3a531d21b80db6c04af9c98a34f28c8d643b25fd00b10
diff --git a/app-text/lesspipe/lesspipe-1.86.ebuild b/app-text/lesspipe/lesspipe-1.86.ebuild
new file mode 100644
index 000000000000..6ebe2f17d7a8
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.86.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="a preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Tests are broken in 1.84, 1.85.
+# Please check again on bumps!
+# bug #734896
+RESTRICT="test"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	!<sys-apps/less-483-r1"
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build.
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index fc4cb07d9d2e..5cdcae1a7def 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,3 +1,3 @@
 DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
-EBUILD libexttextcat-3.4.5.ebuild 631 BLAKE2B 7d0891dec4d9979dd90757edca0f92a5c604341b474b4f6c40e633a481750b03c66d9481bc065115166aa16ddfdb0d964dbef52300bce43fb21a5bd1d7130679 SHA512 d2c329d9b083168a29ef6d1a94fbad6d846997c1204a721decb33ac8f716278f5378e03563a58a9f916df3d4c19f7ce19acdcf574386d16de95b1b92d318175d
+EBUILD libexttextcat-3.4.5.ebuild 639 BLAKE2B 1aae1efa89bbb23bf4856334b1346006af09242dc2cb4a59dedd0e2e1a6d06279b4357fd012de9419a30e85fcd2c76e724c51a527c526bd3bbfb1f7b973f500c SHA512 943dd27809548b7c5419de5793f5d50757a5370a38e23160027caf292c5cd24300895de2c479064e77d9e7b2443eeb5f7d065e8cb1e8ecdd1f9be0617f0016b8
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
index 01e091381ee4..31d321846aae 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.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
 
 DESCRIPTION="Library implementing N-gram-based text categorization"
 HOMEPAGE="http://software.wise-guys.nl/libtextcat/"
@@ -9,7 +9,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
@@ -23,5 +23,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 6f994a6926e3..2dcb5c44ab7c 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,5 @@
 DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
 EBUILD libpaper-1.1.24_p5.ebuild 1199 BLAKE2B ee864bb78ec30f830d0fa66e01f7de3bd31afaf51cb4dbac316997f25f8fc1281cc99217a9fc62b51a7be5dda03a9ab0540d0b944c1ef2fb19b8ce562da3ff96 SHA512 33a26ef7217a5fbc9e9873b18a8f32a5cb13c0bd4c6cc94824a3875fc27f51976a991edee82608f0117a91ae7cb7b4c4abed2dca2b397a8f2f19de9f7236af08
-EBUILD libpaper-1.1.28.ebuild 1146 BLAKE2B cb7163da02ca129b6b6b38b569051d7abfb59366efbc0315427eb2d2ec6ce380c58dcdaf0bd504cbe0fdd3fed267ea2aeccd334019d4d52c5556c2a38d44ff8e SHA512 a278608d0089455b7133ed3118f552ab1d47bf4d4878d7a4d4344240be82756660a95b1cf9514ecf53d06858446ab47aa4d0805904d98429e9f87d7257842c3b
+EBUILD libpaper-1.1.28.ebuild 1142 BLAKE2B ed2674b50afe719886dfec1e284a57a20d32d62c887fdb68c981a6c1d563980e1c0bde075ed753351a0b856599ee7b308c48a03ed591aa98a451b38f434f354e SHA512 7708e7db215a9892bbd6f5c98680f278537f667e742acab9b4c944afd68c906eaaaa1fb004489396b82e3b371f6e528f4eb1afb368c5d9a0e48b1d3f85b767b2
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.28.ebuild b/app-text/libpaper/libpaper-1.1.28.ebuild
index 87f52550286d..5e4f7ebebdaa 100644
--- a/app-text/libpaper/libpaper-1.1.28.ebuild
+++ b/app-text/libpaper/libpaper-1.1.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( README ChangeLog debian/changelog )
 
diff --git a/app-text/msort/Manifest b/app-text/msort/Manifest
index ad01390c0fe9..23dacbc255d3 100644
--- a/app-text/msort/Manifest
+++ b/app-text/msort/Manifest
@@ -1,8 +1,7 @@
-AUX msort-8.53-find-utf8proc-headers.patch 1540 BLAKE2B 2dd8cf34a982048df63cd4dab0aae8730975c1562e8fb818336a84827b93ee2cf75cc66179d0f92d4be9d5fe3316b01058bc0c69bf1322d97836c46a511f3e14 SHA512 fe19465012ded3532db5bd4cca30f3a8721d42d2301e232144be411a364941c7d63da47ea5b6c9d70cb7631bcd3fb50fcefa96421f2e79e5bbc3831ff3307b53
 AUX msort-8.53-fix-icu-build.patch 239 BLAKE2B ff53316fd6b1f531b432655d1fac1c3b24c114ea35ae63f4f4bb65f4598db2039dae80103bf942ba2ecd269ae3fb8ea9735bee71907876a6494181db052941ee SHA512 86f7c131166a568dd3b9534662c02681396686d9642d6cbdb6b4128d0c6c8eeec9660c8e5f9c8156e78e096a668ec67eba52e9c368455f40002e18de4dddf269
 AUX msort-8.53-fix-missing-limits-header.patch 559 BLAKE2B cb158b619540aa9679d845c1c94986f3bbe9f75aab0069d7a12133043ba547d13d26727251cf2524e4e285d0f1207ea43353972eea782198dda34456b984707a SHA512 9e779627e2f92955dc66b03fb64fce767e2cbf2dcdd8a42c9e10f06b512625be10434a47c26a9b7c46e1a15c226d4f66eeda21194f9a0d3eb6deb801b83633eb
 AUX msort-8.53-fix-segfault-on-certain-input.patch 384 BLAKE2B bec03b23365bfe010b04a8fbb24c2043f5436dc866c2dc5b76de4c2639103ecf75bd12ec6d63fa9e2922ac79c8e97a6939c74fe5f37d026af8325c1b161b0f42 SHA512 6d7e1ddf68240f27055a43cddf9e99594ca2ff20c0d666b8e3e09f74c319b38432d15c0b608f76aa5732b6145f1d3120f618cca398c8a68bef4a394949df55dc
 AUX msort-8.53-respect-users-cflags.patch 238 BLAKE2B 50efa37a87f42112524bd8e281c634b0e2527dc4d63597433616a9f220a3cf935138a32eab9a11f5acedf37bc1c6b25efe1e862b81c0b3ba930c6545fce05cff SHA512 c157bf5babc42db689cf9e0b9ee8c9f372c065570b2728833036658215ae508565db2ec4f00688766ce5a18ea3589747c7cce7172232fe0493a8037689f8152e
 DIST msort-8.53.tar.bz2 440307 BLAKE2B 024fa62c9424dd7f994fd9aabdb2414116ba78c2f6bbbfd88c11cde4ed1688260d7bb7f7a18dd36822f4725817df93d218c4382e8b15232fc6d3583098d44db0 SHA512 9afba189d8b703cd6668065ace86733b52a39f6783272849b3582308da5a33db8ae6747501846523ba3671c9fb38a7584fe0db2462cff446b15d79200055a573
-EBUILD msort-8.53.ebuild 1025 BLAKE2B 3c7acb0a7fa29c2612588898823c20690f2dee7e2ca35d855fad205a197f7cfd514710dfd77fc3cfe3ad9a7c7431836187100a99b06db51a07bb0c61e9fbf500 SHA512 1f6eec831620854e795d243ef81660a439df1ab99878205f055e758f55ef075315a0b189b69117ff13bd4a21f0d1d31a9df775197f2e219f8cfd1a64ebe30caa
+EBUILD msort-8.53.ebuild 977 BLAKE2B dd13d82936ba2f22ca96a0f5c9eb52a89ad415710418f8f35fdc4b520efb9152df497e7d722b54cca6d18ce17a69f4d1970aa1c97de7d375eb13536d39061b0d SHA512 2abf69beb5c31b3372389e9c2382d47a2c95f81a6423739236410b34478010fa7432a758bbcdc6940c5da2d07cd70b3e8e9658408c1f85273e06b8e223ab3118
 MISC metadata.xml 1000 BLAKE2B 97ca2922b7def4cba7a8b30ba037f225985d0f9894bde8697a743b0ae7ca62762bcc5a5407840a67967f705521782b82302577492f7ec7d7986fd12bd670b485 SHA512 6015e576adbc1d3569c30e0e60280b537b313c9eda6c5c78fa8fa9ed107a9e258de5e4bb33158c7a6298d32edf9d6099834f41792cd5f043b17bc25c35a6d438
diff --git a/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch b/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch
deleted file mode 100644
index 9b3845bc601c..000000000000
--- a/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac	2010-01-11 01:56:36.000000000 +0100
-+++ b/configure.ac	2018-09-27 15:05:20.205734233 +0200
-@@ -94,7 +94,7 @@
- AC_CHECK_HEADERS([alloca.h ctype.h errno.h gnu/libc-version.h langinfo.h libintl.h limits.h locale.h stdargs.h stddef.h stdint.h stdlib.h string.h sys/file.h sys/stat.h time.h tre/tre.h unicode/umachine.h unicode/unorm.h  uninum/unicode.h uninum/nsdefs.h uninum/uninum.h unistd.h wchar.h wctype.h])
- 
- if ${utf8proc}; then
--AC_CHECK_HEADER([utf8proc.h],[AC_DEFINE([HAVE_UTF8PROC_H], [1],[Define to 1 if you have <utf8proc.h>.])],[AC_MSG_ERROR([LIB UTF8PROC and its header is obligatory. See http://www.flexiguided.de/publications.utf8proc.en.html])])
-+AC_CHECK_HEADER([libutf8proc/utf8proc.h],[AC_DEFINE([HAVE_UTF8PROC_H], [1],[Define to 1 if you have <libutf8proc/utf8proc.h>.])],[AC_MSG_ERROR([LIB UTF8PROC and its header is obligatory. See http://www.flexiguided.de/publications.utf8proc.en.html])])
- fi
- 
- if ${uninum}; then
---- a/misc.c	2009-08-05 05:09:21.000000000 +0200
-+++ b/misc.c	2018-09-27 15:10:37.355738021 +0200
-@@ -41,7 +41,7 @@
- #include <unicode/umachine.h>
- #include <unicode/unorm.h>
- #else
--#include <utf8proc.h>
-+#include <libutf8proc/utf8proc.h>
- #include "unorm.h"
- #endif
- #include <tre/regex.h>
---- a/msort.c	2010-01-11 01:53:32.000000000 +0100
-+++ b/msort.c	2018-09-27 15:10:30.275737936 +0200
-@@ -57,7 +57,7 @@
- #ifndef USEUTF8PROC
- #include <unicode/unorm.h>
- #else
--#include <utf8proc.h>
-+#include <libutf8proc/utf8proc.h>
- #include "unorm.h"
- #endif
- #ifdef HAVE_UNINUM_UNICODE_H
diff --git a/app-text/msort/msort-8.53.ebuild b/app-text/msort/msort-8.53.ebuild
index d70c5e1bf098..62a6fff19ef6 100644
--- a/app-text/msort/msort-8.53.ebuild
+++ b/app-text/msort/msort-8.53.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
@@ -22,7 +22,6 @@ RDEPEND="dev-libs/tre
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-find-utf8proc-headers.patch"
 	"${FILESDIR}/${P}-fix-icu-build.patch"
 	"${FILESDIR}/${P}-fix-missing-limits-header.patch"
 	"${FILESDIR}/${P}-fix-segfault-on-certain-input.patch"
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 43e4159816a3..38bde31905b1 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,4 +1,4 @@
 AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
-EBUILD multitail-6.4.2.ebuild 1316 BLAKE2B a791eddcdc501d050773c76a1ff83781546f7d0e5a563a2a7a7ce3bb8f09e6366151660d87ff1055e1e60b409abc1c2d7bd28bc628dd642f70ed52e937658047 SHA512 978ab556dcf9a7bb59875945d577600d68d8154f3a1d79eb90d2b2e9ef33178b97f3d56cf7ae86f1a98d22b24172f33521991ced2dee5cd7f5f7d8f3f2c2caf3
+EBUILD multitail-6.4.2-r1.ebuild 1318 BLAKE2B 71a4471f33060ef18f2ddfd4c408bc636c780924c6190a8c84818b44ed266dc7bf1bbbad47df0b7d1b25ecf4667b8ae3ce7367fccefe32a5c63bf5705da455d9 SHA512 dbec42fad2778223331f50404d90cd666d5350accc1628036596d4cc639587833473553f9eac75e16310b59b1d390d144370fe1026a99aeafcbc128341e57ee7
 MISC metadata.xml 346 BLAKE2B 664f02453aee33a2c256dd6bc38117edb07ebd971f2b3caff2042c905bd0eaf0b9b58374c448c6f81d345303f7eb449ca7637dc21728cb8be3464a30da7cd179 SHA512 0e40da217b3ad26c858f6d8b995300a903fa77eda44927c710881bf7968d4033dfc82ef1c775c76de3ee08fd7de067882253d848b51373b0ac25d6e33e02220e
diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2-r1.ebuild
index 57f9b4e9f0a3..8c10123313f6 100644
--- a/app-text/multitail/multitail-6.4.2.ebuild
+++ b/app-text/multitail/multitail-6.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"
 RESTRICT="test" # bug 492270
 
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 202f7b5052d5..8ab9540fdbff 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -8,5 +8,5 @@ AUX mupdf-1.18.0-darwin.patch 1001 BLAKE2B 1d6f8452cda38dfca3b0e62069a560ed6119d
 AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c
 AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-EBUILD mupdf-1.18.0-r4.ebuild 4259 BLAKE2B c95febaeb6be6ccef3c48ee358e3f1f32e37af133bf3885dbc381efbf0fa9a85d81f50efbebd7da36d70c339ca465b3670db1daec0061c876ff9ee52a765a65d SHA512 827ae51bdf6613893eddee22708c8fb5ae6322752afc76cf1eae0386f3f610f5e26697e0c68729a65fec0bfcf6ba3d8eeee82544ad9d4d4c7bf5c440ae79b044
+EBUILD mupdf-1.18.0-r4.ebuild 4266 BLAKE2B 840bcff549d8911c422580d8ba07dcaabc5e036840bd4ef3cd2346703465365d91d7cf58fa55d4860dfd6c39f7f32b23a1ae97c32184dfdfa8e5c11e4e65bf7a SHA512 b62fe1022ba26fcd7f2f9e7ea0b6b7f94bcc1e80cc5d8dbb086436afa46c4978249214bfc46d4057263a0a5f6c06a28eeb40c31206355379a442979e857cc722
 MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/app-text/mupdf/mupdf-1.18.0-r4.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
index db2b4ba6fd92..66511fc715fd 100644
--- a/app-text/mupdf/mupdf-1.18.0-r4.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
 IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 1e116d254d25..e9adb84284ea 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,4 +1,4 @@
 DIST pdftk-v3.2.2.tar.bz2 1245439 BLAKE2B ac1991e60ad06308cb7be1e74f9b3772c80416e490fe525e806efb6d30c6bbc9d310b98c255ef9e3eb3f814541d7388140210c4df2b694bd4a9ee325c27b3f24 SHA512 03220ac3036098768dd4250bbfeb6675561e9126697b99703ab5788b2cee7551256c301d9191745c5fdedf429056b46641351d1fb92631ef17673d7e740c5431
-EBUILD pdftk-3.2.2.ebuild 894 BLAKE2B 251c4f945e0a818f1db0c2e5043db5cf2abfb7d6595bdff4888f6a24cdfcd44d6f8e783a496ae96a673065c79927d44593774eb87c8c1a66058c0b0992cc36e5 SHA512 590422bcaf897d40412b8c45f245a93062d878196e953e058038eedf1b37443a6c9481fef2c35bf3b83542382939702cae2e0decdb610cd61c5e5361b8efe9a0
+EBUILD pdftk-3.2.2.ebuild 893 BLAKE2B 5a6692ff39c58520d8f7ca68121274d978b26307db92a1957b389997469d432c724c3aec16f9afeca90a42a7cd22d71601ba35ef6352c8bf147274880137e2d6 SHA512 aa3391a55d5955e7c9271fbfb70cc6defbe9be3b315e7c229149bde83195cefc47ae62d9f5631dcb885e28563353b319fb480770463a13e8ba9d8d00ddd68020
 EBUILD pdftk-9999.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
 MISC metadata.xml 348 BLAKE2B ef51c768c6964646b5e264d379b5c259134b37df3c9d4368b92c44855ee21fa40005fcf1514e95fba43fb683fbf49c35dc251521d1b63f91449c73ecb527a749 SHA512 f7031388d3d15f091e5e477bbcc7291b1e2362cc41fb485875e8a4ec81c9b86ee4a8b9ee640eeffe7e2bc17cc90ab417945bd6aca52cf13c85d979774e8a3572
diff --git a/app-text/pdftk/pdftk-3.2.2.ebuild b/app-text/pdftk/pdftk-3.2.2.ebuild
index b21ad2a678f4..76a67b2ad73f 100644
--- a/app-text/pdftk/pdftk-3.2.2.ebuild
+++ b/app-text/pdftk/pdftk-3.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
 else
 	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}/pdftk-v${PV}"
 fi
 
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 7310f96e235a..8897da0035a7 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 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
+EBUILD po4a-0.57-r1.ebuild 1290 BLAKE2B df2dbc33e75186c1e578cc4ba02ae7df6aeee4e14139d8b9174791a747ae4064012df67b169f11ea5ca84f3b5d96abefd92faf39a0810a9b8e7dbe865bac4c3a SHA512 28847b243fb6a82d9650a1088db67d118ee53808231d2907ebe349e79e66f754a15747981d59faff82365363be613a42e8b5691a9a0118060c9df2e875b053b0
+EBUILD po4a-0.62-r1.ebuild 1387 BLAKE2B 12af309cc2cf5872e03d169df317b1ebc785b5c5f20f06074b15a3c9451e275f9492e45aa9b69e5f524306ae21b9886776966d81610c6113d3bc02ac5ecc8477 SHA512 2577cadd4b5638e0ef18c95ab20a37ace2f22b455accba70b792829503eb70f9f01e6826c368cbfa8a02b46741323f0a663df994269c212bdbea2c4ac80d0ebc
+EBUILD po4a-0.63-r1.ebuild 1387 BLAKE2B 12af309cc2cf5872e03d169df317b1ebc785b5c5f20f06074b15a3c9451e275f9492e45aa9b69e5f524306ae21b9886776966d81610c6113d3bc02ac5ecc8477 SHA512 2577cadd4b5638e0ef18c95ab20a37ace2f22b455accba70b792829503eb70f9f01e6826c368cbfa8a02b46741323f0a663df994269c212bdbea2c4ac80d0ebc
 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-r1.ebuild
index 08593f0289b0..e05dec8567cb 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="app-text/opensp
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
 	sys-devel/gettext
-	virtual/perl-Pod-Parser"
+	dev-perl/Pod-Parser"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
diff --git a/app-text/po4a/po4a-0.62.ebuild b/app-text/po4a/po4a-0.62-r1.ebuild
index dfa0d2ba8699..d2312dd067e5 100644
--- a/app-text/po4a/po4a-0.62.ebuild
+++ b/app-text/po4a/po4a-0.62-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="app-text/opensp
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
 	sys-devel/gettext
-	virtual/perl-Pod-Parser"
+	dev-perl/Pod-Parser"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
diff --git a/app-text/po4a/po4a-0.63.ebuild b/app-text/po4a/po4a-0.63-r1.ebuild
index dfa0d2ba8699..d2312dd067e5 100644
--- a/app-text/po4a/po4a-0.63.ebuild
+++ b/app-text/po4a/po4a-0.63-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="app-text/opensp
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
 	sys-devel/gettext
-	virtual/perl-Pod-Parser"
+	dev-perl/Pod-Parser"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 738b92c6c906..8658a3292e2a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,6 +6,6 @@ DIST poppler-21.06.1.tar.xz 1708344 BLAKE2B 424888e16c72e9ad37fcb0aa3ecc7bef8c61
 DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
 EBUILD poppler-21.05.0.ebuild 3275 BLAKE2B 68c1ae9c653cc9f1ef2ec69f31729ba20d76ab5ee7eac8e19091e38f1eddb9d73714a69c0cda3df1abf9736d4dc1599f5754421da76b2b1adaaf729cb8d619e4 SHA512 e23de4db062620e849b62a511221b7871b0f1e927189c6e7424271f0eac7945a5af929ad12a604ee43fe7e00c2c49d2c99b9e74d955ca8ba64506fbaf473fc65
 EBUILD poppler-21.06.1.ebuild 3403 BLAKE2B e1106d45017fba96cddeb85854b32545dd729616fae234775c1c07080b1e939d8d47f6a86b30d2b670fd67afc6430ee12074f92204b47ca7412cb6be8c8c410d SHA512 4a038a9d3c52dc9bcecde3cd70b282fa371409b0ce78845552a1f08adbcc30ff7fca261d50a431180630befc21783f029ffd318e8e15f93146459a20052d6268
-EBUILD poppler-21.07.0.ebuild 3403 BLAKE2B e1106d45017fba96cddeb85854b32545dd729616fae234775c1c07080b1e939d8d47f6a86b30d2b670fd67afc6430ee12074f92204b47ca7412cb6be8c8c410d SHA512 4a038a9d3c52dc9bcecde3cd70b282fa371409b0ce78845552a1f08adbcc30ff7fca261d50a431180630befc21783f029ffd318e8e15f93146459a20052d6268
+EBUILD poppler-21.07.0.ebuild 3410 BLAKE2B b5184ade27866acbc521230ad858f1fd955039869ac06489867edee3fb23ce4c571e64366500122318bf4bf21022cfcc241a5d69a66383fc91ba1297aa3bf479 SHA512 8ee74313f040dc9c5c4c283f5303bc2d0537e8aa5286b45624ddfdbce8921a2cc77ae5aa92dbc89c69e3e2c539fe3f270ad05a77197669cb523e1c03e435c015
 EBUILD poppler-9999.ebuild 3403 BLAKE2B e1106d45017fba96cddeb85854b32545dd729616fae234775c1c07080b1e939d8d47f6a86b30d2b670fd67afc6430ee12074f92204b47ca7412cb6be8c8c410d SHA512 4a038a9d3c52dc9bcecde3cd70b282fa371409b0ce78845552a1f08adbcc30ff7fca261d50a431180630befc21783f029ffd318e8e15f93146459a20052d6268
 MISC metadata.xml 1094 BLAKE2B 661b20d0ca935bc2d7c91a395f1a541085bab7139858f50c5a8adf04b3d8c8ce97b80153ac9be3a6a92d5ee008505617f305fa1b37e94ecdd77f524f56b28a62 SHA512 51bbcede699a7f4f3d70bbbf18080ae17054daa48de147bc9756614a84225e71d1bb9b7dab918f54661e001cdd33f5a00c5b55e292d8a99e7ed66b82798a9b69
diff --git a/app-text/poppler/poppler-21.07.0.ebuild b/app-text/poppler/poppler-21.07.0.ebuild
index 048302fba121..5730019c6024 100644
--- a/app-text/poppler/poppler-21.07.0.ebuild
+++ b/app-text/poppler/poppler-21.07.0.ebuild
@@ -11,7 +11,7 @@ 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"
+	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/111"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 357e532d4e5f..6d0addc00391 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -5,5 +5,5 @@ DIST qpdf-10.3.2.tar.gz 18943834 BLAKE2B 5b4e320ddd663721d8201139842bb09a752347f
 EBUILD qpdf-10.0.4.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
 EBUILD qpdf-10.1.0.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
 EBUILD qpdf-10.3.1.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
-EBUILD qpdf-10.3.2.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
+EBUILD qpdf-10.3.2.ebuild 1251 BLAKE2B a6c12b3178f671060f2c01633ec3a6b0de3343ca9087998ca54a3364f06ae055d442595ad173057c936c55024cb90b81f170d09259f2d14b7f82aa414c7701df SHA512 84fe44d555383379f59fac01481619e3282ee334e862ba16df186f58ecf73ced5a6a1877e2ac8519ae604850910c07133b4e1cf60be0caeb29d129e81cb7e8c2
 MISC metadata.xml 443 BLAKE2B 4522681371216196a58ef46575aad835e548c7f4e18a7137d6c780b1a5b8596f121e223fbfa6face7e33d5fe487b20219f0a40c68c5b0cb4d7eae1dfe7e8dc92 SHA512 1fcc6699cc87a906f341f9ebf45158a18870df921c573bba5f348375cd1ef0a204270abc9c6337e81d48082bf970ba16b09d940c4dea94b92d1d4efbeac5fbde
diff --git a/app-text/qpdf/qpdf-10.3.2.ebuild b/app-text/qpdf/qpdf-10.3.2.ebuild
index e6c1b1772480..9b78f115b945 100644
--- a/app-text/qpdf/qpdf-10.3.2.ebuild
+++ b/app-text/qpdf/qpdf-10.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index a975e6b55aab..1a8f1379065c 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,6 +1,6 @@
 DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
 DIST scdoc-1.11.1.tar.gz 12482 BLAKE2B 2632da654730a373f03955f0b3bb190c8d6beb2fd4e4b05c88a4c86d384b26c51a8f032e6b2ef8d4d795638c1981a4d5500384f3103411869c7097a2ba1466ff SHA512 28b676a2ba69a101034c47378c4b66c94bfb9903d680a1871020fd8772d0990a4c91678738f71d37bfca06e27991ef782047c6503d375ce69df744caf6b459de
 EBUILD scdoc-1.11.0.ebuild 1182 BLAKE2B b52c95f0dbabac5b4eb7487cd48e59bd1b361a3a944d53c7b007bb52c7b3f0c68c6d80cd22be964b97d95f82474722a005745cf34c9d0ed0d36dac0887183e86 SHA512 a810dfca019775b6aa54e76dd8f2d411550360e86ac883498ba9e769224de6067c225eec31e93735a4f5fc6585507e780fd94c4ecf19b77677188d7118537a2a
-EBUILD scdoc-1.11.1.ebuild 1190 BLAKE2B ad23f7d61db3cc4a223e9dd192dbf90c77a55dde5a61b172e89582b939df6a4051c7ca616e9a72a4ae4a8bbf28c83099ab4c8d4b612f4894b01c8ac95fcd9350 SHA512 7346bdd524f6a04bc39d554a4b73aa6138489302e4fc31aa8a463008c1ec3274527fd432e6fe01ed8d8a17074d575b60c01860c27522112bd7d37a44a43a1e38
+EBUILD scdoc-1.11.1.ebuild 1197 BLAKE2B fe17671505392413faef92b5bcdb3f44b487064b19e522486fbe65dd1b7adde2c8e3fcf7e0807428891447214631ca066e3754e6e90b4cc79c292781ff5621e7 SHA512 842b99af5aec1a9166cb83330a9a789bf2329cbcff0eaf23488a908f860dd4949fd391fc26bbfba0a652ffc23761eb819a10693edb025957a2d38213e94592d6
 EBUILD scdoc-9999.ebuild 1173 BLAKE2B 873f1def0a103e8c431fad6ffbf902a9e97ed543d29f738e0ff4799be7f5d49449f50b30e4f37ae5310f7ede07e15f76a395f553756f1d048b3f36ee8aff0b4c SHA512 4ac9391cd7564179179a1951469c73e798c12a6ad3b82c72019d64e6364c943c02251b43344d5e7a1f4e9f1115c941b2e5b89065be25d00002cf5b6dc8fe3af1
 MISC metadata.xml 436 BLAKE2B 488499e5a1aaf5c623a667415050a63f1460eb6495b1013dd81299807a330680d02f65f725dd1f964794b28956d7d4e32b07cf24bbbb2dedd77d2919e23e131d SHA512 13ff20e7c0fee769e256c7e9ab595ec623d86878bdbd0a57ff036ac496513aac348796d526b978539f0cef1bac23549324fc7a6ed1dd45a685050e04d4be66d1
diff --git a/app-text/scdoc/scdoc-1.11.1.ebuild b/app-text/scdoc/scdoc-1.11.1.ebuild
index 8c4bd7440b60..edae9c69b757 100644
--- a/app-text/scdoc/scdoc-1.11.1.ebuild
+++ b/app-text/scdoc/scdoc-1.11.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest
index 7753a58c270b..90d13586064e 100644
--- a/app-text/xapers/Manifest
+++ b/app-text/xapers/Manifest
@@ -1,3 +1,3 @@
 DIST xapers-0.9.0.tar.gz 159928 BLAKE2B d202a3835ccbcb1adfc2123ee40f6e1992e0c10f84cf57fc38eaae27134d649c94b5c625bf3a11ef2f4d119093fb1dcd99a923a9585d8e6b6b37ed9db7c15247 SHA512 0b2e32d215c64842a2d586c776d6cdfd2b77cd3081929c37dde9682fb61e8c58e374773ef33e1123087e8dcf655e12fd19db371005aaf31875492607d6494dd7
-EBUILD xapers-0.9.0.ebuild 795 BLAKE2B 4fa945cf7fb8872b014c2be83e57f755718b9f3ab298199229d2a2fc9c09cdef71723c9ecafc66bb6a470727761ad2d8cad55fd79442db8d8a0201b26c99e375 SHA512 cfaf7744183bd8a347c6bb7de747f6f1937b167d695f49cda79e610f7050cb1c045edbeb7291d56c0e70bc7cd08a2182df2a7733b1197b39056de20a31332678
+EBUILD xapers-0.9.0.ebuild 766 BLAKE2B a2610982f8c59d93fd8be9d1f960b9c606d83448e06f440d2afced6b26eeeaa5f2d0fcb8b3f60f6858779cb0a8e54bab795336f268ba16e2fd32e62214b09d6f SHA512 6a4f095c8549ee2fd8bea3ec393be4891374d7013defe2d22d1fe559cff6db4959a2c8024725b40c6523343eba528438d423070cfb65664cf2ded77f0baa0df1
 MISC metadata.xml 583 BLAKE2B 89ab5d3ca7ea4dbe5b5371c19793d9f2feca363f5690a67478e83963e9afa273113c95c1b395b12e060754864f2f9c77765a486f7577f864f3a8d0fa73e79c3c SHA512 840c4e58c80d826e67ebbfc2b88670d70a4902f8188fbfba9c63e0553d40676c4df9684ab3c7d086e9c36d28dfec7d402147cf537fd4d4517aa857cb0cd714b0
diff --git a/app-text/xapers/xapers-0.9.0.ebuild b/app-text/xapers/xapers-0.9.0.ebuild
index ca6cde8881d3..e47be22b3be4 100644
--- a/app-text/xapers/xapers-0.9.0.ebuild
+++ b/app-text/xapers/xapers-0.9.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2016-2020 Gentoo Authors
+# Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -28,7 +27,7 @@ RDEPEND="app-text/poppler[utils]
 
 BDEPEND="test? ( ${RDEPEND} )"
 
-src_test() {
+python_test() {
 	cd test || die
 	./all || die
 }
diff --git a/app-text/xmlformat/Manifest b/app-text/xmlformat/Manifest
index 22f98829aa2d..bea2bc6e776e 100644
--- a/app-text/xmlformat/Manifest
+++ b/app-text/xmlformat/Manifest
@@ -1,3 +1,3 @@
 DIST xmlformat-1.04.tar.gz 156498 BLAKE2B 18463dea611a5d080056b0ed314eb12555e2abb12d630fb879421fa6359606f7606fda42e146eaaea7ae2fa470661ab4e28a86762375024704e607316f6323cf SHA512 e45471accf0c04e016d3a9a5bbc2f984a9a76e1d5406a80300bf9da9d04bd78b67716055271923669462b70a1713b94a1e1937318115dfd9eb9d258b69a3c14d
-EBUILD xmlformat-1.04.ebuild 934 BLAKE2B e7f14a90ccfc8c529eadad43d641cd2f1c4ec04560b634822534a15793df1d86164e43acc2b0ea120f5645eef0cffd34ad03715ed777851e731da78b8f7003af SHA512 6191ac9a87aa91b95d004e1762ea94ca66f25a919f2a3df1b677f73b01c156e16fb08163c7a218d1e80012aa6b0bd97f2231d14e34452e6436d630b2e49f1ff0
+EBUILD xmlformat-1.04.ebuild 934 BLAKE2B dd13f05ff612a01c3f59ba545433b034b6a070f3874af73f34377eabd2bcf67c82b85a9fdf7b85ccb1306e52750192ff14232f6f900769c6f3d17a5904451601 SHA512 b19fa048594dfd25c8fcc1d083c29f23f63a7580e4b79f17764956778604ad92190d6c489bbf3999514532ba6ec21f63f74e30c74cfe499d579c7f718a767645
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xmlformat/xmlformat-1.04.ebuild b/app-text/xmlformat/xmlformat-1.04.ebuild
index 7e10ca1cc039..a286b8eb8561 100644
--- a/app-text/xmlformat/xmlformat-1.04.ebuild
+++ b/app-text/xmlformat/xmlformat-1.04.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 inherit ruby-single
 
 DESCRIPTION="Reformat XML documents to your custom style"
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index f650a17b97ed..ee17f9aaf894 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,5 +1,5 @@
 AUX xournal-0.4.8-aspectratio.patch 3494 BLAKE2B 966fabedcb5d1ea3cce635713e45beb1fbae3a5fcee54701fcb3f581107ae80f67af4492998d7dfad7fccccba225bf0758ffc327aa6dd7ea8197d21de26735ee SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70
 DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e
-EBUILD xournal-0.4.8.2016.ebuild 1181 BLAKE2B 7b7a68595c04f314cff458503eedfbcf7a4323d7f99d6b675f8bf08037a5170212d47449862721966ad0f6a0751f743c333842199ac2537ebd8ac18090ccc077 SHA512 bc9bd5408956f06a11f1f8e635ce958fc3e2ecf5f4a26602cfd67a223d50f1fe74edac78528203d389ee6c8a331565a3d4c8594c9181a9995033eaace768a885
+EBUILD xournal-0.4.8.2016.ebuild 1188 BLAKE2B c3803e8c9ed0cfd1e573568fc3de4351ac53d0e997f6e933d912325dad40e8949491e7ef060a9d2496a96c014df6ae98485e61142f57185c6b5651aa735c1928 SHA512 ad4d4ee2b734862b04997351b9aeeb1472a0562dcdfac9fc030d7759b5db5182756e1ebafead88f53c33b9baa58f9e26b86fdd8e827881c85669e73e037f0cda
 EBUILD xournal-9999.ebuild 998 BLAKE2B b040d45de8ab96b168607a97e249a5e92aec2b7e8a2f95f098ddd63c912e33e90679566fec6cbf03ae4b95d5b039ee7ee65d0249cc35303ff68e0b864cd77d54 SHA512 d45e91904ccc3f71297a79ae9dc2308b7cbc38b574d55dc3483789bb3320dcbcf2267a298dbd5f1c368698caf8750b32f6bae4ed887f5a9f6fd7debf6693f5d9
 MISC metadata.xml 652 BLAKE2B 780548e075d6468df82b41e454b8d77c97eb7c9e4b4e4e286b7cd98a4f6c2d5489b355eb088602f414eeecd32b19b42d7c24aec6b1436aed3c818f60605d54f7 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648
diff --git a/app-text/xournal/xournal-0.4.8.2016.ebuild b/app-text/xournal/xournal-0.4.8.2016.ebuild
index c2f75dda057f..8ea556bd5054 100644
--- a/app-text/xournal/xournal-0.4.8.2016.ebuild
+++ b/app-text/xournal/xournal-0.4.8.2016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
 	unset SRC_URI
 else
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 fi