gentoo resync : 22.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
commit: 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree: b9791a06ab3284e27b568412c59316c66240c682 /app-text
parent: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
110 files changed, 993 insertions, 712 deletions
diff --git a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
index 85834ba3e3d9..7e245481115b 100644
--- a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
+++ b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.shlomifish.org/open-source/projects/docmake/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="dev-perl/Class-XSAccessor
 	virtual/perl-Getopt-Long
diff --git a/app-text/App-XML-DocBook-Builder/Manifest b/app-text/App-XML-DocBook-Builder/Manifest
index 7082952a92d4..b54999d722cb 100644
--- a/app-text/App-XML-DocBook-Builder/Manifest
+++ b/app-text/App-XML-DocBook-Builder/Manifest
@@ -1,3 +1,3 @@
 DIST App-XML-DocBook-Builder-0.1003.tar.gz 18414 BLAKE2B d9a9442c46e171fdd8cd11cb997b8f1dd6ddd92c1ca03f0430be01828c0b46439a3aa14f6d68c2550f21bdee17871a8b314c2f1712b7810344d3a8385e9fea8d SHA512 421fdb84c2d9373ccdefa6b490bba1a78660414d27f470fbad48ac48178e3cb383345cd63a232bcf4ce13561e6775ff97397f5ab06c6142e1d8da34a92d6dcbb
-EBUILD App-XML-DocBook-Builder-0.100.300-r1.ebuild 563 BLAKE2B 36843777331cf2327d6d7389596ff180f6d3cf8463c4f993c9d0d69bb81b78f19cb7d29b41f353b837a34c27a70178d680f804758a15e18366dc485eedd438e3 SHA512 e6945424d6409876c9bfe13d18f8d93b9f2467bf3aa252904ab118d500b30be3a3a9a0b99cd545faf5a4c16d18214c47ce828958cfa65a0da3919d23aed3ae4a
+EBUILD App-XML-DocBook-Builder-0.100.300-r1.ebuild 582 BLAKE2B 7e174eb68acd82d36e1cc4cc9bfe646e19c74d864bb95174fcce310b3185ada68a53103f703cdf3439875a7e0ba12ab7bc75fcb22007d3185ed7afa62cfa23fe SHA512 74ca5c7e211a33eb35e7a4ba08bc55621d068ee318d78f9a53dccbc59ab9e8757c1189a01447cff56e9c0df4e9b987169de085abc99f466d986af607fcf5942f
 MISC metadata.xml 375 BLAKE2B 7b6956381a455fffbe920a0706a91819fd70eac409a10a32c7c609a85dfef6bf97a64d2781dcac0bb624fa64be2b56b8f1e2f2dc9d42b728c019e514839f6492 SHA512 dd707b431ec91e6cb9da5dc0e2b21937739e480d0e3f2fb42f8236d7f9c1bbe1f8e2f3d95b506c49c3a982b4769eb441eb306310b82cb425a4550b51728f6a1c
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f82bb5ffb05d..c0e703d5a219 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/XML-Schema-learner/Manifest b/app-text/XML-Schema-learner/Manifest
deleted file mode 100644
index 18eaff9508d3..000000000000
--- a/app-text/XML-Schema-learner/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST XML-Schema-learner-1.0.1.tar.gz 51057 BLAKE2B db9e5c6176484278fcc050c201f4ee3c560536fd1439cadf1f7c2be29e967ef9d84a488ec01045cc3887f527a0cbaf53649bdb4a505f11df17c5697b344a6fd3 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d
-EBUILD XML-Schema-learner-1.0.1.ebuild 1189 BLAKE2B d82af02d227051b772e7943701dc9db367f5adc152bbcfe309ceafe51dcf6238fd594e08e42b64ebec56d795531265aad8d80b0a537dc68af258f25ebbb1783d SHA512 2c6f15528e15026bb63979d842c5c533d584387e5aa13373788b723e1929cba02d93ffb28b2ad691d2589459963fd91fa48a886b70ed1daf12ffd3319b250afe
-MISC metadata.xml 943 BLAKE2B 6dbee3f66f1483c9e0757210e996d6780fa5b8745a14eb102f1419bb4f37288ce0ef2ecd6bd8e5fcaa8b038cbc239a0c62b5235d14ac936ae18feb7c2457675b SHA512 c602dd6b333d5df1176939cb40bdc33fbc366539fde012f067382ae247b4ebe4de5eb0c94d3bd6754f8b18a2134c5f7756ea23fd363b679b99566bb6da6ff40b
diff --git a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
deleted file mode 100644
index c876bebfd7d5..000000000000
--- a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Algorithmic inferencing of XML schema definitions and DTDs"
-HOMEPAGE="https://github.com/kore/XML-Schema-learner"
-SRC_URI="https://github.com/kore/XML-Schema-learner/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# This test suite used to work but needs an update for modern versions
-# of PHPUnit. See https://github.com/kore/XML-Schema-learner/issues/6
-RESTRICT="test"
-
-# PHP dependency can be inferred from .travis.yml in the repository.
-# The necessary USE flags on the other hand were found the hard way.
-#
-# The dependencies here aren't as expressive as they should be. What we
-# really want is for php[...] to apply to everything in PHP_TARGETS, and
-# for those interpreters (the ones in PHP_TARGETS) to be used to run the
-# test suite.
-#
-# See bug #497606.
-#
-RDEPEND="dev-lang/php:*[cli,xml,xmlreader]"
-DEPEND="test? ( ${RDEPEND}
-				dev-php/phpunit )"
-
-src_compile() {
-	# Don't run make, the default target is 'check'.
-	:
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc README.rst
-}
diff --git a/app-text/XML-Schema-learner/metadata.xml b/app-text/XML-Schema-learner/metadata.xml
deleted file mode 100644
index 4dcf546c3a51..000000000000
--- a/app-text/XML-Schema-learner/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mjo@gentoo.org</email>
-  </maintainer>
-  <longdescription>
-    This software implements various state-of-the-art algorithms for
-    algorithmic learning of XML Schema definitions and Document Type
-    Definitions.
-
-    Given a set or a single XML instance it can algorithmically infer
-    a schema which describes the XML instances. The resulting schemas
-    are of high-quality and human readable.
-
-    The theory behind the project is described in Kore Nordmann's
-    thesis, "Algorithmic learning of XML Schema definitions from XML
-    data," available at
-    http://kore-nordmann.de/talks/11_03_learning_xml_schema_definitions_from_xml_data.pdf.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">kore/XML-Schema-learner</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index 26d16d5f1869..aba3f9e8c5d8 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -2,6 +2,6 @@ AUX aiksaurus-1.2.1-format-security.patch 822 BLAKE2B f8891b9772367ce4aef4b68e3a
 AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
 DIST aiksaurus-1.2.1-patches.txz 7196 BLAKE2B c6013301b924a9e6b4fde790bb56848c575f6a8c2a9934a263d3fdfe4a639082c9c1fdaeb0703854d8aba15479c2431738ffb9ef0b750118fd03d0e05a7c6bd3 SHA512 f3db9afbbff5c54d5203db1f09af219c6a6c217018745827b3bc523e156e7d24b197706486f5a88f5829548df88af471d3a7eabdefe7466297dccf786c840520
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
-EBUILD aiksaurus-1.2.1-r2.ebuild 1035 BLAKE2B 1cce411ad0f515efb358349dac8c64aa541d58233036db8b648bac0edfe67107ea6543e5796d379f11088dc7d566b1267e1f5fb51cb122545e81b4852ade3e4c SHA512 170c683b849a8e448752616440d404d8cbe90d0ba4f11af8675eadad91fc702bbfc1900819ebc2601d17732b4d38d89dcf13169a7f7bf1cc194c68e171e13366
+EBUILD aiksaurus-1.2.1-r2.ebuild 1042 BLAKE2B d20952fb4381bb00d97c244193c6a01bb8046367199b251e7ac9f85d1d63d08e94be395fa552fa16dc5138b2b8806f8d58281cf4a7990ac4d587cd72c8ded8bb SHA512 58709cf03af4d19a72ddb395a3877299815e756d083d054be352065dc6d77d8989281e7d58ccc36b890a95541589a0662fa7d192386a8e124dd7b55737511aa1
 EBUILD aiksaurus-1.2.1.ebuild 793 BLAKE2B bb46c201ab41502c8a3b24a2ac2d97f62244131a95efb3a9d8968f397dac06b3d86ef0b43dc5d56499c5770d95e786fb64dbf1427cd08dc026e9bb740a7381ab SHA512 fd0ff4456cd07621f294830397f7221cfc0026e2062dcde149d1595cb2922b5858a0b38317ac6ecc4ba78488798d0d9273e26561d9f36980bd3d1d503fe04867
 MISC metadata.xml 246 BLAKE2B 6ffed2d4f482be2312cbf43d4831e4578c01c855c2134af7d046be942d566069c910bf5fff0133366f2808a7680f50995f2fe9576b561346c54003b59b02ff10 SHA512 6c290491874e5711080025e89aedb0d9072009324b6757bda046f220eda86ad332814745c9653dbe1b14ee4fa8c625f4a4f66201ca49aac95ad7f681df481153
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
index 396c7f414015..1fbc912f1abb 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/app-text/binfind/Manifest b/app-text/binfind/Manifest
index d4afd1952fbb..a6dce979a2ec 100644
--- a/app-text/binfind/Manifest
+++ b/app-text/binfind/Manifest
@@ -1,3 +1,3 @@
 DIST binfind-0.0.3.tar.gz 91222 BLAKE2B 87ab9faa611064b87771d5ddd799b792e27af457e5a768b4ee7c0f3976c41ed8692673a753b95450124ad0c3c8e5e473081961482b856dfb8e722323915d04d7 SHA512 b3a8b72669f701ce54fb3d1c2331262cfc7f396239d14741d3a106c999ef58739a7f33de87da427983ffb641baa7fae4857aa6aab2e1c0748a61d8b913dca3f1
-EBUILD binfind-0.0.3.ebuild 338 BLAKE2B b01979f55cfb829fec1bdce39caf14cec60348c2271bdad4ec1a23377c464da2ea0219b5b6ee6a288886f01ee22335ef2d82f25894724a4dfa9b2a2a7e59715e SHA512 5140cfd2c64b69cf973350c2cf6b4795db35b85a85b16a79da46fb2bb3e5a005e601876d1cb81f3daa556ee1c1f791f3b782f4795cff8fa10daa0950cab28290
+EBUILD binfind-0.0.3.ebuild 345 BLAKE2B 41d5a675f441c21d9239b56f284109f846fd67681907d5ee7df24290dcc7f9e62ecd1f2b2ab82ddd985a0cde429795e5db776b4a471ff06d3437fa42a60f92d3 SHA512 0cd631f5002ab8e47c9d5db0fc11ea133b2c2e1ab85c66643605f7a7b29175598c0711c0bc7d847bb64f8d822ef4396b6e4eecd84dd453362102d07e6b62cb4b
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/app-text/binfind/binfind-0.0.3.ebuild b/app-text/binfind/binfind-0.0.3.ebuild
index 0285f93dbe53..98b9511f6370 100644
--- a/app-text/binfind/binfind-0.0.3.ebuild
+++ b/app-text/binfind/binfind-0.0.3.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
@@ -9,5 +9,5 @@ SRC_URI="https://www.lith.at/binfind/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 4eea455035c2..ae8fa09f00b9 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,5 +1,5 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
 DIST build-docbook-catalog-2.1.tar.bz2 4731 BLAKE2B 38864866f03052386a0ba2fe832c750b851a5a0730df54fbac5253da682e92c0d865333c136d9c169a843e2a1ce291b2e5b5af657e7dba0dbf8d2fda213f6891 SHA512 8399652841f25feefa9ad3c138580f31da34410a44f2bdbdb4d63cb6efd1be445c7c4df6ed93629e53df4a4c6d988ed32a6a709f1abb059ccac0bc35b3b516a5
 EBUILD build-docbook-catalog-1.21.ebuild 1155 BLAKE2B d8b4c8b5da15b768d2035cd6be5ecd87b8464b06d6b1170dd95916f83e7bce3c7dda519d204beb82d001a693456984bc790e952dba24fb63f81b17e5595c1835 SHA512 c3d583f8a38c1992dc7afc750a797ad17d14700331d2717244ff46f86cc859c8b91c5d899b58388b389ab34e2db2fbbc599805b1815476d093d7430d349c597b
-EBUILD build-docbook-catalog-2.1.ebuild 1180 BLAKE2B 3b9962c4df00aade63ffd8280e95d641c549d776608f28cb4090cf8a987e875f7393a34045d11eb4551060545f2f9ef0d54dbd752dd930baaa92c1676c699873 SHA512 67b67fc302ea71d86e0b74653ae4be83adcfca4eb87c5752fc983ae47be78a712fb53c5833de562bf58bca637af0bf4bed1e1259f582039668610c81aa9117ba
+EBUILD build-docbook-catalog-2.1.ebuild 1173 BLAKE2B 8f5fb5c33b5aab167e600dfd2e06151493fa9a22aa1390200c1a33273405e006a534e478f36db5d5c62e049fe7ac193c8485f8980b3a3bcddcbd4ee08a587b85 SHA512 48a2b7f629cbcae4b7793cbc6b38465035d75688560404e53992be03fbf10004bcadc0e77102f32b665896441cd692738264f2c6762a6293c7161fb3ff0a228c
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
index 3deb1d96043e..1c5c688a2271 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.
 
 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"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 75461e04746d..38bc609c1aaf 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -13,6 +13,7 @@ DIST calibre-5.31.0.tar.xz 36937976 BLAKE2B 55995aa8fc75ebee5506145ab7995ebcfd04
 DIST calibre-5.31.1.tar.xz 36943652 BLAKE2B 13fa46d4426f705f7af2de07a38ca2266148291ca054a1de65b11013907fa51eb7ebefb774988a0b471af31d62ba8eb890cd3fe687505976d9d70738fb64f538 SHA512 c9f8e7fef430961f51699eeda009a799b702b740c9999744b982dbd14d971557f76b31897853435f8947199ca3d65622bf974b2d2afadc813d292b64bc048121
 DIST calibre-5.32.0.tar.xz 37115596 BLAKE2B c26340a87f77f373de619a1120f572b21530ebb69ba47975c5fd27e00dc5e72bd23c7265065e25d82f8e964fbeac8a05cc6a08c2d361c4f0105702993230ebd4 SHA512 4ad46e169a0ce23b354d2443b615f2fa80ef69aa763a5f26431968c49af433becf736659daaeb8d8d07e4a2326698c920cafa9a74ac5a8b7bb2f82f0fee2f532
 DIST calibre-5.33.0.tar.xz 37075328 BLAKE2B a6bef8b8a2328c8920f3076ed677818810ba5e99ebcbe520b389b587578878c36b72a4bd1ed6d99aa5982c2860e00ca60743f7d1e808f5622f894d89cab26acf SHA512 e714d352de630df91467b6b3822471897d2c9d6ff05f643de15c1317b7fe32bc375fa462a9a0da07987668b7cf0ba1ca08b325686741742c6e1a6d8e91766813
+DIST calibre-5.33.2.tar.xz 37081104 BLAKE2B 7ef40e39d47b10378918dcdefbec5925d9a43f47c345ccb6fd8811b99a2c417923467724f3ba92152b0951e473af7dd20dcb779e1fc6ad7970ac527fc06fe09c SHA512 5886730000005f4e36373ef6d0b3da4e4f06941886f05d1703420720c16aa913dcfca9358c33e4fcec764f0e4bd24e0223ff35421b41f1cc3f818d6d53896d64
 EBUILD calibre-5.16.1-r1.ebuild 8515 BLAKE2B c9dc7b66d93d6020cde09a360b0aa92894eafab75e7ca4f18a1a9a9286c6eb4f2af17fb162583fcc05088775abd0fa28ff849888775d964a396ab09cfcc02eea SHA512 cd76c560e8acfeb4e41de7ae8cce3fd4294b54ac7bee585ed562a596791054a7ad2918f09105b86587271002f7690b681ac9bc3e53bf1e5657b80f94aa37cbe9
 EBUILD calibre-5.25.0-r2.ebuild 8521 BLAKE2B e8aadd09100a88f08a2555faf10b399ca14b9cc1a514c37e548db7a659ff76d24a25085a6549b9aa07a7c9f106f6198940390c9eb1362afd28745055e461f347 SHA512 600ddb23b1a0360fbb04cc1b84cdcfcbaae4f40b6b52f8385364a8bd5e1aa13678eb97a43600a08ca50c13aef58564a3398f0919232e395a7d4c3cd96556da7c
 EBUILD calibre-5.30.0.ebuild 8535 BLAKE2B 6fa6447889c1ec42b79a78a85997b6edd10f938ccc0aa319f9f9e0cff43590ffc8520844cea70526b6e67cd31a2dd4ff62bce9340b6bb6b86c38eb190c244e8f SHA512 a0758ea6888c9def11b0835301e5f6b32b8315c07b66d718125f9cc8c2d3d8e66e270b9382d825c8e40e5330bc5599c163182f180419b02130db369167482fb8
@@ -20,4 +21,5 @@ EBUILD calibre-5.31.0.ebuild 8535 BLAKE2B 6fa6447889c1ec42b79a78a85997b6edd10f93
 EBUILD calibre-5.31.1.ebuild 10375 BLAKE2B 6e8e273664d2e2f926cfc2a01aba692c9b671267de9008517242b3c3f61a51ff0d184417ae9b69a32fbfa7e172c26fbb553f927cd0dffe573df8288d780e1318 SHA512 0075d57a1b2f9e734a90e2427aa8e11548af33d925b4b646a6bee54b104c02af66bd82a009c79d5c429b8d2c42f69ab00d55a7f247cd4f644df6a2a76f67b3b2
 EBUILD calibre-5.32.0-r1.ebuild 10358 BLAKE2B 5a45a111ce35949075dd77b7f3113456f22613fb4957f031cce2878eb5706c47393b09cdc75846ab89047f87a4f644df6f723b577663a0f8b0c06043590b4009 SHA512 95f4c46743d61ce1deef6f32e4eb7bc703da29e35064703e1a9d7b5990b3147bfa7c6f3a445746a2eff1712f77ec9940bc278b7d0a409ec3953149384a657337
 EBUILD calibre-5.33.0.ebuild 10358 BLAKE2B 5a45a111ce35949075dd77b7f3113456f22613fb4957f031cce2878eb5706c47393b09cdc75846ab89047f87a4f644df6f723b577663a0f8b0c06043590b4009 SHA512 95f4c46743d61ce1deef6f32e4eb7bc703da29e35064703e1a9d7b5990b3147bfa7c6f3a445746a2eff1712f77ec9940bc278b7d0a409ec3953149384a657337
+EBUILD calibre-5.33.2.ebuild 10358 BLAKE2B 5a45a111ce35949075dd77b7f3113456f22613fb4957f031cce2878eb5706c47393b09cdc75846ab89047f87a4f644df6f723b577663a0f8b0c06043590b4009 SHA512 95f4c46743d61ce1deef6f32e4eb7bc703da29e35064703e1a9d7b5990b3147bfa7c6f3a445746a2eff1712f77ec9940bc278b7d0a409ec3953149384a657337
 MISC metadata.xml 304 BLAKE2B 0d93b1c7606c37cb8b7308b507a1d2988a05f780a93ae80c98e021f5af75128954d57b102afc1d96728872c81bf0adc40e32b31197dfa825cd040af3a8739fb7 SHA512 e193c0b78ed4140b695c44d273310207c9f2f745bf31589c69e81230a9eed68fa1c361c1e3f68a60e135ef0628aa480002229871f4a50f4000aea6df7e5f067d
diff --git a/app-text/calibre/calibre-5.33.2.ebuild b/app-text/calibre/calibre-5.33.2.ebuild
new file mode 100644
index 000000000000..7b6a8c3a07b4
--- /dev/null
+++ b/app-text/calibre/calibre-5.33.2.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
+
+inherit toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	dev-libs/glib:2=
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	dev-libs/snowball-stemmer:=
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cchardet[${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/jeepney[${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/pycryptodome[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/zeroconf[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=[jpeg]
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+PATCHES=(
+	# Don't prompt the user for updates - they've installed via
+	# an ebuild.
+	"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
+
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-5.31.0-jxr-test.patch"
+
+	# TODO:
+	# test_qt tries to load a bunch of images using Qt and it currently fails
+	# due to some presumably missing dependencies. This is important and
+	# we need to look into it, but at time of writing, none of the tests
+	# are even bring run, so I'd like to return to this later.
+	# We don't want to skip test_qt entirely, so just skip this particular
+	# assert for now.
+	"${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Warning:
+	#
+	# While it might be rather tempting to add yet another sed here,
+	# please don't. There have been several bugs in Gentoo's packaging
+	# of calibre from seds-which-become-stale. Please consider
+	# creating a patch instead, but in any case, run the test suite
+	# and ensure it passes.
+	#
+	# If in doubt about a problem, checking Fedora or Arch Linux's packaging
+	# is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre
+	# contributor. Or just ask them.
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+	sed -e "/^            os.chdir(os.path.join(src_dir, 'build'))$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
+		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
+		-i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_compile() {
+	# TODO: get qmake called by setup.py to respect CC and CXX too
+	tc-export CC CXX
+
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+
+	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
+}
+
+src_test() {
+	# Skipped tests:
+	# - 7z (unpackaged Python dependency: py7zr)
+	# - test_unrar (unpackaged Python dependency: unrardll)
+	#
+	# Note that we currently have a hack to skip one part of test_qt!
+	# See PATCHES for more.
+	CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \
+			--exclude-test-name 7z \
+			--exclude-test-name test_searching \
+			--exclude-test-name test_unrar || die
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	mkdir "${T}/bin" || die
+	cat - > "${T}/bin/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/dbacl/Manifest b/app-text/dbacl/Manifest
deleted file mode 100644
index f73cb88bf3b2..000000000000
--- a/app-text/dbacl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dbacl-1.14.1.tar.gz 923956 BLAKE2B a98b7e01a0cafaee8178120069beaa6fbfe716eaa02eeb9505aa498f11b1c54ef599ea3a40bbc6ddfe235d571f550381a9c8026e80208c56a4a44a80750f00e1 SHA512 910fe5d8e56a92a643f16eab73fc3376489f303e22c470b3d78428d65340b01073f336ac8febb7d911eae0995f08ba265cac09628efd55a64955814a810b7372
-DIST dbacl-1.14.tar.gz 922969 BLAKE2B 9d16c1736b9bc062135daa2fd810b527324abe1fa4cdab650bee45949c21f44fef4197a09d9059e89bdc36dc038f073e7d67b295f6a460fad5dd22d688bd464d SHA512 1cf0877c8bea9c47e055f9291efbb934b65cfd7d26d4ef375ee9fb154b557c691e760543254c5128eb1a04b0724462078f47477a91c4e396e7096ef88d2d77c9
-EBUILD dbacl-1.14.1.ebuild 703 BLAKE2B 529e455038ca4240ce6d18b6b1e8e8cd09fe3462e2262cb1711c719dda7758597326b5eeb31e53fc6338a92d882c61ba0bdfc9291e381e819a694407bec839ab SHA512 1cebd8459c13ed191bd3b764a122e97391a5671a5d5f0bcc246bb68357f8e8fc8761d8cf46f7d6f89c9da8307c1964ac770b2f2b9f19b32cd437c15957aa787b
-EBUILD dbacl-1.14.ebuild 692 BLAKE2B 81c2b6a44c5233d71031b1d5b1e7cced88e7ba26a952cefcc756fdbf77fd18d144dfe8ceb0615639ca1b33c26ebb50ad32d558681a9446aacf4b7b2a7c586580 SHA512 535358fc4ceb38dafb62fc3950ef77e8852dd5490b66ecb356ffe67939e630ae7f2444ae6fa8bb37c33f5a4dd82e73c97250619195b3aed385edce7dee9c32d4
-MISC metadata.xml 529 BLAKE2B a5aa3461eb0d2b86ab06bc4ec08a2b53b84c580137022738125ba580abc9ca660a5adca3c778a752be141908b347a10be82eedb289d0b191109fa9ef92d7766b SHA512 10ba0638073df69b333a4470948285e77fab39a843b5eb795a30af375577824e1ad0ce6a64fad98eae098720d0f0d8cdc0053c05b65fddd08580eff82b60a390
diff --git a/app-text/dbacl/dbacl-1.14.1.ebuild b/app-text/dbacl/dbacl-1.14.1.ebuild
deleted file mode 100644
index ee861dd57ff3..000000000000
--- a/app-text/dbacl/dbacl-1.14.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Digramic Bayesian text classifier"
-HOMEPAGE="http://www.lbreyer.com/gpl.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="interactive"
-
-RDEPEND="interactive? (
-		sys-libs/slang:=
-		sys-libs/readline:=
-		sys-libs/ncurses:= )"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# See bug #352636 for reference
-	export ac_cv_lib_ncurses_initscr=$(usex interactive)
-	export ac_cv_lib_readline_readline=$(usex interactive)
-	export ac_cv_lib_slang_SLsmg_init_smg=$(usex interactive)
-	default
-}
diff --git a/app-text/dbacl/dbacl-1.14.ebuild b/app-text/dbacl/dbacl-1.14.ebuild
deleted file mode 100644
index 2d58f06146d4..000000000000
--- a/app-text/dbacl/dbacl-1.14.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Digramic Bayesian text classifier"
-HOMEPAGE="http://www.lbreyer.com/gpl.html"
-SRC_URI="http://www.lbreyer.com/gpl/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="interactive"
-
-RDEPEND="interactive? (
-		sys-libs/slang:=
-		sys-libs/readline:=
-		sys-libs/ncurses:= )"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# See bug #352636 for reference
-	export ac_cv_lib_ncurses_initscr=$(usex interactive)
-	export ac_cv_lib_readline_readline=$(usex interactive)
-	export ac_cv_lib_slang_SLsmg_init_smg=$(usex interactive)
-}
diff --git a/app-text/dbacl/metadata.xml b/app-text/dbacl/metadata.xml
deleted file mode 100644
index a7fbda3ebab2..000000000000
--- a/app-text/dbacl/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="interactive">Enable the interactive mailinspect ability</flag>
-</use>
-<longdescription>dbacl is a fast Bayesian text and email classifier. It builds a variety of language models using maximum entropy (minimum divergence) principles, and these can then be used to categorize input data automatically among multiple categories.</longdescription>
-</pkgmetadata>
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index a5f212f25645..e7caf5db6631 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,12 +14,12 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-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 1239 BLAKE2B 239eef1bf4f81b163dd02f064a27ad55c5a180d627f674bbf76fc9b1936adba5d13df8e8dea08ca7eda35e6ca37bdcee932eac3e4eb6d61f9104ac6aa8870e8b SHA512 a638ef7cbdab3f3189a8cff6b76bf15db2d94aa1ea41761c685c3cf963c0b48c1393b40ec0f823991b29abc84df82baa4397e11482954ffd930c65e0f4a2c0c3
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1280 BLAKE2B 49ad5753228fe65e7543dd297eeabc1ebc5a89518614c146df4f563df61b1d5d19aa839d9d73cd5ae906c23a92807bdf131b1f83dfaa519478ad8e1bafd4c405 SHA512 5eb01d5fbf731b15a7c6a75395f2bbf629cb00b2798b2572063fb990cb154f8285fdbf0836be5435611b311f6d28e2967d14c9d085824dbae7e20ed7582f6e64
-EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1250 BLAKE2B 1c45c9c384c7adad833cf96b6feb350bd7d3e5466cf3a1ef691741a37fde7a884d465db7b382bce8dc5a843f565aa789bce8594b581878052b7528599f43390c SHA512 2cb75bd3291390b46e37c8f63d34b90fefc3454e50b3fbc036c3a2c3600036c888082ef6778d7628c8f894eb901a2ff31d84d062dbae8e90bda5c14594720762
-EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1235 BLAKE2B d6f7247d4a19507591323bcd007dc0b539b2fafb6506a47e13c11ac8c833f38091bbe48c46e1c8548f4129f39d29b2a5d35fa87252d38449cc3ebe83663b6c7d SHA512 c66958024687577b47abb37d0ad9861de725395991b485732a80b4bb395ebd06b345897742a6cbfa8833d0c794eed9571495f3af5648aaf53c7f6455e0041834
-EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1235 BLAKE2B a27b99082ed42d9591a312e961908b4540cbb0bfb8cb4f2302f7f7b91569818005e4e3700ff8a91648419aa912cad93b0d87487d6a191b8b4745beed03d34f15 SHA512 d268062133ffed3857fa7653c9a33f8abbae69bfc9456dcd1879b868bcaf9c8cde17330b2b66ef55ffc06b532da80e95d19d0e7b5e01fa4833b7c783870f4259
-EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1272 BLAKE2B ee18c6c71ed01ff7c760cfa05309e9ae873c8fa1f30d02afec083a6157b8521f9ff0ab2d619d3531a542277b6b1477b6eebcfd9033c8027fb3646790372e2acd SHA512 69060de85a4880ddb72e507c11af3e4897e98cc0e5fcdd0acc957a50884bc7ece04fa50f17f72c3a003a023200c2077f2ab9919eb3ae897d7d42c2bc01164992
+EBUILD docbook-sgml-dtd-3.0-r5.ebuild 1240 BLAKE2B 600ef276f230a4ba7c38a5acc17b2f3d45cf3f9c21e70a55b05d55af5c7859923c7e947cd3ce590877a82f9d18091d0d36dd4dca6fbf192020d670f300ed1458 SHA512 9ca95c2109b2ba58952455912397a4c03869d5d83dddf7038b3ea5c24939687c7987477c6ab034dd8f7cdee52e93a313c255458512e11e4c2ffc9110286c44f5
+EBUILD docbook-sgml-dtd-3.1-r5.ebuild 1240 BLAKE2B 600ef276f230a4ba7c38a5acc17b2f3d45cf3f9c21e70a55b05d55af5c7859923c7e947cd3ce590877a82f9d18091d0d36dd4dca6fbf192020d670f300ed1458 SHA512 9ca95c2109b2ba58952455912397a4c03869d5d83dddf7038b3ea5c24939687c7987477c6ab034dd8f7cdee52e93a313c255458512e11e4c2ffc9110286c44f5
+EBUILD docbook-sgml-dtd-4.0-r5.ebuild 1240 BLAKE2B 600ef276f230a4ba7c38a5acc17b2f3d45cf3f9c21e70a55b05d55af5c7859923c7e947cd3ce590877a82f9d18091d0d36dd4dca6fbf192020d670f300ed1458 SHA512 9ca95c2109b2ba58952455912397a4c03869d5d83dddf7038b3ea5c24939687c7987477c6ab034dd8f7cdee52e93a313c255458512e11e4c2ffc9110286c44f5
+EBUILD docbook-sgml-dtd-4.1-r5.ebuild 1281 BLAKE2B 5dca51ad5c9d4ba02517d9725c4422b16b6039cd8df91783be3d962579cbccecfb01b9964d02d1e1cf9d0847f19b642e9de94e0fe22db7ad780be080d773c493 SHA512 a30fb397ac3139195b7d110171c6c633fb45edb9d60d8cf8d1cb2c80f070ed524539e2b2ea9c9bde99938dbc4ff0a504421ae3eda4b696a8079ad9d63cfb0495
+EBUILD docbook-sgml-dtd-4.2-r4.ebuild 1251 BLAKE2B 041d6bcd4913a834381463d0d9abf6ac4ac893f3bfb5863a9a78a0b48b31a60770d922bdf938c59e2b427ea5505d35b29985de95a954fdaeeba967f408b0b96b SHA512 1e96962b3a0a377ead76874840cc35c8ebcb69184eaa8b8ed7685844e49d5e236a7b21741e181400651947091b95bd51a6d7a2b3892991c63f6fd8ae2562001a
+EBUILD docbook-sgml-dtd-4.3-r4.ebuild 1236 BLAKE2B 06dc7c8c23a03bd26f60ec81b664bd424c4ee59723976084487553b994bb9d377e2165e25218639ebc68c0fcc8994bc0e7ba72447f341ce6c5a0ef5947db3e5f SHA512 2a84e280cbe917979a76fb67ad602da1b914cc427a8182d87cd9589c613915bc415bbf85465427a8782f9877747c7a508239f6aefa22926656b1c216d2d98d46
+EBUILD docbook-sgml-dtd-4.4-r2.ebuild 1236 BLAKE2B 20d1aff34d26619cfee31ab259d1855b43a0f8355b2d929647402881fde50d741ebf2366f66428af4dfd3125e6420871d683eabeebbb743d750ad94fcfdc3346 SHA512 fab0807284a6353427ce26c8f46be50ec358af7ad06d866aecb7d428e7bf437f1ba348227fe6ad2b91b383843561e245732c2ae277d923cc5d84c3a14273c051
+EBUILD docbook-sgml-dtd-4.5-r2.ebuild 1273 BLAKE2B eeb1aa61ba99b816b97a4a55c0dc6adb0db48eaeb4923e45719a579436d2680e6f7931b87bf03ff8beaf7766fa4fb3ed64683189c03e9604d3177a92b54991ab SHA512 d63b8916b0b17d4fd89b6e3f1b2275e8f47b5f7530290241360fd961063b8e9533dfb5ff69850b32f8dcb607e27c5f6043f5945fffe38a6fe68f6dd7eece3f8f
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
index b416d65c3188..dfb1003e7ab2 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
@@ -14,7 +14,7 @@ SLOT="${PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
 
 S="${WORKDIR}"
 PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild
index b416d65c3188..dfb1003e7ab2 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild
@@ -14,7 +14,7 @@ SLOT="${PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
 
 S="${WORKDIR}"
 PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild
index b416d65c3188..dfb1003e7ab2 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild
@@ -14,7 +14,7 @@ SLOT="${PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
 
 S="${WORKDIR}"
 PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
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-r5.ebuild
index 7a62740ffb32..87e25d31472e 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-r5.ebuild
@@ -14,7 +14,7 @@ SLOT="${PV}"
 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"
+BDEPEND=">=app-arch/unzip-5.41"
 
 S="${WORKDIR}"
 PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild
index 1a818fa15b74..ef1ddb6b0813 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild
@@ -14,7 +14,7 @@ SLOT="${PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
 
 S="${WORKDIR}"
 PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild
index 9fa5aaadf06a..2e6d2e030fc7 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild
@@ -14,7 +14,7 @@ SLOT="${PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
 
 S="${WORKDIR}"
 PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild
index 75a0ff68fff1..3391332678f5 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="${PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
 
 S="${WORKDIR}"
 PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild
index db8c331274e9..2b8e3af280e1 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="${PV}"
 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"
+BDEPEND=">=app-arch/unzip-5.41"
 
 S="${WORKDIR}"
 PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 9c3001725c45..f42c7f6ce22c 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,3 +1,3 @@
 DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
-EBUILD dos2unix-7.4.2.ebuild 2139 BLAKE2B 69b2c6a53bed341e10ff4d909b82f28509a44db1a80e124d6b5934a169d7e8c79294435d2dfb28c8736f1559f6226aec5eb2b4a3a980142b88acd4ec9c9507b1 SHA512 22e59c18061e231d5d400393447e4a6392c050a013fb10a30a95ad13019c518a8ff9794db51442c9d6e20cc778d3231b838a6b7c7780ad29f1f1bbcd4c7fd474
+EBUILD dos2unix-7.4.2.ebuild 2146 BLAKE2B 3eaf44598607be6cc86ca03bad64cc6a6f90435da92018f0cc870ee936f330e1d13c9705ef48caff10fd1f09e4031faf183cc4ccaa2ac904b033f6ef85413a5a SHA512 e8958f09f9d4929dd337468291a9177545c66cf2b46b5d775432d217216771faf83bdeff4578a39f78285144e8277dc33992c3fe4dff3f607199cd3a2f308186
 MISC metadata.xml 344 BLAKE2B ec6c66c1693ed09d8434840bb0e5eaf6689d629c787a115eedad537972c06c3aae6d739cd55a9acf85ed21043314e9721030b7c570c85eea4361c083d7db9fe1 SHA512 63d5baa4e84950d6cb2fd604f93e60842bc210af298eef73bc9e59e3d811957b99a95e2538ddd6df7d2ac6a50e30ff5bda66af4d7dbb573cec4ef83a38e42919
diff --git a/app-text/dos2unix/dos2unix-7.4.2.ebuild b/app-text/dos2unix/dos2unix-7.4.2.ebuild
index 81b5caa70133..f022990ffe52 100644
--- a/app-text/dos2unix/dos2unix-7.4.2.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || \
-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"
+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"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index df03aca7c0c3..b3e06c9a8dd9 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -3,5 +3,5 @@ DIST dvisvgm-2.11.tar.gz 3111889 BLAKE2B 7944b62bee48173f1ed0e2de5ff0c8090322da9
 DIST dvisvgm-2.12.tar.gz 3164951 BLAKE2B 249f1ee43444ac95ed512eac803ab073e1ec04a58266fc569a272014510ab373890fdc7be2207d2037742f4192e266eb214078c0bb448de953ffdf5c29deabba SHA512 3f0ca530f24a8866839d71093dc6fd84f2a0f984d06cdd189425aeeb7c7e7e3c9e283d1fe2e7e9ec79845f36c8bd4d973224a321b8ad39da229a3b4fd59b7008
 EBUILD dvisvgm-2.10.1-r1.ebuild 1166 BLAKE2B 26e6a705af966e996d370e139cfcc1e4568b5d2473923ae9d5ccd938703e832c32170779536ca893fb19f066feb931620cedca2a85ad24e809264e50cec98693 SHA512 0820393c43f6358e1e851ade6b2e33d14dec9b35e42566f39d6aeb0b4001db6609f626c2456c02b9a8a1fc300c3641010b28432de4fdbb3a1c79eda93651009f
 EBUILD dvisvgm-2.11-r1.ebuild 1174 BLAKE2B e4993aa5e154933dce24b7da16fa968e36922b58659f23199391b1b04933ec1cfab75d265cc0479b9fd2203ecdd4037131b7989b87971739ab347b18d15c35c3 SHA512 82b42b4d29502975215e88eba5067087db20fa7c9d301d438b634acc242f82bb35f0d90b607117508302212306bfd4a599aaf3cbf6656421d98176fbee50aaf1
-EBUILD dvisvgm-2.12.ebuild 1141 BLAKE2B 9485e9bef19e48eddca9a57128adf7e9b307e3926792bd257e67faec3893f820d9939ed0e053911e9d10f2e6f041673472142da0195d81f63afbd225bc34c70d SHA512 3665fee1c633aff1e6b2e1c698bd9b5f9a31be8e2b84351ffb8a8d3508429d8473d44f3b4bcee06a894555f1dfa650ba319a7a8760698b773643fe8374c5c59f
+EBUILD dvisvgm-2.12.ebuild 1134 BLAKE2B 62fbe3220b3c3af58ab36c70c1e070605a47483c216488de23ff83d52c79d5313ea236673bffbbafa443801e214286218ff585018b5bc3c4460e98074ff15148 SHA512 a5a937dc42dfc9b6b23c60a1fc094bed65cd57ee524a1791f0548d865c371ac5c0d1d144187994f03c20f5dfe7cb4994a5917176dfbfac41e2a24f529f69a009
 MISC metadata.xml 383 BLAKE2B d4d13b1caf7ebbd81baf9d911434c0ca57f5b9c5d5c136c0ae569341c511e61fbbaf9211accff192d86bdcedca81ad9f6dab2e23f65778a0b2b7c4be0a286a1e SHA512 563b8459b11497c84145cd7dca5cfa38cafbd5bbeb2c2709080633e785509073b96d1ee999fa87b4263f2babefe32b030361fb537b9016cc3eb5ccf423639573
diff --git a/app-text/dvisvgm/dvisvgm-2.12.ebuild b/app-text/dvisvgm/dvisvgm-2.12.ebuild
index 1c8d9fa3d375..39a5bfb89049 100644
--- a/app-text/dvisvgm/dvisvgm-2.12.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.12.ebuild
@@ -9,7 +9,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 ~riscv ~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/enchant/Manifest b/app-text/enchant/Manifest
index 2a65fc2db7fa..70a40adb0e03 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -2,7 +2,9 @@ AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.3.0.tar.gz 986837 BLAKE2B 57859d41d1e605ba5b89a264e3b6f53bab7a2f060c2b306a1ac51c55925d5b30a5d40fd121be7d3df22395cc11ad4808e63627f7e0f5ae9f3c1d2f2939dc2f68 SHA512 ed25d74176aefe4ab3b1754ea09356d04c844f8e7a50441d331fcf6a0fefbedaffa21df7296b7947ab1fcd44844c1d8567d39d67ebc4381ce8766577c0269d43
 DIST enchant-2.3.1.tar.gz 987361 BLAKE2B 86d6f384ada861a1df40a3241d2d32ef8513784c9dbca3b71bfdc52e2efc94c4d9cfb38e752970dc31a36545c1f9bf32f0550316b969d9170363e8b52c030819 SHA512 c6fb8498d34a55040c2791124c2975952497e5a1b8999958691279b1a60a37473a1d2e3e11504f7cc877370be7772c2db621022040ea7035b21e40e8367606f5
+DIST enchant-2.3.2.tar.gz 991782 BLAKE2B ece8c4cbac2c242c23b4b8c5ab2daf1037705dbf58ad29b4863dd01cb30b2d98e11828f2b9d1ce3823aec419c871cc3dd1092e4659e10ef3e3cd2df867255be4 SHA512 886635bb55c5f0c774445e4a0f14d39e2d08eeb964257037062c2e97c2cf3348be8c631ff5e7a13144936127761964bdc60ff1e0dd6f63b292a655626f91ef62
 EBUILD enchant-1.6.1-r1.ebuild 1625 BLAKE2B 8f42b0410fa9b7565c5eebb849fa32c8850e8d77d65d34cc5f69a6ae553acf3bbf702e85d134387e8b2a75ad22f43426021d65b5ef4ac4f8e92cd6b3236c0d9c SHA512 fb0da3b82a95b9af44b7f35c05c204f6eaf2529fe72dcfe00b2e9a0ba6edfccdacda4f87e0e167548d66b2256beef4177bf4ee7fbad9a4817ed5688270531de3
 EBUILD enchant-2.3.0.ebuild 1234 BLAKE2B 581181d56ebf49b2d414dbbc9b5b10978b00995af9c1351fde61323c7a82037f7d1ad9bf04e45fab52d493724d77c1b722d363c5dd83e7be9bf61d674c8f0bd3 SHA512 ffd97fbf9221420bce5cac19b147c65f945ee5c612728f7e400a9172fad1b62aae24ddcf811a6ea12fe9bdef9fb73fc1bef41d50a11c012db75352e253d48c91
 EBUILD enchant-2.3.1.ebuild 1234 BLAKE2B 581181d56ebf49b2d414dbbc9b5b10978b00995af9c1351fde61323c7a82037f7d1ad9bf04e45fab52d493724d77c1b722d363c5dd83e7be9bf61d674c8f0bd3 SHA512 ffd97fbf9221420bce5cac19b147c65f945ee5c612728f7e400a9172fad1b62aae24ddcf811a6ea12fe9bdef9fb73fc1bef41d50a11c012db75352e253d48c91
+EBUILD enchant-2.3.2.ebuild 1241 BLAKE2B be853d1f72faf5dca852318b15cf3c61c5b0b2938a76863df67602dbc244a58d651c080e5f367a8e6ad226367808de6415b931781a2507a5d0440c27de635f1b SHA512 3f4176267b8e7cbd0278bacccafc89c4ee3210947db628a4dc919c418541f47ba46685c31eb5378b978205c30de406c424507dadaa01ca7a506844fcc1b054a1
 MISC metadata.xml 537 BLAKE2B 6cb7c6968b6f90f2c29d2f7d3d731f947431b0648e7de6300599ca1f6d67544300484cc794309d27ce8878c068c2e8b5aadaa9fd6670d4388aabba2c1ef470a3 SHA512 140143a602063450d3ad55cf0374d42c255f689326978aca64f9c9f529eff6bb97b31bcaa798f34322d4e8c541478796f227e2c164cf1fa6e8538158c0f9fc60
diff --git a/app-text/enchant/enchant-2.3.2.ebuild b/app-text/enchant/enchant-2.3.2.ebuild
new file mode 100644
index 000000000000..1c7845af2065
--- /dev/null
+++ b/app-text/enchant/enchant-2.3.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+IUSE="aspell +hunspell test voikko"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )
+	voikko? ( dev-libs/libvoikko )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/unittest++-2.0.0-r2 )"
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="test" # Tests fail
+
+src_configure() {
+	# TODO: Add app-text/nuspell support
+	econf \
+		--datadir="${EPREFIX}"/usr/share/enchant-2 \
+		--disable-static \
+		$(use_enable test relocatable) \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		$(use_with voikko) \
+		--without-nuspell \
+		--without-hspell \
+		--without-applespell \
+		--without-zemberek \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 5b4ac1683740..2b2b735613f1 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,8 @@
 AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a6816326a17527d91b68d481d23ed3ad982211c07c412a61157d17cecafa591cc80482ec22abad3ce29101068bbd5 SHA512 703d9b5ca4e718660fe5af2d59a60b3187beda965e3a7b6eeaf1f7bf61013f3acde54b0ba89c8b493b1f0b1950cd52893ff1fb00a74c6d97645df29a1829902c
 DIST evince-40.2.tar.xz 2928072 BLAKE2B 86051e8568044ec484a7a3c036a523ee44d22e46bdf5e75c6052d3302f92a27d48cb26e2408b176cfee3fafd3879a8771f4bf29a51f6b8085c31fa28f4885660 SHA512 f3ee19053a0bc6989a50fc790d1d54747d7aac5cbf0cd1e0eaea6cb743c0ebbbdf2565e88ea995fbba31c7f97e4279f9c0fa44c386bcf635a500033f6105ca9f
 DIST evince-40.4.tar.xz 2928100 BLAKE2B 491b2333e21093b032ec9c4f24c61cdaa31e4a46ee058b0f109b0998fb7216ada2c933e6202eae1d6193caad0cfa94a77434ef042555bab7cf4aeed959be759b SHA512 dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd
+DIST evince-41.3.tar.xz 2889368 BLAKE2B c6ef9b4c126f938ef8b50aa65d8591e0ce02e7404dd1984bce27e0acce6e62462d42665ad19992cb2fa22afd09d6da49ecdbbb51eb209518d415966824523628 SHA512 b00422ef0fd752e5afacea2db852ad71d8d16514945a9a54c54967cecd2b1f5058b762ec53eb9057b8f583d5e1e3363c2b7ae1f4434fa6637ad45c5217f082cd
 EBUILD evince-40.2.ebuild 3114 BLAKE2B 212af71efdef680ec92b16edfb8e3e7663f456f66aa33d87f9c6a3f3238ed3d47c560c73a5067290969c88a28e215ad96dcfde4c6e341807f071521de0972c0e SHA512 0868af950d265c5f12ab93a29eb547285cdb7e9ce07a6f82b3067fdaa507c47188f619d53dc3f987a6820a0518690cbac93fe9592df048e22b417194581ee917
 EBUILD evince-40.4.ebuild 3152 BLAKE2B c7a5f0a517b4b5b6600e1c50a0474bd866d996d2a4d0d3df4b96645c72ada67e2209c8d45a7fdfea3880ee16b2355ab8a5ee5c97455e835c9737f3fbbd8903f6 SHA512 42a636ec94d77c69b3376167b618dc141acf88d1960588bba6fb5a3b9cca34db0383922bed15c0b5bba2fbd4a1f416d1cf6bd8b31199ba333c6d3a32c113f817
+EBUILD evince-41.3.ebuild 3025 BLAKE2B f2e7616814e87fab6895758666d47517f8816c76060ce638fa6faeea43726cac929e450ca3b6964232cb607243a297dfb88ebe09522622ea82d7d5eab3b25bc5 SHA512 4248db2678bbd4f4ae644bcb2fb068ed10e5000f66bec289af68006b2e78306afe898a87e9e44e579088154276888e48f9c440a69141c812c79066bd57657fa4
 MISC metadata.xml 882 BLAKE2B 5a52fc8a3986b5a07774f6b157e0c13b3c29a6f5d9bbbedba6367a0dce8a057c6c43ac9b2864a98ec4413e66365971935e4f111ae2be0d2430769f3fcb2b5047 SHA512 73a18d8f42a94322d8292b4ace3bc256dd170af87f160f9e33c12c3b5c76c2032beebbb7eaf9facd2f9d9ee8d669f0f5f805dfeef5c406f75f13f90105521f9f
diff --git a/app-text/evince/evince-41.3.ebuild b/app-text/evince/evince-41.3.ebuild
new file mode 100644
index 000000000000..6be2d9b21a02
--- /dev/null
+++ b/app-text/evince/evince-41.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.44.0:2
+	>=gui-libs/libhandy-1.0:1=
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.40:2
+	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.76.0[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		>=app-text/libspectre-0.2:=
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10
+	)
+"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.33 )
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddevelopment=false
+		-Dplatform=gnome
+
+		-Dviewer=true
+		-Dpreviewer=true
+		-Dthumbnailer=true
+		$(meson_use nautilus)
+
+		-Dcomics=enabled
+		$(meson_feature djvu)
+		$(meson_feature dvi)
+		-Dpdf=enabled
+		$(meson_feature postscript ps)
+		$(meson_feature tiff)
+		$(meson_feature xps)
+
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_doc=true
+		$(meson_use introspection)
+		-Ddbus=true
+		$(meson_feature gnome-keyring keyring)
+		$(meson_feature cups gtk_unix_print)
+		$(meson_feature gnome thumbnail_cache)
+		$(meson_feature gstreamer multimedia)
+		$(meson_feature spell gspell)
+
+		-Dinternal_synctex=true
+		$(meson_feature t1lib)
+
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 2778323f2f31..132787f41361 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -15,5 +15,5 @@ EBUILD ghostscript-gpl-9.52-r1.ebuild 5176 BLAKE2B db5d5ca4785c48ca75d55c980f9e1
 EBUILD ghostscript-gpl-9.53.3-r5.ebuild 5297 BLAKE2B 2e113f1d62339e4f09612787a016bcb67fa12cb93e40480a536d621fe4530005dd5827cd6141bd9cbab739fdf5870522ff7082faef73ef3fa955c98b50e6603c SHA512 0ed8f0571efe2853937ec4fe79c6f875728721a1b66d29df5f2e99de329e54354243c148a64493d969ac64b82bf56ba4333fe43cc93f3f1e27dea9fe955ec33b
 EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5288 BLAKE2B 1f194c1941407cef1131e3e43e4ed01cc0faf1f66c41c94ebd7e1cb40ca99b52e132200bf0dc667e4a6bb32382764b59954fc711d7c6955075db5b9cdd8c81ff SHA512 d73961f100f711592e9a59b52ec27a5cba04cb1c53e09dd009a1f623a179e8fc44dc14ba5ed1d64a6240478eb034ef1865d7b7ed49e9c846e9cd992ce0aff109
 EBUILD ghostscript-gpl-9.54.0.ebuild 5143 BLAKE2B d9f1444bc320b4c7747722ffafdf5b8d47edc9ec60abc682d0ce91c53d8ff3e047b51a06af5d3acf2d09603b775bce0a199c9647f3ba2a61b3a249891327b29e SHA512 a6a5623daad8e504a8afe6e18a1fc9783ce9eb6dc2b8504eaa161d4d51dfedda2a45c85802eb72519ddb47fa2278c104946fc66dd9feafd763fc999d54e90be6
-EBUILD ghostscript-gpl-9.55.0-r1.ebuild 5100 BLAKE2B ce835911d4994f58d38f654089305e7e9e2d6cc4b7f4015bc3573d13cbbb5401dcd16e0c44809bcfdd8b9b5dab08222498efb8dc5d164e18aec6bf04165b7852 SHA512 14dee31b2174fb090008978af0f6f099b2892f05e70387adb901e5a1ae5dc1ec740850d409ba681ef4044a27eb42857a648aeead61561d23b0a5bf12c329ee2c
+EBUILD ghostscript-gpl-9.55.0-r1.ebuild 5092 BLAKE2B 54b6fbb7b8c29a522a8a75dfa1f423bfc11538822ede6940277f052d8143c35aa8cf17f72b58cae3ed60e5d5698287dcbf2657fb603fcdeaab215f493f79a8de SHA512 4a398746c4c357d5123b5fc8690d884227ca8685a365cd81097aa955cecc89bc28ce2cbb699077452adb681e13008bc69f7d355ce1c57f19d8732cd998d4ea67
 MISC metadata.xml 765 BLAKE2B dc8466ca08f1fa1891cc60e886bfdd4cccc517c4b355ba6d7697acdece16657982adbfbd4f5709b3850dfba1293ce269b17f9c05bb92f5e5531f3c7debd13613 SHA512 7f4dba7c256642b532cb7418507169a2554e0c4058011ff8dba802f93d677a824b8ae7896840369f06c801ca4a7d27fda86f8c6a344127f65f61ca6e3a02c0ee
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
index 9f00300df385..63b3a363c410 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-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"
+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="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest
index c964a6d11996..145f1d6a5e44 100644
--- a/app-text/grutatxt/Manifest
+++ b/app-text/grutatxt/Manifest
@@ -1,5 +1,3 @@
-DIST Grutatxt-2.0.16.tar.gz 29929 BLAKE2B 11ed6a87884ed79e6f8705f6ed8ee94c2fa79e6867296eaf6255ed7f9473a99d5fce0dec0d29de16df2a15959b6593dcba7937b3f8cda88ee88072abefb0f01c SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512
 DIST grutatxt-2.200.0.tar.gz 20751 BLAKE2B 1df00316b4379f7922348fa6a90e53ed0a34e5498558b00a7dde09e7eea53098ce9b66e44260a95575b52180baff5b78073339d0f47370e30b8c61042ae40c4b SHA512 2ecf5145c42efbfde69278ecd9a7bbddceef79aed036a659e126f02ba2c20968c10425004298f6fb786b0e9407b4c78f25885ea4f112dbca111b6bf8b7e834c0
-EBUILD grutatxt-2.0.16-r1.ebuild 610 BLAKE2B 49e8ca2d3d83e190ca7fe7ad05ede8548cdc7889863aeef4f58cba43e35538ec46f4cc7d7c6b13ba6a0cec0f23641a9617aedaaf1e1dc4014887ecf7af90cb9e SHA512 0a665914e74e84f4a361d4243d1bc513c9ef4bf544a4d6e92019750bd7c6587b6fc34cd00e7e2b3721c0d89f5916ec5441e1d71ff8fec45b5db60b155b045d2d
-EBUILD grutatxt-2.200.0.ebuild 545 BLAKE2B b2e03bd06dcf35e69dbc29ee6d668b721ab327a4e86eb59d8a1c7cf230c0479e8ad2bdc22fde9fbd94060024164de89b269df2dbd97129145e3796d95e9e483d SHA512 f29204fd48757f453f3c87505c403be190b095026a8e3bdae23f9951d4070eb0fc2a49f64a9cd39675b26a43b8d57f3549b2b54564735cf7bf3d18b47187f2d0
+EBUILD grutatxt-2.200.0.ebuild 540 BLAKE2B faa907e9dc08ba55f453d5a65d2f9ae804e163e4c6030d890ecb1a7454cebe0b021ff86ce24605ea15b7f404f288510779d10a8d2e71f246a1c7ffba78f2e356 SHA512 b0a269dc9c67a87dac084a772956aa01ea3420426df8685c821983425fbd3aaa2fdb85eff91f16157176b1b4ce7df060b0402ca9edb57e5bc9b6cc605d7016d4
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
deleted file mode 100644
index 68a3e9b6acbd..000000000000
--- a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-MY_PN="Grutatxt"
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A converter from plain text to HTML and other markup languages"
-HOMEPAGE="https://triptico.com/software/grutatxt.html"
-SRC_URI="https://www.triptico.com/download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
-
-# set the script path to /usr/bin, rather than /usr/local/bin
-myconf="INSTALLSCRIPT=${EPREFIX}/usr/bin"
diff --git a/app-text/grutatxt/grutatxt-2.200.0.ebuild b/app-text/grutatxt/grutatxt-2.200.0.ebuild
index 3f7847db3e94..8ff1c9379a9a 100644
--- a/app-text/grutatxt/grutatxt-2.200.0.ebuild
+++ b/app-text/grutatxt/grutatxt-2.200.0.ebuild
@@ -15,4 +15,4 @@ SRC_URI="https://triptico.com/download/${PN}.tar.gz -> ${P}.tar.gz"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index fd1b59ff7bce..d0f96103b5d3 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,3 +1,3 @@
 DIST gspell-1.9.1.tar.xz 424252 BLAKE2B 436e6af50f7d1058dd7692c22b5a5e18c25cc76ea6816193e48728f7e1d55ef29af26127403a40d594a2125e4d3e1ee889abe067d2c065de74ae95ca431e5fbe SHA512 72f1fb384e02bb73397b457c3e8a7b98393c9fab5c0dad07f84d1db3f6b75c093663cc83c13fefe868424c503abc2fb89c8b045d0495dd43ddcedad025f23bca
-EBUILD gspell-1.9.1.ebuild 1496 BLAKE2B 71e3de555c034ec86fc2c191e7f3ff74821d87da4bd03390b831e9ed4831f331afdc006d51f67dedcfe23512fb121ed8b82ebbb8ff08a8359f3ad6bd12e2d8dc SHA512 500f46833989705262091f83c3864c353472351c32717719261bbb733e6d2b52bce229c836b27973f449994b95cd4a5c57d69291b11b38f3fa5a9421bd38dcb9
+EBUILD gspell-1.9.1.ebuild 1508 BLAKE2B 3bc7ce7b37f35fc7d8916421d73bbb7c0af3de238e7308270664172737dde15e5d56010077c41734d78b0903efdedc6bff97d41c68f9d728875724d392e029c2 SHA512 b5fe49ebbd959c5a3860e1c9eaa0412b93bfe3e48a640665a8795a7890232b91890c99a82b6688222206e2bb37793e2fe66400dc98fe36c36b3e1f756c9f2a76
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/gspell/gspell-1.9.1.ebuild b/app-text/gspell/gspell-1.9.1.ebuild
index d95e8e062ca8..df529ccddab3 100644
--- a/app-text/gspell/gspell-1.9.1.ebuild
+++ b/app-text/gspell/gspell-1.9.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 7e7738488d58..7d0e623de205 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,7 @@
 DIST iso-codes-4.6.0.tar.gz 14089611 BLAKE2B 0e85ca49dd40ca053af4b06aca440e55c2b9bb2061fcdceaa25b31ac7fd7942a590756db90c10db64e5e1ffcedbce5a552e60a6d495bb9d60621bc7b862e630b SHA512 fcee802a3f92ef035371ff45fa9d8acbf1e2f490e38d84d2e27d2226d250ad02d088156d0889c0fc0fc09f30c4541b30dc7eb65ca4f40c3764599c1b2143013f
 DIST iso-codes-4.7.0.tar.gz 14122654 BLAKE2B 5dfcf4a0b39ff7b696f157a3938b7c1d35015c346ba4b046dda6b6b5bdcb02e561161afecfd2909fdbfbff6378cd4940335543d0ca7313bb9e80e490ad901abb SHA512 77ceb2ba9f3290f9409efdb50112beda2872ed163a86912b46480407f1135c0263cb70bf84bd2635b304d1af65e5b60f97a20b305219ead9ac98423b5abb255d
+DIST iso-codes-v4.8.0.tar.gz 14359576 BLAKE2B cf1228c8865ae68dad3167a9460c66ca81267df04e83bd495793e729c8db9c93798e3738f2316cd18622c0fe224bad70c6fdd177d2c2b3c2e8bd95508b616b33 SHA512 a96c104eb3f183ea8e5920446a53c15a416762a0ec13b7f7a7a64e6d68341b6a12385e75ba6c9d8b9351921afaa65216f3dcdd3b82babb6227dcf718bea38802
 EBUILD iso-codes-4.6.0.ebuild 2637 BLAKE2B 96372d652576a4070b2c72792d4596d040e95c857a688612b92eba596433267274aee5b0d07cf86516ccc5ba40860468523b8ec3bf0a1658a020a166cc2580b5 SHA512 51a092a6c6a712e4a862b5735c439d8e8f079e098cffa883aebcbd531468456be49a7a0f20f313dd359ecc3e59f1b783ce2a7ae18e0c603919afa1103cbd0779
 EBUILD iso-codes-4.7.0.ebuild 2638 BLAKE2B 82ece660270b8b61bc7fad445d1f11f6f1c3fa39b67772be4d3edf1251e766752bb87fde75b429e22ff0f017f5b0f0282c1d1578d9eaa09505066e7413c7822a SHA512 efc173f44bc56f3410f9daa01b416fdb1ba406207444e8bb24319a37da9be291f074b23e8111302b576a9c71fea2398adc2208eb838c692f2194d5e21f978160
+EBUILD iso-codes-4.8.0.ebuild 2644 BLAKE2B 263fd1fdaba300466c747dee40d2b1b5d6b710a807a5e8c58c4ae87a6de669622665aeba2d64557c96b547f15a50848671fd59f68ac3989935a2fda7544baea0 SHA512 3fdd6c2989c9c090f2f1fd48c6f7eefcd3a988bd9b5a992e0adf186cdb2ecc1038913359f326451ee513866337136d505d539d63ad8ce36a5584fbbe6610bbf0
 MISC metadata.xml 481 BLAKE2B e19ee7de8b2de3aa09f97bb7eb4247ba2979614d768c0dd92a8cc131269e46a560baa1c0ea8fcceb49073efb1b890cd54d939c16ac7412413983a19083f05337 SHA512 f1e20f870fabd59d97ca612c3db3443a6a1544de3b03f12fe0c9c44a1740b06bf38c394b489738e60b22fa0797379d24c0ec8371efa067873910ba39fe30f194
diff --git a/app-text/iso-codes/iso-codes-4.8.0.ebuild b/app-text/iso-codes/iso-codes-4.8.0.ebuild
new file mode 100644
index 000000000000..5348c7e2c48b
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.8.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+DOCS=( CHANGELOG.md README.md )
+
+# plocale_find_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index e2c54c396c23..31c8d8b15600 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -2,5 +2,5 @@ AUX kchmviewer-8.0-custom-url-scheme-registration.patch 2583 BLAKE2B fac216716c6
 AUX kchmviewer-8.0-no-qtwebkit.patch 719 BLAKE2B f70114458bae2dad5739d40828c310d0dc29153034d962bb39594a1ba260ca9ba02fc1adfb001d555a3dcbdd8b89f08e2350ddeaa3713d924f040c0636b33ada SHA512 0f264ad713ed455257089fb2d9396353b793b7f2c4c79078ef1225d68df94fe32119399c834ff24d9200e7e34c34b253e910073cf6894a55d3918ca7b284e4f7
 AUX kchmviewer-8.0-underlinking.patch 882 BLAKE2B a20eebc7a2649ffa293e57d9b6e042232754922d69b1702923232c1f01690ddaaa2dfd2381406e81aeda9a44cded48945450bf4a9c8a6df36f1e88781614622f SHA512 493eca26ba6e681f0fb2318d43eb8fb37838a1ac8e18f1c4b3943e81dd2f4e63ba76a07e78a243e7dc294828d51883775f806c9223f29ba445d807a8b38b9103
 DIST kchmviewer-8.0.tar.gz 311899 BLAKE2B f317dcc17fa88f30a4a1867b59b16bdc78457b46f4f3d3b78bd5d9d50745bf2d2329df170568c7814a02814a77b319bbd1d9f8edc3c1da0071a6ce64965b26bf SHA512 28ae8ee8a6f4a9be2e8a9666f6326906e04f34ad80a363697fc7e5bfbc745e6671884add3f57b6a1264f2056428cb0a31504da9c69a0bede0c3b485a08e75048
-EBUILD kchmviewer-8.0.ebuild 1006 BLAKE2B 9303b074646b1ae6feca490b01e287b1f3f4805563cdb276e54fecd9bb98a20de01a02c2a99532f63d46f1003bf3d45299e159cb524f4ed5b7deed04d9016353 SHA512 89c01169d3a60d93702b2e86d0723372fd95e82097ae1df9c4d2d9cc37228455edb36b6c1b9ac33c15676a0fad0467c3e29e70c9603c89512ec57cc3a964b43c
+EBUILD kchmviewer-8.0.ebuild 1020 BLAKE2B c42089bcbd7b761504f307b712de82e72a6bd3f8abc5ad0b6b26604f8611107e6fa178552c3168f586ea94e65ee3d6296f92c7e1693fcf89508ac848524a1da7 SHA512 e31c33f4bf271116ef2d69750178133aa45ea93b6e43ac2aab030ca4dcd70c2246a9207f2ec684a0f2a72e320e82ab05092bb7e3d3102e1136155be4f38a7c10
 MISC metadata.xml 333 BLAKE2B bfaa56da3082143494480933ceef05c2f930fd48567d8654fbea8926a897c13bb1049c6d8ef5ece5bc0fd66f2078afd1372416791bc011974a72107e6466d75a SHA512 ff9b28820fd3ea0a4f2577a133afd3c46cfee072b1d3105404b85a1f42608dc6e1058007f70198084583187a3f85b1c62f70ac638c376fd2f047528f1cf340b3
diff --git a/app-text/kchmviewer/kchmviewer-8.0.ebuild b/app-text/kchmviewer/kchmviewer-8.0.ebuild
index 18bf404abb9d..188a1ca12bc0 100644
--- a/app-text/kchmviewer/kchmviewer-8.0.ebuild
+++ b/app-text/kchmviewer/kchmviewer-8.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/kchmviewer-RELEASE_8_0"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
index e0d6b33bf69f..7be44b871cb6 100644
--- a/app-text/kramdown-rfc2629/Manifest
+++ b/app-text/kramdown-rfc2629/Manifest
@@ -1,5 +1,3 @@
-DIST kramdown-rfc2629-1.4.19.gem 47104 BLAKE2B a967987f34b0af0bff964488d640a8ca830e55b8a1955442896ed0bebf2cd4d9b902699e1347bd81d82a1b10e085ad2f2827968ff62e96cc4ea7f023f8336af1 SHA512 4843690fe10ae02d90a4dde9ade086308b8081155bd6fea1d83c38563cba1c2d447e337f658666fabb57ca9f85b5f4d5687db2503b0b28b5718b978b1db2714a
-DIST kramdown-rfc2629-1.5.17.gem 50688 BLAKE2B adca653cad4f6e8ff11ae7cbf5314f963d112ea445a402792ffc66eea9e109830ceac69f5016f1b31a1ca783884f15939986374777f270e09247d3416abfd795 SHA512 b60328a8039628b1ca3655c82f6174f0334c2f15ae9bc3fbd0be2d721837e14f2c6b30ae25c818e11b688735e6ddc83476ad1590ba3fe6acde0e8eff0e2362b9
-EBUILD kramdown-rfc2629-1.4.19.ebuild 615 BLAKE2B cefdf9146f455535b25cee3168dfd48770e2710200dcd6f7d1b5a65a73c653a76cb266f09fe952bf481f68f647ac1cd4794c67eae7a98bdcef4556cb0f342998 SHA512 92f772c80ccf2778c80542ee189f8f2528e85657bc4519fcbda10b3c9083fc4a55336d7a7d10e7fe4a211510d6d95099d0180e513e696ca50740e097bf5f0951
-EBUILD kramdown-rfc2629-1.5.17.ebuild 653 BLAKE2B 7bb06b55d72f27e09787ba115c14faaa3b2fbce1ecc0dfa7c1c0681cba6cf8eb3a895c98da9390b1923c29e98df7c4e9bcc5066833bb8253c409b7b71acd6f55 SHA512 0eec3f27b5a5c385a1bd70a0f71c9cd5a9fac465277cb854afd0b9f4d151ab8bedda7368e93f9083520ccc42170dec3aa04036656cdac74915146d5d698b0e1a
+DIST kramdown-rfc2629-1.5.21.gem 51200 BLAKE2B 554806eaf72532d99bc1a620a4806ad167c44287b91bea57638b894770e35c50cd195deff487370dbe501efffdf3ec4453a3c0084705e3bf4b5b66fe5b204a13 SHA512 acb087d3c8cf9c33ded92275fff774403585bcd3db2faaf02fb78ecf60b58cce626856c28b91c6aad85b07b6c913d93b1ca109a4839f9e80b1fc312fced3a2e7
+EBUILD kramdown-rfc2629-1.5.21.ebuild 653 BLAKE2B 7bb06b55d72f27e09787ba115c14faaa3b2fbce1ecc0dfa7c1c0681cba6cf8eb3a895c98da9390b1923c29e98df7c4e9bcc5066833bb8253c409b7b71acd6f55 SHA512 0eec3f27b5a5c385a1bd70a0f71c9cd5a9fac465277cb854afd0b9f4d151ab8bedda7368e93f9083520ccc42170dec3aa04036656cdac74915146d5d698b0e1a
 MISC metadata.xml 247 BLAKE2B aa1ac899418ae6358314e4cbda5c7db1a4f1e7fd8587e101508aa77bfe6d127e1c7bc762c52a81810f22baf7cf6a3a3a22da3810beecdccc5307c42d028dbbcc SHA512 b93f40a4fe9148f409cb20b5db2233ef29cbd27ce7dfeac19e0f3d9cb6b81c6eb2fcb19ce31739eb83911298f089f0bec7e372b5581fc3c839174129f3ab36cc
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild
deleted file mode 100644
index c3777b12f31c..000000000000
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser"
-HOMEPAGE="https://github.com/cabo/kramdown-rfc2629"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend "
-	>=dev-ruby/kramdown-2.3.0
-	>=dev-ruby/certified-1.0.0
-	>=dev-ruby/json-2.0.0
-"
-
-all_ruby_prepare() {
-	sed -i 's/json_pure/json/' ../metadata || die
-}
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.17.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.21.ebuild
index 057efaabbd87..057efaabbd87 100644
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.17.ebuild
+++ b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.21.ebuild
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index f1de004ea876..5305fbf55781 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,3 +1,3 @@
 DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
-EBUILD lcdf-typetools-2.108-r1.ebuild 858 BLAKE2B e8fbc3b951c63da38fad8cd2cce2096a3d6f3f936d1d822a9a535594134f691633a8ff48170308ac98eaf0a8211dac3b41f22a083811a7b40474dfc23a1aa03b SHA512 518ba50d5f15493ee610baa2564d019669bdd05c065dc913f99c198bb1cdc96e7ee58231f237bd64e346a37784b133c4167a33b2fad739abd06b7c2d95b74ef5
+EBUILD lcdf-typetools-2.108-r1.ebuild 857 BLAKE2B d69de17e257ab8729ff98ef6b152c80e97ba780abd556f32f94d0f98d060068557de505443107cd8ea03c5a2fdc462d0d33a88ba8b059daf942427f8b2dade5b SHA512 341d97c0c9a57d4ee34e74d1e44c488308aa0991d4cb274f7ebcb7d78674152c8d83adf3dfc785e420399934e540429f4221b4d7cfbeb9ecf4d474dd10b569ab
 MISC metadata.xml 795 BLAKE2B 0fe34057b644c8df7952739791c9f86ded3139f42cea4a81c9395720acb4ae75f98dbc15a632ca1f95cbac9c91ebc68bca59d30205d0d08d08fa51c9ae9d6791 SHA512 164fc5d8c8919b7620c56b78ad349885103e9beda04cf3f4393dc0d45981ac23ec0f4ab56d14b15a845e212c7bfc89fcb6de76e5cdcde2b121ee8453e123f540
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
index b1b8d8ccf1f9..8117ec68bdda 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://lcdf.org/type/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+kpathsea"
 
 RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )"
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index fe0284af9c83..3780620a541e 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -4,6 +4,6 @@ DIST lesspipe-1.90.tar.gz 121098 BLAKE2B 269f4193f423e4ac5770171156e2f63d14966d7
 DIST lesspipe-1.91.tar.gz 121965 BLAKE2B 93c169b2b1a81db7e7b569718a43152a8f2b9ea95258047a00ae4940509817a3eb861fdadb6bafc5861c49e805ce910348a57f634bdae57317811ac6fbfc6945 SHA512 d080ceaae019d8885a53c8abb26f4a159b78578f68c2b9a024960aa69509651e3b6638e78bd6e2e57c23d81123d9a3cab167736f253ba4276a3889890d594bd3
 EBUILD lesspipe-1.85.ebuild 1166 BLAKE2B b4f5ad06062203f195b36dc874c2d91f30f4222ecc94940687225b94a84129e142838c12938cb54ad35d248a3ea48bcc8ceddeda5aad0154b19ee8be6dfaad38 SHA512 7c7c0b9e6e95c1a6821338ba67f9869154b86ec9ab7d9f5e24e027a72c71ce6510da7f7d824dfea3e8e02bd9101111e1d75d45f1ae5518ef7aa50770904f3034
 EBUILD lesspipe-1.89.ebuild 1699 BLAKE2B 5a2f7a3ce059c3907fcc929f764e25545318d46d7f819bb3be3316946c6201fb7c1c3ab99c62c6205280fcdd4a578b30f4f7d2f872c1064ecea3620996566f66 SHA512 e6c9ddef87efbe09e4dbd03e71173e290a9436730106878c31507cd670edbde6937aec79cd45ccc0177a57eede30d2978d7a7fa0c42abfb21f52ca1edba77fa3
-EBUILD lesspipe-1.90.ebuild 1699 BLAKE2B 5a2f7a3ce059c3907fcc929f764e25545318d46d7f819bb3be3316946c6201fb7c1c3ab99c62c6205280fcdd4a578b30f4f7d2f872c1064ecea3620996566f66 SHA512 e6c9ddef87efbe09e4dbd03e71173e290a9436730106878c31507cd670edbde6937aec79cd45ccc0177a57eede30d2978d7a7fa0c42abfb21f52ca1edba77fa3
-EBUILD lesspipe-1.91.ebuild 1754 BLAKE2B 1fceb92955affd2c975babae33f58b8e6e8091bebfab68a878e3a8c62c64bdeac85dbae57693f23f8470c32c8f3af76ed884af0e3b9e8bb185ae390bf681192b SHA512 8028cfe92e60595e23d5cbe46bb763f09c97663a24272fadde3ecb22461e6f20d2dba94ec1fdabd1fb8e547557ca28f512bae0e3325942d5d3ff7d214ced2f53
+EBUILD lesspipe-1.90.ebuild 1697 BLAKE2B b9b89e7d1a12c6ceccec482d956b36c3ada14f5709462563386645984d15f7e8f96083a4fb4bfca130a75c44970aefba11578e8c5e22ebefe15af6d7b6de7394 SHA512 bd62889ed01cdfad435b38e6b165d73fc8c5fc5b80edc1ce14eb236c87727cced1d55eca7562b23ba69b1883f02a75cc436964f7285eb95c6210b211326eeda6
+EBUILD lesspipe-1.91.ebuild 1752 BLAKE2B fa3d9e2e31d757748e09b181726ad642448ad7c61721350f9906b46ebcf759c7e0aee401d80e5f54901192e21731fb4bd166a1726cc7c59b6ceac71a21a14f35 SHA512 bb054fcc877e96d7c193cfa29fa3699474b7bcc636703dc898b0c4cd9394af2124090a582f0cb1f10c9ccb8034454de7a0d9418eb9eff14a9f5fbeb10a210deb
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-1.90.ebuild b/app-text/lesspipe/lesspipe-1.90.ebuild
index bc53c82f7b8e..5f4f14e6f48c 100644
--- a/app-text/lesspipe/lesspipe-1.90.ebuild
+++ b/app-text/lesspipe/lesspipe-1.90.ebuild
@@ -9,7 +9,7 @@ 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"
+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"
 
 # Tests are broken in 1.84, 1.85.
 # Still fragile in 1.88. Passes when lesspipe is not installed.
diff --git a/app-text/lesspipe/lesspipe-1.91.ebuild b/app-text/lesspipe/lesspipe-1.91.ebuild
index ecc7dc9e5b7d..e2cbf3aceef2 100644
--- a/app-text/lesspipe/lesspipe-1.91.ebuild
+++ b/app-text/lesspipe/lesspipe-1.91.ebuild
@@ -9,7 +9,7 @@ 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"
+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"
 
 # Tests are broken in 1.84, 1.85.
 # Still fragile in 1.88. Passes when lesspipe is not installed.
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 6aedcd1499c3..3d549b2c3097 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 689 BLAKE2B 2f95b4642b49229b6dd509385819534bf80917f81b3136144dfd919d12c5a922d4b2a13837ddc6c5525a7b9ac70abd21c3a5d8951f8e0fa9dbbf03fe0207869c SHA512 be3313c7d72e318747b95fbf4f31c640a28827f7cbb49fe8764dc7dfc4b4f43a566e11e6fe0cff279c99c9351f0ad578fd553ba5f3aebdd4523cc0a31d80d002
+EBUILD libgepub-0.6.0.ebuild 688 BLAKE2B 6403a39233e409d7f3ac26d342e1d6439ff9771f585363b6b1906020818bce7be222bd12fa518bfae2d04c5d03c3950cf24fbd99e6a1353ab03620abc2cc7d80 SHA512 214a6a8b039c93213918e2a302415952c8adb3a8bd8d42938509fb31e0dc4945eef641ecb27ad22145a84102684b10ad7e5c2eebb791995911e9bd3131599106
 MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index a00d54d6d7f2..3dc7a2b3c588 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgepub"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 824fe75a29b9..9b9f9d662fc9 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,4 +1,6 @@
 DIST libmwaw-0.3.20.tar.xz 1425812 BLAKE2B a708ce4a28a0d5a5a5ee9d178c67119189add0180e61d67af6821c509d95b9f8bfb60eeb1afcdf8e2da5bed26053108b12db57db98912d97dc7e0ef0f7121f18 SHA512 d6cd28629b6482dd61e070036e94568ecc44d9064dddd9c699c7362caa8ef36652ce84cf0f199813854636f2e39ab19d47f4e148990822791b88cd3f17f68b3b
+DIST libmwaw-0.3.21.tar.xz 1457212 BLAKE2B 19e0893c186f273f5743a397da895f653cca1300febcac90353951c6ca66405c2481aac6083017f4ec00a31ee0f08e8e77dc579019396e23930a091de2d8903a SHA512 1b6aab4f3e76d1d7a3c15cc175642c62f826172c9fdef558617b87a98d056a05d817caaccdc199197670f84ada448b65cce61f5254ed8e1d7634a637d3367384
 EBUILD libmwaw-0.3.20.ebuild 1013 BLAKE2B 3c741c8bc6e6c1a65ea8ed24d32a8f0d00286c93f92b80bda796cdb040c98080b29be016c8b548b720fc5f14447a225847a48e55a4a6a5f8c4678a4cbfaf8c7e SHA512 32f096bbad136c93920fdd74594b22ffd448030660fbb602be6379da3b66a36194ec5a4412a692a263be8bbf1c50d3ba51aac4efe5cfdaa018267a87244106c5
+EBUILD libmwaw-0.3.21.ebuild 1016 BLAKE2B 9000ed0395fe4a35c333a638eb6dd96974b7a6471ec29d5904f4b4686b23a6593ee82c94516e0efff83c4861e4a013ba875499fb1ec1d53c10764d37b1c5d650 SHA512 b9a1c5684dd554884f8dab0b84c4cb7d5d68470cae41153988176a3954de510b660d54223a14e28d13ac5568afb02c80e5d79ddbdca0633f6c975f4627988c82
 EBUILD libmwaw-9999.ebuild 1016 BLAKE2B 9000ed0395fe4a35c333a638eb6dd96974b7a6471ec29d5904f4b4686b23a6593ee82c94516e0efff83c4861e4a013ba875499fb1ec1d53c10764d37b1c5d650 SHA512 b9a1c5684dd554884f8dab0b84c4cb7d5d68470cae41153988176a3954de510b660d54223a14e28d13ac5568afb02c80e5d79ddbdca0633f6c975f4627988c82
 MISC metadata.xml 404 BLAKE2B 95ac1c73023ff52b4a0d1754f9d37b6c2ffd82f49f16122058f853e40ce15dd9b2fbe6ecc24bdf86e82addc27b4a6f9cd7478560fde845b696f62a1645abdca7 SHA512 858235729f5091f06699f4b32ff14890c139c5e0adff30172da79e3fec4b4452e8529c401a0273b1799706e0ade449451f10b84555ade12022bf62e37098ac07
diff --git a/app-text/libmwaw/libmwaw-0.3.21.ebuild b/app-text/libmwaw/libmwaw-0.3.21.ebuild
new file mode 100644
index 000000000000..4c609720e0df
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.21.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc tools"
+
+DEPEND="
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+
+	# Refresh stale libtool, bug #814512
+	eautoreconf
+}
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	local myeconfargs=(
+		--enable-zip
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/mathtex/Manifest b/app-text/mathtex/Manifest
index e278da46390f..02895c6cf4d3 100644
--- a/app-text/mathtex/Manifest
+++ b/app-text/mathtex/Manifest
@@ -1,5 +1,3 @@
-DIST mathtex-1.04.zip 148443 BLAKE2B 6632d30536428f6f33fc13a2b5b38651f2ab7a938381166b79c009ab3d95788fc69e8ed824dae64dca00d32bb79ccd00a73b772f9aebc813d54fd6e0f18839f4 SHA512 4b299a6dc503a01d6be3182ad982e38c0b6d926f09a09bd5169f8ad2c947c020ad532b15146379b4bc2158cfceec4cb4a0b7bf902423e0a8ad9b0b0190a99601
 DIST mathtex-1.05.zip 161624 BLAKE2B 9812cfadcc5d47286afb86c6ad38f5bdf932ef39efad2228b04b3b39cbb7543f78be9d82cfa8bbfcc72c9f46fa1931e39aeb71e3abab865dcd60e4e9717e2377 SHA512 f116618de4264efdbccb122b0e9769bbe622f6300266284a96e65f37346c000364063f201b31554bde62a4a4e13c0c8f16d570dca359d3ef27bc0f7622af3715
-EBUILD mathtex-1.04.ebuild 903 BLAKE2B 1b410976032bb2cd416333f8c0dfc6540578af989336cf8219eea36b3f358a08c4c95d0fde4bc6fb2dfbbb8ed7474986a0a4f1835e5555c1e2c4d10725ef0cfb SHA512 bec772a76171828bfba8344b0f2a9292ffa23b803011b0975f2b872b56c7755d285ee7ba06a82c763ce12d42832a098b8baf0d199b78ffddda89a4b6506a0d50
-EBUILD mathtex-1.05.ebuild 930 BLAKE2B 865707bc57b4c02acd053ebd2d66c5b7a78184a688f00b0e00d68f97c76332a3170c95b1c631a18bcc02fd4af78e303fbc2de68c4ef6e4f0902e29ef63081a84 SHA512 b57bc91f09aa20d35756e42728abd4124f472d52b58499d1c6c6563c3e3787221567f16ccd8bdb06b00f32c46b37c8aa09ae23a05047a451c482770ccf6c19b8
+EBUILD mathtex-1.05.ebuild 928 BLAKE2B f900f084ed4e95c005495672adcee1a6c236e6a77453c11f01c7fe233cdc06e9e7b40fabbae7e4be61cc11e5b2d9c74002dd32d1250fafe97c7f245ff51fb150 SHA512 6a1cff31c2001d009dde3ec55984f9f9f32b8da973338ca90c9725ed96d8d31b7e0e5f5a6ca8a3ed5c80bb3b22bc8f7a04f1073ed798d6d3a7072c27bb592aac
 MISC metadata.xml 634 BLAKE2B e034340d471f0aa802b1b874659596fa57e4447c362fb14e99a1efb1dd056da0de19a31fc8b175c58937d5dee2dc52e24a0c76ce0854f654b97fddcae43987e1 SHA512 6e8f077a6641b87fbf52f2d75ab67c4bf5a8389ccd4fae334d3e4d48af771e1acc380a222f720c939cb153277e1355e2ccf1cfea1728daaf89f6a54fd7facfab
diff --git a/app-text/mathtex/mathtex-1.04.ebuild b/app-text/mathtex/mathtex-1.04.ebuild
deleted file mode 100644
index ac93ae93133a..000000000000
--- a/app-text/mathtex/mathtex-1.04.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lets you easily embed LaTeX math in your own html pages, blogs, wikis, etc"
-HOMEPAGE="http://www.forkosh.com/mathtex.html"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="png"
-
-RDEPEND="app-text/dvipng
-	virtual/latex-base"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-einfo_run_command() {
-	einfo "${@}"
-	${@} || die
-}
-
-src_compile() {
-	einfo_run_command $(tc-getCC) \
-		${CFLAGS} ${LDFLAGS} \
-		-DLATEX=\"/usr/bin/latex\" \
-		-DDVIPNG=\"/usr/bin/dvipng\" \
-		$(use png && echo "-DPNG") \
-		 mathtex.c -o mathtex
-}
-
-src_install() {
-	dobin mathtex
-	dodoc README
-	dohtml mathtex.html
-}
-
-pkg_postinst() {
-	elog "To use mathtex in your web-pages, just link /usr/bin/mathtex"
-	elog "to your cgi-bin subdirectory!"
-}
diff --git a/app-text/mathtex/mathtex-1.05.ebuild b/app-text/mathtex/mathtex-1.05.ebuild
index 9f8ebe064542..47b8d0d3f71b 100644
--- a/app-text/mathtex/mathtex-1.05.ebuild
+++ b/app-text/mathtex/mathtex-1.05.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.ctan.org/support/${PN}.zip -> ${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="png"
 
 RDEPEND="app-text/dvipng
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 51286e332da6..82a571ef9141 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -13,5 +13,5 @@ AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a7
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
 DIST mupdf-1.19.0-source.tar.xz 64077324 BLAKE2B 4c30cfc004b4f354ae349e5460327775a4dbdd689e561888c156e9e69e22b45ea1f260dfed8d2d8c017fe65a1e83cabc8ff29dad8de47a2c541f9e335bf11285 SHA512 421e8e49f83cf00bfb2c86b5425939056fe866a048cf18e4c8f5764cdee9829974eea655c944d0f3f5a9407347cceaef34030f4079aa399e798da3ff849230e7
 EBUILD mupdf-1.18.0-r4.ebuild 4358 BLAKE2B 67d3b045314556eb3e81a668015e36115e7729436a91bfebededdf316bce062bac229c64b63f0aebae7553b8a5595fa0d4db53bb7a7a9b452a087967cd04547c SHA512 90dd0ae5d0376dafbce8b19d711d92ab9debceb467578f0e529881b219e8b3166fe5ec1f0b535036300a1e4a60d9969ba21450ca54b6f7e18f8631b035b8a4b8
-EBUILD mupdf-1.19.0.ebuild 4213 BLAKE2B 1b161dea60359b4c82e5638a4c4af0dc392805bebecce65484d32518efd27a6ae164c4495bcbf94684787cd27798407d72737d9a19ac4ffcdf0009adac46bcb1 SHA512 ebcb029809f7661ff2cd671cb11ab777e5e6eca2759ec7edb60ed35191f125b5c880fcd46fa5fcedb893fdf8e02bff70b592605a63f3351610063748db2dfd1f
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD mupdf-1.19.0.ebuild 4464 BLAKE2B 45d3165da6c42cf75673aac3c14e99ce4d54181c24bfd1524aab515c26bdb18eb1112b6a7e3fc54402346e3106918427c17e8f97599711f9830e6b4d86f1dc96 SHA512 c3b803db79087c1a0e302c414e97455ae3c6b16d1c454694aa7538ae66bac8627eaeb4b1bc9547fcabaeacd17bbdf6d307543a6f247ac15d3004b34563b9a59e
+MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 115e9d64a669..5d2f87cc3174 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild
index 88ff8063033b..9d1dae31213a 100644
--- a/app-text/mupdf/mupdf-1.19.0.ebuild
+++ b/app-text/mupdf/mupdf-1.19.0.ebuild
@@ -67,7 +67,7 @@ src_prepare() {
 		-e "1iAR = $(tc-getAR)" \
 		-e "1iverbose = yes" \
 		-e "1ibuild = debug" \
-		-i Makerules || die
+		-i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
 }
 
 _emake() {
@@ -122,14 +122,14 @@ src_install() {
 		domenu platform/debian/${PN}.desktop
 		doicon platform/debian/${PN}.xpm
 	else
-		rm docs/man/${PN}.1 || die
+		rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
 	fi
 
 	sed -i \
 		-e "1iprefix = ${ED}/usr" \
 		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
 		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
-		-i Makerules || die
+		-i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
 
 	_emake install
 
@@ -144,7 +144,7 @@ src_install() {
 	fi
 
 	# Respect libdir (bug #734898)
-	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
+	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()"
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins platform/debian/${PN}.pc
diff --git a/app-text/pdf2oo/Manifest b/app-text/pdf2oo/Manifest
deleted file mode 100644
index 624688225bbf..000000000000
--- a/app-text/pdf2oo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pdf2oo-20090715.tar.gz 14765 BLAKE2B b84b34f4c932468d26ca6f53b596f762ec098fedfee22f1dc568e27a41c7ea9df32cc645a1f2ffd1469441ef579a11f31840fd9ed536853aacdef1f1593f4aeb SHA512 44a933e55f9137d8b02f8deedd3e0af2bbaf7a5d8ba94b3ab3ee32cf2ee331576a871fadb902fbf32ff231200d1e54b2bf8d31cd15005dee7deb5810a804bff5
-EBUILD pdf2oo-20090715-r1.ebuild 467 BLAKE2B 940d5d9e76dac181efd80c0075a1c8b18ce1a3a084b1ca683563598e826063d421d1612e92de17f8ea67139a59a4348b73d6be6e2de98b9b7e87b5d7f6da12a8 SHA512 e23740f08207b911ab2ba0f4d0c5677d8891f9fb0f73da24a8fc97eec68233bd123e0318f20067cc63cc4aead803b6efa94ed27a531b064cdc68d9262b677228
-MISC metadata.xml 244 BLAKE2B 544d7676cdcc6403e82ff1b3882209a154252f24348d681c08fe38c70e487bcce3b09688bc94134a378710fceb849770f60d3db6e9fede37fbf9d34b0a1c714a SHA512 f60287903b2b504d6e622e3c1b47e8cc04f600b174ab2f8da51b313bf0e4270dc1b364d18a1ff3353484a60b38083c05d0c86960aff4dcb621886d7afacf8acd
diff --git a/app-text/pdf2oo/metadata.xml b/app-text/pdf2oo/metadata.xml
deleted file mode 100644
index a639e8828d9c..000000000000
--- a/app-text/pdf2oo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">pdf2oo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild b/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild
deleted file mode 100644
index 9db50ba4886a..000000000000
--- a/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Converts pdf files to odf"
-HOMEPAGE="https://sourceforge.net/projects/pdf2oo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-arch/zip
-	>=app-text/poppler-0.12.3-r3[utils]
-	virtual/imagemagick-tools"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	dobin pdf2oo
-	dodoc README
-}
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index 466e7403d0e7..e8b09fe2efb0 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -1,3 +1,3 @@
 DIST pdfgrep-2.1.2.tar.gz 197289 BLAKE2B 94d20649104f7b17adf2d99bdf2ce215cf16746c649f7ec77d58a41b90b13dd903d47b5ed2d35f56ca7ca12ae49cfb8a57004f9ad3ee6b8930f533b33d7d8463 SHA512 27bc4741e5203b2fd265815a22ad8d702b3455b2ae932641b040fc9ce615bc9ff0abef221eb2ec8aa59c79cb139d31184261d076f9731177129a473d62aa4e5c
-EBUILD pdfgrep-2.1.2.ebuild 766 BLAKE2B 1a651ed9900ff90aff32b31673d5bd3e37504f2db734c92716f6fbc89dd36b3899a6888dabfa6c3e301fda28f71299b6c16190a7702289d4c98351b16e147df8 SHA512 5c392b83a699cbbacf651611a06f150b80c95a199bc712ffb38adab371680cbea617461412204dade2a4c4452d0a4978d4b87bc48af151cd9c5c667a1541d908
+EBUILD pdfgrep-2.1.2.ebuild 773 BLAKE2B b3fe173acaa4d4cde4e40afc314c2b8fd787300af557c5dfc72311a64234d8f13bbe210e730827accd93361802dedc033db89d90c7385a8550f07db311ca6e91 SHA512 2ab114b4c6b415111fe134072862d75af7abca80989d00f9015d9e25b77402f5bdbd68d82f18ee4a8468dc5d6f19b40790b07ad6b38a5b4e32034b5644a6816f
 MISC metadata.xml 406 BLAKE2B e17c3c0ac01271746b615190ef3a9f09298a719a5aebc299fd7881cb8b41846a4f7e4f83e7c03f700159a3394f45c11ffd4ddbaf7d8b22395740d4cf1ed1c931 SHA512 5d13105da1f904035b6286f0730f48230a13340fa813ea8a0d66514abb4113fffff4c1773291d47ca9676b09d88885792a3dcfc4030e6f1ae5d30ed37a4dfaef
diff --git a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
index 444d6258b3d7..22c87a31ea4d 100644
--- a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
+++ b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.pdfgrep.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="+pcre test unac"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 33cccff39b2a..4ba57fca8e37 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -2,6 +2,6 @@ AUX pinfo-0.6.13-fno-common.patch 217 BLAKE2B 80bfe222627299bb078cc33005a6470278
 AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 BLAKE2B a49a7addbf822436bc5cb8cf2da9964eca3b354274de1fb5f64cf4d634164fbe55e634c99282f87b3cbda5ac9f334b25d9123237b4cc64e7e5286b57ddf2a057 SHA512 373eea0e8feca230c14bf658ca5e73698ea16d35b5ca790c46b5bf02a83aaf1d55628183f89666913dfea96ef0f3653789255f8dfd616fe5b3a19be195d46ce6
 AUX pinfo-0.6.9-lzma-xz.patch 614 BLAKE2B 0b84247de91a42f75d0664f4ccab23e3d57bc66f6af2444e8b9dee2c0e6edb5afad1d467725507c9618947463cdd2f221024c7feb387282ebafcb6bc62741c89 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4
 DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
-EBUILD pinfo-0.6.13.ebuild 1087 BLAKE2B e4fc77671bb3cac6a1a9fdcfaf4b898caf61ea313cc9a630d0ff29f2e519831821ba27a411dbfedfb761921f383d0f5043d33a451f48358c118197c5cfa8b230 SHA512 cab73af963721e6b7b5c3e42a9684679f96f176cf2444d2ad7b1d0a10dce4ecb5d4c62cc6e7cc3acb9f1859bdfd367151d14181619b48d9a794b291138ef53a5
+EBUILD pinfo-0.6.13.ebuild 1094 BLAKE2B 08d872b1a0eb6373aa437894603cec36780f71565a94fb4ed726b042cabd897ee6792a7386b6d97c65ab0b6945b7ebb442a5edff452b030549d13da00347a489 SHA512 195a6f92e8207ba32b1928656437a0d7bd1bce68fa75228245c04a3cd5e4c0a993b977de345830efa1b8a4a118ebeffeaa49a05d48dfc0e537d571713cafb6f3
 EBUILD pinfo-99999.ebuild 965 BLAKE2B 70eea0fb86462f8cea446b270fcde21247bb2d497946ddf585bbf5f21651de0068746f82133cb0dbf8b3802be02af7ccbd8189118bc4da21e525b2cf456872eb SHA512 38490ae9c934f6a73e31b4e30df86d249f5c54199622ec6d9c9185f3d13cc83cc56a711b62c9fb639ffd80ae8448ccd9c8548121bcbb21356e272c3f44a7381f
 MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index fd125b72037e..895fff2840ad 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="nls readline"
 
 RDEPEND="
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d1f54d61bd83..ab36f1ec112e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,10 +1,10 @@
 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-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
-DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
+AUX poppler-21.12.0-include-csetjmp.patch 737 BLAKE2B 69215658a6d5f075c0d9b0aea3bd9539e1a415225552b6328c635a071f417a5cf7f29edc44e790a96e69b5aad4efe1e04534ff78db211ee470f5d6ed3bf02a00 SHA512 ffa0521d9265431be3e98e088f66c6156ceafa9dc9c118a6d78315832fe04b58ea8b0a44a49038cc2c4a0fe3d640b1109c6de6ea4eae92cc2f7ecd28c7a6f777
 DIST poppler-21.11.0.tar.xz 1783592 BLAKE2B b0448ae0456ffda29c18732e6dd94cb285af67cf4adbaded05a4abe2e465cb63a17e0041240c82c83c89b313ec8c7bf9d68fc8d727b7d41c1ee70722529ce45d SHA512 354d6372093e7ecedf95c43e8d203e9b2781ff7ecd81cd3920cb8c72a37463b47423ce7ab3c8233c0f031f2c024ac1ba5c8d442c80e6643722192fb9638e5d3a
-EBUILD poppler-21.07.0.ebuild 3339 BLAKE2B fa5a0f1aee4edc405149d5573b917320eb8748054687222ba9dab6c61105af7286022bfc7d7b685aff174966a7d0db1274dddf9464343fd4e35a4dd6d5c53921 SHA512 c0f8caf6a63c76024c668e8f98cdb67ddd5ff3a0798cd54d1276a1aecae54324dcbbd291e308a4e322eefa61ff13a34027fe86bbd9f464a8fc9873da6a41af48
+DIST poppler-21.12.0.tar.xz 1798780 BLAKE2B 403f928dfe8f94048307eb120dcd85c9821a12e100b7030831864fbc630244e79923e48061352e49e1a6daf5eda7f05b32254735ef5037db108ac4e3fedd877e SHA512 86856e33479a357deb671b4fdd6336a7581b5ac14b9715ffc2482d8dba7a455aab07317b1fc0c33f479f11de38012958fffa619105c255de51929e61a6b63e33
 EBUILD poppler-21.11.0.ebuild 3330 BLAKE2B 98babbca9cf633b92235569e7cd3d790fbbfb714be2ddce49e7f238d2eb234e4ae37a280e3a7d753f3e0b22a7480038dd87940f1a7bd6b3d731eafa5a1c2c756 SHA512 f6672b5a613f3933a83b702a1ace108eb62f644e5ce38b53e59ceadf602f815ae5c69bd536325d0cb668fc73fed7c767da48b6312caf3be03bef886d6db97f2a
-EBUILD poppler-9999.ebuild 3338 BLAKE2B e4d5451cffda510fe65615af575175011627ef6116e822c00e8d2ac6c5dd50177ec14709f64fecbdde55562ac77cf895160d8a6239e254a3e9ee0e63058184f0 SHA512 821eb6517298d9f5a10fdf1aef8c6072f00ce7f5757cd2b41d8bad927ee44c95bd2f5ef0a13efe18484764fcf883b27364e128611aa0f9601dfe1bc427411fbb
+EBUILD poppler-21.12.0.ebuild 3380 BLAKE2B a01131242d38a8f53806365578205f354127126c6eb334b9357325e347eb810558b6bf0baf6ab0af8f6584e1f27d966878a236d43e285ba1f65a6a43e62c7173 SHA512 679d8c829a42558702b591030edb5f766058ae697e136d73569f36d98bf7f2531b3313c734b06a9fa8dd0524bb6804818da83ee55e9b1442d45a11dcb3188e62
+EBUILD poppler-9999.ebuild 3338 BLAKE2B e8fdf3ac099097ab534bbc78dd126b39f2150d4ea68b070f774f6a443a2cc9adf096b2b8e6db432d1b95c4e67f2823dad10c7100fb67a2ba02f6f9eb8b8c01ea SHA512 3b04f844539eaf99d22d8af8121d2fdad37fee28f916a9101c2b404dea52c93d6de8e65ccb738e047f6d4bc2b1069735449ff33941ccc3538cfb385a545a67b9
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
deleted file mode 100644
index 8781bbec5bbc..000000000000
--- a/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001
-From: Theo Anderson <telans@posteo.de>
-Date: Wed, 14 Apr 2021 10:16:11 +1200
-Subject: [PATCH] build: respect cflags
-
-Signed-off-by: Theo Anderson <telans@posteo.de>
----
- cmake/modules/PopplerMacros.cmake | 77 ++-----------------------------
- 1 file changed, 4 insertions(+), 73 deletions(-)
-
-diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index fe1182da..b77eaa3e 100644
---- a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -79,14 +79,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-   set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- 
--if(CMAKE_COMPILER_IS_GNUCXX)
--  # set the default compile warnings
-   set(_warn "-Wall -Wextra -Wpedantic")
-   set(_warn "${_warn} -Wno-unused-parameter")
-   set(_warn "${_warn} -Wcast-align")
-   set(_warn "${_warn} -Wformat-security")
-   set(_warn "${_warn} -Wframe-larger-than=65536")
--  set(_warn "${_warn} -Wlogical-op")
-   set(_warn "${_warn} -Wmissing-format-attribute")
-   set(_warn "${_warn} -Wnon-virtual-dtor")
-   set(_warn "${_warn} -Woverloaded-virtual")
-@@ -102,22 +99,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- 
-   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
-   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--
--  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
-+  
-+if(CMAKE_COMPILER_IS_GNUCXX)
-   poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
-   if(GCC_HAS_AS_NEEDED)
-     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
-@@ -126,57 +109,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
- 
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
--  set(_warn "-Wall -Wextra -Wpedantic")
--  set(_warn "${_warn} -Wno-unused-parameter")
--  set(_warn "${_warn} -Wcast-align")
--  set(_warn "${_warn} -Wformat-security")
--  set(_warn "${_warn} -Wframe-larger-than=65536")
--  set(_warn "${_warn} -Wmissing-format-attribute")
--  set(_warn "${_warn} -Wnon-virtual-dtor")
--  set(_warn "${_warn} -Woverloaded-virtual")
--  set(_warn "${_warn} -Wmissing-declarations")
--  set(_warn "${_warn} -Wundef")
--  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
--  set(_warn "${_warn} -Wshadow")
--  set(_warn "${_warn} -Wweak-vtables")
--
--  # set extra warnings
--  set(_warnx "${_warnx} -Wconversion")
--
--  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
--  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--
--  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
--  set(CMAKE_CXX_FLAGS_DEBUG          "-g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
--  set(CMAKE_C_FLAGS_DEBUG            "-g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
--endif()
--
--if(CMAKE_C_COMPILER MATCHES "icc")
--  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
--endif(CMAKE_C_COMPILER MATCHES "icc")
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
--- 
-2.31.1
-
diff --git a/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch b/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch
new file mode 100644
index 000000000000..0f0029269673
--- /dev/null
+++ b/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/828578
+https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1016
+
+From 3ea6bca90d87d3f91556205c4e58ca425c6ac437 Mon Sep 17 00:00:00 2001
+From: Marco Genasci <fedeliallalinea@gmail.com>
+Date: Sun, 12 Dec 2021 10:23:37 +0100
+Subject: [PATCH] Include setjmp.h when WITH_JPEG=yes and WITH_PNG=no
+
+---
+ poppler/ImageEmbeddingUtils.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc
+index 5c50f1269..c26b9eb2a 100644
+--- a/poppler/ImageEmbeddingUtils.cc
++++ b/poppler/ImageEmbeddingUtils.cc
+@@ -16,6 +16,7 @@
+ extern "C" {
+ #    include <jpeglib.h>
+ }
++#    include <csetjmp>
+ #endif
+ #ifdef ENABLE_LIBPNG
+ #    include <png.h>
+-- 
+GitLab
+
diff --git a/app-text/poppler/poppler-21.07.0.ebuild b/app-text/poppler/poppler-21.12.0.ebuild
index ccde4b8643bb..4b6f8bce95bf 100644
--- a/app-text/poppler/poppler-21.07.0.ebuild
+++ b/app-text/poppler/poppler-21.12.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2005-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake toolchain-funcs xdg-utils
 
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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
+	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/116"   # 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,13 +52,18 @@ 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}-21.04.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${P}-include-csetjmp.patch"
 )
 
 src_prepare() {
@@ -70,7 +71,7 @@ src_prepare() {
 
 	# Clang doesn't grok this flag, the configure nicely tests that, but
 	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
+	if tc-is-clang ; then
 		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
 	fi
 
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 337023d962c8..9da7f4e63ab3 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/115"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/116"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index 62899a740348..cee4b5b15a14 100644
--- a/app-text/ps2eps/Manifest
+++ b/app-text/ps2eps/Manifest
@@ -1,3 +1,3 @@
 DIST ps2eps-1.68.tar.gz 97304 BLAKE2B 594b894b2d81f64c8c6a7461d1df96d7b6e3ce3ef8f7eaf58161eb6a05ebca7b2d304a531be954898f1a9ad53cccd84536b64127b080afbc3902265d2e4e1108 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b
-EBUILD ps2eps-1.68.ebuild 910 BLAKE2B dd28ec4cc59f0c4b1dba392ed1cf8e076452434c91c50639de763082529d3c6b48b1b39f8c05eddc9ca0e76aae097330f9f9e989fed2a8040f91477b5893e33a SHA512 850acf6f71655600f3554ac61215fb41e6e7e6f90968aede0276645ecb767106a22e63024b7f4f8355bf53c27ece385bad022a66d6944fc0515b53f733ac2e14
+EBUILD ps2eps-1.68.ebuild 909 BLAKE2B 93f68a7c306df14429ea7562191b9f9f14136068f8a43c4571170771a2fd050faeb5cc6046120c89879dcd1122c035a087e34bc4c8112d5e7fc680b8db151e0c SHA512 8ffadea4db7480028d80a6c0417e83c1c77fe0a79476c3275b1a089c690481f343b78ec2437b5c32e23652801e3d8834d9aba05e48f00ad0f067ac8d4a439917
 MISC metadata.xml 370 BLAKE2B a2bf24c1d3fb684c89c96271437cc7412d9819981e6bb0a34722706de0dce1a404d5bedab84482c420603781658122d82be7e3c44083884ce9a3099e1e23f1ee SHA512 7a2db218407f734699f3cdaeb7029abe79326e23d1419ab74400a307a48d841762298311cc142f44da80a2ba1344f24e531e654ecfeb2de224872269468c648f
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index a717ead48443..e261eb3c9d4c 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index 4c0826e5ba89..04c6cf5c12ea 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,5 +1,5 @@
 AUX psutils-1.17-ldflags.patch 1417 BLAKE2B fa54e0f8cab31336dbe95db96313e345e9cd3a03f2c92855c5bc5fbc4054e89193ade6b346f52edf61f58f20330dacc8d7df32a5ec1769ed7ff62b4eacb36368 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08
 AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
-EBUILD psutils-1.17-r3.ebuild 968 BLAKE2B 07b0d7dc6b0ce9198258e14a0fe110b15d440c4f7401dd0ff7c5cbdceb34715b9206687a2c8cce2695df69d312939176ba58dc317cad6d081a0f1f3f717ed0f8 SHA512 c27c9fce996721a5b995e2904adf07e0d6a264f6f69f758148a57dde82ada5798d90f5fc6b6860665c3367e1e78f38b2ce86b6f609ce9f6e3e831425dec56504
+EBUILD psutils-1.17-r3.ebuild 967 BLAKE2B afb29ef8ccc04185c3aae15d95d0218ee663263bf87ce4423395e28a2261069af7f62715d67cc1aac6bcdba18f846d30df4116b7b0287e2418c88eceb5541b45 SHA512 3b0a5e16d39cf06926663de53e64756446290b8dc439409a74f7f471ffe3ebde3ca93ce33c4cb06c3a3da4d44aa75ba521602b8a609a2ad3dc59b9978da0860f
 MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index a2df5ca8d372..f1c0d00de2e4 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
 
 LICENSE="psutils"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 1565ce69f8cc..927aad3bc832 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,11 +1,8 @@
-DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
-DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
-DIST qpdf-10.3.1.tar.gz 18956768 BLAKE2B 1581799b7bd08e28829fd26571ddaa06fc8460fd4f6935a4f69374e49c445cfcbe824175de7137817a26278c2f58d7524f6440181945064fc853f4dd30b2d528 SHA512 def94fe09770e67fe13bd3fc946667fc2935e7c448eb43602e15218e5b50f452e4f4152411f818115620e67934890c37203663537ac77ed1fcd4317e01a6d623
 DIST qpdf-10.3.2.tar.gz 18943834 BLAKE2B 5b4e320ddd663721d8201139842bb09a752347f86c3e33116063b2fff1426aed5ff6e3c581c120771a712a8ed278102e0d41816db207a25dabd84e5b89490d35 SHA512 4e630959abf27d1801e36d0cbd754945ded42ade9299057a6b9a642c7cb2a3f8242e274642f1c33a65b4a5a77562d91dcbe64fd5772d483cbe5edb4a6a389219
 DIST qpdf-10.4.0.tar.gz 18942833 BLAKE2B bc984c742bec582b5b67f7a4f4f00bb22a36e8e14d78b8e8848baed0c94489f6920070bc317928c53aca855c252c2fa5de0fba8b64ba16ba37afc2362d6ae7ba SHA512 7a17cc2b3168bb60ac05d01b585d34d94f62e44e309b86635351b2564bc2c3b7846d3a008ae0d6c068bce3b1d9c42d3a3ab40de3f85a1ec4952280cf8321a041
-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
+DIST qpdf-10.5.0-doc.zip 6621139 BLAKE2B 9297946619df67799a450495ead8a980d8e2cfa92556e9eb6ac6f365b80d489bb11a9c5dd95e13df9a8fb013a3f254e89ae1682e8be73799ba0c872dc50075c5 SHA512 75c4eac6e828eb5f8544b4194b775e8258a769aa5e18006b9491d9658981abcd286cd082a233122805e785f283704dccaf2078cd84965ab58ebc6c80fdb4a06f
+DIST qpdf-10.5.0.tar.gz 18362586 BLAKE2B efb0a051df9824c6324ce3c4de7b6f5890a04e0a0e1e08a1086c7b7a7e3d29e01d8b6760eeb36cd5461f5ea8a9ac1e6453711df53b514c223abd3d2a41ae1a93 SHA512 758dd4fd86b79a8b08738abb36685cf4a458dcf70a480efe3207d1148a691cf06a8040c83075ace9c3bbaf372cefe78508df2e52513cc969dca76442ed43775d
 EBUILD qpdf-10.3.2.ebuild 1251 BLAKE2B a6c12b3178f671060f2c01633ec3a6b0de3343ca9087998ca54a3364f06ae055d442595ad173057c936c55024cb90b81f170d09259f2d14b7f82aa414c7701df SHA512 84fe44d555383379f59fac01481619e3282ee334e862ba16df186f58ecf73ced5a6a1877e2ac8519ae604850910c07133b4e1cf60be0caeb29d129e81cb7e8c2
 EBUILD qpdf-10.4.0.ebuild 1255 BLAKE2B 05bb94b38e12e7d8b5164ffa05da1582db08f877bae07c40ba2c54aa850a7db2c6b36d2c629951fcdce7b775c94fc8ff92e0b8dd9bc28395af8fdff8ee1482bd SHA512 ea70dba22e61c4d14f0882611983e614da1e19db82433340ef937cb5bfeaed0ac9811a2733dfa833b64d665eb4e1aa9d3cd0b9868639aa6bfcf09a2e2b69f0e8
+EBUILD qpdf-10.5.0.ebuild 1895 BLAKE2B 4f655622af49383d4cea2354042215f58e25e5241e0c6f378a7c65f9739c60adb9aee8d8bc1ab5c5879e15e0ebf2c0513899504a13bf9e9594b0b46efe90310f SHA512 0a90e110633cd12a3fa5d115cb0b3cd189dfbd0ac8985433dbc57106deb296457108f64a1bcb0126deeb1bec78c1a440baee8f0a18898d7cc3bc7da3a7472bf5
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
deleted file mode 100644
index e6c1b1772480..000000000000
--- a/app-text/qpdf/qpdf-10.0.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-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"
-IUSE="doc examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/gnutls:0=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		app-text/ghostscript-gpl[tiff(+)]
-		media-libs/tiff
-		sys-apps/diffutils
-	)
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-implicit-crypto
-		--enable-crypto-gnutls
-		--enable-crypto-native
-		--with-default-crypto=gnutls
-		--disable-static
-		$(use_enable ssl crypto-openssl)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-10.1.0.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild
deleted file mode 100644
index e6c1b1772480..000000000000
--- a/app-text/qpdf/qpdf-10.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-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"
-IUSE="doc examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/gnutls:0=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		app-text/ghostscript-gpl[tiff(+)]
-		media-libs/tiff
-		sys-apps/diffutils
-	)
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-implicit-crypto
-		--enable-crypto-gnutls
-		--enable-crypto-native
-		--with-default-crypto=gnutls
-		--disable-static
-		$(use_enable ssl crypto-openssl)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-10.3.1.ebuild b/app-text/qpdf/qpdf-10.3.1.ebuild
deleted file mode 100644
index e6c1b1772480..000000000000
--- a/app-text/qpdf/qpdf-10.3.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-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"
-IUSE="doc examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/gnutls:0=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		app-text/ghostscript-gpl[tiff(+)]
-		media-libs/tiff
-		sys-apps/diffutils
-	)
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-implicit-crypto
-		--enable-crypto-gnutls
-		--enable-crypto-native
-		--with-default-crypto=gnutls
-		--disable-static
-		$(use_enable ssl crypto-openssl)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-10.5.0.ebuild b/app-text/qpdf/qpdf-10.5.0.ebuild
new file mode 100644
index 000000000000..d83ec13d06ca
--- /dev/null
+++ b/app-text/qpdf/qpdf-10.5.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+SRC_URI+=" doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# subslot = libqpdf soname version
+SLOT="0/28"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples gnutls ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+BDEPEND="dev-lang/perl
+	doc? ( app-arch/unzip )"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+	local myeconfargs=(
+		--disable-check-autofiles
+
+		--disable-implicit-crypto
+		--enable-crypto-native
+
+		--disable-oss-fuzz
+		$(use_enable test test-compare-images)
+	)
+
+	if use ssl ; then
+		local crypto_provider=openssl
+
+		if use gnutls ; then
+			crypto_provider=gnutls
+		fi
+
+		myeconfargs+=(
+			--with-default-crypto=${crypto_provider}
+			--enable-crypto-${crypto_provider}
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docompress -x /usr/share/doc/${PF}/singlehtml
+		dodoc -r "${WORKDIR}"/${P}-doc/.
+
+	fi
+
+	if use examples ; then
+		dobin $(find examples/build/.libs -maxdepth 1 -type f -executable || die)
+	fi
+
+	# Completions
+	dobashcomp completions/bash/qpdf
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_qpdf
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/ronn-ng/Manifest b/app-text/ronn-ng/Manifest
index 4f4b324eb4df..86fcb836f71b 100644
--- a/app-text/ronn-ng/Manifest
+++ b/app-text/ronn-ng/Manifest
@@ -1,3 +1,4 @@
 DIST ronn-ng-0.9.1.gem 69120 BLAKE2B 9da30156104ef448c458199ee33fb5369f7d97c7bbeac8072567127b964456a34226bcc15f72d6f2875f524175d31ec9652a282b369e818748790cd07f290786 SHA512 5ad7dc426d9bc77bca86fbb06775a3b19f1b8d79f5a4331d117e9fa394e7a9c3b0440b70b993672d77a24f56f5da3ebd0e41a5183f4330707b7ddb83c9108bdf
-EBUILD ronn-ng-0.9.1.ebuild 845 BLAKE2B 672a55a4477766ff9f0be7f14be73177a662f1be85413d5cc248af76d2279dbb7f0e602f19a6e212b27f8750e780c7afcca5b8b57e8b0bd195d96901c2733607 SHA512 b8e69d1f37e88d6f8d5aa77609db3a515da19d79c47c846087cd63b67863e6c7bdbd63ebdc59ffb521e3dbeecd4b1f3490c4270782d21fb6385d7be256a8caf8
+EBUILD ronn-ng-0.9.1-r1.ebuild 1017 BLAKE2B 6f9271362d8000e7a6cb7a97de947758e9a134b3f20d6c4e7aad011d0a83efa54534465d94f02fe11fae3c8c2aec633df90a856d63de98ff770bbe491cfd8225 SHA512 724a4c53fb5e74ee5633133a33bf984f43fab69e4b369d75819d01c9a8004cfd2bdf878784ca5e46016f81035f6b22d496797b8edbcc136534ef510027f1ce94
+EBUILD ronn-ng-0.9.1.ebuild 852 BLAKE2B 3c22d8d513af265b6a326b51a639bce5c1b3d09d42eb737198f42826eb89849a9a2dd108d07f2aca4f9a09a398b66efa088e8a8be165ec3575b5ba5047eae12b SHA512 61f5761f3080b120e353d5f4a025783ba51fade9739af437b392331ad626e02c37d505c854a928ae9d685653bcec9cdf78317cd2e6eb47bcdb4193fcde352864
 MISC metadata.xml 342 BLAKE2B 71ab5a2d2a9e2d20165f54c1cf79f483768c3637cc87a32acf80708d79b3be9d24408a330ed23ad837848933b0a40f1165f60d7b7e08146a28088a4d9d558630 SHA512 92e6778f8a2f44a81dfdbbd6699ce2186cc48b801f5c462c99b4bc35f79806ff154d72bec2916d79dc7435c1a9b75f2bf3842b7dba2b132335afc38d00d22780
diff --git a/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..421aa12c568d
--- /dev/null
+++ b/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
+RUBY_FAKEGEM_GEMSPEC="ronn-ng.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Builds manuals in HTML and Unix man page format from Markdown"
+HOMEPAGE="https://github.com/apjanke/ronn-ng"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+
+IUSE=""
+
+RDEPEND+="!app-text/ronn"
+
+DEPS="
+	>=dev-ruby/kramdown-2.1:2
+	>=dev-ruby/nokogiri-1.9.0:0
+"
+
+ruby_add_rdepend "
+	=dev-ruby/mustache-1*
+	${DEPS}
+"
+
+ruby_add_bdepend "${DEPS}"
+
+all_ruby_prepare() {
+	sed -i -e '/mustache/ s/0.7/1.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	# Make sure that we always use the right interpreter during tests.
+	sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb
+}
+
+all_ruby_compile() {
+	PATH="${S}/bin:${PATH}" rake man || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/ronn.1 man/ronn-format.7
+}
diff --git a/app-text/ronn-ng/ronn-ng-0.9.1.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1.ebuild
index c35f4ad46bfc..4858edf7a04f 100644
--- a/app-text/ronn-ng/ronn-ng-0.9.1.ebuild
+++ b/app-text/ronn-ng/ronn-ng-0.9.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/apjanke/ronn-ng"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
 
 IUSE=""
 
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 8f3a45ac7f1e..ef098e18c731 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -2,5 +2,5 @@ AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538
 DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
 DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed
 EBUILD t1utils-1.41-r2.ebuild 647 BLAKE2B af44e224f01fe627267a3b5a5054a4ea6cd22dd602a4d6091db1eac73da73ed8b911609b67a35e6469b7cdd7132ef56eda107a6254cc53f7bcfda22b2faed394 SHA512 49bbd7b7fc14ceb3583d3b4277d0e225a883b0873b69c159e709cea02236c6f5c82a2cb26668d2d92cd76a67ee98640ff3826c4686f1485f00e308cf26f6b4c0
-EBUILD t1utils-1.42.ebuild 549 BLAKE2B d42ce3a0897c058dc98bd9f87273bfb77b6dd1c3001e8bb6a076a885b5a484d2e4d8144b2f37538c612fed05a5ff13e5158bb2cfb23bcde7b49dcf386757a68a SHA512 56cc9ed4d59aa0f8b31e1d7f54770119764dd248a975b666c72196830c64fbe82f4b8acbed1e855bc56ec9b752dcf8d0b83c32db9fd3cddb5547ed262760781b
+EBUILD t1utils-1.42.ebuild 542 BLAKE2B 78c6a5a00b3b177744434ba10111082b46ebd8e136a89d9ddd56a888a9f9d586180ba7fc316cab810c21036755663072d482cd7ae789b263ece81873b6bd73cf SHA512 2de00f97e597e2c1aa7bb89db448381d5155b178c01dd781e60db94bb6da88e3b66573c1e76b37745b04d615f63b082d9b2d0b70bff8511928e17f6395a5c197
 MISC metadata.xml 348 BLAKE2B 6bfc533631d2566e3ee69cd2984da33fc89afe690b4501ed2a1e40b8f961fde4e9049f67a3a32de0cfb54fccae798f29c24f86c3d57854ddfa904bacc275d702 SHA512 b329f25a743f60cacddf37ab7ec8c22cc64a2bf06c02f3115e46a80974a761e456d8ded059e8a8ec09abcd8653a16e6fd81fcf2af7d11f3c479716d69f556fbc
diff --git a/app-text/t1utils/t1utils-1.42.ebuild b/app-text/t1utils/t1utils-1.42.ebuild
index 896f2c6e4720..ed755ef48db8 100644
--- a/app-text/t1utils/t1utils-1.42.ebuild
+++ b/app-text/t1utils/t1utils-1.42.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 7548c4513138..67e38a282edf 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2021.ebuild 6695 BLAKE2B 7c51c81d0a867a1cb1b1f8728517dc126a7cb2e22d8accba9b69630fded11a36c1cd1a766e0d47a2e7f71d8e1092c1c92eb0649290cbc4499724cb13e36b2814 SHA512 356243730d79a5b12140d0cf132e9ec63ab4f6dcc645b58acd344360bdbd3c988c3daa405fd19f376fa1cc3a29ec158728949eef5d9752c40d9307a85f19e549
+EBUILD texlive-2021.ebuild 6694 BLAKE2B 442ec2bb4972a334de9a7846dfc602a9e06b8ce826d2122720a44ac5408c5e5f54dca207f7613cbc260b329e77fcae2102d7dc6ab31e418065c57d6ef88d8c6f SHA512 cb2471d03efffbe078fa727169d4481f2767fb90acee50060d3f8dfa7823b17fd7ba8d8fbc2dbd3876601b0c717d861fb9100120310b3e45309a822e59f06cbb
 MISC metadata.xml 1819 BLAKE2B ba20856f6096e3604b837e0c8927454d472479698b14fa1e529360f08b654e40e8a8c2afe39693fe77c51ccabc331e402eb26439d8fd858c236b411f66dcc1a4 SHA512 4bd20e6a92bd2684bbcf012f0a13e2fc7b2b9a70e328b59375b2d1e4b86b289f3eed40533162559e01d2c9f98c04472f750066dcbd3e07ee1cea186b534f58ad
diff --git a/app-text/texlive/texlive-2021.ebuild b/app-text/texlive/texlive-2021.ebuild
index b1eedb0fe042..0e5a1a02a93b 100644
--- a/app-text/texlive/texlive-2021.ebuild
+++ b/app-text/texlive/texlive-2021.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X"
 
 LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
diff --git a/app-text/tkman/Manifest b/app-text/tkman/Manifest
index 366ce807c81f..0dfe39a63d15 100644
--- a/app-text/tkman/Manifest
+++ b/app-text/tkman/Manifest
@@ -2,6 +2,5 @@ AUX tkman-2.2-gentoo.diff 2321 BLAKE2B 5ea163cd50fbf1f2b30aa9e009a350d3c6df4fc0a
 AUX tkman-CVE-2008-5137.diff 11645 BLAKE2B 4d628679de1bfad459badbe4fa610c316871b801e01438f52e6c1c3906e325b752dc3de8f5556fb6f9cab7ed83908aee7bc341ccf6700d29f81fdf334be31012 SHA512 60c65badeaa93d5e032117152905bd3c06985d7694fdec8c9ef9d0816446a865c45a1a4e7ac2dffc8eaf76163514de30663b2185fe6ba8e27a2cf9276aa09f4f
 AUX tkman.desktop 149 BLAKE2B 20e07ce0d89b6887329c47cf1d134466855118a24e6fe2f800ec678a0823824ab9a9f55c4d13d349d7f178654de8449463cc641b243e1ac56536b9b03f92b1e8 SHA512 d73c6ca978f0538c1b02f321cc4f45eec496c3e978229fc7eb373190d447c4d0c7639d0eaf8a3b7cc22d569e6a9088dd8371799874b41b13bb758c75369e572b
 DIST tkman-2.2.tar.gz 229273 BLAKE2B 3015ce0ecb224f1c01e1513cff1a55d3a95362753436a981630f7133c56a8b8f03030d5d368cb4a5a631ecfb2f0f9afbdec37a2d5b0e9fe74add82142172ca06 SHA512 31adaa4017282a6e6fba18a5f72c07c7d7d3bc63ef043b214bf68ec4837c73d4e0679d8b7513b0bae3984e1737e797ca886e15150b2e1a9cd288bbd7491a8777
-EBUILD tkman-2.2-r1.ebuild 759 BLAKE2B 1b969319ff642d668864571368d5cd3298340d049882fcf66fc6166cbfc1caf8acbce4430a43edb14d043bd288d33e407d9a2498ede4d3fb8b4bc8abad341675 SHA512 e3a906ed3b41a1d20c045ee3104735443aec235555ded446ead4239cdf30b863d9a4b9d3b5edb4d358b695da83cc7135cf57c983a6e4f8411c5c36ff5583bc45
-EBUILD tkman-2.2-r2.ebuild 760 BLAKE2B ae657c8ec9d11c68138ca08b860e7a74524234d2227dd8dd1b96c32e341b0d1559db54640a6dd1a1f2f41ee2b2a1db53f1e18f38e040c8ad58ae3b45cf982cd4 SHA512 6966da8aa82015a198802327d64f660450fcb35e8f7ddecbad18f2e3cc1b5fdc6955d78f377457fab7f767ded7855d5326eb7d2344c670c8ad723e047f2965e1
+EBUILD tkman-2.2-r2.ebuild 757 BLAKE2B 0604af632ca47e04e1f3f46b1f24b621a6b1f13af74ccf68375e93534f0e746b647acd1f53776044b7aa262896b546d3cb26ca65482d8ad34333f1f8c6ed5123 SHA512 d1c7e0b6b5b3dab64dda587a11c85f5df89dc11a7cbaf2a04cb881ec49b64f5f7744afa48ae8ab360af798f35eaf2bf63a2495403fa8f949a62190ce0f95e8b3
 MISC metadata.xml 243 BLAKE2B 2307a4532e529127018ad864fee582691b7f866ebb493b0804fdc586e56e2325f79cd6ce93ff781c9741c60f9e8fd19b896833fad36bf686bd0b7c9727593977 SHA512 f591a0cb9455271d0056a2407da505db0306a56019549b0101a412e822d0b531f1d4ea39ca53b4b7ab9b2ccc500113c752e50665a72ddf9aa68fbc4c492abeb9
diff --git a/app-text/tkman/tkman-2.2-r1.ebuild b/app-text/tkman/tkman-2.2-r1.ebuild
deleted file mode 100644
index 818ec72240da..000000000000
--- a/app-text/tkman/tkman-2.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit desktop epatch
-
-DESCRIPTION="TkMan man and info page browser"
-HOMEPAGE="http://tkman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="
-	>=app-text/rman-3.1
-	>=dev-lang/tcl-8.4:0
-	>=dev-lang/tk-8.4:0
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.2-gentoo.diff \
-		"${FILESDIR}"/${PN}-CVE-2008-5137.diff #bug 247540
-}
-
-src_install() {
-	local DOCS=( ANNOUNCE-tkman.txt CHANGES README-tkman )
-	local HTML_DOCS=( manual.html )
-
-	dodir /usr/bin
-	default
-
-	doicon contrib/TkMan.gif
-
-	domenu "${FILESDIR}"/tkman.desktop
-}
diff --git a/app-text/tkman/tkman-2.2-r2.ebuild b/app-text/tkman/tkman-2.2-r2.ebuild
index 6db7c4e92700..6efcee2408f7 100644
--- a/app-text/tkman/tkman-2.2-r2.ebuild
+++ b/app-text/tkman/tkman-2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc x86"
 
 DEPEND="
 	>=app-text/rman-3.1
diff --git a/app-text/unac/Manifest b/app-text/unac/Manifest
index 799f1f50280a..dd5766787c3c 100644
--- a/app-text/unac/Manifest
+++ b/app-text/unac/Manifest
@@ -1,5 +1,5 @@
 AUX unac-1.8.0-automake-1.13.1.patch 950 BLAKE2B 41be5811b494475d0927f6dc8a3581a4f39d15c6bd315921674e8653c0c87bf07b85e9d72c6ef3cae6463852a78b5f084b4a193ec1412369a818b04737f57f2e SHA512 f6f29885b937b4e3dc21379e1e5d81229de9f1a400d24f3ea83a8cd06db822b0dc7bb8fb1dbfce27aac6d2b83834fe7fe15cdbfabfb6d82ee6311079fe7807f5
 AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1204 BLAKE2B 8014d5cf159b64c3898f3356ea8dd5393d4288c352c660b75d847a8323eb4425b02ab3f466864424405011e6587334a1e5f006588b563a1666b53b0e5f256359 SHA512 a4379869ea0035640905fd592085a48a6d23e3ae958044f606129e589348d5244cd3b6b161a22b8b5867588aeb60cc3f90ea93ed38ea1c90039928e4126fd29b
 DIST unac_1.8.0.orig.tar.gz 281807 BLAKE2B 1c566d75eef70b37cc6e8d4840d5712783ec01e2cf6ed5dc39a10b5da2af2c35928b62a1e6592bae1bb21682c3a0410582158661b4989f0ecbea80220bd256d9 SHA512 770508daabe7f1cf2fdd2c7cb0f88ed6363a091320547e1f5cafc32db6506c18548be98f6c5780757f3dc914c372a27a336865a0cd92c0a5503245fbb25ca3c8
-EBUILD unac-1.8.0.ebuild 871 BLAKE2B 627be94cdb06181a94ee9c20e79148166fc6ccaa3f11474fd363ef3078ece81847daaebbbfafc59f24fcc2b60e6c20dfe3262b636dfa3bebb991952a5d83cea8 SHA512 184196d1e2af662f28e055921bebc0c8ddfc42d5fd072c1c0322ed99ff3312379269ebeadb755c36a5ce35403819d973d20f3bd36a3419e973298bb622718ae6
+EBUILD unac-1.8.0.ebuild 878 BLAKE2B 18f1693f113d0ae1ea6a4264690a45d7d45e3202902b4e194ef15d653af0080e1a75fa9ba2804c943b1bd4c2e22ed99c7ce313f7b79838325d837ab79f6c8e03 SHA512 0fac6760bc9093d31743d9d940951806564b4a40979dc1f83c1d09be2002eb7ceaccb14294301e44f1a08265696b5bccca16c8f73c4f78f834cc7b2ce330cb86
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/unac/unac-1.8.0.ebuild b/app-text/unac/unac-1.8.0.ebuild
index fee2c8d8d145..7915104bafe9 100644
--- a/app-text/unac/unac-1.8.0.ebuild
+++ b/app-text/unac/unac-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/u/unac/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 6b926cc149e2..59235dbf3fc3 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,4 +1,4 @@
 AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
 DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
-EBUILD wv-1.2.9-r2.ebuild 1457 BLAKE2B a94094b2c97a3882ba8d7d1758e8f8257ed105e8fc1149217108d14549c768942923cb4c781a9606bdfb16fe10f5c51d60283974d0d7b38a575167144a4c4332 SHA512 1c4dca445af2a0c2aaf8e4e3f5e12106e1d948e22622d080321c596216607e846dc2ba9c9da51d2de1ce1ea1784b83e52f2ed855d1f43f496142979d175846a7
+EBUILD wv-1.2.9-r2.ebuild 1464 BLAKE2B 482ccc5284fed69a53a781b6762b7061a7c29f258f82bfbadf9c6a3a05ed9d420209943fc331035c36b3652a6aa98d47f0069b7bfafe49a01f3c26328940e4c7 SHA512 b3e5db6849fd40308567c08d22d9e2913e8369af3bfc7a323ed41143163fce7dc264b23b0ff4d528361665d2f54ca2fb6cb1764a97e9143b5a5611f6fb9eac91
 MISC metadata.xml 449 BLAKE2B ac74f5a8ee805072c669569b336f99840bd4a868aaedca72764c516040444b3c216bb33d9369d020d46394add0de746597c33c43c6466be4e672c2c017eec390 SHA512 bb4871f0e9a9801aeac5660b82c480d42a62d0d06641a085887d7359aace546b10071d09e92f730d1958aaee9444752723aa5d05fe9417842413b92270bdd174
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
index 4c6e750d78d5..a587d0bffd5f 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://wvware.sourceforge.net/"
 
 IUSE="tools wmf"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index ded86cbd6e22..128faca5bfc8 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,5 +1,5 @@
 AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r3.ebuild 2906 BLAKE2B 76b622e4f73fb0bb510950bd78e53369d6fd1792aaecc4f86710daa00039122de35a8c2e69ff6543004e8ef9a6ff1f195061c49722ab6f2f86b29a6b01b686c5 SHA512 ce04d1adbc8e0dec5db0b0127ebe99bfaefef931c28d66c0512feca66c04b6934e46fdc547fd2ae6229ba9cae4e31834a1d33f56cd02736d22e2ef58a41bbc0f
+EBUILD xdvik-22.87.03-r3.ebuild 2905 BLAKE2B d3534e59c513372e72eaf48ed34b09b89542688deab3d03a22bbae30c45b991dd91a9fdcdc728a34ac1c0ff23572810e78731636893821d4aa779226f67205f4 SHA512 f871231eb081e65bf03dfcbdc9c09cc561a74074a806477132d5cd1ffff37fbc70aa62bfb15eba6978a49449ee78e5ba05d45ef5e20070ce23f0089478ffa989
 MISC metadata.xml 595 BLAKE2B 200debd0214e5985f3f59cabdac72252b556edef5224c77f5dbd91de347f57ab492dd0f7ce846c335179344bc9215b02af61572ff859c9c44ca947235ce5062b SHA512 bf925b9c9738c62f26ebbb2f88782597d6cee471a19258b553e0dc7aa397443149adfceba6cfcdd045196eecc3319541b980850ba5e572f51266da1945b65e4a
diff --git a/app-text/xdvik/xdvik-22.87.03-r3.ebuild b/app-text/xdvik/xdvik-22.87.03-r3.ebuild
index 113fe335056c..6ae5639b5531 100644
--- a/app-text/xdvik/xdvik-22.87.03-r3.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 99c402265a41..aedbd89297a8 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,8 +1,8 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
 AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22
-AUX xmlto-0.0.28-dont-hardcode-paths.patch 782 BLAKE2B 400e85b97d2683943279b2f88f87cd3074f575376a69ca068d29b35cce266351847f267b4039a640bf8c2aafca39b48dc0cfd997db6e1ed64b847524d117e25a SHA512 f621d70836db82e300473679d7a5f88e13886273de48d87a8e77b790641d0142e7cde02fd5fd3e5f37d363fe93000025ac3d7df6991b9c151f5700769ccd9da6
+AUX xmlto-0.0.28-dont-hardcode-paths.patch 845 BLAKE2B 37618989b609bc7dd2d94d22fad0562d6e0580541d8f6ec2a222316da89a6744a16cac9b4cd446ef80f58cf415f4a784aefedf53349ea85e98cf33000b7799b6 SHA512 9947787a1c3ebbd0a73e271ebab3dfcd01b7aad3bcaa627e7a236947bc7edbc23696c38f96aae62785013e2ac8c5171ce6f386f655676a4cde8d820f49d5df7d
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.28-r3.ebuild 1422 BLAKE2B 82f75b7468184f59b6b7edbecf2b9a9a06daf91c61f163f0c6501ea5ebb1cec4922d309f4bfb5962ec7192035dc9daa887aa967a1f46e88f390f478ea5565091 SHA512 88c76795131133792a8de0591b183682418e7c670b347276eab3bfc7f1c966d980d9d48de407bc0de746aa7ac5e0371bea5bb149c9a302984de042ed79a674f6
 EBUILD xmlto-0.0.28-r6.ebuild 1434 BLAKE2B 0d9830777786cdad0b056f0f9e4b3c60d7dae2c5fa89bcd90e81d9b0e7a538523f5ee918f7944c18179bad04a0eaf581c1bc4f83e40f02856e70fb89c3282987 SHA512 e6e3c76f5a90e308f29f2a2b4cf61f3d5462322c92a6537be718b73e007e5b2ab92d501d4be72580feb4da8a14ba1f75e0bfcb62b3d1f4856e305202b49e7ea5
-EBUILD xmlto-0.0.28-r7.ebuild 1496 BLAKE2B 1169a22eb7e73831633e5cf73817a95c05b214cbfc846570392ce98e089fbacbe1c87f9383a39bb8f5e1981b08df7627ddac43095d6157e5f423fb5482721f9e SHA512 4cf19496ccf9ff462da5547d2df92edd80dde84c409ac594dc2187068c150cf7d074ebe84ba88b823e71f5c10e1208632a21061a7a9d545e9a9a62b3f135d0b8
+EBUILD xmlto-0.0.28-r8.ebuild 1496 BLAKE2B 1169a22eb7e73831633e5cf73817a95c05b214cbfc846570392ce98e089fbacbe1c87f9383a39bb8f5e1981b08df7627ddac43095d6157e5f423fb5482721f9e SHA512 4cf19496ccf9ff462da5547d2df92edd80dde84c409ac594dc2187068c150cf7d074ebe84ba88b823e71f5c10e1208632a21061a7a9d545e9a9a62b3f135d0b8
 MISC metadata.xml 324 BLAKE2B 3cabb2600d6843ebecec023a16fef87a40432202ff195a6130e57f97802d4c0ed2e82ffee506c65afe554291f05c64c7ae2fe524c708db7a9c6bf4a71c4c8710 SHA512 19ed2fabc04f96b1b61495e2fdba674ca4b4a9a1cee11b3cb13baec6d9e7fe0d82b653a0cbb523de3fcd4ed1ef18d8111686f8b618db9924674ee274ae5a21ed
diff --git a/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch
index 5823b7350749..7137966b27d2 100644
--- a/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch
+++ b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch
@@ -1,3 +1,5 @@
+(See https://bugs.gentoo.org/828520 too)
+
 From: Sam James <sam@gentoo.org>
 Date: Wed, 10 Nov 2021 04:53:33 +0000
 Subject: [PATCH] Don't hardcode paths to utilities
@@ -20,7 +22,7 @@ this package is fragile enough. Leaving it for now.
 -SED_PATH=@SED@
 -GREP_PATH=@GREP@
 -ZIP_PATH=@ZIP@
-+LINKS_PATH=$(command -v links)
++LINKS_PATH=$(command -v elinks || command -v links)
 +W3M_PATH=$(command -v w3m)
 +LYNX_PATH=$(command -v lynx)
 +GCP_PATH=$(command -v cp)
diff --git a/app-text/xmlto/xmlto-0.0.28-r7.ebuild b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
index c54987d45d2f..c54987d45d2f 100644
--- a/app-text/xmlto/xmlto-0.0.28-r7.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 3d8ad36446f4..84b4ddc274ab 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-tools-40.0.tar.xz 38708 BLAKE2B d9533fefc6a9416ed6f887971db62a7db6baed4f65aaf1e03d20c98fa23efb3af9f10189af0284bde3837f58f662f4ca4be8275d597a7c799a14585c87e6ec10 SHA512 b89e514cdc2c6ff96097af0cab5694e9f1dfd2a125e08f99a69c0e7dd51e1e1a859c2e6eec656ecea6103bfc65733e1256a77ef992454db4a554567b46fa2628
+DIST yelp-tools-41.0.tar.xz 38696 BLAKE2B 6e742e0a5c05c07fb3eb80fc10201650597fb36702edb1d9fc022895daf2837daed15a2b69b8bed7aaf0106139c7138e8f13b65b63cf18971e14eaeb0068b061 SHA512 76b8f9568942426698716d655bc2e7a614a26e40a820d1f4ce5021a54c6baa081d494bda06657cfc1c11999e14a8601c97ae51bb3519555b8ee1111489c0e10e
 EBUILD yelp-tools-40.0.ebuild 938 BLAKE2B 72ba4da0112a0d1d13e720332060301b315576315977fc03038f41908fea2c4a515e2dd7e5d4d475c6d23a3154ead23c72dcdd844f1688acbe89fed419a4adbc SHA512 1032d3a2b1a705bac569c14561caaa60a92afa306453b9772871c45277234c4c983f33bce75e432be9ec884938da7c1d27a46c490d965087ab8ebd856cee25eb
+EBUILD yelp-tools-41.0.ebuild 945 BLAKE2B 3ca6b1c1c0ba50745f8fbcb0202409ac1c01029a5e2253fdbc4b91b1b618232e114141a8e48f8e18961efce99fd33c14bdcdf8a5a4a2e1e682b277bafe5f9503 SHA512 298ef364d6569e4fde1f56a58cf335f681800997d9e8f602fca6e462c712c196d16efe0f0e1c1ba664799cd330011a716998683a3c0cf3ff8751b7f9bfc7bb12
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/yelp-tools/yelp-tools-41.0.ebuild b/app-text/yelp-tools/yelp-tools-41.0.ebuild
new file mode 100644
index 000000000000..5ecbd011540a
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-41.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+inherit gnome2 meson python-single-r1
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	>=gnome-extra/yelp-xsl-3.38
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/yelp-{build,check,new}
+}
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 7eeffdb203e6..1394dcb070c2 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-pdf-mupdf-0.3.6.tar.gz 8925 BLAKE2B ee74a1655da7d16070b8909dd0f44239eb21055a40a525b766dc3d9e81f84377abe0623ba33925a25739bccf885f8967496be30c27e421d30b1a78dd64b84aee SHA512 f6783c3fc08849d7dc6fd527b7fcdb51d4ef9214379ca6b4dc6d29e75b10f37e3ada2046e205449a7d0465f07e65a6cf3f2f44fba98360cba16676e705390a97
+DIST zathura-pdf-mupdf-0.3.7.tar.gz 8957 BLAKE2B e25412423ba8ec7c9c96d320129f9a3e71a974a118476f2720a356a0c51476f7c827d16b4fbb00d4cebcd803e75ff34b5e7d5c024db57fae17861c137487e021 SHA512 1e27bcf0fc2eb730e77d3dab7c25575e0ae830ca251f380d740a4b8bef588122d279b2c97a7b75fb749daaf24bb458cd54ec7a11321d75bfb5c1b4b0dc0fccac
 EBUILD zathura-pdf-mupdf-0.3.6.ebuild 820 BLAKE2B 8b7e4971575be372a30c98a8fbd348e3df257adcc1e4e2a02a0c09d8c3967e3e7c6c352fb98c239aff269eddbd765f6fce0e0995ef07f8b6fc56bcd4851a8cb8 SHA512 866df18c6496c891994782243fcea2fbd3301042e12f1cdb1358fe7195e30fa23e469ec462c604ad27250f235ff4833ec65664cfc571f0751b507b790d6ef4b6
-EBUILD zathura-pdf-mupdf-9999.ebuild 823 BLAKE2B ed4be465381eb7313c35873f9d479b3119c49b9175744511349b5345d6f6fba1ec2f341f05b0e5679eca91bed6f2b2a6d146706e25cfdc45caa894a312b07ba3 SHA512 2314179fdeac75c52412d950e449a5edaed5d3846d56e35c775086d17aa572fa53c25032b6251664422351618f920f909846ae4ef705fa06c06b5469ecfa8d30
-MISC metadata.xml 593 BLAKE2B eae144f33be25a2df391b571e1e10131b6a3ffedd8d9a5601557b514e5cc4f3fa55d8eca9a7eb4403e64a9786b0c8d6a5da1a551c6fa129bc617172407955d72 SHA512 0dca4273a6058d7650376a15023fa1df80213aa60a6159858428a35ace693be853b463c74d12f8135a02b22069e8014a1e61c474b8c388ea3e69b199aec0f585
+EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 791 BLAKE2B 1c404c508b0dc647056799051ca1eebee5e340f8031f306fe9bbfe08dd5d9719532eb4dc5e22ab5659001d90860488f1b14ceceb35175c5c44056314a6f94032 SHA512 376fd36b73f1fcaeec6e72cabef9f2b7afb646a6b27262b6b2ab360502e55ac195ee9d4d8a8461ea24953304ab458093e49522ec48ae76b55343a9b7b09d82da
+EBUILD zathura-pdf-mupdf-9999.ebuild 791 BLAKE2B 1c404c508b0dc647056799051ca1eebee5e340f8031f306fe9bbfe08dd5d9719532eb4dc5e22ab5659001d90860488f1b14ceceb35175c5c44056314a6f94032 SHA512 376fd36b73f1fcaeec6e72cabef9f2b7afb646a6b27262b6b2ab360502e55ac195ee9d4d8a8461ea24953304ab458093e49522ec48ae76b55343a9b7b09d82da
+MISC metadata.xml 830 BLAKE2B fbae9ee1ad786f6defe68a52311be5334c0699a67aaddb17ee4e1d09df395f01ab7484dfe370e269ed0c52f0af94e7493d6a535eda1ed6696f50aba81ec55337 SHA512 5692ec06aef6fbff3cb481c2b3706601c0dfea1c61e570cb9077548a9b48627a3c2fd85a2a6993ef10046adca3edcbabf67fec524dcbd29a10ca09d09a4e9150
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index 18a11cea9c40..90a532bc0a5f 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
new file mode 100644
index 000000000000..35451c79f998
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND=">=app-text/mupdf-1.17:=
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
+
+	default
+}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index f3f90d3b0870..35451c79f998 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
@@ -24,9 +24,6 @@ DEPEND=">=app-text/mupdf-1.17:=
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
-	media-libs/jbig2dec:=
-	media-libs/openjpeg:2=
-	virtual/jpeg:0
 	x11-libs/cairo"
 
 RDEPEND="${DEPEND}"
@@ -34,7 +31,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
+	sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
 
 	default
 }
author	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
commit	93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree	b9791a06ab3284e27b568412c59316c66240c682 /app-text
parent	2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)