gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /app-text
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
97 files changed, 838 insertions, 2241 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 7e245481115b..b7cdf2082ead 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
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.shlomifish.org/open-source/projects/docmake/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~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 b54999d722cb..b9b816c6d3a0 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 582 BLAKE2B 7e174eb68acd82d36e1cc4cc9bfe646e19c74d864bb95174fcce310b3185ada68a53103f703cdf3439875a7e0ba12ab7bc75fcb22007d3185ed7afa62cfa23fe SHA512 74ca5c7e211a33eb35e7a4ba08bc55621d068ee318d78f9a53dccbc59ab9e8757c1189a01447cff56e9c0df4e9b987169de085abc99f466d986af607fcf5942f
+EBUILD App-XML-DocBook-Builder-0.100.300-r1.ebuild 594 BLAKE2B 7a769cb00bcc11dae9c83aded3cf588e399ad63c3040e7c1585017de6cfe24afb13bfed79fee447fd557674f6751f6a0c29544ef339c844fa9453eefaf25a9a8 SHA512 6c70262a35de8cc8b8410964de98f4cf5a6e21205010e1cc27e5bd409b659ee27a2cb94f2713bcc64db8f2045117c4501d933d06cae679143ea54d055d3f586a
 MISC metadata.xml 375 BLAKE2B 7b6956381a455fffbe920a0706a91819fd70eac409a10a32c7c609a85dfef6bf97a64d2781dcac0bb624fa64be2b56b8f1e2f2dc9d42b728c019e514839f6492 SHA512 dd707b431ec91e6cb9da5dc0e2b21937739e480d0e3f2fb42f8236d7f9c1bbe1f8e2f3d95b506c49c3a982b4769eb441eb306310b82cb425a4550b51728f6a1c
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 57f4dd795239..52dfca186322 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index d733528930f2..9f96feb71acf 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,3 @@
 DIST ansifilter-2.18.tar.bz2 436432 BLAKE2B 43c592e83a967ee86404332a464d57d202a73651b2e29da2d1d21163d295b6efba96ecb5861dacfa89b8f567c0367f7a32b8e658f8cefad82c5982f2f2bf70bb SHA512 ef7febed1fc31f5c7503648e4fc0a7aefc3da8e30ea649bd6f03eac2904667fb779049106ccb77ad16fbf655e979f6651b25b84ab126c940c66bedee115a28e2
-EBUILD ansifilter-2.18.ebuild 1130 BLAKE2B fe6ab59e81234ee1e4ba83c63ffac4389a45513c76e6be10fce8b9cce9554d8ae7ba7541e65ebfc85ff88dde5fb993c9ccd9ae2b80a9fdc63fc6480369934c37 SHA512 beea8f1cf9c5f670ecaf548fb31c6277eccb55cc0f12f3384a4062c27ebb1a47d91977ad8d3a1eb8ef749115c788ad493c1c1e7d9013a24461fdcf879771c9c8
+EBUILD ansifilter-2.18.ebuild 1129 BLAKE2B 269f9616cb0092cf02bb95b40e6b06e8b5ae03142ce7d1782801f0be3036571141791d9c224217e07d1c1e716ed2b9901f989f8b1f27afc6365d27f607e15a4d SHA512 0dbc53979d988ca1fefb3fe811290dbfcf94b8000dbd30db2f98321e5ed7a0eff7395d766d2aa2bd9118ceec545171fd2e55e5fd6032ddc728ecc5cbd9af1bc0
 MISC metadata.xml 222 BLAKE2B b5daf033ea46a708411a54d1b465effb557d4f48cef8f0f4b6872917da7e8efbc9b69db6e04f6331c7a27b473d1ea83e2bdf54247e7c6b427c94c492e62ef21d SHA512 52f592a4e8342cae9f7a982302b75c68af50523b23b4d8a13b5434b150d3c0e812ba66a13b8d5d093e59b64ccbb550640064aabd9748a200e63d170d0b6f327d
diff --git a/app-text/ansifilter/ansifilter-2.18.ebuild b/app-text/ansifilter/ansifilter-2.18.ebuild
index 1a9bac6deb2f..521a408a2afd 100644
--- a/app-text/ansifilter/ansifilter-2.18.ebuild
+++ b/app-text/ansifilter/ansifilter-2.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index 50414dd9daf8..5c26e056022b 100644
--- a/app-text/antiword/Manifest
+++ b/app-text/antiword/Manifest
@@ -2,5 +2,5 @@ AUX antiword-0.37-CVE-2014-8123.patch 528 BLAKE2B 612718b3af9f3e91b5b755401a124c
 DIST antiword-0.37.tar.gz 317884 BLAKE2B f47c815e2c6a1ddb33fefa33b3579fa5ba6e3900d3b9339350d28ebd0223853ad60ed717a1bccf4960c835427ebacc4de944548f9b354cd34889f0742de4e74a SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8
 DIST antiword-gentoo-patches-r2.tar.bz2 1747 BLAKE2B c01aa7c02539fb5148cb1ec01983a8406315bc3cb2f909118c022c2f218660919e6862582cda34dbd4c08a21beb02c928f685273853d1ff3350548957ae30cde SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe
 EBUILD antiword-0.37-r1.ebuild 1359 BLAKE2B 439002b6ce33a663b68c282770dbb3b43f86bb8e3255a8e15027c5a480f0642cfa71359be9628a5ca0a77520d1aa45ff337aa7c00902a77ed198941b0b06f6f5 SHA512 5ec8979802319c426e7899a56700bed2beecc656a5469b86f86cb353efe172cd221e0940f65457894b1af607b511459e947a02eb488b55ca27a8b2089df9e544
-EBUILD antiword-0.37-r2.ebuild 1336 BLAKE2B 5e7f7b96a93ee47c7114c46df7335327d4fcca53a1bb251179779fc08d80951cf5bce14c11ee0408f49dc91c6b176135acb6ecc409f5f0fe8e236a9a140c96f5 SHA512 f8dddea2b4b77cadd00c3a0fa38e63f79fe586a02f06596d1f755227758f041d2693ab8a55c9b2e1c0dce9295805059277ffa59b5dd0db8b8d0bd5d9b07189be
+EBUILD antiword-0.37-r2.ebuild 1331 BLAKE2B f42119acb912de393b39f19df9815b8b00a2fc2a808400e53f16939eb089e7e69ea901e73252782ca8cef6719afae2cc8f5c3a03ac5990215bc0ce1317cab4be SHA512 a0a417107e6c9443308aaf715f1f369b91dce63b1f32eae49a7cabd330ef5791bd16d2cd585fa29b8ea9bc87d3120cc2297aaccbc158ef404ab14a723e2e7190
 MISC metadata.xml 343 BLAKE2B 43a8dd808338ef2c570ac118c0600029bb805033af3f7e70d8b3afd7e9c685949c4b4e006e1c5bc51b72f9b8ab54104a0f9c731223d73dd5909f04a5bd964526 SHA512 184ff7031a9864c1ee3daa6c3714d148216f556fd112a62c1c2e352f3eef08bd6a1813dbb46dde3a163cc69f59f06ff99570460e4af1c2d4a31085b9aa7043ce
diff --git a/app-text/antiword/antiword-0.37-r2.ebuild b/app-text/antiword/antiword-0.37-r2.ebuild
index 1b0fc3a45055..4cad9bec11ef 100644
--- a/app-text/antiword/antiword-0.37-r2.ebuild
+++ b/app-text/antiword/antiword-0.37-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=(
 	"${WORKDIR}"/${PN}-gentoo-patches-${PATCHVER}
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 3fc051ea9c3e..d501e003d989 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
 DIST blogc-0.20.1.tar.xz 346280 BLAKE2B b2cf2c0ac0eaa857d91c75f7bcdf9e6b6ce0132e5a999719f9da3d32c7c336b8557f0e76b13ca02e6a20d67aef5cccedf01b3abe7b77dce6be612501d208eb8e SHA512 0e64e3da70ce52cec148210c140000b34cdafb848ae1fbd6160979de47738257a08af236e53e908f256d610ae6680bb554376c049246c32867b64985a637746c
-EBUILD blogc-0.20.1.ebuild 1089 BLAKE2B d1a12e1b7c38d34f68a97aa1726e54d31355ebc542cbf91569f682d9aae3c6bbca28cda392d8ee2f3428c62d4891ab20d0a56eaddad49565c5db86f08cd4e3f8 SHA512 c38ff5d064b78091378e2ecdcaef710c15365ad138c04f093f9357bfab51b4fc5e46da4bae79563c28ebd0df1503caea8ed07477b3c92faaf52bd5186afd13cb
-EBUILD blogc-9999.ebuild 1089 BLAKE2B d1a12e1b7c38d34f68a97aa1726e54d31355ebc542cbf91569f682d9aae3c6bbca28cda392d8ee2f3428c62d4891ab20d0a56eaddad49565c5db86f08cd4e3f8 SHA512 c38ff5d064b78091378e2ecdcaef710c15365ad138c04f093f9357bfab51b4fc5e46da4bae79563c28ebd0df1503caea8ed07477b3c92faaf52bd5186afd13cb
+EBUILD blogc-0.20.1.ebuild 1113 BLAKE2B ef3634ff1a904c723acf9f98608921c476d4ffd601cb4fa58e081342c3a3d4fcad319506478ae0b36909831c635fde4f0a4a255537a4f1911a1482adbee3d357 SHA512 94bfcda42d57b440e506b68d0ff4c91fd5ab2e3c7039ae1cc00993595195cec7514e8fa52916f0c642d4f6a103b69b0e53b046ba60b03c1684a051bcd0b8e7a6
+EBUILD blogc-9999.ebuild 1113 BLAKE2B ef3634ff1a904c723acf9f98608921c476d4ffd601cb4fa58e081342c3a3d4fcad319506478ae0b36909831c635fde4f0a4a255537a4f1911a1482adbee3d357 SHA512 94bfcda42d57b440e506b68d0ff4c91fd5ab2e3c7039ae1cc00993595195cec7514e8fa52916f0c642d4f6a103b69b0e53b046ba60b03c1684a051bcd0b8e7a6
 MISC metadata.xml 546 BLAKE2B 5c72bad470de7b6409cc55b31b51c086a193c67f906e4d791c40ad8c20078048e8f5f119af8ad9bbcd042df2acd216fd2f19d88350341cc02e811f95448acceb SHA512 e06439ca644d5800f1d17cae652b8cbe27c9bf64848ea13599983f300735ff7942d4819ca420ea071b17f7a2086609241926c699f76b26394ceaa78c3654484f
diff --git a/app-text/blogc/blogc-0.20.1.ebuild b/app-text/blogc/blogc-0.20.1.ebuild
index 75b899156927..166089083955 100644
--- a/app-text/blogc/blogc-0.20.1.ebuild
+++ b/app-text/blogc/blogc-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ else
 fi
 
 if [[ ${PV} = *9999* ]]; then
-	BDEPEND="app-text/ronn"
+	BDEPEND="|| ( app-text/ronn-ng app-text/ronn )"
 else
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild
index 75b899156927..166089083955 100644
--- a/app-text/blogc/blogc-9999.ebuild
+++ b/app-text/blogc/blogc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ else
 fi
 
 if [[ ${PV} = *9999* ]]; then
-	BDEPEND="app-text/ronn"
+	BDEPEND="|| ( app-text/ronn-ng app-text/ronn )"
 else
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index e37a9e691091..18d0bbe01f63 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
+DIST build-docbook-catalog-2.2.tar.bz2 4711 BLAKE2B c93f6c14450e9308dce82724c305846b1635e96470ecb72c240d502b6f7ed360ee013bf40e3cda204e784c034b8a522f6247b3dbc24fe92a9e12d0ca5c28acb7 SHA512 2e6895f8d3564dbef0dc4882448ee5f4457ac01c58be09e2939a364676a52f7d44899cab621101fb4a3161292d15d9df898e076e412ff50fb88d2861ca554b1e
 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.2.ebuild 1103 BLAKE2B 5606ec5dd620a1305d127e700af57f8a8f11fab69268ddceac69c164594dea42e462bdbffa14363eb5ce0fd07e136f8129175195c81a9615082898feb45deb2c SHA512 9d92c406f08ac02d0b352d6165909ae6a3ec1609ebc9196cfe5d29f3e6450edb336b3949953b4f2247789cf133948e2aab4a81e62ca54e4098af650b3009c421
 MISC metadata.xml 283 BLAKE2B 5cc7f34f6d2e2efcea07d91ed23d5f70a834c0d11b92ee45c27bab7296bd480fac2d27652f0ea4388e370014bafe490e8464eff4e3bb27fda67e20f568c1d92b SHA512 97de2993c7828c3585e4e97d62ac2a08146ae5a39051f825b38be1f657836603eb24ea8819bce7bf75cc71a349ad29f6d920876f20c1bb1cc88a78f9e5dfab66
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild
index 3deb1d96043e..c62da59add92 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,7 +33,5 @@ src_configure() {
 pkg_postinst() {
 	# New version -> regen files
 	# See bug #816303 for rationale behind die
-	# create directory if needed
-	mkdir -p "${EROOT}"/run/lock
-	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+	build-docbook-catalog || die "Failed to regenerate docbook catalog."
 }
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 38bc609c1aaf..0df2ef48f422 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,24 +2,15 @@ AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad7
 AUX calibre-5.16.1-zeroconf.patch 1457 BLAKE2B 104ba007fbb051cf07bf55fcc30f58469e989dc842a4a046c8e212a2f971b27c497346466a15b380080fd54cc8c561bdbad5bbaa5b1917d7f8a748bb289d1b2d SHA512 e15a2659f1663e77a80b9148180b0636228d483cef7395aa0e7a45eb41e57b541bc91c1a87ed1439e3a3e43a167882af5ce6d493e4723220c8665c1d1341e302
 AUX calibre-5.31.0-jxr-test.patch 943 BLAKE2B 39742add85bfb6abbc7d3a01b2018e6c47279ecc3e78d46f70c6e661b77304f2b739a5d44b9b106a0089559043691a3c751c020685abc53ba08a9a8b52fbc76e SHA512 aa1efc13bbbce430832ef20e41634c1f5d833544dc566d102314d80b4f3ce1fb838ca9916c559fcde4401531434bf2095647ee3dc79bcf87cddd56ddb9f347d9
 AUX calibre-5.31.0-qt-image-test.patch 691 BLAKE2B b0eb6e3a5f74277b967d2002ad1090107a4a131fa2c1107fdb9ea0ca8593e7872e73a4c6d657670b5de1a1296567fa87f5a891514e379b83925a8d0c55154bdc SHA512 29a86e8416eff1f47f49790472480ebf6dc4c0dc771d045b0c3ea632e0df6d05f5fe23adac9510135b944757dc84c1f96cae55ef4860dc68bd68ee6a3ab3902b
+AUX calibre-5.35.0-jxr-test.patch 827 BLAKE2B 0a94ac5b12ee2ec732d3ff68979c2060b0b218eee27409b3c351a9cc0b6bccce2260b8b387b442ae10f31483b20bd6d672f7d5424f7d9a8297a1bd14af2f7793 SHA512 259a3b4882bf0fbb01cb22974e219a621a2b337d6f638234a806148b11142fdbf9ac36ae38e71fcb7e18bd61362b34cf3c221ba1df317ec6ea8668591ad2d3ff
 AUX calibre-disable_plugins.patch 709 BLAKE2B bfc3fb85203fd64296793d58099e9d43bd173d3545954960fb72c16d42f5e09d4a99205339012cdcab512d46f0fcb08aa6c9410e848c83782a776accfd654710 SHA512 deaf4ad84aa1d688ae67ba4bd09ab7f163a7a33d498d9e9fe1e6d24f3fb9599757f9d6cb7c3d14953b6a0cda482d1427fc6fb6343d5cfe94223ff6b6e2f4b507
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
-DIST calibre-5.25.0.tar.xz 36849112 BLAKE2B f9cb423317ea1f5b22e7f3540708fd4fa6e7dff2d6d2c667755c74c4f46b72f52aac7672933c51efaf56a5ef57e573c8927649fe30570481c2057e5f757cdfde SHA512 7913fec188d8a8c40cf2768671836f6431d233ac53d1d683222a12f8a753a11cc4023fcfc1dd5ca8b27fd049fb579563b1cdd89624b824ce4eec7b438e25006e
-DIST calibre-5.30.0.tar.xz 37002224 BLAKE2B dc034c54a6ebee838652fe10b467bf8408f8dabd759108d617e2c9f64109e92afe0f2994c5df480ec4346c596361ccb63d0aaab2796edc4993ae0eef4222ba6d SHA512 c2d435ec9a8cfd5f76439f229cd9a7a7f4e829e44d9f2ff37003faf8a925df40cd77471d72d05a8d145bfc104bf92dbdd67ddacabc84e6e3cad055887530d8bd
-DIST calibre-5.31.0.tar.xz 36937976 BLAKE2B 55995aa8fc75ebee5506145ab7995ebcfd04dfa080eae48229a167e404cc4f091c27f9d9401656c52b1620b6d407904a6e454b0b693c6e194a871bc6fda30d4b SHA512 4a2926f86d4bb4e9b66312c9f988bdf9cbcf12096c76578259f9473f69f7e8c16f763934fbd2664ba8e3bd24fbe6a878c1e2a9df43152ea0fe0ba3d447dfed42
-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
+DIST calibre-5.35.0.tar.xz 37801424 BLAKE2B fcef3dfc3fa09d3a6324b3b9a860a3f0eb4cfe1311df84aea39beed9c0f42e620bfe3ec1a33c89e0e701b955fe44cf9b15f1e4b0f24529847c9b28d2eb7b2fa2 SHA512 b99a5c86a48d29bcc6f6188f9e4a20fe8ac1c4115147a964596e2bc3635d20c2556ae0be90c7deac95d4ef430b6ce6c7b712510358f71a22817c9360203b1f11
 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
-EBUILD calibre-5.31.0.ebuild 8535 BLAKE2B 6fa6447889c1ec42b79a78a85997b6edd10f938ccc0aa319f9f9e0cff43590ffc8520844cea70526b6e67cd31a2dd4ff62bce9340b6bb6b86c38eb190c244e8f SHA512 a0758ea6888c9def11b0835301e5f6b32b8315c07b66d718125f9cc8c2d3d8e66e270b9382d825c8e40e5330bc5599c163182f180419b02130db369167482fb8
-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
+EBUILD calibre-5.35.0.ebuild 10358 BLAKE2B 24d8c5fb1ce51010fe59b35b38f6935b19604c05dac80b146f26b0ba470c3ca8dfa1ced3321c864cc5f90314b4f25dd14151511e01cacd41830a5d53f58f685d SHA512 9e6c9112a25ddbdc922fb204c6d9735d82cbfdbf13bfdee68501ec1db38512e08ba94459737ca54680505766e744eaf1fc71eac19df17341da8d6c8f8cebbbdb
 MISC metadata.xml 304 BLAKE2B 0d93b1c7606c37cb8b7308b507a1d2988a05f780a93ae80c98e021f5af75128954d57b102afc1d96728872c81bf0adc40e32b31197dfa825cd040af3a8739fb7 SHA512 e193c0b78ed4140b695c44d273310207c9f2f745bf31589c69e81230a9eed68fa1c361c1e3f68a60e135ef0628aa480002229871f4a50f4000aea6df7e5f067d
diff --git a/app-text/calibre/calibre-5.25.0-r2.ebuild b/app-text/calibre/calibre-5.25.0-r2.ebuild
deleted file mode 100644
index 40fa50fcc405..000000000000
--- a/app-text/calibre/calibre-5.25.0-r2.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# 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 bash-completion-r1 desktop 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 '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		>=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/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}
-	$(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"
-
-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() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# 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 "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', '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_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/calibre/calibre-5.30.0.ebuild b/app-text/calibre/calibre-5.30.0.ebuild
deleted file mode 100644
index b01b4920f276..000000000000
--- a/app-text/calibre/calibre-5.30.0.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# 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 bash-completion-r1 desktop 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 '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		>=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/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}
-	$(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"
-
-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() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# 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_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/calibre/calibre-5.31.0.ebuild b/app-text/calibre/calibre-5.31.0.ebuild
deleted file mode 100644
index b01b4920f276..000000000000
--- a/app-text/calibre/calibre-5.31.0.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# 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 bash-completion-r1 desktop 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 '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		>=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/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}
-	$(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"
-
-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() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# 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_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/calibre/calibre-5.31.1.ebuild b/app-text/calibre/calibre-5.31.1.ebuild
deleted file mode 100644
index 4c142f046ab5..000000000000
--- a/app-text/calibre/calibre-5.31.1.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# 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/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_chardet (unpackaged Python dependency: cchardet)
-	# - 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_chardet \
-			--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/calibre/calibre-5.33.0.ebuild b/app-text/calibre/calibre-5.33.0.ebuild
deleted file mode 100644
index 7b6a8c3a07b4..000000000000
--- a/app-text/calibre/calibre-5.33.0.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# 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/calibre/calibre-5.32.0-r1.ebuild b/app-text/calibre/calibre-5.35.0.ebuild
index 7b6a8c3a07b4..59a9f2a0e0b8 100644
--- a/app-text/calibre/calibre-5.32.0-r1.ebuild
+++ b/app-text/calibre/calibre-5.35.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -123,7 +123,7 @@ PATCHES=(
 	# 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"
+	"${FILESDIR}/${PN}-5.35.0-jxr-test.patch"
 
 	# TODO:
 	# test_qt tries to load a bunch of images using Qt and it currently fails
diff --git a/app-text/calibre/files/calibre-5.35.0-jxr-test.patch b/app-text/calibre/files/calibre-5.35.0-jxr-test.patch
new file mode 100644
index 000000000000..bec72c15cb8b
--- /dev/null
+++ b/app-text/calibre/files/calibre-5.35.0-jxr-test.patch
@@ -0,0 +1,24 @@
+Avoid calling libjxr's JxrDecApp as we currently don't package it.
+--- a/src/calibre/utils/img.py
++++ b/src/calibre/utils/img.py
+@@ -118,8 +118,6 @@
+     i = QImage()
+     if not i.loadFromData(data):
+         q = what(None, data)
+-        if q == 'jxr':
+-            return load_jxr_data(data)
+         raise NotImage(f'Not a valid image (detected type: {q})')
+     return i
+ 
+@@ -645,11 +643,6 @@
+     despeckle_image(img)
+     remove_borders_from_image(img)
+     image_to_data(img, fmt='GIF')
+-    raw = subprocess.Popen([get_exe_path('JxrDecApp'), '-h'],
+-                           creationflags=subprocess.DETACHED_PROCESS if iswindows else 0,
+-                           stdout=subprocess.PIPE).stdout.read()
+-    if b'JPEG XR Decoder Utility' not in raw:
+-        raise SystemExit('Failed to run JxrDecApp')
+ # }}}
+ 
+ 
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index b3e06c9a8dd9..6fe963fef546 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,7 +1,5 @@
-DIST dvisvgm-2.10.1.tar.gz 3110061 BLAKE2B 3f3bb50baa587c1d20061d235885b4c921efbd3400aa7e4d2df872e37e0ef57d57ae4713fedfd0587d7fcffe7e0286ca55e319e6e82b3b72b49c5df5fa08f633 SHA512 8faa68b13a0e351ba54b5c9acb1dbda6e081eddd167b2cc599208cc2e7967c116c3d105d29df224165daff88f81acb3135d936ec9b2da4dce2c82c197f6a4e78
-DIST dvisvgm-2.11.tar.gz 3111889 BLAKE2B 7944b62bee48173f1ed0e2de5ff0c8090322da925abdd4a57611ccb5c055ba602a76ab4e3dbddb83d73ac19a23ce4b657d96a3830f76eb8939f3e3a9c0890cd1 SHA512 bbefff027f710a0370d179e42f1775cb37765836969fcf9e27e5e05d46565e6db74414440823068b04dbef0dac768b70b2573359fe729c12b27f6d678f41d55f
 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 1134 BLAKE2B 62fbe3220b3c3af58ab36c70c1e070605a47483c216488de23ff83d52c79d5313ea236673bffbbafa443801e214286218ff585018b5bc3c4460e98074ff15148 SHA512 a5a937dc42dfc9b6b23c60a1fc094bed65cd57ee524a1791f0548d865c371ac5c0d1d144187994f03c20f5dfe7cb4994a5917176dfbfac41e2a24f529f69a009
+DIST dvisvgm-2.13.tar.gz 3174723 BLAKE2B bee6efd0fd32b1b0c116820df955a3b76cfd795acb75063f35bf2b6b15b6bacc8ddc60d9622d8554c80f7c2ab44c85c78a120d4e18fd7a0c902eabb70b6060fc SHA512 264643f9d9dcfa7e1d20df31c3514108ed45c88e0bd0f1ce88c37af22ae57447d624537720e902c5e5e799906d567999c9449fea411f755e75e4c4158e37de30
+EBUILD dvisvgm-2.12.ebuild 1133 BLAKE2B 682c6f278485d685080c7cd998a0e55a39e52a8bddca2fd0ffe3a1964773a283bfaaf16771eb66fc850e5755842a8ad325c40bc96e6bb2cac8c4a8547e80d463 SHA512 74a88a33242e5f7b7511f97557b2f70afdb3e28d1cf51a53789e552a215671d58229378d65bddd342da3bf4cef6b6539674753fe0fd46970f4835d416bfe70da
+EBUILD dvisvgm-2.13.ebuild 1149 BLAKE2B 7a169d678e8f57eba8a15243116d053f6a2acc04346f69a13d2b97291d9089f4f86961ecadc20b1e4a4465c993814975f0eddbbd4089d1da5927425c263cc762 SHA512 4a408fb8dc501c660f581ce8369c5ae1605230e2fe2f57dcfb90a29a33f5a22df193ce846d841fad7510a86ac0b0e6401e25687a3f423dcc466c06a19654a400
 MISC metadata.xml 383 BLAKE2B d4d13b1caf7ebbd81baf9d911434c0ca57f5b9c5d5c136c0ae569341c511e61fbbaf9211accff192d86bdcedca81ad9f6dab2e23f65778a0b2b7c4be0a286a1e SHA512 563b8459b11497c84145cd7dca5cfa38cafbd5bbeb2c2709080633e785509073b96d1ee999fa87b4263f2babefe32b030361fb537b9016cc3eb5ccf423639573
diff --git a/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
deleted file mode 100644
index 3bad4b3c179c..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-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"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-BDEPEND="
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="
-	>=app-arch/brotli-1.0.5:=
-	app-text/ghostscript-gpl
-	dev-libs/kpathsea:=
-	dev-libs/openssl:=
-	>=dev-libs/xxhash-0.6.5
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	>=media-libs/woff2-1.0.2
-	sys-libs/zlib
-	virtual/tex-base
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myargs=(
-		--without-ttfautohint
-	)
-
-	econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.12.ebuild b/app-text/dvisvgm/dvisvgm-2.12.ebuild
index 39a5bfb89049..0fc4f7c95209 100644
--- a/app-text/dvisvgm/dvisvgm-2.12.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/dvisvgm/dvisvgm-2.10.1-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.13.ebuild
index a35bc82ca5a9..25e4d4acd0cc 100644
--- a/app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.13.ebuild
@@ -1,48 +1,44 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic
-
 DESCRIPTION="Converts DVI files to SVG"
 HOMEPAGE="https://dvisvgm.de/"
 SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+
+# Tests don't work from ${WORKDIR}: kpathsea tries to search in relative
 # directories from where the binary is executed.
 # We cannot really use absolute paths in the kpathsea configuration since that
 # would make it harder for prefix installs.
 RESTRICT="test"
 
-BDEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="
-	>=app-arch/brotli-1.0.5:=
-	app-text/ghostscript-gpl
+RDEPEND=">=app-arch/brotli-1.0.5:=
+	app-text/ghostscript-gpl:=
 	dev-libs/kpathsea:=
 	dev-libs/openssl:=
-	>=dev-libs/xxhash-0.6.5
+	>=dev-libs/xxhash-0.8.1
 	>=media-gfx/potrace-1.10-r1
 	media-libs/freetype:2
 	>=media-libs/woff2-1.0.2
 	sys-libs/zlib
-	virtual/tex-base
-"
-DEPEND="${RDEPEND}"
+	virtual/tex-base"
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.11 )"
+BDEPEND="app-text/asciidoc
+	app-text/xmlto
+	dev-libs/libxslt
+	virtual/pkgconfig"
 
 src_configure() {
 	local myargs=(
 		--without-ttfautohint
 	)
+
 	econf "${myargs[@]}"
 }
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 70a40adb0e03..6b7b8a96a583 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,10 +1,6 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
-DIST enchant-2.3.0.tar.gz 986837 BLAKE2B 57859d41d1e605ba5b89a264e3b6f53bab7a2f060c2b306a1ac51c55925d5b30a5d40fd121be7d3df22395cc11ad4808e63627f7e0f5ae9f3c1d2f2939dc2f68 SHA512 ed25d74176aefe4ab3b1754ea09356d04c844f8e7a50441d331fcf6a0fefbedaffa21df7296b7947ab1fcd44844c1d8567d39d67ebc4381ce8766577c0269d43
-DIST enchant-2.3.1.tar.gz 987361 BLAKE2B 86d6f384ada861a1df40a3241d2d32ef8513784c9dbca3b71bfdc52e2efc94c4d9cfb38e752970dc31a36545c1f9bf32f0550316b969d9170363e8b52c030819 SHA512 c6fb8498d34a55040c2791124c2975952497e5a1b8999958691279b1a60a37473a1d2e3e11504f7cc877370be7772c2db621022040ea7035b21e40e8367606f5
 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
+EBUILD enchant-2.3.2.ebuild 1234 BLAKE2B db4fc98f82f8dc5a139a01c61836629e128138482e78bdd7ad3b99b0b1a1a0a52f5c7c352fa6094fccc0ab42f3adcff8bc4e730aaa3cfeb13560e5a0f64967e4 SHA512 4e55587f310f6970002bed29142c20ae42afa67995624f6785aa102534b2ae837dde841bd1db201a1b302cd0bcce78fb068d75debe1435d696791d3f6e552bc5
 MISC metadata.xml 537 BLAKE2B 6cb7c6968b6f90f2c29d2f7d3d731f947431b0648e7de6300599ca1f6d67544300484cc794309d27ce8878c068c2e8b5aadaa9fd6670d4388aabba2c1ef470a3 SHA512 140143a602063450d3ad55cf0374d42c255f689326978aca64f9c9f529eff6bb97b31bcaa798f34322d4e8c541478796f227e2c164cf1fa6e8538158c0f9fc60
diff --git a/app-text/enchant/enchant-2.3.0.ebuild b/app-text/enchant/enchant-2.3.0.ebuild
deleted file mode 100644
index 148aae6be617..000000000000
--- a/app-text/enchant/enchant-2.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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/enchant/enchant-2.3.1.ebuild b/app-text/enchant/enchant-2.3.1.ebuild
deleted file mode 100644
index 148aae6be617..000000000000
--- a/app-text/enchant/enchant-2.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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/enchant/enchant-2.3.2.ebuild b/app-text/enchant/enchant-2.3.2.ebuild
index 1c7845af2065..2da677c77f45 100644
--- a/app-text/enchant/enchant-2.3.2.ebuild
+++ b/app-text/enchant/enchant-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell test voikko"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 2628b6318ca3..3e8d63daa3f6 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,7 @@
 AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a6816326a17527d91b68d481d23ed3ad982211c07c412a61157d17cecafa591cc80482ec22abad3ce29101068bbd5 SHA512 703d9b5ca4e718660fe5af2d59a60b3187beda965e3a7b6eeaf1f7bf61013f3acde54b0ba89c8b493b1f0b1950cd52893ff1fb00a74c6d97645df29a1829902c
+AUX 41.3-fix-build-with-meson-0.61.1.patch 1385 BLAKE2B 70740f1424234b056537cd2781aed5c9b114aa6eaa629d48a24022de0a6ec789630a8ab32b8451655b049e3b55db88895654cdd78cee89d4d91858cb60237a47 SHA512 588b93f599b31cd80ada5b599b267ba9eced928b3b9597c43dc1319f41996df056704860cbf7ebe1815b0e91ffd467fb019d7ec64eb09f08d1a969fbea55f46e
 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.4.ebuild 3156 BLAKE2B 73037ed0f0b38c1cc0e0ae2d8609d543b120de95c94a9d73ba85c1c8d8a7dcf8f1446d5fc8c23badb791c2e273f8b45c4dc43f011e7773c79a47d3c2d7df8813 SHA512 2c50a03f52775b4d43cf75b05d850e6948bba51107d4e367fbff1024f23367b3f854462722f11231de3de201b746829546999bb32086cc79e112535b699b83cd
-EBUILD evince-41.3.ebuild 3029 BLAKE2B a001190d9841d95938ca70dcbf05e62e9d2869ac1d2ad03ffa1f5365c297803267fe98d26fa8807ffe340253f403177d17934f2e8c5277abaf1e5bb67cde75a1 SHA512 0b63a3e6184d757d5f04e982cbf8613c2444b832b7ca8494900abf07d9bdbaa2c24beb0df82eac4b3d6ba2256920a2883a08429cbb3f07a12ea62576ea6068d8
+EBUILD evince-41.3.ebuild 3097 BLAKE2B 7c1a45a85dd0e95cb8be16edd96d3d52f1e6a4461d1c84cbceaba7dfc750ca7674a935bb805ae0e71011adebfa93d184adce810f98b3b551127de0b07e19a29f SHA512 4306ed1b6232731acd0e8dbd7e77f3815353027acaf68714d07ca7984b67de05a2b2c15547f97fd65d62d179347f3a85028dd999d0a3cf62074923bc288da596
 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
index 11777c63ccda..75e615774832 100644
--- a/app-text/evince/evince-41.3.ebuild
+++ b/app-text/evince/evince-41.3.ebuild
@@ -67,6 +67,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 
diff --git a/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..fa0a5cd82914
--- /dev/null
+++ b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,54 @@
+https://gitlab.gnome.org/GNOME/evince/-/commit/1060b24d051607f14220f148d2f7723b29897a54
+https://bugs.gentoo.org/831853
+
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:22:45 +0800
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for
+a time and explicitly rejects with error since meson 0.60.0
+---
+ backend/meson.build | 1 -
+ data/meson.build    | 1 -
+ meson.build         | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/backend/meson.build b/backend/meson.build
+index e44c1d6d7..ab3df9acf 100644
+--- a/backend/meson.build
++++ b/backend/meson.build
+@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
+   )
+ 
+   i18n.merge_file(
+-    appstream,
+     input: appstream_in,
+     output: appstream,
+     po_dir: po_dir,
+diff --git a/data/meson.build b/data/meson.build
+index 8a308b853..afc302098 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -15,7 +15,6 @@ foreach desktop: desktops
+   )
+ 
+   i18n.merge_file(
+-    desktop,
+     type: 'desktop',
+     input: desktop_in,
+     output: desktop,
+diff --git a/meson.build b/meson.build
+index 34c86661f..f74efb3c4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -492,7 +492,6 @@ install_headers(
+ appdata = ev_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index 732bc1382699..765543d2818c 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,5 +1,7 @@
 DIST foliate-2.6.2.tar.gz 4760966 BLAKE2B 299dd8ab9f489772d18b85749cb312c8ddd4b21855452f87176ddfe068ff9e1e78cb5465fec97dbf70de22e7a773cf0910c11c3be7d0adb19279f4d9813249a1 SHA512 30bff00c34f90bfbd26b9e2b567a7cbcb1243cc5da17ff060762b7f1aafa4159daacee615de7f9bfef7d29d8209c8191094a154564f04321280037d2ec76a63e
 DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb
+DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
 EBUILD foliate-2.6.2.ebuild 1217 BLAKE2B bad2c61ebe50ad2780fcf432273ce882f04eefb16119d6627b185db713717ef68d408e08cd18b5af63db2d94971291744b734fbad43ae2e20ba66e3ae78aec9a SHA512 253edf5d06def6414bc22ae06a834260609b065a292dadc5a038fd8e0a44116f7ed68372be55b731a97f1bc4c12a002a247a6886d1bbc0723f923cc3748cff7a
 EBUILD foliate-2.6.3.ebuild 1202 BLAKE2B c3e662e2218eb04cb4be8090eedeea2325c49d586e52040f5dcf976cfbdd9f029e0c9d41fd5b9165d9d760d46d3afcba116b85063b76187e816017f81148f9c9 SHA512 4e2c3de331b47ae613dd90d5fba956a4c7ed80788737a321e9a91612004328cf1f6cb6c286964431bbf8d88712c98fc219aa91efad5fa6ca358a5f4a70c5d6b7
+EBUILD foliate-2.6.4.ebuild 1202 BLAKE2B 5393135b4883f5cd16ca754cfd1ad41f53606118c44469d5fb03788ed1069d7dab0890628cc80aad692be1f4a345558eaad8bf1f95c4993290bb6f572a9b88b5 SHA512 e5b91817a3abac0ad25b54b0adaa0450937383a7f5bfba879c62c072658e38632218fc1fc9ee9345228d8266418de8e4fca43de4f3771e5af20dfd3be8b5e760
 MISC metadata.xml 607 BLAKE2B ab5cffaca496e55fe6c7cce465104fe2c0010d4ef6110c816575944d7f48ae94d834ac61430e1c722daca0ceb739fdb4e2ad35b2afef010675726aea967d2ea2 SHA512 7e1d53bcd78408d6ef3803871d131beced46b118555d7daf0ccc0abf6233d3892568ca3264f1b123f20524d56600cb162c53057fb38a0811571a98ca0051573b
diff --git a/app-text/foliate/foliate-2.6.4.ebuild b/app-text/foliate/foliate-2.6.4.ebuild
new file mode 100644
index 000000000000..e884210fcfef
--- /dev/null
+++ b/app-text/foliate/foliate-2.6.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
+inherit meson plocale xdg-utils gnome2-utils
+SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="gtk ebook reader built with gjs"
+HOMEPAGE="https://github.com/johnfactotum/foliate/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="handy spell"
+
+BDEPEND="${MESON_DEPEND}
+	sys-devel/gettext"
+RDEPEND="dev-libs/gjs
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	net-libs/webkit-gtk:4[introspection]
+	handy? ( gui-libs/libhandy:=[introspection] )
+	spell? ( app-text/gspell[introspection] )"
+
+src_prepare() {
+	default
+
+	plocale_find_changes "${S}"/po '' '.po'
+
+	rm_po() {
+		rm po/${1}.po
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	plocale_for_each_disabled_locale rm_po
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 904d76876cc4..2bd74a4cb466 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,3 +1,4 @@
+AUX gtranslator-40.0-meson-0.61.patch 865 BLAKE2B 79db4e5cc4f08822ce3a0f2237cc8216e763cd2de4f2383815062c6e1f4dea33298b04d56e18f5930962098f68fde1447bd96515f993a3ebe018809d92cca235 SHA512 6774f3a43e892e871b47ac6f44d6c4e32b03c72acf36419b757b1e3f029445b9c6d9aadffca8ad8c8cdb6a8a1d2f9396e73c6043379b58b4d0f74d3a6b0ea0cc
 DIST gtranslator-40.0.tar.xz 1509940 BLAKE2B dbf4c4a8765167177959c058b29563a2c3190e103a9f462a976bfc416c7cd995c649b549a40aa6f7c9b26502c5d56f3e4252a52919de979167f7adb5381604fc SHA512 214c5360ada6c98e9e7cd6a653bdc9a1dc5dd6cca995295369f8f9aac7261680fa521f2d2528f275233479d55ef1b03ee9ddc4a4e734e27a25bb24172c855a47
-EBUILD gtranslator-40.0.ebuild 1082 BLAKE2B 43c21ae6404f66834f7c0d51fff3c0b185e391c14df85b459159a8de4b6cfbe05618dff11b28438882612e82e1ec83c1999a8ab31207845bf93977d2932a8c16 SHA512 530b34d6b13f54b5480f5819b6f3b776553c96e2455a41fd4b88c9c16795145d731679032f06aa1c772f5ce090d6e26cd4c7c0b417604d82c92b0e330550ec8d
+EBUILD gtranslator-40.0.ebuild 1132 BLAKE2B d18a39afdffb04a671590c994422457ea050c78e7024dd59338b7c8638ef6b4da6297eb6ebcebd542d93ed039177fd2e4ce4b8e0da495922246b735b5181a3e4 SHA512 a463faa8b570d2de8d13662c2ce5ed0b55f15bac63074fb44c2e6f54adbd1a0155c467353897a048186ce6705644130faee6b50ed1a4c3e75534114e2ada488e
 MISC metadata.xml 813 BLAKE2B e88f712bb4475618b3f4c55a56becdb271752ce7c14a870893a243719124100e4d95dbc090fdb8069132f7b6d024738568ed6ff1c649486ae054302b73bd213e SHA512 e8b69861262d570c05ad69f30891ac979d5860d34de4aa85531111c6c8cad321dad8a395325c687a459e2e72b83374a9a986304e081ae93afa985d8b06c07364
diff --git a/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch
new file mode 100644
index 000000000000..a43a32eb4a6b
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch
@@ -0,0 +1,30 @@
+https://gitlab.gnome.org/GNOME/gtranslator/-/commit/7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch
+https://bugs.gentoo.org/831966
+
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:57:43 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@0@.desktop'.format(gtr_app_id),
+@@ -35,7 +34,6 @@ appdata_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata_in,
+   output: appdata,
+   po_dir: po_dir,
+GitLab
diff --git a/app-text/gtranslator/gtranslator-40.0.ebuild b/app-text/gtranslator/gtranslator-40.0.ebuild
index 00fa6d54bb65..bb0973914e18 100644
--- a/app-text/gtranslator/gtranslator-40.0.ebuild
+++ b/app-text/gtranslator/gtranslator-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-0.61.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use gtk-doc gtk_doc)
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 6d26c6ff7ae2..d198794a511e 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,9 +1,3 @@
-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
 DIST iso-codes-v4.9.0.tar.gz 14483789 BLAKE2B 683921fede69149cf196b70dded975763746d943f470d21e517334890c4c45b11b551c0746e3907341e55870ac733d1f14f74ea5cf723e3f4df164f56531b7da SHA512 0e14101b6a1480c463d83b32a40715485ad5494e799bf0cb6b7ed927b69dff0454512bbccbcc23de8741bf7dce139feb7490c4edf75b4a0af8473fe5ad9c567c
-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
-EBUILD iso-codes-4.9.0.ebuild 2644 BLAKE2B 422e4a7fa399816a1c4390d84a99e0049969b3f6f11deb4eebf63c9e9556bbe63a88902b8e203b073943382a7fe2f507de3e4f849a68144672015cb089bb4d54 SHA512 c4f71415a84c30f7b6f713bad3286ed1fcf63ec5f9d3efb52b65bb75d24d726434106f6523fed739debf7beb72bd0943249d7491d1acebc31e7ae1ea294103bd
+EBUILD iso-codes-4.9.0.ebuild 2637 BLAKE2B 007d7d029a6fbd50c1f4e5a6715b7eac7814fdde9fc66a2d8e137ea6d80cb47bf66b1cc2ef806dc48313108a0d63a3fc12ae0263b85df134bee2017478898e0c SHA512 7acdde7d0634c9cee4b485abb0fbb0f2512f95bfb38ed8bec2ed109039412e0cd14339b54b773d1565c743752dfbcc5e0ae94e158ae9a384e1b33fa500562f17
 MISC metadata.xml 481 BLAKE2B e19ee7de8b2de3aa09f97bb7eb4247ba2979614d768c0dd92a8cc131269e46a560baa1c0ea8fcceb49073efb1b890cd54d939c16ac7412413983a19083f05337 SHA512 f1e20f870fabd59d97ca612c3db3443a6a1544de3b03f12fe0c9c44a1740b06bf38c394b489738e60b22fa0797379d24c0ec8371efa067873910ba39fe30f194
diff --git a/app-text/iso-codes/iso-codes-4.6.0.ebuild b/app-text/iso-codes/iso-codes-4.6.0.ebuild
deleted file mode 100644
index 35577914637f..000000000000
--- a/app-text/iso-codes/iso-codes-4.6.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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 kn ko kok ku 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_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/${P}/${PN}-${P}.tar.gz -> ${P}.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}-${P}"
-
-# 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/iso-codes/iso-codes-4.7.0.ebuild b/app-text/iso-codes/iso-codes-4.7.0.ebuild
deleted file mode 100644
index 37abf9cc8729..000000000000
--- a/app-text/iso-codes/iso-codes-4.7.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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_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/${P}/${PN}-${P}.tar.gz -> ${P}.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}-${P}"
-
-# 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/iso-codes/iso-codes-4.8.0.ebuild b/app-text/iso-codes/iso-codes-4.8.0.ebuild
deleted file mode 100644
index 5348c7e2c48b..000000000000
--- a/app-text/iso-codes/iso-codes-4.8.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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/iso-codes/iso-codes-4.9.0.ebuild b/app-text/iso-codes/iso-codes-4.9.0.ebuild
index 40294c158f09..a3a39a26e9d5 100644
--- a/app-text/iso-codes/iso-codes-4.9.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}
 
 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"
+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
diff --git a/app-text/katarakt/Manifest b/app-text/katarakt/Manifest
new file mode 100644
index 000000000000..97400ac7eca2
--- /dev/null
+++ b/app-text/katarakt/Manifest
@@ -0,0 +1,5 @@
+AUX katarakt-0.2-install.patch 671 BLAKE2B bd647ae915a46d5bf80e1df24c44dbfe5d14ae1eaa9c8db965de24c1cb6b89ba2dd4f7fc86e3e41091af1d62e2fb328c986b1a12419c455a9e87d89381fdd57b SHA512 33400a5114547409e33aa86d43293c98d696e383a190529e34dfd32e36f9c0effd1652648954b5eb5572e80070ef007d1fa6a047c0e4e4e117dca9a5589cfa6d
+AUX katarakt-0.2-poppler.patch 1344 BLAKE2B ade342298b369a1f6a405a849dba2f1a088dbbf202fd713bbb871efe16ab751682aac4ccac91fe740af5126e1eb840814f48f53aa45b66d1ac84896a4626a685 SHA512 8724ea6be2ab6a2efd448406b169662c16b751d723c6bf0a4270c3a425b37630c22b09d019769979b8f57475d2f436b033e89868b3ed7be094120518b5d91752
+DIST katarakt-v0.2.tar.gz 52004 BLAKE2B af014425bbf9c36350f4c10e57d9668f4a362d786c660f032381f6cf68b006d384c88bb0f4cabee4c0bc8e5f01ad25a44ef38d100ddfdfe955a442313b77b322 SHA512 a07054e0e9915f6239b8149bbd08c8b5ec095b0e9ffb54e03761ad9e59914f66166e4b8359298721a6b46c2bcf5114f40ad117c4826a32660c1fba28f69b8e68
+EBUILD katarakt-0.2.ebuild 884 BLAKE2B d2bf53d81e5b5786c3e56a99d3bb6e4c63dd9440743227fe60ae2fb6d0ba7875c1bbd162ca8d2ba12164112912e95ca7069c37c66154c716e169e7ce3f97b413 SHA512 33a9d5aeb8a79df5494af73d7d54f13b690b2b9dfc0ff5df032b0a6d8a5d4dfba584897a955cc58967772b839f788b914149abf8e0e979fe8fb5a61aa3f50c85
+MISC metadata.xml 1036 BLAKE2B fad9496039867e698ee44024a200a8fc77025c8ef7427a6d2903fe898204d0c04324daab893d3f653b0863bd1651f2000c43a323a2a9f6e860853979a2de4015 SHA512 c8874b9aa44646129e1798c59ef1a87607280637a6f8a2715c6af009d9b5990d66aab743a0e108626823cb705fd932058ff27b52083c98f533aac4243353dbe4
diff --git a/app-text/katarakt/files/katarakt-0.2-install.patch b/app-text/katarakt/files/katarakt-0.2-install.patch
new file mode 100644
index 000000000000..96cb6f4b6140
--- /dev/null
+++ b/app-text/katarakt/files/katarakt-0.2-install.patch
@@ -0,0 +1,26 @@
+From 4801619c7752b317da8d57183f590d9c3cce42e1 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Thu, 30 Jan 2020 19:22:05 +0100
+Subject: [PATCH] build: Install binary
+
+Add an install target for the binary.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ katarakt.pro | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/katarakt.pro b/katarakt.pro
+index a632713db2ce..220dfd68b1b9 100644
+--- a/katarakt.pro
++++ b/katarakt.pro
+@@ -57,3 +57,6 @@ web.depends = $$website.target
+ web.CONFIG = phony
+ 
+ QMAKE_EXTRA_TARGETS += documentation website doc web
++
++target.path = $$INSTALL_ROOT/$$PREFIX/bin/
++INSTALLS += target
+-- 
+2.24.1
+
diff --git a/app-text/katarakt/files/katarakt-0.2-poppler.patch b/app-text/katarakt/files/katarakt-0.2-poppler.patch
new file mode 100644
index 000000000000..7979bf6a59cd
--- /dev/null
+++ b/app-text/katarakt/files/katarakt-0.2-poppler.patch
@@ -0,0 +1,29 @@
+From 23b68e9c48204d43b37b23735ad9ea0b219fec7b Mon Sep 17 00:00:00 2001
+From: Philipp Erhardt <Philipp.Erhardt@informatik.stud.uni-erlangen.de>
+Date: Mon, 19 Oct 2020 20:42:37 +0200
+Subject: [PATCH] Fix compilation if the version number contains a leading zero
+
+---
+ katarakt.pro | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/katarakt.pro b/katarakt.pro
+index a632713db2ce..84cd59797d0a 100644
+--- a/katarakt.pro
++++ b/katarakt.pro
+@@ -17,9 +17,9 @@ unix {
+ 
+     isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config    # same as in link_pkgconfig.prf
+     POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER)
+-    POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1)
+-    POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2)
+-    POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3)
++    POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1 | sed "\'s,^0*\\(.\\),\1,\'")
++    POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed "\'s,^0*\\(.\\),\1,\'")
++    POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3 | sed "\'s,^0*\\(.\\),\1,\'")
+ 
+     DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR
+     DEFINES += POPPLER_VERSION_MINOR=$$POPPLER_VERSION_MINOR
+-- 
+2.33.0
+
diff --git a/app-text/katarakt/katarakt-0.2.ebuild b/app-text/katarakt/katarakt-0.2.ebuild
new file mode 100644
index 000000000000..161ff49aee54
--- /dev/null
+++ b/app-text/katarakt/katarakt-0.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="A simple PDF viewer designed to use as much available screen space as possible"
+HOMEPAGE="https://gitlab.cs.fau.de/Qui_Sum/katarakt"
+SRC_URI="https://gitlab.cs.fau.de/Qui_Sum/${PN}/-/archive/v${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-text/poppler:=[qt5]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-install.patch"
+	"${FILESDIR}/${P}-poppler.patch"
+)
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install doc
+	doman doc/katarakt.1
+}
diff --git a/app-text/katarakt/metadata.xml b/app-text/katarakt/metadata.xml
new file mode 100644
index 000000000000..7a3b0ef78c18
--- /dev/null
+++ b/app-text/katarakt/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>kurt@kmk-computers.de</email>
+    <name>Kurt Kanzenbach</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">
+    katarakt is a simple PDF viewer. It is designed to use as much available
+    screen space as possible.
+
+    There are currently two layouts. The presentation layout is very simple and
+    only supports scrolling on a per page basis. As the name suggests the
+    current page is displayed in the center and zoomed to fit the window. It is
+    active by default.
+
+    The grid layout is much more advanced and offers continuous (smooth, per
+    pixel) scrolling, zooming and adjusting the column count. Pages keep their
+    correct relative size and are shown in a grid.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 537404affb7f..93f256c948e9 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,13 +1,7 @@
-DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
-DIST lesspipe-1.89.tar.gz 121118 BLAKE2B e730b6e8afc767a0118abbcc6221d2c18467393119c26baf71b8758b5826ba52230526b9c5cd67704aadda07b63a62dfe006db10de1dbae0a73ede1885b03ed0 SHA512 b8d7c92d3dae77f2ccee8e314af4354fefc9f3aaec1566af02c9be2640f11ebf7ea1432334470c5d5dbce39d2ac7c3e9f4074bcf9ee4a502dc59b370a21b54f5
-DIST lesspipe-1.90.tar.gz 121098 BLAKE2B 269f4193f423e4ac5770171156e2f63d14966d7dcc77bf015c3100f281206424ef334acc1edf2edb6fe31f73aed80b9c3ba6c715d6e97993c5a90dfc1ce42405 SHA512 d402bd46c37d2509c90530e9da0560fa3e5da9002c37a515451a8ab9275576d1af44793a10914e74e804f10a3352439815c6763d2d77e5e41a0e9840286f518e
 DIST lesspipe-1.91.tar.gz 121965 BLAKE2B 93c169b2b1a81db7e7b569718a43152a8f2b9ea95258047a00ae4940509817a3eb861fdadb6bafc5861c49e805ce910348a57f634bdae57317811ac6fbfc6945 SHA512 d080ceaae019d8885a53c8abb26f4a159b78578f68c2b9a024960aa69509651e3b6638e78bd6e2e57c23d81123d9a3cab167736f253ba4276a3889890d594bd3
-DIST lesspipe-2.00.tar.gz 190295 BLAKE2B 8f950853673e7939d6dd67c5022219ab101eea26b8efec1a7572e3c2c8465a14d09acbe945b204e927444b10953309b27fa47c5661df02e67aa2e2b98a940980 SHA512 f709bae63b17617d2c02bbe691736826c857ba1771907e37ba56bd407a29c2092a936ecb43d6a6e180a1d2eb5f54dccc894d2cf4eb113d42b4892ca6d8a4378d
 DIST lesspipe-2.01.tar.gz 171601 BLAKE2B 25c65ff0ac97382101fc25f23c52d1d1269d28a30ac472214992fda654946337dfbcd9d9d84e01bbe76902bcdf9c6eb4fdce481b40d2d74632a81d0da4214fa8 SHA512 e050075a43419f735d46314b006ceb16a2255b01a65b192d255a1256178fdca8286473292ef5248c15c8bda305da28275cdedd923c03bc6c601336bb857f2437
-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 1697 BLAKE2B b9b89e7d1a12c6ceccec482d956b36c3ada14f5709462563386645984d15f7e8f96083a4fb4bfca130a75c44970aefba11578e8c5e22ebefe15af6d7b6de7394 SHA512 bd62889ed01cdfad435b38e6b165d73fc8c5fc5b80edc1ce14eb236c87727cced1d55eca7562b23ba69b1883f02a75cc436964f7285eb95c6210b211326eeda6
+DIST lesspipe-2.02.tar.gz 166136 BLAKE2B 337dfbb3e15fb1acd6727fc1d99e8c72895c861babf1c3cd755e77ee31dd94e354c6eb66cd8935b0c7bb6c604b543fd9b269266f1b4abf603585cbb10d46b2de SHA512 7e61199f6b70ae0662d6e75cd15ce1adbb98e6b845f73282e3981bbc58b6ddee6cf2307317e9ebbef285bad57413e18c0f6116cf73491750017667f1af6a0cc6
 EBUILD lesspipe-1.91.ebuild 1759 BLAKE2B d61d0be210938702952601dc8685539aa4005d85027906388240c044b6e9435aaef7eb6dafa02bfbea38012b65d75734b5377849bc38059359dd7d0d3e524f93 SHA512 4082d05188d6bd724d28554fa883e470fd5b86d2b79c5d547078341d8966ac84bbc2a9facd33d72c77f85e91d47f9d17548e715f4829ba48241c17ea9f3547b0
-EBUILD lesspipe-2.00.ebuild 1151 BLAKE2B 8548077e644da8332e57fb87ac2cfe96faad4783e2b7bef05141faa1da51def693f33a1efd273e844056432b80789efbb1d11e71e85f932430d50f9381800558 SHA512 29c9c3205fd5a17fc0078decac414fbbca6c3b6276adb6dd981f48cd4f6081de4ed81a68ebec0a8a3836cae7146e1184f9ad09b2629a854ae6b9b9103da3d741
 EBUILD lesspipe-2.01.ebuild 1151 BLAKE2B a1fab056c11281135661629adda35e1eb368c2019495b296042087e2d64006343a9d54d8f0431a3969c565390febe636565ae3537b570d269042410280738e83 SHA512 c3425e65c3ef18352e4cb2998eb3e4bb2dcce7cea1e2685ba727d4d079f98487b167711801e94ddc8a3a292465a5e8eddb1dbbde4a93bce36397d2279afcea62
+EBUILD lesspipe-2.02.ebuild 1151 BLAKE2B a1fab056c11281135661629adda35e1eb368c2019495b296042087e2d64006343a9d54d8f0431a3969c565390febe636565ae3537b570d269042410280738e83 SHA512 c3425e65c3ef18352e4cb2998eb3e4bb2dcce7cea1e2685ba727d4d079f98487b167711801e94ddc8a3a292465a5e8eddb1dbbde4a93bce36397d2279afcea62
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-1.85.ebuild b/app-text/lesspipe/lesspipe-1.85.ebuild
deleted file mode 100644
index 07996432881b..000000000000
--- a/app-text/lesspipe/lesspipe-1.85.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="a preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Tests are broken in 1.84, 1.85.
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build.
-	:
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/lesspipe/lesspipe-1.89.ebuild b/app-text/lesspipe/lesspipe-1.89.ebuild
deleted file mode 100644
index bc53c82f7b8e..000000000000
--- a/app-text/lesspipe/lesspipe-1.89.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Tests are broken in 1.84, 1.85.
-# Still fragile in 1.88. Passes when lesspipe is not installed.
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_prepare() {
-	default
-
-	# Drop a failing test. Not ideal, however:
-	# The test suite for this package is pretty fragile; it's more valuable
-	# to have _something_ failing/passing overall, than relying on a single
-	# test which seems to fail due to an unpredictable external command.
-	sed -i -e '/#needs pstotext ps2ascii/d' TESTCMDS || die
-}
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build (avoids the "all" target)
-	:
-}
-
-src_test() {
-	# LC_ALL=C manages to fix one test failure
-	LC_ALL=C ./test.pl -d || die "Tests failed!"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/lesspipe/lesspipe-1.90.ebuild b/app-text/lesspipe/lesspipe-1.90.ebuild
deleted file mode 100644
index 5f4f14e6f48c..000000000000
--- a/app-text/lesspipe/lesspipe-1.90.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Tests are broken in 1.84, 1.85.
-# Still fragile in 1.88. Passes when lesspipe is not installed.
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_prepare() {
-	default
-
-	# Drop a failing test. Not ideal, however:
-	# The test suite for this package is pretty fragile; it's more valuable
-	# to have _something_ failing/passing overall, than relying on a single
-	# test which seems to fail due to an unpredictable external command.
-	sed -i -e '/#needs pstotext ps2ascii/d' TESTCMDS || die
-}
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build (avoids the "all" target)
-	:
-}
-
-src_test() {
-	# LC_ALL=C manages to fix one test failure
-	LC_ALL=C ./test.pl -d || die "Tests failed!"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/lesspipe/lesspipe-2.00.ebuild b/app-text/lesspipe/lesspipe-2.02.ebuild
index c6c0557f8a33..9e47976576e2 100644
--- a/app-text/lesspipe/lesspipe-2.00.ebuild
+++ b/app-text/lesspipe/lesspipe-2.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
index e247f50d0c68..a3af625d46f3 100644
--- a/app-text/lowdown/Manifest
+++ b/app-text/lowdown/Manifest
@@ -1,4 +1,9 @@
+AUX lowdown-0.10.0-dont-install-static-lib.patch 467 BLAKE2B dcf6e7e61025248ad62af0534a9a04d8f113889ab8a909f746e26928733c243c49bafff41eeac0fb618bd49ceb980998b41c54b7ac62790868419e3e384a1d21 SHA512 9d4ba6ed91376b9013c6104d1157721efcda390471d9b89716573a74f73167d469ba23769197f7c8ea8f534c34920f1329313660579722f85f53291153b22cd2
+AUX lowdown-0.10.0-linking.patch 1628 BLAKE2B 7a390371b9969722c1651f1c79a8d07fddc42a1466b0f85dffc395b59a0f5dab2e92e3d9ca562b804e7ca5fef32b9f65a84cb458aa3fa465ff37a09185de5d5f SHA512 b38f6c9d96be0097a59dd99ad04b5da53267af243aa8e2f42ec61b6a777725fd0d6477890d2290ab875f0a5fc035c5aff7d38330bc3e910218e2f0e1299fa8b4
+AUX lowdown-0.10.0-shared-library.patch 1847 BLAKE2B 42d32a96aed20ac8419805c4d5e3f3ae5bde9801121452fdad68d085c618c22064770ebe6b021d25f104557c149a1f1e279873987400161b5a57e9313023a36a SHA512 dafec418078bdc9ca047fb69e299a5508d2be12f7ce37cd34322ef7d415031cb8db7b8f688f1f5d100398672eccc7cecd0de290fd748252655a8813f9ae2991d
 AUX lowdown-0.8.4-configure.patch 770 BLAKE2B c91c27b9d7a33435515214ab8701ee0c5c2ea79b074e4ba8f96d57d0ced14ca77a918258cdbcb60b6ad9522e14f298b707b69aa70aae3e89b9b061c91905da72 SHA512 b768fade94fc2369e75d4c59b13cc2a053c3edf8502e246abd0a90123a9483f2160ab470c2c162cdf439dfacf4fd184751a069d6b008775f6ffa8bf4eba85463
+DIST lowdown-0.10.0.tar.gz 547397 BLAKE2B 93d87e3aca2466398a625750b928062fbafd26311899e52ddd8264218675e78d30714c920f3331619fcd510a92cc6046401c946f5bd1465d6fd46f26937318ac SHA512 7454e618607628ec0a1649f44f5ec64f8778ecaa151f6aad4984935e297abfe8e84ffc321d3c93cec5d336ff14b6bf9a0ff9054e7363cc58ba708a5b60db9048
 DIST lowdown-0.8.4.tar.gz 520735 BLAKE2B dc66b92f285b186ca83b9fad1cccfef9b395233ef56756e9ea9071b5502cd81dc6ce2d67d7ef265dab8953010af0907cd76125cd4442cfbfc2bcf8c63e097809 SHA512 cd46ead69ed038bf3ccf848b784327d66c78dd8adbc9ae4bfee660b9b1e52844ac8c7ad0377f8f38a3fee0d2e523f979a22d6b547c7964304accef0951cfca34
+EBUILD lowdown-0.10.0.ebuild 1038 BLAKE2B 7afcb03620a4472430ee5e66e470da9416bd88d1978f725bb8016f7d7fc5fdb952ce5d44d3aab79d83b90476613fd9d5fdbe873ce7bf7d791356240d3e68d2e3 SHA512 8ee31b181cc2e0e6cc42c4796e48c58ef796a763fdd2dd25fb5f1763253ebde9f677e5a8ad5c4a4718f9139eeab7f6d8d1776f74d0fd307c553df2424d19cf48
 EBUILD lowdown-0.8.4-r1.ebuild 793 BLAKE2B bd37690ad0713dd2d74fba662ac26f6cde745eb3ae57b19a44bdf8b9b62f559f3217b16e97848657f9b962627abb58bc42a1ef2c442a6455bea67419e62d8655 SHA512 8dc701ba341787364ae600391f2945d3f4d1fb5a47fdbcfffa4eada6f5a10aedd9b3403876b9f78afec654790822bae3a3cb0976629161b9804b9a0f34248d4d
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/app-text/lowdown/files/lowdown-0.10.0-dont-install-static-lib.patch b/app-text/lowdown/files/lowdown-0.10.0-dont-install-static-lib.patch
new file mode 100644
index 000000000000..4a120c32ed29
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.10.0-dont-install-static-lib.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index f13a364..d013a1c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -153,7 +153,6 @@ install: all
+ 	$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+ 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
+-	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
+ 	for f in $(MANS) ; do \
diff --git a/app-text/lowdown/files/lowdown-0.10.0-linking.patch b/app-text/lowdown/files/lowdown-0.10.0-linking.patch
new file mode 100644
index 000000000000..e0ab7285e07a
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.10.0-linking.patch
@@ -0,0 +1,43 @@
+diff --git a/Makefile b/Makefile
+index d013a1c..c9de4d4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -130,8 +130,8 @@ installwww: www
+ 	$(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots
+ 	$(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots
+ 
+-lowdown: liblowdown.a main.o
+-	$(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm
++lowdown: liblowdown.so main.o
++	$(CC) -o $@ main.o -L. -llowdown $(LDFLAGS) $(LDADD_MD5) -lm
+ 
+ lowdown-diff: lowdown
+ 	ln -f lowdown lowdown-diff
+@@ -141,7 +141,8 @@ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ 
+ 
+ liblowdown.so: $(OBJS) $(COMPAT_OBJS)
+-	$(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)
++	$(CC) -shared -o $@.1 $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) -Wl,-soname,$@.1
++	ln -s $@.1 $@
+ 
+ install: all
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+@@ -153,7 +154,7 @@ install: all
+ 	$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+ 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
+-	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
++	$(INSTALL_LIB) liblowdown.so.1 $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
+ 	for f in $(MANS) ; do \
+ 		name=`basename $$f .html` ; \
+@@ -271,7 +272,7 @@ main.o: lowdown.h
+ 
+ clean:
+ 	rm -f $(OBJS) $(COMPAT_OBJS) main.o
+-	rm -f lowdown lowdown-diff liblowdown.a liblowdown.so lowdown.pc
++	rm -f lowdown lowdown-diff liblowdown.a liblowdown.so liblowdown.so.1 lowdown.pc
+ 	rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
+ 	rm -f $(PDFS) $(HTMLS) $(THUMBS)
+ 	rm -f index.latex.aux index.latex.latex index.latex.log index.latex.out
diff --git a/app-text/lowdown/files/lowdown-0.10.0-shared-library.patch b/app-text/lowdown/files/lowdown-0.10.0-shared-library.patch
new file mode 100644
index 000000000000..0adfe762fb57
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.10.0-shared-library.patch
@@ -0,0 +1,53 @@
+commit e33536ae131e31adf77d3258c0cdd3da10868534
+Author: Kristaps Dz <kristaps@bsd.lv>
+Date:   Thu Nov 4 12:27:21 2021 +0000
+
+    Generate a shared library as well.
+    
+    Earlier, the library interface was just moving too quickly.  Now, I
+    don't think I'll be changing it much---if at all, unless to add new
+    front-ends.
+    
+    References https://github.com/kristapsdz/lowdown/issues/45
+
+diff --git a/Makefile b/Makefile
+index 475f780..f13a364 100644
+--- a/Makefile
++++ b/Makefile
+@@ -118,7 +118,7 @@ REGRESS_ARGS	+= "--parse-no-autolink"
+ REGRESS_ARGS	+= "--parse-no-cmark"
+ REGRESS_ARGS	+= "--parse-no-deflists"
+ 
+-all: lowdown lowdown-diff lowdown.pc
++all: lowdown lowdown-diff liblowdown.so lowdown.pc
+ 
+ www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
+ 
+@@ -139,6 +139,10 @@ lowdown-diff: lowdown
+ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ 	$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+ 
++
++liblowdown.so: $(OBJS) $(COMPAT_OBJS)
++	$(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)
++
+ install: all
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+@@ -150,6 +154,7 @@ install: all
+ 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
+ 	for f in $(MANS) ; do \
+ 		name=`basename $$f .html` ; \
+@@ -267,7 +272,7 @@ main.o: lowdown.h
+ 
+ clean:
+ 	rm -f $(OBJS) $(COMPAT_OBJS) main.o
+-	rm -f lowdown lowdown-diff liblowdown.a lowdown.pc
++	rm -f lowdown lowdown-diff liblowdown.a liblowdown.so lowdown.pc
+ 	rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
+ 	rm -f $(PDFS) $(HTMLS) $(THUMBS)
+ 	rm -f index.latex.aux index.latex.latex index.latex.log index.latex.out
diff --git a/app-text/lowdown/lowdown-0.10.0.ebuild b/app-text/lowdown/lowdown-0.10.0.ebuild
new file mode 100644
index 000000000000..a38987c1e1aa
--- /dev/null
+++ b/app-text/lowdown/lowdown-0.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="VERSION_${PV//./_}"
+DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
+HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
+SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/lowdown-0.10.0-shared-library.patch"
+	"${FILESDIR}/lowdown-0.10.0-dont-install-static-lib.patch"
+	"${FILESDIR}/lowdown-0.10.0-linking.patch"
+)
+
+src_configure() {
+	append-flags -fPIC
+	tc-export CC AR
+
+	./configure \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		|| die "./configure failed"
+}
+
+src_compile() {
+	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+}
+
+src_test() {
+	emake regress
+}
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index 5e54e86880ac..43d878444141 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -4,5 +4,5 @@ AUX mandoc.cron-r0 87 BLAKE2B 2fb4946dd2a9025f5bee78e61c11d77d6c6b9b32f9d17c11ea
 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
 DIST mandoc-1.14.6.tar.gz 697150 BLAKE2B e9f6087e9df977901815b1231f68e381502c7392b0ac65a060ce0ef270da3b76540a17931a076b700865a02f9ca1a8ca044a54dbf6318756931c29e6b1deb228 SHA512 54286070812a47b629f68757046d3c9a1bdd2b5d1c3b84a5c8e4cb92f1331afa745443f7238175835d8cfbe5b8dd442e00c75c3a5b5b8f8efd8d2ec8f636dad4
 EBUILD mandoc-1.14.5-r1.ebuild 2954 BLAKE2B eb4b9ffbe134ea11c1fac9fce45e8f84d7cad63a0ff803b4d1fdd0cb6287a732c2c29f1114be40eb4b031d90035858edb79fd83e170b6e9de1c34e6fe7a03d96 SHA512 5f1edd81227c09a9eab1f348f1e34bbd8b23e7e5c710af31667a9cbc94943965f5411aea9594ce611b08487b4137f5627452c45ad8668b33b73f2a1d56765b87
-EBUILD mandoc-1.14.6.ebuild 2914 BLAKE2B 20b234353c2c77e7054a22eb2ba97092f60850c3ce38385e1da797d778f21324c5980f60b70105aeef70dbb229e0cf4d743cc99174afb2050f8286df83e3749f SHA512 f1e3c69ffd70178c8b9bd3cdfe01db57411a5c7050444b2a64e491fd2f640a9d2a2aa34fe5f0d6fe5ff0d769afdedfd551d75b522065aae0ca0b1ca92262ecd3
+EBUILD mandoc-1.14.6.ebuild 2921 BLAKE2B 99a34559def0b24a1f71e639363428f7bedc332fca27b1deaf8a279027e587f2cb606076ce11429eb8e2e60859c94859a8d5bd175303d32fac552ee6b16ea5af SHA512 c7802078dea385214874d42e401b97e7e91d208f32202f1b4770ebabf3bc7266bf8f263a1d167aaec692a493d38a35e78836c8fb24820df53f9badd89bc8fba1
 MISC metadata.xml 376 BLAKE2B c9e309738edb58e62de763b93af8b88fc0c939afa0a471a9c8e83c989bb515b1f6acdde23fb74d8d277d3e111219857f715c7107136fc82f8179907474653a75 SHA512 ce13542ac914c6dc4de722325319c7f49b93fab7b2baf0625d749c793068750800f1af55f15c199e38029a27b523b14b441fb964cf3850fb6c69607cc2a6b99d
diff --git a/app-text/mandoc/mandoc-1.14.6.ebuild b/app-text/mandoc/mandoc-1.14.6.ebuild
index c533b6e8298f..50a0102f8340 100644
--- a/app-text/mandoc/mandoc-1.14.6.ebuild
+++ b/app-text/mandoc/mandoc-1.14.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cgi system-man"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 47788f9f488f..c3951af8cc1e 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,4 +1,4 @@
 AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
-EBUILD multitail-6.4.2-r1.ebuild 1318 BLAKE2B 71a4471f33060ef18f2ddfd4c408bc636c780924c6190a8c84818b44ed266dc7bf1bbbad47df0b7d1b25ecf4667b8ae3ce7367fccefe32a5c63bf5705da455d9 SHA512 dbec42fad2778223331f50404d90cd666d5350accc1628036596d4cc639587833473553f9eac75e16310b59b1d390d144370fe1026a99aeafcbc128341e57ee7
+EBUILD multitail-6.4.2-r1.ebuild 1325 BLAKE2B 266d8fe2b7be9ef97487256010b84d25d046bd16a5790eb920e730d84228b2b7f678a73dd85f3a67a9a38d184f38ef030d92f9153398566f6a4982a99d19284f SHA512 717979028622d84bb660d477aca52ee7f2b1b6ea430a4982e35680830f0a14e7829e7551b96e48784af0f51f9c1f987b1aaa8baf8fd61c211d8f187035b1816f
 MISC metadata.xml 347 BLAKE2B cd2f6a0c6edbaecbc5562db280ec4185d556b73206a2dcdcd6317ca146d8222ec6701e494edcad91a5beeb48fbba2ec22b90b85f5881630be82c93a4efee1f2f SHA512 6b1083b70e3b94d79bf2811301dc1abb4d55a91f38de4eed1d7522743945be5193ac61fd6423fb127e3e4fc8c4f6dd373dd9bcef32e89a8993dff096f2c13ca6
diff --git a/app-text/multitail/multitail-6.4.2-r1.ebuild b/app-text/multitail/multitail-6.4.2-r1.ebuild
index 8c10123313f6..8f3629c5129d 100644
--- a/app-text/multitail/multitail-6.4.2-r1.ebuild
+++ b/app-text/multitail/multitail-6.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"
 RESTRICT="test" # bug 492270
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 82a571ef9141..bb63f2a2f1f8 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 4464 BLAKE2B 45d3165da6c42cf75673aac3c14e99ce4d54181c24bfd1524aab515c26bdb18eb1112b6a7e3fc54402346e3106918427c17e8f97599711f9830e6b4d86f1dc96 SHA512 c3b803db79087c1a0e302c414e97455ae3c6b16d1c454694aa7538ae66bac8627eaeb4b1bc9547fcabaeacd17bbdf6d307543a6f247ac15d3004b34563b9a59e
+EBUILD mupdf-1.19.0.ebuild 4458 BLAKE2B 606bebc50aef75584a837505d863d051a4c805309144236698e77d56715550e353b0582304c5688fbafad4323640be9b8d84f16dbcf6a174528b20072afc2bcc SHA512 56fd53e94c1a9aac683aba53143c5d16eb96ad2b867d2379386830799c27be39a1d399009313d557779dfd64d56d7b6df1328b003c07d43c9280e2cbedc124ed
 MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild
index 9d1dae31213a..f88096d3c7b6 100644
--- a/app-text/mupdf/mupdf-1.19.0.ebuild
+++ b/app-text/mupdf/mupdf-1.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
 IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index 29afc2069827..6f5f67cdb287 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -5,8 +5,8 @@ DIST nuspell-4.1.0.tar.gz 380814 BLAKE2B 500da0797e4f0d1939afd8451b734f309b5c58e
 DIST nuspell-4.2.0.tar.gz 382635 BLAKE2B cc141e764ce4e649a7a10f213c392973eb98eb21adddc7d2cd46c01f3cc9a6c85432bfb13ce178fba387a01aa1661e7c9b6a4717fca18fb3bfa220732daf53eb SHA512 ae9157e9753868c002ed69a765fb705d29d993f3940e11efbc2699778a8b1abee2eb7daa0ff51187b899d6935a215a24662e5b52ec1ef5c644e90a0245f7583d
 DIST nuspell-5.0.0.tar.gz 372940 BLAKE2B 67e3b9b73f79d39c7cdb371ae7699fdaf8323db15dacd17907642f3d799eeb3e3303678d4a9ee4c5a88a5f61d7f1778745590fbac880625dc08c78e94752da6b SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5
 DIST nuspell-5.0.1.tar.gz 372917 BLAKE2B 30743620035fa49b9d2d190673de1b3de4be0978633eeead1775586c5ab4f0912e4f778867b5839105d1b4f4597e8a2ece33ddbb3290b6447755bfe4a742ea5c SHA512 f883d8c8a3a722a62d411d7b0973dd409c6d09d08ea678c577cef68ec8b5c7e4a4e4cb8a1323e632114414fc17137d1add996a72fbd522ab4de8c6f70fc77073
-EBUILD nuspell-3.1.2.ebuild 1170 BLAKE2B 016ae5d2d29907d7ddd8bfde4f17f6b17259a79e75f1de133ea9074d777dd1a9bb7a3a6d53c188232720360d0714e849cd821cb80477dada5c89fb7e7508696c SHA512 eb61874975da9232e1dcacef814560c4eb43e8664e0130561e20b976c4b1a98b3b3fe7a64a90ccc2adc4c8c4ff707eda831658ca609a31122e41d49fef16cf0c
-EBUILD nuspell-4.0.0.ebuild 1170 BLAKE2B 2492c07d1f7b6ab3ab9bbbec92e1ab493931ec69352ec2b8f4dc6559e905982938c25bdd3cd30f6f04e9c153f495a3228ab5719ec8fde7a2c98d0b565e28bf1d SHA512 4f9b2ba615a77757d70c9e1ab1569ec8330d6c5ef89c7f32570e7dd41b7bdcd08ff2569c7c2951996a8b83706b77e572d0f9500a5acfe4b2de3300e33c7d3ae5
+EBUILD nuspell-3.1.2-r1.ebuild 1203 BLAKE2B 4fce19158989243e396139e92e5e26649c23d8b041dfddeb0135564660af39dcf9eee19d33db57304b508882dfb08a444e10d39958ab3de14ff4f4340255050b SHA512 48703b751d89adfe0fa14170c5a52007c7a87dfc47a8a9a16b2242a89c2701d73c76b5d84529146d8ef9af31b92cfaf27f78c96dc25385d27fde8a2466e1f0b7
+EBUILD nuspell-4.0.0-r1.ebuild 1203 BLAKE2B 862c4521ddbe12201cebc5feebf00269f6ab3930858337008fe5019be804fda1fe23d74d7dc3a41bf8948bece3a92f317ba0dafbd9c2d8c381e6e8b175e35826 SHA512 e5d5becea73860e081f851977ff48ff4a0f72b86101276cd20268fb4672ef90d8ff50d34b7d1cf5c0a488b4a0ce24d54278469a23278166255603a48d9eb9e20
 EBUILD nuspell-4.0.1.ebuild 1172 BLAKE2B 71b47bc2e71e680cbaf050c851332e0c58fa63e61fbeec724c740571132f8fe38fae1abbe758d4236456ab788aad1b931c346df72d71eb5733ad155548259034 SHA512 140180c0c6f8f2a9e8bca2677601a8129dfb4761db93265affee61f0f57fcb33b428817b03a8619f2b1cc775a1c126e73ae58e24ca84fde3787fd127d0464ede
 EBUILD nuspell-4.1.0.ebuild 1172 BLAKE2B 71b47bc2e71e680cbaf050c851332e0c58fa63e61fbeec724c740571132f8fe38fae1abbe758d4236456ab788aad1b931c346df72d71eb5733ad155548259034 SHA512 140180c0c6f8f2a9e8bca2677601a8129dfb4761db93265affee61f0f57fcb33b428817b03a8619f2b1cc775a1c126e73ae58e24ca84fde3787fd127d0464ede
 EBUILD nuspell-4.2.0.ebuild 1142 BLAKE2B 940a20fd21b52017c1e8d2d2a9dcc56de5f1e2eaabfe72b2c6c06052fc8bb8f372e88452eeb0f7d702c6ff93d630212a53d66b5939a786f2b72de437b2a693dc SHA512 3c4c91aa5cd1f38389884bce74fb343877ad0977ed8ad4919ef69dc00f87350416e964384f2b62c875221657b37a398279838dbe3f0e1c5b00c36293046c99c0
diff --git a/app-text/nuspell/nuspell-3.1.2.ebuild b/app-text/nuspell/nuspell-3.1.2-r1.ebuild
index 57cbf24e8c75..f0fd181ee336 100644
--- a/app-text/nuspell/nuspell-3.1.2.ebuild
+++ b/app-text/nuspell/nuspell-3.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,9 +16,9 @@ IUSE="doc test"
 
 RDEPEND="dev-libs/icu"
 DEPEND="${RDEPEND}
-	doc? ( app-text/ronn )
 	test? ( >=dev-cpp/catch-2.3.0:0 )
 	>=dev-libs/boost-1.62[icu,nls]"
+BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
 
 DOCS=( CHANGELOG.md )
 
diff --git a/app-text/nuspell/nuspell-4.0.0.ebuild b/app-text/nuspell/nuspell-4.0.0-r1.ebuild
index b7de7c6dd8c8..fa2f0d78afd0 100644
--- a/app-text/nuspell/nuspell-4.0.0.ebuild
+++ b/app-text/nuspell/nuspell-4.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,9 +16,9 @@ IUSE="doc test"
 
 RDEPEND="dev-libs/icu"
 DEPEND="${RDEPEND}
-	doc? ( app-text/ronn )
 	test? ( >=dev-cpp/catch-2.3.0:0 )
 	>=dev-libs/boost-1.62[icu,nls]"
+BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
 
 DOCS=( CHANGELOG.md )
 
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index d2d2aa140e08..add8918a8886 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -1,5 +1,5 @@
 AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d96bf5b2f645d2d6706e82ae1767a99fed8f6ca4bd4f1abbc24bf80c4fa00d848f03056b01ac98f5b8a74d3a78c4467 SHA512 dea5fe17ea2662150b201ab6011bb01ba0f0c07689d267ec4086a914cefef3e91967f8db4be0258bac87d3cd73a9b05eb1f879415860552d9853e66e98e16e11
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
-EBUILD opensp-1.5.2-r6.ebuild 2082 BLAKE2B 34c5958335d5a556e7b7faf08bc38afc7eef200239f26b55da7ec9bf78493cf506ca07ffae600886a409ef5927a0f84c3b5d0c8346218e0059729de887985244 SHA512 c005aed3eb1c85e0955b532515227cc20977c158346b54aee7b1335bdc0f4f339ed7b5ee6dc4a8c4743a31f303833f5a2f2b02d66df77794f29d10cd47a77d31
+EBUILD opensp-1.5.2-r7.ebuild 2103 BLAKE2B 3fc8034b281bf7f97fa2f8b30ba7e7a43f835ad1d5b9011115a810cf508c5861a2cb965a7316990e85e96403109fcddfc7eb34bea2375241bbfd36e87fc32a0a SHA512 142cb390ab5fec7703eec1f62c63bbad2043c20797eac2752d16b03d7b43a41de2ea67c7c94bac4982d6b99c6bc24ff5a5850e8eded03dd325e5a3d456981b56
 MISC metadata.xml 321 BLAKE2B 5571226bba817c3d5cc47e0bd7d67e82399403e24e7773104f33b13bf40d95113da9613db2bd77408557e6793b9efb6d435402a7b680d07e1e3e6952614bdedd SHA512 95c0d6759a91874b81b707e479eee48bf67ba762584587b4027b583e42d63a83018a3243fe81b6649090d1e0167ab825b591dfccbd3a8db9078b1a80f729de15
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r7.ebuild
index 433e25dafb4a..ddf0d6074591 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r7.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch flag-o-matic autotools
+EAPI=8
+
+inherit autotools flag-o-matic
 
 MY_P=${P/opensp/OpenSP}
 
 DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
 HOMEPAGE="http://openjade.sourceforge.net/"
 SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
 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="doc nls static-libs test"
+IUSE="doc elibc_glibc nls static-libs test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	elibc_glibc? ( net-libs/libnsl:0= )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
+RDEPEND="elibc_glibc? ( net-libs/libnsl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
@@ -31,11 +31,13 @@ DEPEND="${RDEPEND}
 		app-text/sgml-common
 	)"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-segfault.patch
+	"${FILESDIR}"/${P}-c11-using.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-segfault.patch
-	epatch "${FILESDIR}"/${P}-c11-using.patch
+	default
 	use prefix && eautoreconf
 }
 
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index acef760d9d1a..bb8f437eb5ac 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,6 +1,4 @@
-DIST pdftk-v3.2.2.tar.bz2 1245439 BLAKE2B ac1991e60ad06308cb7be1e74f9b3772c80416e490fe525e806efb6d30c6bbc9d310b98c255ef9e3eb3f814541d7388140210c4df2b694bd4a9ee325c27b3f24 SHA512 03220ac3036098768dd4250bbfeb6675561e9126697b99703ab5788b2cee7551256c301d9191745c5fdedf429056b46641351d1fb92631ef17673d7e740c5431
 DIST pdftk-v3.3.2.tar.bz2 2169492 BLAKE2B 53cb98fe3e3d1dbe8b01a45b5b11c6fbe57017ea8029efe35677914a48ffd446c5d67621443a89f512b15d0f7e77a81c945d4c220ccaf4fd658cc1726cc32059 SHA512 b02c713b67531205e760e8d8a240a82af47dbdc28e59aa683e03772d2fb27b504b98f8be1e8dc73bfc967cc9532f3dc1eccbd105abb21db396268855233051eb
-EBUILD pdftk-3.2.2.ebuild 900 BLAKE2B 4ce505b123cb0eb98db780bc7b32016e0363bfe489fbca02a84b4db29748e3e39a925d7fa15bf725c157fc997666a4af43b38acee14f0e39bddbc2769f4cd55b SHA512 8f7b74233fa3de35807c93f96721358ad5f107354e6289fd447d4dc37da5cbb35945d18e4631a8292aefba9fd1326babb9cdd8b9b8a1901f207a7b891ae77046
-EBUILD pdftk-3.3.2.ebuild 906 BLAKE2B bbc5a168431ff4f4f8a51ee581c1dde06c3044212be071360168a7f192cf7f257fa3b0bf966cc66532763b3cbe5ac74fca56de276f8afbf17cfe49fa7a837a5a SHA512 312c2f2bfb40abc41c2b67f96ecb54b1cdaeeb083dffb2d395e5fb757e56b7b1d128850f64c6427a4066734a2cf33d29ebbf3841497cbc8a106edb1c305de55a
+EBUILD pdftk-3.3.2.ebuild 904 BLAKE2B d51e397e8d255e08c859516bf94f31516ae6c7d819ff86ca178b53b49bf37e6afe5306b213b5f07e779c139e728014038d6bdf70ca8f36fc088675ebbdddb4ad SHA512 1c0a7cd38337a472350b70a2654d63fec064b2d6313081dc7f69f797bf8f525218003eba7d0b8586790e4f773760ad56acdb11d2e11639580764c0442551077f
 EBUILD pdftk-9999.ebuild 906 BLAKE2B bbc5a168431ff4f4f8a51ee581c1dde06c3044212be071360168a7f192cf7f257fa3b0bf966cc66532763b3cbe5ac74fca56de276f8afbf17cfe49fa7a837a5a SHA512 312c2f2bfb40abc41c2b67f96ecb54b1cdaeeb083dffb2d395e5fb757e56b7b1d128850f64c6427a4066734a2cf33d29ebbf3841497cbc8a106edb1c305de55a
 MISC metadata.xml 349 BLAKE2B 3fd6e82540ef8da6c46195a90af4638d914e5f3f6a1e6f3e3dbf0bfb940f23ed7b26578185219ef1fd00f069bb38a308056a39edea7661e263ac523c3bd40a2e SHA512 364f75cc6a80de2e1d517b094c1073fab7fc10738182d1fb37f0723fdcfc5238704f905a0f6ec8e373e1a91f2a7ad0990891beb26f94010eab13e8f688d230ad
diff --git a/app-text/pdftk/pdftk-3.2.2.ebuild b/app-text/pdftk/pdftk-3.2.2.ebuild
deleted file mode 100644
index 5600e30323a7..000000000000
--- a/app-text/pdftk/pdftk-3.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="gcj-free version of pdftk written in Java"
-HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
-else
-	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	S="${WORKDIR}/pdftk-v${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-JAVA_PKG_STRICT="yes"
-EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-CDEPEND="
-	dev-java/bcprov:0
-	dev-java/commons-lang:3.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8"
-
-src_install() {
-	java-pkg_newjar "build/jar/pdftk.jar"
-	java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
-}
diff --git a/app-text/pdftk/pdftk-3.3.2.ebuild b/app-text/pdftk/pdftk-3.3.2.ebuild
index 01bda985c416..a832a031427a 100644
--- a/app-text/pdftk/pdftk-3.3.2.ebuild
+++ b/app-text/pdftk/pdftk-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
 else
 	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	S="${WORKDIR}/pdftk-v${PV}"
 fi
 
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index b570bd8d90b8..136d420b861b 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -3,6 +3,6 @@ DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813
 DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
 DIST po4a-0.65.tar.gz 4152612 BLAKE2B 81d330f234cae10f228b5de7e8417f79d7008f827faf676a68c83b05044a2198c1c03f8d19d8bbbfdb71a83cb93abc319e7e6ac5ce57704294d0f3b858bb9b56 SHA512 eea2ddc1344d371ee685e73dc3c3b1b58d24f8bae7edbe7f2112bfead1c481c6796d02c5f7d9fc9bbac57bd93c4194ade51368bb8b29ba62aee333a7afa2e7e6
 EBUILD po4a-0.63-r1.ebuild 1372 BLAKE2B 1f74822760c0db37f0644721e1c7b8f17635c268b7ed802e4ae60127c0d59a7c073faa8706b3455adfaa952869c603ab843f96f2fefa994eeed04b997eeb2431 SHA512 82f12d2cc7b3a27e5f1aa2ebe65870855b164b4a4127d1396fe6c015865107e03ccf9e8d655419d3e70a147b2b08b95aff625510408973427dca7e5a051781e9
-EBUILD po4a-0.64.ebuild 1386 BLAKE2B 774fcd30b694e0a37b8e8ac1f56a3c101e8f02d00774b9e8f7d126710223c26512d6222e4f3dbf4a6057f29f685e1bcd292f0bf9068edf6e7e06a98cb5849900 SHA512 adc5a01e4a974e4e8194952ea759f5020c11bd943bd7cc68a51f72cd3d81fa747180959272442445b16a875f5699592ada6fc433a60548623863d60b799d8c28
+EBUILD po4a-0.64.ebuild 1385 BLAKE2B d8dc3462be2d9ad83c9046542c7c4878b0708c6097af240e5165a1d03ae118a0619a63e5c508ede6b85b7470f4221dfcf22a11f7aeb5f2c10c61bd86bbe83873 SHA512 eb30319d6d96c536cf8c2344a6b160306170db4ca973dcb17144aaf617bef7882555b3525b41a81f81db31a9ca26ebcba9e0f40f630e7829ba685cf901a05da7
 EBUILD po4a-0.65.ebuild 1411 BLAKE2B 0450c2b8a4258daa5a36024a03bcf7566f171761eb0145684d6a79c3c2996ca41f01f20f231251f24e16afd13193b65bcbca356740a2546c1ab05e7434bfdc7d SHA512 66a22a0d55bdd5aa71aecb5d9a275a9d5d043d395e7e2b3d629366a85f4903125b12991918f63127b56eb6a52561335bb11005beb2d47fa0051bbb6da2f370be
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/po4a-0.64.ebuild b/app-text/po4a/po4a-0.64.ebuild
index 2e2a180300cb..7859d1c978d7 100644
--- a/app-text/po4a/po4a-0.64.ebuild
+++ b/app-text/po4a/po4a-0.64.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index fc0dfd6f5a4f..b521611d09d7 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,3 +1,5 @@
+DIST recode-3.7.11.tar.gz 2405035 BLAKE2B 363499d265c201e9c8c4be0821efd9900e72aa21aee2e6f77ea85b5a31afb43a905eb5a88cbf1be0fd40bdc44f8707b24fe5a896cd645f5674ae69027bd167a9 SHA512 b00be87c321f5fef6aa0a7813f97b2368cbcac28f0c9e856b81e84ff878689428e1ca079a255ad44beecdcdf6efc7406517fa3116f12886bcc421b323e3810ce
 DIST recode-3.7.9.tar.gz 2230259 BLAKE2B 36039ba9e62c5113231764dfa9cffa73b7ff5cd91bab622a0daf0a48a73ab8a62afd16132cec2590eed14623ce5b86ad057e8ca8454cf8185869f0780b3523e7 SHA512 277074dee63cdc7f1a1be2acca67481b8fb816bd4319fe8e882696e42d15309750b930fa9e8d6286e714132a976f0eaf87f718560d6cb86eeaa79b86f0700a6c
-EBUILD recode-3.7.9.ebuild 1308 BLAKE2B 1d563895a5a28120b51384b8003185967a255c3d5147909b32c07e1021c7f884c054eba5f05844ba16e818547f7d995199dcf3908da38cf87ad9215ae109509c SHA512 b297ec5032cb8d23b05117cbb50ea14f6675fec15076aeb0431c9efe8f6c177318c7d2f18d9cdcc552c95b121b5e135c4a6882963b0c77ad3a3967bd9af92238
+EBUILD recode-3.7.11.ebuild 1316 BLAKE2B 5eb3d2a848d845b971889e8016a28b0bb1b15e6fb5afaea150637f37966c04d2c4440f9a445b4498915e80a5c6e77dddb23fdd146da8b7ca56bfc16c35061b2e SHA512 8f339cbc1f190e3963766a6ac0ca938d4ef67eed0395b30630e233b5e6274ceb3f1ed28fd1fd0614440fe0d84e45a93f389ed8411531a1e98c15e796635bf768
+EBUILD recode-3.7.9.ebuild 1307 BLAKE2B fa1ea275681fa935a04ae1bc1f460aa8f1ea150663026dbcb22fd43e6b00d5ad8ce0e877d1a197761ff2c4632059b8627be0a7d9bf3a93830cb6fba4dfde274e SHA512 3ce036702e82736f1f8e1380228b033293c26cc084c00540e0a31b682a6778c91178d29d8b95aa46595f138cac552af4fc8d08d83a6d1c713bf16e0ddf6c25f6
 MISC metadata.xml 431 BLAKE2B a2f1b90590a30ec6d561845193e29d2fde7254ece1cc31b777bc5d3ed85aae53a6abb23cd9a00f9fd07ac4e13ccabd35e2fc71816106e46c89ff0607e869419c SHA512 388038f9e95b0491e8061def1c405facb327e8feefeca08d7b425b143db03d4f7745c6b7515cc000f42992b97cc9e82aac7660e313a2159d324883792d6d85fb
diff --git a/app-text/recode/recode-3.7.11.ebuild b/app-text/recode/recode-3.7.11.ebuild
new file mode 100644
index 000000000000..84074fbac49b
--- /dev/null
+++ b/app-text/recode/recode-3.7.11.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="https://github.com/rrthomas/recode"
+SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+# librecode soname version
+SLOT="0/3"
+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 ~x86-solaris"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/libiconv"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	if use test ; then
+		has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	tc-export CC LD
+
+	# on solaris -lintl is needed to compile
+	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+
+	# --without-included-gettext means we always use system headers
+	# and library
+	econf \
+		$(use_enable nls) \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/recode/recode-3.7.9.ebuild b/app-text/recode/recode-3.7.9.ebuild
index 824721b61d61..31a05a563f10 100644
--- a/app-text/recode/recode-3.7.9.ebuild
+++ b/app-text/recode/recode-3.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-3+"
 # librecode soname version
 SLOT="0/3"
-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 ~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 ~x86-solaris"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
index ff834d0c2452..cb9af82ff3d4 100644
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -1,4 +1,8 @@
 AUX test.xml 3053 BLAKE2B f9837b05c4ac00fa63ce75f04318f3378c2cc0c99680c21520d7d75a74e0e9ad00a9fcdf4857655ac32a3eea935208dc86e51d2bbef3e2349cd78d65ed74ac30 SHA512 11b4faef6fce89d72e8cdcc25cc1dc6c89ea7bc44252e0521a9a5ff47f686e78c46eac6b606e47f51b0bdb8175e583d5c1c56bdcb8bea105c70a63b65f20ea67
+AUX trang-20181222-build-fixes.patch 968 BLAKE2B 5f84f3388133b126c711024750f85aff03cd76027ebd526e3eec4b4a605c4e3515662e2d2b1abcf3df08e88176a248442478d1350946e3b3150e00ab928a85db SHA512 ac8bf8e5f8f71f9271a9adba732112b39c379946298b859ab7504e4f861274670666f4a2e0337712a607049f34dbc206962fe2ff8883b8a8a7c5e09037f67062
+AUX trang-20181222-unicode-data-path.patch 627 BLAKE2B 78ed1c0ad5cf4327311ba9a65113bbc38554444625fa1da1ac90586e7cc4b87722458b483219c9c6a1132ffff3076a8d4dec120de772b4191ebf7db8cdc33224 SHA512 51909cfdac55204197478e7484794cd6d4a0892baa94d0a98e46bf1e227b7e21ac544451ff1fe9c4a4fb67fe3dc2b557d98471abc5ba130a92da973aebe41495
 DIST trang-20151127.tar.gz 13746141 BLAKE2B 8895fefa8be62a524a2bfb603a64bcf641f13cd500dbe51b9efdaed7d5147dd6478963d356aec81c5c5b6af12a59edcb908d203b6b8edaf093fe29f76db80b7c SHA512 f5c6973791e8caa8dcce6bbf92cbd58491f55edd7819523947ad718ea3973eb81afc6b21d4e830949c2f183b485915dab98dbb5b90e01324677cfa41f5746e26
+DIST trang-20181222.tar.gz 14847113 BLAKE2B 335722853b2d373fd9a6e9d4478b8248ca49d0559d5a8f60566f5550e60d5a004f26338897617acc617f84d1d55546afb9c51da64b7634514fa2ec508fa7a47a SHA512 fa412a5beeff07a620c4aa5723cf5b73bdb6b1cda561e3bf7764a609110f538da5313bcc79aca4d7742f71b3b071d3537681845d17ece46bc871c0964f4e251d
 EBUILD trang-20151127.ebuild 2070 BLAKE2B 6302b85f0047cb8fae003b7bccbdcf2bde3f24d4395fe8b3023bf425bf9cda31d4b3ef9bb42c73db51e4e14858ce907bb13a9d2744f8e3e1ec4db6ef1810f23a SHA512 45ef3c04539287046ba9792f018f838079e9d40b8c46771702c0f6ab3c952bd3072e5e071f8205bf747610e1a4ee059fe847081d2ea256865893a6dc3bcf3fb4
+EBUILD trang-20181222.ebuild 2224 BLAKE2B a5bbe67ccbd909bbb01f48dff6b61f641fd8b8cfc2afff743a16d3a0d525d5a75dd7910076ffd4980be4f1defb6c14ef875b49fc55c76fcedfc3427ad872cc3c SHA512 ce5232eb5bf83c5e029b0866f4ed97d62c8df6b619fb11a474c19d2c297e37e5ba6246e539b065763be2a88f7059770355a31191ed5d03f6f28f0457231421c3
 MISC metadata.xml 375 BLAKE2B 0c05bab3ec0ef8605c8422510fea174514ce9fee8e642a2172c6e1eff07ad7cd0f10bacf1478477cf3a94abfca23a48ad2a18d5ed8133c4165694f1bbe930045 SHA512 fdd72c06fc6e618e789ef0bf85e6f4bb566f4bc36032d8d428ea8596d610dc3d0b435b03de0e157ce5cf3402edf4832e9c45c3b4d69401846f004ab69377a00b
diff --git a/app-text/trang/files/trang-20181222-build-fixes.patch b/app-text/trang/files/trang-20181222-build-fixes.patch
new file mode 100644
index 000000000000..ef7118c650a1
--- /dev/null
+++ b/app-text/trang/files/trang-20181222-build-fixes.patch
@@ -0,0 +1,31 @@
+https://sources.debian.org/patches/jing-trang/20181222+dfsg2-6/javacc.dir/
+
+Description: update local Java path
+--- a/build.xml
++++ b/build.xml
+@@ -1,6 +1,6 @@
+ <project name="jing-trang" default="jar">
+ 
+-<property name="lib.dir" value="lib"/>
++<property name="lib.dir" value="/usr/share/java"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="doc.dir" value="${basedir}/doc"/>
+ 
+--- a/build.xsl
++++ b/build.xsl
+@@ -23,15 +23,6 @@
+     <target name="dummy"/>
+     <target name="init">
+       <mkdir dir="{$build}"/>
+-      <exec executable="git">
+-        <arg value="submodule"/>
+-        <arg value="update"/>
+-        <arg value="--init"/>
+-        <arg value="--recursive"/>
+-      </exec>
+-      <copy todir="{$doc}">
+-        <fileset dir="relaxng.org/jclark" includes="**"/>
+-      </copy>
+     </target>
+     <xsl:for-each select="modules/module">
+       <xsl:apply-templates select="document(concat('mod/', .,'/mod.xml'), .)/module">
diff --git a/app-text/trang/files/trang-20181222-unicode-data-path.patch b/app-text/trang/files/trang-20181222-unicode-data-path.patch
new file mode 100644
index 000000000000..e1aaf5452f47
--- /dev/null
+++ b/app-text/trang/files/trang-20181222-unicode-data-path.patch
@@ -0,0 +1,15 @@
+Adapted from Debian.
+https://sources.debian.org/patches/jing-trang/20181222+dfsg2-6/unicode.patch/
+
+Description: update unicode path
+--- a/mod/regex/mod.xml
++++ b/mod/regex/mod.xml
+@@ -46,7 +46,7 @@
+ 	    failonerror="yes">
+ 	<arg value="com.thaiopensource.datatype.xsd.regex.java.Categories"/>
+ 	<arg value="${build.dir}/mod/regex/gensrc/main"/>
+-	<arg value="${lib.dir}/UnicodeData-3.1.0.txt"/>
++	<arg value="@GENTOO_PORTAGE_EPREFIX@/usr/share/unicode-data/UnicodeData.txt"/>
+ 	<classpath>
+ 	  <pathelement location="${build.dir}/mod/regex-gen/classes/main"/>
+ 	  <pathelement location="${build.dir}/mod/util/classes/main"/>
diff --git a/app-text/trang/trang-20181222.ebuild b/app-text/trang/trang-20181222.ebuild
new file mode 100644
index 000000000000..3ca0be320143
--- /dev/null
+++ b/app-text/trang/trang-20181222.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2 prefix
+
+DESCRIPTION="Multi-format schema converter based on RELAX NG"
+HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
+SRC_URI="https://github.com/relaxng/jing-trang/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/jing-${P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+	dev-java/xerces:2
+	dev-java/xml-commons-resolver:0"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${COMMON_DEP}"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/javacc:0
+	dev-java/saxon:6.5
+	dev-java/testng:0
+	${COMMON_DEP}"
+BDEPEND="app-i18n/unicode-data"
+
+EANT_ANT_TASKS="testng"
+EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_PKG_BSFIX_NAME="build.xsl"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20181222-build-fixes.patch
+	"${FILESDIR}"/${PN}-20181222-unicode-data-path.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify mod/regex/mod.xml
+
+	java-pkg_clean
+	echo "<version>${PV}</version>" > version.xml || die
+}
+
+src_configure() {
+	java-ant-2_src_configure
+
+	# Because this crazy package uses XSLT, we need to escape this.
+	sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die
+
+	EANT_EXTRA_ARGS="-Djavacc.dir=${EPREFIX}/usr/share/javacc/lib"
+	export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)
+}
+
+src_compile() {
+	EANT_BUILD_TARGET="modbuild trang-doc" java-pkg-2_src_compile
+	EANT_BUILD_TARGET="mod.trang.jar" EANT_BUILD_XML="modbuild.xml" java-pkg-2_src_compile
+}
+
+src_test() {
+	java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.xsd || die
+	java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.dtd || die
+	java -jar build/${PN}.jar test/test.dtd test/test.dtd.xsd || die
+
+	md5sum -c <<EOF || die "Failed to verify md5sum"
+4bcb454ade46c0188f809d2e8ce15315  ${FILESDIR}/test.xml
+d096c1fb462902e10a3440a604a21664  test/test.xsd
+3fb46bdb16dc75a2a1e36e421b13e51d  test/test.dtd
+fce355ca962cb063d7baa5d7fd571bcf  test/test.dtd.xsd
+EOF
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	java-pkg_dolauncher ${PN} \
+		--main com.thaiopensource.relaxng.translate.Driver
+
+	docinto html
+	dodoc build/*.html
+}
diff --git a/app-text/uudeview/Manifest b/app-text/uudeview/Manifest
index 2bb1560a3c2a..ce40dbc50528 100644
--- a/app-text/uudeview/Manifest
+++ b/app-text/uudeview/Manifest
@@ -6,5 +6,5 @@ AUX uudeview-0.5.20-makefile.patch 822 BLAKE2B b7729d04f9b881924205efce8dbb398b1
 AUX uudeview-0.5.20-man.patch 3246 BLAKE2B 390d89a13080798b1ef0f902d92c82df59c10c6bb5b34eb8655ceadade0e31b0e81c100fc3e8908edf6c482c51c2560b90aaff8156b7ca805908036aa8342b77 SHA512 a940d6663563e7a91b35f5350e05b6cb7939f06d7db8767a8a5483dc82477c796a351cc03be9de49bd55513ca0b2e3203cd82c4b834caa54da9c8aae5750136b
 AUX uudeview-0.5.20-rename.patch 1736 BLAKE2B 820e32f9d2fd248ee2748e3f6173994b02074720814ec8adc6a896b72defc29ce24a356626c7bab414c516555547fe04cbaf304a52c9f141b80a836593c8638f SHA512 afb5b72bca70eb7c156584df1b44fa3cbb6cf07da97a79ff6330acb52ff102584b7a382ce779f2f695c9384d017984cabc670d31b243c0e5d916df19c6846439
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uudeview-0.5.20-r2.ebuild 915 BLAKE2B 584efb60337f66d21187ad432eedce73f9ab56e0d47174ca5844b85caaacf457fdf90458e29a294c8bf9c8cb9d09fa0bb48fe9f90fa1d8bfba683a766d2d9d65 SHA512 65cafdef3c549f7de91202b343411e7dba71db676ee7bfaf60a5861c450adbe0a1a7faea3396bef1bf28ff96d405c2f3e381aeeee9531b326c9a1ed768ff139a
+EBUILD uudeview-0.5.20-r2.ebuild 915 BLAKE2B cb90d99429ff87ae32bb43766ff681eefc2901f577e98deb0151aa7f1d4d72dbd8a76a57083e27acca98f30c7cb8eec64fdc15adc8e7f9c920662c2af459cd00 SHA512 4b159d03eb9ea9621d1a6bdc4e9cb72dfb1412da77d6bb00278af707bc12689f67145fa408c89139c4139bec1e38d19e05312d90699dd4702b5d0cd84f393292
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
index 72fc9d499c88..6e3b8d57277d 100644
--- a/app-text/uudeview/uudeview-0.5.20-r2.ebuild
+++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ PATCHES=(
 DOCS=( HISTORY INSTALL README )
 
 src_prepare() {
-	sed -i "s/^\tar r/\t$(tc-getAR) r/" uulib/Makefile.in || die
+	sed -i "s:^\tar r:\t$(tc-getAR) r:" uulib/Makefile.in || die
 
 	default
 	mv configure.{in,ac} || die
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index 721e4ed07523..c95cd1a5339e 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1,7 +1,9 @@
 DIST vgrep-2.5.1.tar.gz 1355092 BLAKE2B 82b9da137400ede07b3fc2472168139385df8ee639aa0ba34832d20e437ac3da5a86f89fcc9139faa0ca3a037a358a50947b982473d114056483aaf9cfdde52e SHA512 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd
 DIST vgrep-2.5.2.tar.gz 1571753 BLAKE2B c3378fa11e9bb88fb8d63a380722603efa0725e2d43b69aafbb6ff8788abab441f1fbd3d0c946c922c8100863c185623b41aa76a04e81aab302b26d68f5956d7 SHA512 dc63647b995a21e75d9658efd7e9bcc4c706221ac249d0273cf6997eef832ba4a27f825126fb3fb4c65d724c75e27d04e9b5505b0b65c9b9b0022a49580011a6
 DIST vgrep-2.5.5.tar.gz 1571944 BLAKE2B 263ae7c9092de890861f9f8acf69f06477b7cb4078274ae0dd67b2c5ba2aea0058e57fee9b3efb51e1393fea803eaa26be853bf575821f5b4aa95935230f332f SHA512 f4f37eb2fc95e3937085bf8ccb9e908200a2640928a0ef216bf4f1bd510f2b53bcce2f01251a898ea295876789362fb5be5fc0bce0dfa5a77262b70f9a4f98d4
+DIST vgrep-2.6.0.tar.gz 1589155 BLAKE2B 847954ccf020c2b7f54360aab2fd9e3fc897dfd3ceab7d9ecd79f378c18196048649b37f4f9b62dc8f2af46f874a8433c8a20e5e025ca9e0f08b8f6859b0dd40 SHA512 712ca1ab4318a69fbb9f0e60343c188b292c59c52ca488adb1db546937822b0e49a49541e2b9e69cec6b721003198518f530521f4c726988516bcd64e7247846
 EBUILD vgrep-2.5.1.ebuild 645 BLAKE2B 00198ae16ad677349172aa644376ec3057d6e813575c28558ece7aa39ffde63a383bfe69111ce9cf25465cb66f0dfd4b12b4ab1cf1c3bc0cec17626db3b52367 SHA512 42caca3b8423f3189005c74d6bb52aae5f86d62e4b98293887fc5bfce5af4e50c0e6764064006a8ba46ff61977f06b070dc414cebe2a1515a2269e49fb0e5d5e
 EBUILD vgrep-2.5.2.ebuild 646 BLAKE2B 4c20d640f0842e708fe2e75eef6bc467a940d78305b81fee64ca4ac97e06e309b88da0dd3ab83c91a82bbf07cbadc8b8617f1e4444268cd0a45cb8d3ab5ac73c SHA512 ebb564be732ce64e4ca68a8848ae6bb78a4f8f8d056ee682a961f076b44f671bc78793bbc1959b3d2d10a07c51e1c14e8dd22b7ef30863ec6349bf894d52d9e5
 EBUILD vgrep-2.5.5.ebuild 646 BLAKE2B 4c20d640f0842e708fe2e75eef6bc467a940d78305b81fee64ca4ac97e06e309b88da0dd3ab83c91a82bbf07cbadc8b8617f1e4444268cd0a45cb8d3ab5ac73c SHA512 ebb564be732ce64e4ca68a8848ae6bb78a4f8f8d056ee682a961f076b44f671bc78793bbc1959b3d2d10a07c51e1c14e8dd22b7ef30863ec6349bf894d52d9e5
+EBUILD vgrep-2.6.0.ebuild 646 BLAKE2B d5d8e4047877ad4663acc00d6a808097efb0fc0904b623dfad9d6b746e6c468dceada877a169a70dd10c63acf13aad2e9c9e2069b89247745604e4c809519685 SHA512 925577a75e00e9133a814f292b54f6f0aad3bdd41b81b00e840194cb0ddf3ca0cfce93444f258223495a6d2bf36ceeb46a7cd58b94fa1917e32bec7970ff98b4
 MISC metadata.xml 395 BLAKE2B e88ecee1ff22ae904be1240a1fcc62b8c93adbcc1a50cdc5109dca17359d0d39f2c3468e844cb125870f244a1fd3c1eaa6332f91c6936c76911678d1872ba56a SHA512 adb30f2b4351a77f73c617b4bfce45dafec6f8c17ff4cb0b375598e05c92fda79a2f091553c68df383bbda5d9001e73f23607bc3ca07515fa389f1bb25392b2a
diff --git a/app-text/vgrep/vgrep-2.6.0.ebuild b/app-text/vgrep/vgrep-2.6.0.ebuild
new file mode 100644
index 000000000000..3ca9a3117ab5
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# golangci-lint is required to run tests which is not yet packaged
+RESTRICT="strip test"
+
+BDEPEND="dev-go/go-md2man"
+
+DOCS=( README.md )
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+	einstalldocs
+}
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index d957ab8268d8..614147cc1f78 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,3 +1,3 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 869 BLAKE2B 426d5ee138f5fa6f86702b391b8fccb6c65867cd2271712eeabbb4678a6b9f91ec8c26bb5a4f438df0e7b044b342946727949126e3f28b9dda8691aa825e1917 SHA512 47448ef8e3d4d8ec636116de592d449fd8ae2e59043087a0319deb3d77414a0c95d2cde2a8abe2e33503c0b848f0eaae8ae15b89d332aac6ae9177d6a19d704f
+EBUILD wdiff-1.2.2-r1.ebuild 868 BLAKE2B 0ac7ddaa3e76beb71c015caee820e09d484ffd4bfcc96c40213f3761d0e7745ff2447196a69439451e3f518022f0c20c46ce28be0a2402c66205173b9c24515c SHA512 2c382c2869049ab9881283b90814c9352a2a707a54e53ab924a5eb03d1c747c88606b05e9b5182fbf8fe68dd5ac376c0e9917f5e74a84ab7cb88770d634e464b
 MISC metadata.xml 378 BLAKE2B 95e3d451a7fd7af4da58c03b88615a0547c6063c0e4601dde7781db46f0805b06a76d900a0407ace672cf76c2b6c481f775c2b1d7da5653418e26ad71ae7ec32 SHA512 1da43e6a6e6907de98682dcb9221b33327d2fec70675452e40262eada16d7c94f312a1dbe40a770b064d4034848d84801f3a9c5f887a669664722198cadfea6b
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index 4e865d7184db..9f0af0d46f14 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 1c9863461646..0979a115fc88 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,11 +1,7 @@
-DIST xapian-omega-1.4.14.tar.xz 540532 BLAKE2B 193e03bfea5cf7cb5fc5bfca57f80b1390ba63ca999f235a10a7ab9bf4db378273cf6f7f6b3107c80c1ebb44bdb1a94ce3c00585f83ac0bec188163633be843b SHA512 27059d13bbdfc2ee9e8f4f6e74479bac0885cabab97d7eb1ebdc57eacbff1724b2684ba72efdf6d35f608e2e8f0891d47c626aaa100c713f4c2f66f923d841b7
-DIST xapian-omega-1.4.15.tar.xz 545916 BLAKE2B be89c817d13888bc8de28973be15a512992dc1e6c23ea55f0470b179c9b29b82f2f2988c6ac430d62c3e45e6502555a3497bf3f3ce7bebf832fc8cf8e3dc9f1d SHA512 99ffe32c37b22db4557cae214a157d3b1bda27b2eb86f99862ca59ac326e5ba3f044fbd58a0ec9db7098700dd6a2422634c80987c9152536ec217e48d9694679
-DIST xapian-omega-1.4.16.tar.xz 546360 BLAKE2B 990eab976833854d2a172e1584383b71375fe2e0b83a8ff0a150f4c9fdb6e99cbd42e58720e81698292843918112426d3b445efe14d9ee5f76e85304439475de SHA512 7f8c3d4e372c49f89e28da999ee49f0754052a339bbc4492b50f8134cf29b2c433ddae9e58ef3a2468898b711b4510ea87687a247ce21e83eba2f8daaa2910c4
 DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
 DIST xapian-omega-1.4.18.tar.xz 549892 BLAKE2B 440f7ac93acca5803c80d905a90db854f36a5fb1e486d5178c25db0490bc01812f2173feb8abb97a2e399449950524db7b557b303c671d1e9a50f062f332008a SHA512 35da36bdaa6997353554604db5ced3f3a05d0862ce5cf357fae639ca88a65ea83bf0be039629e6aedd67f8cb369a7eaeba7f279980c9e2f585083c737c61ea43
-EBUILD xapian-omega-1.4.14.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
-EBUILD xapian-omega-1.4.15.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
-EBUILD xapian-omega-1.4.16.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
+DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
 EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
 EBUILD xapian-omega-1.4.18.ebuild 1163 BLAKE2B dae372708867c009c83bc637ad3e1bcab78ebd8337890eae447236367109096f1bdb96e70ac9ed80b0b09adb37358d763d2db08f5aff37576b810f23f7429a52 SHA512 dfa45c4f78539ea8f1e485f3c0381645f44c95cf9ff10df293d8b1244b0a3b64b865c98fb5323db6594389e1550ec3338b711de9eb67198f854a57d7bac0ed0f
+EBUILD xapian-omega-1.4.19.ebuild 1169 BLAKE2B acabcf22c975b909dd8451f9a877a734d76b08acac626db3afbe43872cdcab4a072067ced0e75c54bd7a7ec650ec55b91182033081f675fbd68295c3149a1c00 SHA512 3eb46b32d2d016bd8d9da518944205eac0576bda3c04c0eb93388acf4449649143e09e9d782c8605cea77ca0a6d42e968454321e4c31f369ed68b4eb3c97106b
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/app-text/xapian-omega/xapian-omega-1.4.15.ebuild b/app-text/xapian-omega/xapian-omega-1.4.15.ebuild
deleted file mode 100644
index f76f70d1acab..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.15.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.16.ebuild b/app-text/xapian-omega/xapian-omega-1.4.16.ebuild
deleted file mode 100644
index f76f70d1acab..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.16.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.14.ebuild b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
index 51e7f7c7a19d..8095ec6dba1f 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
@@ -10,10 +10,10 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="dev-libs/xapian:0/30
+DEPEND="~dev-libs/xapian-1.4.19:0/30
 	dev-lang/perl
 	dev-libs/libpcre
 	sys-libs/zlib"
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 1394dcb070c2..a2d7d2e8aa04 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,6 +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-0.3.7-r1.ebuild 791 BLAKE2B 1c404c508b0dc647056799051ca1eebee5e340f8031f306fe9bbfe08dd5d9719532eb4dc5e22ab5659001d90860488f1b14ceceb35175c5c44056314a6f94032 SHA512 376fd36b73f1fcaeec6e72cabef9f2b7afb646a6b27262b6b2ab360502e55ac195ee9d4d8a8461ea24953304ab458093e49522ec48ae76b55343a9b7b09d82da
+EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 788 BLAKE2B d2693364d49dfb413554148616d543faaabee72dcf2edd047092ff75b40c16520b90afef49d1e0b4b35b1df367be4ee570786468e7775a63fac03f7ed8edf831 SHA512 832eada866899d6eb5b85f05fd26b1268b76b378d6ec05781f49dad5353c41f6f8cd5f1d888129d31d6cc66dd9d47b9941abbf3102caad62d8e254af293c2e7a
 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/zathura-pdf-mupdf-0.3.7-r1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
index 35451c79f998..36993e63161f 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 2ff06d4abc3d..ffd27a5a4b0b 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-poppler-0.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde
 DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff74f91ada036f0cc9beca49b2ebac3e09dbc8334b150ac313d75c3f05f7be59d1f42873a67b77c58186a40c41f88d4772f15 SHA512 588c1d03fef2b0cbb44af6904ab078ae3686d79ce05b1448a41a62ac807226cade4b54725002f0c4bd9c428b192b607664da4bdc8d83c792fab250ef43622a85
 EBUILD zathura-pdf-poppler-0.2.9.ebuild 742 BLAKE2B e3a1fbaf7947512832385b3b8ffd47a56ca09cba148a5d80af28457a9d041563eb5dfdf7bb89a0cd590f990a9c4265349a8ceb832c77b6ac1b0dd185b730125c SHA512 a8504ef444e936e214b3621ea3111d82a0e86f89f087531f9f82b9ea05e2648c9aa11adc19c923e33b6bee85330bc8fd9bf782ae78801dc303fccf62b0438ed8
-EBUILD zathura-pdf-poppler-0.3.0.ebuild 770 BLAKE2B b6db6889df5c3088c88eff744dcb688725b85ffcff86bf4ba5bfa68f0a63516e5f0e3912fa50ecfeb83a61b789eb7554a96f5f9e6591a9613d9096387365d0ee SHA512 a784650b714a0983050ae1b152e11422451a7b4e9d76c70c8004a34e5af32790166f6a502214e71105c0621029cceecefe0ab9ca5774abfdd1fa408eb302c50b
+EBUILD zathura-pdf-poppler-0.3.0.ebuild 767 BLAKE2B d4955dc86e748ab9710b15b17c83cb2cff34e11d845eb3261efc854ba7b132a8d6a90c05b5b3001fcbbc6c6d128a1442272012388ff2d48fcbeaa6724e84822d SHA512 e9e573f14940d53d9627b782aabe16e1903044b7490cd03047d05bba924ddac57493b98449602bce074611535fef9d4f7a031f90a1a9f3347670ce2ea20cda0a
 EBUILD zathura-pdf-poppler-9999.ebuild 752 BLAKE2B 1aa9d28b4eb5af1bbaa3b98351d744766a97e08e2395f2f180e2ff4b076865dbb58359cb1b616079e1bf0a6fd83f3e228eba0ac26631ff684a79018f371e7dfb SHA512 bd09f493abef296daba93fd43f3d68d2a1e2cf5015f189057cd676fd12707246eacb2ff7947fe9e3bb32f769720afd336d3a5d90e87aba6b88e2ecaf0f16e9a6
 MISC metadata.xml 669 BLAKE2B 60a8af6a6f1ef902d941ebbfa7bc86fa10a773af260878d0bdc2d211d6792ae1eb28106e653247a03ffb3dfbc4bddf76d7332fd7b703a9e03dc37c90c69b1deb SHA512 c2afc877f4c46a55d662fd0ee6a66fd940f32e7b396a0124cf24209b1cf9d9fd2cc8dc05fccaa5a7a067f7760207a2f8b2ddc54964c6191f2a438d790b3a0d34
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild
index efb6d5f25416..6bcc5341d270 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	KEYWORDS="amd64 arm ~riscv x86"
 	SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 9468fc2740c5..633412178e08 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,3 +1,4 @@
+AUX zathura-0.4.8-meson-0.61-build.patch 814 BLAKE2B 692fa4e525d8ca5bad33e1e36a288832509da06399db895f53235709db2367e4011a58d6b6632ee8850677619e6cf8a8d419989737af4cbfc6b6ed04ed8ea83e SHA512 ebf7769d5775f60e57521bdbfbc5a749c584ed706dc0f28d63ec2b6de6e5324a1835ad6f66827301a8ccedb3f2e4b6d60822c0176d63a52173b37fbf36e8f5ce
 DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
 DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
 DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
@@ -6,7 +7,7 @@ DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 70916ac23624b8e55b39bc2b9329fc5d992d3e2
 EBUILD zathura-0.4.3.ebuild 1334 BLAKE2B b8887cbbf8b755c44d79bf4c517ea4c6669566b5576584cf5f6b20fd918ef53ca36ec8918608070548556978a776fa80873716c108e32be0e252f9acc350ea1b SHA512 c9a38f2029607e41eac29b14446028eb6969317360039add7b3d7d8fa9add0c3fbba40d900053db498c7d0e6e83af67f6aec774259a2bb7613f6901631b7bb39
 EBUILD zathura-0.4.4.ebuild 1347 BLAKE2B 48da5928fb897cb42e2d76dfe24b4d6b55aefd8fd336d41af466b00a01dd75d59566f0b1d9a57d982ed94d543f8862f8205979e2bb2c084b162c77219b9dbe2e SHA512 58a2e7db42b483c922412a74bd47e938355ce828b9aa172c1a2bfd4a10690892101641fada3ff080cbdd0ca9dc8e491768ac114ab36a7cb560061b830b393d2a
 EBUILD zathura-0.4.5.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
-EBUILD zathura-0.4.7.ebuild 1358 BLAKE2B 7c35176562a0d79c560291b94511b40ac435a39595de2473327d4711caaa1ccee0f84d5a090e508496c9502d22770c2ea27cd153db2b6349f0ff011079eb6b91 SHA512 da770ed67844205850b17eaa8eb4091ce728717b44d868bc0987c33683b8e4892872b60ba79983ddecabf264c342c2f1eed8cd8057eb60895d70f39e79cc95ac
-EBUILD zathura-0.4.8.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
+EBUILD zathura-0.4.7.ebuild 1355 BLAKE2B f5e59096beb3e8cc13dde9cb887a1ceea87c7ee22f28f1599e235240c4e065da858ffadb96c3c702602684b6c0f6c6ed9018cf039ad16077f6f6b041d1c4f3fa SHA512 a1996b203c933b5e6e3661151bdba217ef131cd1e895ad2328c6cc6207b7f841434671671f7cc49af97bc6554fa366c9cc16f8eb38eafbb6bbf584b41632c3c4
+EBUILD zathura-0.4.8.ebuild 1414 BLAKE2B c9e53786f10e0bcdd9057124a365b050881a640e7dd42e87a962b71aaa0702d7090a43b360dc92976456ccaaa1af84160bbae95a9a21a3fc315b116303a3aaf7 SHA512 fc53625f6057cc6433c61e30b8beb9e37c83772ee6eae7ad3177e4f00d8de56223ebcdd728a9773b9fadc93746295cb99e1331a1c6763c6fbb9108539987f95e
 EBUILD zathura-9999.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
 MISC metadata.xml 769 BLAKE2B 417d92ddfcbc7c2352a79c4275022515fa0bf31b7c06058bb29452f7e15882b59ad3d2b92a2aa8063bb54120377e028449c0e253cd2aeab719a92e4853a3eea7 SHA512 9f7284f67e9bb6b454670393431546685ede815937bb06f7a73ebf25c9cbecca734a8e09753ffc803f8f44ce3a67002c59e31d98bce6185b4237e5d499e3165f
diff --git a/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch b/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch
new file mode 100644
index 000000000000..577eddc4da1f
--- /dev/null
+++ b/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch
@@ -0,0 +1,27 @@
+https://github.com/pwmt/zathura/commit/c6ec5044c5ff843979050bfb81742d14740bb656.patch
+https://bugs.gentoo.org/831468
+
+From: Sebastian Ramacher <sebastian@ramacher.at>
+Date: Sat, 30 Oct 2021 15:41:25 +0200
+Subject: [PATCH] Fix build with meson 0.60
+
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -19,7 +19,7 @@ endif
+ i18n = import('i18n')
+ podir = join_paths(meson.project_source_root(), 'po')
+ 
+-desktop = i18n.merge_file('desktop',
++desktop = i18n.merge_file(
+   input: 'org.pwmt.zathura.desktop.in',
+   output: 'org.pwmt.zathura.desktop',
+   install: true,
+@@ -28,7 +28,7 @@ desktop = i18n.merge_file('desktop',
+   type: 'desktop'
+ )
+ 
+-appdata = i18n.merge_file('appdata',
++appdata = i18n.merge_file(
+   input: 'org.pwmt.zathura.appdata.xml.in',
+   output: 'org.pwmt.zathura.appdata.xml',
+   install: true,
diff --git a/app-text/zathura/zathura-0.4.7.ebuild b/app-text/zathura/zathura-0.4.7.ebuild
index 1be1a7793199..90354da9273c 100644
--- a/app-text/zathura/zathura-0.4.7.ebuild
+++ b/app-text/zathura/zathura-0.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
diff --git a/app-text/zathura/zathura-0.4.8.ebuild b/app-text/zathura/zathura-0.4.8.ebuild
index 0de2aed7939f..83b02ddfd08f 100644
--- a/app-text/zathura/zathura-0.4.8.ebuild
+++ b/app-text/zathura/zathura-0.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,10 @@ BDEPEND="doc? ( dev-python/sphinx )
 		dev-libs/check )
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-0.61-build.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dconvert-icon=disabled
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /app-text
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)