gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /app-text
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
130 files changed, 1875 insertions, 1498 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 1bc0e918f218..3b98813d5a1e 100644
--- a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
+++ b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.shlomifish.org/open-source/projects/docmake/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha 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 c596a8598fbf..601c8a6a640d 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 601 BLAKE2B 0a99b53cbf8dbcc5aca5fa7bdfc251a2e67639c4d4f1aef88cff79293d28baba87d8ee71196e9c4da5684d3f81ed5dafbd65e15b4d9f2bb1b528c7ea3c3c667c SHA512 6fcad5e55c16ab130e4fbe1a458474fa61b798eaafe8c64e424bf9cfbc533d3d5fff212e52f8a3fdd344db8499f0545262461c53554b637289753c7b5b8692e3
+EBUILD App-XML-DocBook-Builder-0.100.300-r1.ebuild 595 BLAKE2B 75737da516866511ca92b570843311d2c0754771ddaa4756e53868868b693882894a5c9fae6f357038da773df163f1313d3d467a78b2129df1038faab4020d23 SHA512 605324c456bea340288366e0f6c18f3b17de3c6dd76b8c7c2431014e9a06a74875af10774e1ac88d0efcc2b7a98ef28e26c6a40e72f3ed1057a291cccd1e8cd1
 MISC metadata.xml 375 BLAKE2B 7b6956381a455fffbe920a0706a91819fd70eac409a10a32c7c609a85dfef6bf97a64d2781dcac0bb624fa64be2b56b8f1e2f2dc9d42b728c019e514839f6492 SHA512 dd707b431ec91e6cb9da5dc0e2b21937739e480d0e3f2fb42f8236d7f9c1bbe1f8e2f3d95b506c49c3a982b4769eb441eb306310b82cb425a4550b51728f6a1c
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c519ce66b41f..3635e63fa1d2 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index aba3f9e8c5d8..7fe969d208ab 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -3,5 +3,4 @@ AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639
 DIST aiksaurus-1.2.1-patches.txz 7196 BLAKE2B c6013301b924a9e6b4fde790bb56848c575f6a8c2a9934a263d3fdfe4a639082c9c1fdaeb0703854d8aba15479c2431738ffb9ef0b750118fd03d0e05a7c6bd3 SHA512 f3db9afbbff5c54d5203db1f09af219c6a6c217018745827b3bc523e156e7d24b197706486f5a88f5829548df88af471d3a7eabdefe7466297dccf786c840520
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
 EBUILD aiksaurus-1.2.1-r2.ebuild 1042 BLAKE2B d20952fb4381bb00d97c244193c6a01bb8046367199b251e7ac9f85d1d63d08e94be395fa552fa16dc5138b2b8806f8d58281cf4a7990ac4d587cd72c8ded8bb SHA512 58709cf03af4d19a72ddb395a3877299815e756d083d054be352065dc6d77d8989281e7d58ccc36b890a95541589a0662fa7d192386a8e124dd7b55737511aa1
-EBUILD aiksaurus-1.2.1.ebuild 793 BLAKE2B bb46c201ab41502c8a3b24a2ac2d97f62244131a95efb3a9d8968f397dac06b3d86ef0b43dc5d56499c5770d95e786fb64dbf1427cd08dc026e9bb740a7381ab SHA512 fd0ff4456cd07621f294830397f7221cfc0026e2062dcde149d1595cb2922b5858a0b38317ac6ecc4ba78488798d0d9273e26561d9f36980bd3d1d503fe04867
 MISC metadata.xml 246 BLAKE2B 6ffed2d4f482be2312cbf43d4831e4578c01c855c2134af7d046be942d566069c910bf5fff0133366f2808a7680f50995f2fe9576b561346c54003b59b02ff10 SHA512 6c290491874e5711080025e89aedb0d9072009324b6757bda046f220eda86ad332814745c9653dbe1b14ee4fa8c625f4a4f66201ca49aac95ad7f681df481153
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
deleted file mode 100644
index b0454f1c5135..000000000000
--- a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic libtool
-
-DESCRIPTION="A thesaurus lib, tool and database"
-HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="gtk"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )"
-
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
-
-src_prepare() {
-	default
-	# Needed to make relink work on FreeBSD, without it won't install.
-	# Also needed for a sane .so versionning there.
-	elibtoolize
-}
-
-src_configure() {
-	filter-flags -fno-exceptions
-	econf $(use_with gtk)
-}
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index 3457b8b522b4..0bdc668b4a04 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -2,6 +2,10 @@ AUX apvlv-0.1.5-cflags.patch 702 BLAKE2B f6679326fdf3263e5a304f11bb1b6d047fd5604
 AUX apvlv-0.1.5-gcc6.patch 403 BLAKE2B d593c72ef63ddc22a76fe8b93ad12078b1739f359832dee54f3ff4f5fbf7fa4249457ac74921b8fd9734eafdae2088321703df0b3bf56a89a1c33b96a15908b8 SHA512 f838fe6c601765e7d03ba83575aa5ffa2562d90e257832109ebe879b29d67228784c920ff7c9716010f10d2c36f4e873bc2425fc337857c437c6a19e6bd5e5f5
 AUX apvlv-0.1.5-gcc7.patch 685 BLAKE2B 3ece21cc1bfb5bbf66d10fb67abb140a357c6953655ca1b02b37cbc3d09503b5382694fb20337b2a7e50fc0a7ab51657f1a3091060bf03e8666b2bdbd0b8a8dc SHA512 53102dfea587fd946bdd7300fdb60b8395d6b2436aef6fe67be539e4ac88063f9d7934282227316f456951aa1e0748db7db02ddda06e17056d32ea6b91588afb
 AUX apvlv-0.1.5-poppler-0.73.patch 282 BLAKE2B 8bd7926afd2ce2364b82e7f9c8348b2905e1c3cdd6ba3565b4191ec5b6cfa5565179cc58706286f793b5b02cba2dc6eff04076b2fa61eb0be1638681632eedd5 SHA512 b832ee8e8e7290d2294ac326e84271570f560a5e7afc29446401ad1c05f1b03998c054bf3cd7ec80813899e49c256f86c871b400ce8e5a663fa9ab22015990cb
+AUX apvlv-0.4.0-cmake-cxxflags.patch 378 BLAKE2B 44063fd090374654067c6f1b43d9d392fb0a6739ae1e44271796c97a39962e229b6ba597b29ec7a0e5b30501af3c62f5a7c0fcc3ed093985e4b253ed33a39efc SHA512 d52d7b7f4500c3094de521e8eee368d6b50dd858d78fa830067ea2fe7cb446f66850d57ab70e6f51281d7a86ac531c0ed89425480d1c5e371631f1fbcff23fd3
+AUX apvlv-0.4.0-icon.patch 258 BLAKE2B 440dfe9904c4ac79408c90c5930e7b6ffc26fdd084ac4320fd945679f69c5333ffc4120991658d045d1e4525421f973d7dce020814b641397b54a0706f510475 SHA512 039204036fdf6b8a26451ca7d4b5d7d2e6b28bac8df5d97876a3b3dcb1e5b24e1f030864cac41b7a4776ea7999dffa9053bdd0632baf2d43054474c28e9a9b3d
 DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
+DIST apvlv-0.4.0.tar.gz 4361302 BLAKE2B 99d61df285ff3b910ace50bc4b1b62601fe7ca9037f835262a8eac179ddcccff5f772121b223e38050243d4bc2da9532e17d9b38fbceb786971d77fea006f91d SHA512 a25033e52acf34b486101953ffaa5de604e3321f9b4705e94fa157596ef560351c1712ed830b2a950f92c054b600a33f903be58f8a7d222c27e5125fedf4245b
 EBUILD apvlv-0.1.5-r2.ebuild 1074 BLAKE2B c372704ea0105086aec23cf4a5ca647440e1a9c3dd90fee4e94bc285e6b78475cf0c7f43edd3b91b4999fcc22f13cb6d978837d9ad2c9cbf3e7ae6b1327a9060 SHA512 7b78bf8e5805f95348e4ae1dd7a6c8027bfc147f2db31b78739b7f343557a918db53831891ed1d0b71430ba2a963f44483277913de5998c7829a70aa7d7e3c5a
-MISC metadata.xml 305 BLAKE2B 75eae4806f80d6d5bd63b9231a76f9942c167981b0fe013331eabc31af98f9cbe2c5a694c43445ecf1b2e731c4b518c1e3a76b52a8d7b880a8d187d3e5b0d6c5 SHA512 1d9926b3a9c4ea0104dc8c38088f747484540e0fb94da38df035e851fdd344886f7b250ca32dd9d722b7c5fc3dc0b2e5ce83201211f840e03b742e113da3761f
+EBUILD apvlv-0.4.0.ebuild 1121 BLAKE2B eca8f737ddc977486b88a1c1e35e5d70f03004433d9e02ea34e7cb518221ca512a8fc1f1219352cea3557b44ca91947f32582fb7436c5561a5ce8831fdc0e012 SHA512 1a46f0b96d3c7327acd15c03bb1e9a3533a987464c9d35f7bcd4044ab4f5307452ca57a51e08f87b4c6abb18071e903a6981cabd2ac49f3caebfb1aab01293aa
+MISC metadata.xml 543 BLAKE2B 6e61516bb251d76663ce79b5c55ba6b7ea8fc6c3b1f0bd9ba4524e7b61e9f79d271599395daaeafa90ff2a44ad6755bf1185aa29adc0462bf65d4bdc9129e502 SHA512 c8822ce8ddfec1223794ac415517f17e46b06eb19207a52457b5362076342364fb85cd1873c0b39642f65bc2640eb752fb793df1d26a66140dd8026f81b8ea90
diff --git a/app-text/apvlv/apvlv-0.4.0.ebuild b/app-text/apvlv/apvlv-0.4.0.ebuild
new file mode 100644
index 000000000000..50ce18678ec9
--- /dev/null
+++ b/app-text/apvlv/apvlv-0.4.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake desktop
+
+DESCRIPTION="Alf's PDF/DJVU/EPUB Viewer like Vim"
+HOMEPAGE="https://github.com/naihe2010/apvlv/"
+SRC_URI="https://github.com/naihe2010/apvlv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug djvu"
+
+RDEPEND="
+	app-text/ebook-tools
+	>=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)]
+	dev-libs/glib:2
+	dev-libs/libxml2
+	net-libs/webkit-gtk:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	djvu? ( app-text/djvu )
+"
+
+DEPEND="${RDEPEND}
+	app-text/ghostscript-gpl
+	media-libs/freetype
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-cxxflags.patch
+	"${FILESDIR}"/${P}-icon.patch
+)
+src_prepare() {
+	cmake_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DAPVLV_WITH_DJVU=$(usex djvu)
+		-DAPVLV_ENABLE_DEBUG=$(usex debug)
+		-DAPVLV_WITH_TXT=ON
+		-DDOCDIR="/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+src_install() {
+	cmake_src_install
+	newicon -s 32 icons/pdf.png ${PN}.png
+}
diff --git a/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch b/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch
new file mode 100644
index 000000000000..101877bbff63
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch
@@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ IF (WIN32)
+     ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+ ELSE (WIN32)
+-    SET(CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
+ 
+     OPTION(APVLV_ENABLE_DEBUG "If build binary with debug information." OFF)
+     IF (APVLV_ENABLE_DEBUG)
diff --git a/app-text/apvlv/files/apvlv-0.4.0-icon.patch b/app-text/apvlv/files/apvlv-0.4.0-icon.patch
new file mode 100644
index 000000000000..f5e8ad370877
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.4.0-icon.patch
@@ -0,0 +1,10 @@
+--- a/apvlv.desktop
++++ b/apvlv.desktop
+@@ -2,6 +2,7 @@
+ Version=1.0
+ Type=Application
+ Name=apvlv
++Icon=apvlv
+ Comment=A minimalistic document viewer
+ Comment[de]=Ein minimalistischer Dokumenten-Betrachter
+ Comment[fr]=Un visionneur de document minimaliste
diff --git a/app-text/apvlv/metadata.xml b/app-text/apvlv/metadata.xml
index 43022be5fe1e..6a3c3096b614 100644
--- a/app-text/apvlv/metadata.xml
+++ b/app-text/apvlv/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person" proxied="yes">
+    <email>c@cgps.ch</email>
+    <name>Chaquen Beliakov Amaya</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">apvlv</remote-id>
     <remote-id type="github">naihe2010/apvlv</remote-id>
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 6c50914c6468..43c2b30c2957 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,11 +1,7 @@
-DIST asciidoc-10.1.1.tar.gz 214619 BLAKE2B b7dc12d57cc3ad72301335ea84aea45db1a1e98f13aebf17fac6cf86657c509daa48ce1755817076c1c82f0a61c68fa7b178bc78bc6fda7274708bfde619491a SHA512 7b2b1ed9ea32b7336c271faf1e40e3a24d3b3af803c87f9d5d32c2b40cadaed682fbbedc6ec67bbe5a51377812d18180128c27779d7190898446266adee92842
-DIST asciidoc-10.1.3.tar.gz 215537 BLAKE2B 61613ded3f0b6b08b097534d88a14ff4b3820077dac14d9136462fe01727ea3134f05b0ddd3d81b31f9a6c2654cc8b775d6e4eb85b9edf8812a16191a43f587f SHA512 b060cb547e008dc2d4ca4646826c0968a0907ac0a2c13d8503e68be69e0ecef12d9a2f742e4614411202b6ea5fff6975bed0dbc07931b0b07a1462841d19c9ab
-DIST asciidoc-9.0.5.new.tar.gz 1225334 BLAKE2B c3e428098dc4d71704ed13b54fd5f640b9de81d12939facb5faaf38a3123794e57201ecd9c312a22c220a2ec6b06c88a76ab47f05ffa972fc8751089b3471cfc SHA512 9125631fdee464f96f7e3c76a60fe37331905e9e55a81db27aece4065b246dc05a35db4c157dc7dbb2345eb95c153b474251d6a447d65774bf1b3f57e1883895
+DIST asciidoc-10.1.4.tar.gz 215656 BLAKE2B 461dd31ebc7067430e595935681ec6e0207a481ec183f0c29e08be444b40a26afabe84ac46dd8f7c563eb8d28ad8eed4b63a23fccd1105d817f7402f6afbfc5e SHA512 fba8c8efe215da0170fc46f1245af831c7b9e982705fbd9cbfe4cd2b979286b49f30570b116bc9f095f060099904a30671ab0498a58fc24b0069575ecf026a7d
 DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6
 DIST asciidoc-9.1.1.new.tar.gz 1259206 BLAKE2B da274d3a9389ee2e42ad1be70467f11d0164df3e6f9102e6ef1be6a802dbeb12898786fa1fe37a95755d0db8c9df5d5dd3faf000dfb73b701a83af3cc0261606 SHA512 74b83e8c8904fd761783c2f572d353656fc0794c6cb427f61e9179c9f80b6fc3b3ee8d028baba4e25eafe5f8cf5318f9984a5828849a793a7520f83e6fe50d66
-EBUILD asciidoc-10.1.1-r2.ebuild 1654 BLAKE2B 870db651ec6e6f6c2992eb18fbeb48f07df484bb16a0b70333a82a6bd1b374abca87dac6e8229c9898f753550547f734ea7288bb893d69b352d721084bcb15b8 SHA512 228c9778988ac516d182a143073f8208ad83012a056c88bdff1905eb22037cc46ba08aadb033cf23e3229762185ecbef1aaf6a7dddeebfee53dc5a396fff7e21
-EBUILD asciidoc-10.1.3.ebuild 1685 BLAKE2B 56b8bfdec5d77ff72cc4c6fe808a6367e0e53fbd248218670a65600522b58e69e93fe2d6d1df9bb68e83bd04c24901bcf8e7c2098f569f1638792b961b80cb43 SHA512 b35e06a0692f33085a45879867aef7699f82152006b7dae00041865500a259093a8f05007f736fea68b7e4d1abaeca4e38c209173a0327737240aac1ebb6e735
-EBUILD asciidoc-9.0.5-r1.ebuild 2329 BLAKE2B 61dd6902f330bff8023c6bb92d221ec7ea664332ce198380371ca16e4e08272d9f8ef16d3ef7e6e190545d8524a78123d06fbb49fe2baba0a818c71cc053e054 SHA512 dd4208ebd95a7f788ca93c8d3c4a7eec25aca0c8d09cd3182c53f1f5a63ba0808b2c661cea3bb92926b0ffc5629d71c59142991eef17ec1bd42054386aab822b
+EBUILD asciidoc-10.1.4.ebuild 1692 BLAKE2B 778cf7374ea0dc5082c48a3d4f037e064f3283f59a8d97f21fcbff606395f5318efd9cd5cc96c52d7890530fe056276f65145fb448e153f0fe95f4f7fa6634c4 SHA512 1fa77bb1e8095df7412a2d0896548bfe27dd949ea6c36383f877608c49ec156342b0973f8af7726ba98654481e2995b392c5271b30cfd8ec0daba60b405e76ca
 EBUILD asciidoc-9.1.0.ebuild 2334 BLAKE2B 17cf7c01cdec7a9b24f82a82446e8dfb7033396efdd4941660a47fc9d87938a52e18b20ce739797ba0409c8a2f27fff3db131a56c6f45a93d36062a166ea0fef SHA512 e3fdf9af5fc2ddfbf935616ac49a13691952fc2f6fefb16b1bfd7b2c35428ad4730ea01a8eda7402a80982e5d4d98b15e71fb1aa172b74b758916939188b774b
 EBUILD asciidoc-9.1.1.ebuild 2342 BLAKE2B e5c950868bcb3d5e185540c588433deda3ad4d1197cc3062002d66fd8af18471552ad59bc4c6b48203bfc1d22e292bb83ae5e42001f300eb785b424e439e3837 SHA512 b4c7e2232546238a9a4b46b2a59036e64aa13eb46e39747d06f1b55d2a3345f0670a8039f68c463d395053945b14b7144f70e511d66fdabd579707501533dcd7
 MISC metadata.xml 380 BLAKE2B b305117b6bc883045d912377e57fde1a62e33ae3194b722d88e3afa0c062d913c1c3ccdc62d789ee97db89fb4fc1b02edc0dd97d2dfdc1a112b71962d35ee819 SHA512 027c6862485a219997037b8d418a03fbb7da9f4a50cfefac573c3f87d7f1c23cc7e82206e0b3c3ee000a7e05dfc446c340c068ca089bc1af16ed9ddeeb378aa4
diff --git a/app-text/asciidoc/asciidoc-10.1.1-r2.ebuild b/app-text/asciidoc/asciidoc-10.1.1-r2.ebuild
deleted file mode 100644
index 132a1d4ece30..000000000000
--- a/app-text/asciidoc/asciidoc-10.1.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 optfeature readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-# Could use the github tarball but we need autotools then
-#SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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"
-
-RDEPEND="app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2:2"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-src_install() {
-	distutils-r1_src_install
-
-	# TODO: Consider using Debian patch to allow /usr/share?
-	insinto /usr/share/asciidoc
-	doins -r asciidoc/resources/.
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "music filter support" "media-sound/lilypond virtual/imagemagick-tools"
-	optfeature "source filter support" "dev-util/source-highlight dev-python/pygments app-text/highlight"
-	optfeature "latex filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
-	optfeature "graphviz filter support" "media-gfx/graphviz"
-}
diff --git a/app-text/asciidoc/asciidoc-10.1.3.ebuild b/app-text/asciidoc/asciidoc-10.1.4.ebuild
index 705aa07cc25d..9f376b493bd3 100644
--- a/app-text/asciidoc/asciidoc-10.1.3.ebuild
+++ b/app-text/asciidoc/asciidoc-10.1.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="app-text/docbook-xml-dtd:4.5
 	>=app-text/docbook-xsl-stylesheets-1.75
diff --git a/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild
deleted file mode 100644
index 7772c2bc97ef..000000000000
--- a/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild
+++ /dev/null
@@ -1,84 +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} pypy3 )
-
-inherit autotools optfeature python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.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"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2:2
-	"
-DEPEND="
-	test? (
-		${PYTHON_DEPS}
-		app-text/dvipng
-		app-text/dvisvgm
-		dev-texlive/texlive-latex
-		dev-util/source-highlight
-		media-gfx/graphviz
-		media-gfx/imagemagick
-		media-sound/lilypond
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
-	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
-	   filters/code/code-filter-readme.txt )
-
-src_prepare() {
-	default
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		asciidoc.py || die
-
-	# enforce usage of the configured version of Python
-	sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		emake DESTDIR="${D}" docs
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
-	optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
-	optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
-	optfeature "\"graphviz\" filter support" media-gfx/graphviz
-}
diff --git a/app-text/bibclean/Manifest b/app-text/bibclean/Manifest
index 49b68412acbf..9a9aaa34cfdc 100644
--- a/app-text/bibclean/Manifest
+++ b/app-text/bibclean/Manifest
@@ -1,5 +1,3 @@
-DIST bibclean-3.04.tar.xz 1683624 BLAKE2B ea18b07ef508e811dbef4b6a2794fcc82142f817fc46be3556610ae5022ce851a47800f0dc70992627f52ac4057a1dbb7bac16b19f8abe55614821927ad97127 SHA512 52119000978a510a0ef83ca7d8aa9f9d16fceaaad667fccef8c816877e8ef87e5a6885d62b8e9269b622a17a65b27ce485f79db15d1985a0daf3f67334fe46d0
 DIST bibclean-3.06.tar.xz 1697732 BLAKE2B c1d9623588e892360eb98e753b44cb54e0eb65d3e3d46a04463c0c3183beacb58fd07542ba06d00eb754061b45ed195a82b90b2843b6ba456c7ba09856090474 SHA512 b167243415f010d7597ffdf52c5bb71de3585f70443c3a04f762a633b2bc276c7aef50e16159c32d8765924be2781b1e60a111305a17c2f42b68ed5216b2e31b
-EBUILD bibclean-3.04.ebuild 576 BLAKE2B 1471a11ca6e13cf14580d1c981d0930d5aeabdd59233700640c4c261bc217cf1eba0db47000744859063d8462f17367d28f870c34fd734aa516552ad2c783feb SHA512 6517e5fb34ee2ae61540a478ff4e5f04bf761fbb02a72e9832359adb68772dd63f446206334202d61e4b6f2e554a417f459c023d4ae3239b8d43b211a46e0394
 EBUILD bibclean-3.06.ebuild 550 BLAKE2B e3453381c46f49adbfe25ee923fda0582b7636af70cd6e1c734361a2e1aa8211411ec273a63763fcd47bfd54a615340f96455acb9bcf04d11fa31a356fa78317 SHA512 0d0c46e2592677b925e1f495fd433aa406da6834f301e7535d04a0ef421ae93047a882f024bcbaf234ae0de52ca746dd02571fedb7d6f5f5f442efee281ee62a
 MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
diff --git a/app-text/bibclean/bibclean-3.04.ebuild b/app-text/bibclean/bibclean-3.04.ebuild
deleted file mode 100644
index 5c8f492f6a09..000000000000
--- a/app-text/bibclean/bibclean-3.04.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
-SRC_URI="ftp://ftp.math.utah.edu/pub/bibclean/${P}.tar.xz"
-HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
-
-# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin bibclean
-	newman bibclean.man bibclean.1
-}
diff --git a/app-text/blahtexml/Manifest b/app-text/blahtexml/Manifest
index 476f25db293e..d613087b1fb4 100644
--- a/app-text/blahtexml/Manifest
+++ b/app-text/blahtexml/Manifest
@@ -2,5 +2,5 @@ AUX blahtexml-0.9-Makefile.patch 1811 BLAKE2B c84ab5b3781413ff04e771849514ec2443
 AUX blahtexml-0.9-gcc-4.7.patch 614 BLAKE2B 1b4f8418c1a5d18271a721328c68dfe86ff9e1ddb4900557e35503a3c1af791d21f8b1ae1cf63045826d0d95c9968a197a9435a5a7fe28015a778ec8c2db02f6 SHA512 2f4d65ae7aec887bcee4719f23cfef762f0a25a4815e86691df86e7675e600211e285a6aab8389cff7adc9899a669a34caa70da5fa42d80c7257636d11ff4eee
 AUX blahtexml.1 3094 BLAKE2B a1b1bd3d1a6952529685b8be5c22f12a1d6168b7d37eea958fd295a593e17ff363c966e46bf26f8f28a2f424a34344c7673e96d976088b9726dfd1717042edb3 SHA512 0f114e4cfb806fe6d120a738118ccd0817d898434a9d878cd20e5ea59d804420f07b90b9763a387e5b29251ca4acf9b1d7b7b845f9f86036d9dc729775155a7d
 DIST blahtexml-0.9-src.tar.gz 168564 BLAKE2B 941f241adf6e423cd0eff4a13b11313d6cad143badb6d862be01bd603f84aa04f224ae2d84abfef05341c66e410ba18bf39d99f636a8a33512e1da9739770a19 SHA512 5a5ddd50c0b3a25954135c44de0ac3a3d992e3e9dd691a552512415c385a39011595683877cdf98aee77d6ef2f9dae750214798ec2af69b8de089d0aec64b042
-EBUILD blahtexml-0.9.ebuild 829 BLAKE2B 7e5ba589ddf3e7df2ebf2e5096653866d136a4e5a02cc4fb666b4aeba4cc2c25a860b98c6593b46a98deda899d59cd11999f05fd26b42baf48d25753e7b4742f SHA512 9d8b1bbca5ab2454a2e98004d1e49aecadc75553eabac85572eb8590921038f8a8850d95bccd39e0d2cfd16cf09fce1fab61b14d55e02d6b7e65b4a673956a95
+EBUILD blahtexml-0.9.ebuild 835 BLAKE2B 95858117e33f62354f3d8d946a7c385536b6e60c7d23add801c9f5a36d000c42cf1643d42ee7075e2d0024914eeedcc2f1f9d2245bc22eab5463166bcbded8e7 SHA512 b850559c51236b8a93324c003efc8c4d4032c8fc8579e9fd01803996427b027300546e426834245d5e840e28a7895c8cde73af253e70daa087163283c07bdd40
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/app-text/blahtexml/blahtexml-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild
index 9e5e3851e780..e8daaacf166e 100644
--- a/app-text/blahtexml/blahtexml-0.9.ebuild
+++ b/app-text/blahtexml/blahtexml-0.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
@@ -11,7 +11,7 @@ SRC_URI="http://gva.noekeon.org/${PN}/${P}-src.tar.gz"
 
 LICENSE="BSD CC-BY-3.0 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/xerces-c"
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 18d0bbe01f63..2f5a08e9e19a 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,5 +1,7 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
 DIST build-docbook-catalog-2.2.tar.bz2 4711 BLAKE2B c93f6c14450e9308dce82724c305846b1635e96470ecb72c240d502b6f7ed360ee013bf40e3cda204e784c034b8a522f6247b3dbc24fe92a9e12d0ca5c28acb7 SHA512 2e6895f8d3564dbef0dc4882448ee5f4457ac01c58be09e2939a364676a52f7d44899cab621101fb4a3161292d15d9df898e076e412ff50fb88d2861ca554b1e
+DIST build-docbook-catalog-2.3.tar.bz2 4686 BLAKE2B 3e386d0aec67ed9cada98cacd9bdce4345f8732a1d9653c096744178902036da5cefa2bde1d69279fe2080f660635f5c29380f40f6fb39aa586d80206c5e42b2 SHA512 79649f39f5a432a57e2457f61b73d83c8ccf76144e29b8e44a2c81bb86a00ff711c199fbd126236edfa965518e0cbd023597c97e386211b8c07a6ef66bf232a7
 EBUILD build-docbook-catalog-1.21.ebuild 1155 BLAKE2B d8b4c8b5da15b768d2035cd6be5ecd87b8464b06d6b1170dd95916f83e7bce3c7dda519d204beb82d001a693456984bc790e952dba24fb63f81b17e5595c1835 SHA512 c3d583f8a38c1992dc7afc750a797ad17d14700331d2717244ff46f86cc859c8b91c5d899b58388b389ab34e2db2fbbc599805b1815476d093d7430d349c597b
-EBUILD build-docbook-catalog-2.2.ebuild 1103 BLAKE2B 5606ec5dd620a1305d127e700af57f8a8f11fab69268ddceac69c164594dea42e462bdbffa14363eb5ce0fd07e136f8129175195c81a9615082898feb45deb2c SHA512 9d92c406f08ac02d0b352d6165909ae6a3ec1609ebc9196cfe5d29f3e6450edb336b3949953b4f2247789cf133948e2aab4a81e62ca54e4098af650b3009c421
+EBUILD build-docbook-catalog-2.2.ebuild 1102 BLAKE2B e1e93eaa7a594a46e1af18ab7aa8b4ff2fae83c695292f52944b4998287d085e5cf5e7c9ecd8a615769081246566d9d75154984c94d005d4860041c9d3d6a693 SHA512 5d39773399eb782e365cb377a6df9ddfa0cbc72dff3c93e8230cf2b0894b8820a96d460610a65d3db100a2554da84a1ce3bbe0d17c557b3220d0b344dea446df
+EBUILD build-docbook-catalog-2.3.ebuild 1110 BLAKE2B 0357a83a95f85e334f2729ce12350088d57069bab3d38f9ba8cb21d4c20c0cb684aaf2605c428b456a27e65a911cadc9ea4fb434e145c2121584dd44df8d0110 SHA512 b233403d7afd529601a7f65e648267339cad6256da13770508a7ab1b4df7e3703cf2e0bde04862f0b674410accfba96e3ff2d78d8095e20a573aaf2cd2b0e605
 MISC metadata.xml 283 BLAKE2B 5cc7f34f6d2e2efcea07d91ed23d5f70a834c0d11b92ee45c27bab7296bd480fac2d27652f0ea4388e370014bafe490e8464eff4e3bb27fda67e20f568c1d92b SHA512 97de2993c7828c3585e4e97d62ac2a08146ae5a39051f825b38be1f657836603eb24ea8819bce7bf75cc71a349ad29f6d920876f20c1bb1cc88a78f9e5dfab66
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild
index c62da59add92..e354a2c7f348 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild
new file mode 100644
index 000000000000..a4684d16c16d
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-libs/libxml2
+	|| ( sys-apps/util-linux app-misc/getopt )
+"
+
+src_prepare() {
+	default
+
+	sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
+	has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
+}
+
+src_configure() {
+	# export for bug #490754
+	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+
+	default
+}
+
+pkg_postinst() {
+	# New version -> regen files
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog."
+}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 14afc3c1a151..50068e367997 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -9,7 +9,11 @@ DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbc
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
 DIST calibre-5.39.1.tar.xz 38375212 BLAKE2B c9205b84180cdf3e98ca30729815f0c3f6b490e1df855119b3032689417b4218d26ce4c6f56d93d040fd5b88924fc432102c00af3286f85b7d5a72a536ab1ece SHA512 47a3be38a24b9e690102108abd1f2385d792721adec637f6de1cc8504df8cc0e3577786add3f48a10c2bc995320d65370d002afaea6ea13b6131b8b6767f27fa
 DIST calibre-5.40.0.tar.xz 38395684 BLAKE2B ff5289d9042dd114a41b90a0b91a84cba30a79d6778d0b59d2115d03dca93151ce4cd0de5fbe8cc94eb89c6cbaf8268d54680d4a1981be33f94bf332b7afb243 SHA512 06d973a6945cdca6b9eb252c656a4fe5dab15201e4c77f81a1174bdfceeaed1d64d50bde5ea7cfb4e462bb7e32d30ae0bfe166c80b2a3b765641da574fd8ed46
-EBUILD calibre-5.16.1-r1.ebuild 8526 BLAKE2B e9aeb2e4c2f2714a0955fb6dbb80c87666ffc7c92a04578b1294316e1418d992112e87c97f23cbe989a5823937a4918e703cf05abb296f583e8ee734dffd1ca9 SHA512 8d55c8439bc7c78f3e1ce2a0e25301eb690bfe9d15aab1a6f709452e0e6528021114684a9828c7337653e6faba5521aca3931d676ca697a292234bafe73dcfb5
-EBUILD calibre-5.39.1.ebuild 10409 BLAKE2B 5b0ee9258b0ee7faef09a188e42557b2d04e154d7dd4759c1dade17af56295655f71bcab61a794c1e3c30a7bc1764708242f5dd81ec4ddfbd98d14c07c3c0797 SHA512 540c9ff9dd4028d742fb18696b5156d77606b8a17ae5365d0ee7a3249dde716cc6b6ea5cfdd7d28f331e9726257db1d000898fbe8ecf54061706ea5ed19b4bf5
-EBUILD calibre-5.40.0.ebuild 10409 BLAKE2B 5b0ee9258b0ee7faef09a188e42557b2d04e154d7dd4759c1dade17af56295655f71bcab61a794c1e3c30a7bc1764708242f5dd81ec4ddfbd98d14c07c3c0797 SHA512 540c9ff9dd4028d742fb18696b5156d77606b8a17ae5365d0ee7a3249dde716cc6b6ea5cfdd7d28f331e9726257db1d000898fbe8ecf54061706ea5ed19b4bf5
+DIST calibre-5.41.0.tar.xz 38461752 BLAKE2B e6ea7d1c838492ea23d1f630de134d773c09f5080bd4575065c4379a52170f3bb3ed7ee6ea53af413f931ffc68a25abf06139d60a333e2888149e9080014a5dc SHA512 f2d43ea085ce9d55ae619302d1e53ba6f3ef8a850903878937605eec322e6ef412075e53dd92608f6829a91d706bdd3f3f9f9fd21866f3f73cb1b5d8e0639c10
+DIST calibre-5.42.0.tar.xz 38523536 BLAKE2B 81d8477fbbaeedbf589c3c25b16925f6fe383c74d9ad17d0036f886304c9ce1f807fea6463ef0dc345a07de69438785faca6ef7337e5ff1e7d5684b4d0ed7cdd SHA512 dac197d0a6f36f8ebb56720214df355bfc2625ecf55992b824e3409e7273db12fabfd54d2f602f950761efc717e52f872f5f2c2078770abbc887ef30cc64bbe8
+EBUILD calibre-5.16.1-r1.ebuild 8499 BLAKE2B d4b47b4895cf8f5007d1f343cff5c569f36720af61be55f992062ab32befb30f542696be6c03f0d2b5851916c104ced0b53795ba12809527a7252e906ae9bf2d SHA512 231dd7720e077410d7dfc544cc17345f57061c26b3f439d6714d92ff016932a3eb608fe43e6bba89a4c1489b51d1b4e12e0ae81a05a6c5f46e22a9ac2ca74715
+EBUILD calibre-5.39.1.ebuild 10382 BLAKE2B 07966f004bad618c153b6c5d47ba35a8b4e261ace2b98914778659f39098775fe41f6f9545dbba089b12f5f792354475a63a0a796b5b23e61f7667026c305bec SHA512 ee63ec0976e2c996e4fd31347edbddd692ec62f37b660dafa7c43ea665c31dc774109947badfde13be58dc447c307660ea2c793c4073ff0f11491408de372a5f
+EBUILD calibre-5.40.0.ebuild 10382 BLAKE2B 07966f004bad618c153b6c5d47ba35a8b4e261ace2b98914778659f39098775fe41f6f9545dbba089b12f5f792354475a63a0a796b5b23e61f7667026c305bec SHA512 ee63ec0976e2c996e4fd31347edbddd692ec62f37b660dafa7c43ea665c31dc774109947badfde13be58dc447c307660ea2c793c4073ff0f11491408de372a5f
+EBUILD calibre-5.41.0.ebuild 10382 BLAKE2B 07966f004bad618c153b6c5d47ba35a8b4e261ace2b98914778659f39098775fe41f6f9545dbba089b12f5f792354475a63a0a796b5b23e61f7667026c305bec SHA512 ee63ec0976e2c996e4fd31347edbddd692ec62f37b660dafa7c43ea665c31dc774109947badfde13be58dc447c307660ea2c793c4073ff0f11491408de372a5f
+EBUILD calibre-5.42.0.ebuild 10382 BLAKE2B 07966f004bad618c153b6c5d47ba35a8b4e261ace2b98914778659f39098775fe41f6f9545dbba089b12f5f792354475a63a0a796b5b23e61f7667026c305bec SHA512 ee63ec0976e2c996e4fd31347edbddd692ec62f37b660dafa7c43ea665c31dc774109947badfde13be58dc447c307660ea2c793c4073ff0f11491408de372a5f
 MISC metadata.xml 304 BLAKE2B 0d93b1c7606c37cb8b7308b507a1d2988a05f780a93ae80c98e021f5af75128954d57b102afc1d96728872c81bf0adc40e32b31197dfa825cd040af3a8739fb7 SHA512 e193c0b78ed4140b695c44d273310207c9f2f745bf31589c69e81230a9eed68fa1c361c1e3f68a60e135ef0628aa480002229871f4a50f4000aea6df7e5f067d
diff --git a/app-text/calibre/calibre-5.16.1-r1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild
index f0ce3cbefb85..3e20077ff835 100644
--- a/app-text/calibre/calibre-5.16.1-r1.ebuild
+++ b/app-text/calibre/calibre-5.16.1-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
@@ -77,7 +77,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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
diff --git a/app-text/calibre/calibre-5.39.1.ebuild b/app-text/calibre/calibre-5.39.1.ebuild
index ec684bf96296..a5e1b79e63a2 100644
--- a/app-text/calibre/calibre-5.39.1.ebuild
+++ b/app-text/calibre/calibre-5.39.1.ebuild
@@ -82,7 +82,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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
diff --git a/app-text/calibre/calibre-5.40.0.ebuild b/app-text/calibre/calibre-5.40.0.ebuild
index ec684bf96296..a5e1b79e63a2 100644
--- a/app-text/calibre/calibre-5.40.0.ebuild
+++ b/app-text/calibre/calibre-5.40.0.ebuild
@@ -82,7 +82,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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
diff --git a/app-text/calibre/calibre-5.41.0.ebuild b/app-text/calibre/calibre-5.41.0.ebuild
new file mode 100644
index 000000000000..a5e1b79e63a2
--- /dev/null
+++ b/app-text/calibre/calibre-5.41.0.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2022 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 qmake-utils 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/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.35.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:$(qt5_get_bindir):${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_mem_leaks \
+			--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="$(qt5_get_bindir)/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.42.0.ebuild b/app-text/calibre/calibre-5.42.0.ebuild
new file mode 100644
index 000000000000..a5e1b79e63a2
--- /dev/null
+++ b/app-text/calibre/calibre-5.42.0.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2022 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 qmake-utils 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/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.35.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:$(qt5_get_bindir):${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_mem_leaks \
+			--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="$(qt5_get_bindir)/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/cherrytree/Manifest b/app-text/cherrytree/Manifest
index a048488a24c2..2365a6f68d40 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,5 +1,5 @@
-DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
 DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60 SHA512 2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
-EBUILD cherrytree-0.99.0_p20200523-r1.ebuild 2089 BLAKE2B 038125bfaec0ced1b0a091189a1feefeaaa1bb30210b1c6c41b183f986d06a28ab2f33d8bb728513467cd1b91bc625bcff10936c034ad49213e50a90626fce1c SHA512 7964528b0fbfbd1636f6e1e3df3652cb2a71b39980479c17f30753b7dce2c89d49be2942632b07964fad164e9835a34238f010d42ca163569cf6949af16940b2
+DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742 SHA512 2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023
 EBUILD cherrytree-0.99.37.ebuild 1938 BLAKE2B 02616be9599b9c31bc85d96f70469be605eff6ad863c5ce7ce68974541d46845ea8ace862635fa2b99ec2fe1335b11d559eae60125236506a6c6c01fd4854c93 SHA512 df1dc2e036a067cb1d0b5d84dc6ea0e4217f68c292c14a94e89161575c6e51bd9a9ac3f473740468af80865a099eb221c467e98ab7d31b132c226b90656bbffe
+EBUILD cherrytree-0.99.47-r1.ebuild 2068 BLAKE2B 0443e9b568c60c824fc92b35de0ea863ee272e97487764a2dff4e099ae57846b304baa25effce149cf86ebed2837a7b07479bdf60c7722ff6157d8e21443d4c0 SHA512 3d80785cd39cba9f2c25ec96803b4c9932a97d2282091498642f861ab817193dc68c606659a4b096bd512114fdd348ae62ab4a1766e938f560384f6eafd21663
 MISC metadata.xml 251 BLAKE2B 807473dcec4b0ae2f6941f34664628d5842fd525b66aab0dec500b3e9aeb8b5d350edd18e46805bbd71a90aa02e8de98bbce6f5321a3b3bd5b1582a107424cf5 SHA512 e31af6e228e83d7eaff87e8c09c7939ebf20a062ed71ca7ee7fda148e68ea5886025346d30b5429f8358475d98a5f2a09b9a2b32ca280306ac6230a6ae2ff872
diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
index 8ea8d40b3a31..7f173bed6432 100644
--- a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit cmake python-any-r1 xdg-utils
+inherit cmake python-any-r1 xdg
 
 DESCRIPTION="A hierarchical note taking application (C++ version)"
 HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree"
@@ -15,10 +15,12 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
 	S="${WORKDIR}/${P}/future"
 else
-	COMMIT="074a09ce3c1130ec60f5f5a3b8be958337b6d5ab" # 20200523
-	SRC_URI="https://github.com/giuspen/cherrytree/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
+	#SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${P/-/_}
+
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${COMMIT}/future"
+	# S="${WORKDIR}/${PN}-${COMMIT}/future"
 fi
 
 # GPL-3 — future/src/ct (CherryTree)
@@ -28,32 +30,34 @@ LICENSE="GPL-3 LGPL-2.1 MIT"
 SLOT="0"
 IUSE="nls test"
 
-RESTRICT="!test? ( test )"
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
 
-RDEPEND="
+RDEPEND="app-i18n/uchardet
 	app-text/gspell:=
-	dev-libs/glib:2
 	>=dev-cpp/glibmm-2.64.2:2
 	dev-cpp/gtkmm:3.0
 	dev-cpp/gtksourceviewmm:3.0
-	dev-libs/libxml2:2
 	dev-cpp/libxmlpp:2.6
 	dev-cpp/pangomm:1.4
-	dev-db/sqlite:3"
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libfmt:=
+	dev-libs/libxml2:2
+	dev-libs/spdlog
+	net-misc/curl
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/pango"
 DEPEND="${RDEPEND}
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
 BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	nls? (
-		dev-util/intltool
 		sys-devel/gettext
 	)
 	test? ( dev-util/cpputest )"
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
 python_check_deps() {
 	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
 }
@@ -70,7 +74,7 @@ src_prepare() {
 			CMakeLists.txt || die
 	fi
 
-	python_fix_shebang .
+	# python_fix_shebang .
 	cmake_src_prepare
 }
 
@@ -79,19 +83,8 @@ src_configure() {
 		-DPYTHON_EXEC="${PYTHON}"
 		-DUSE_NLS=$(usex nls)
 		-DBUILD_TESTING=$(usex test)
+		-DUSE_SHARED_FMT_SPDLOG=ON
 	)
 
 	cmake_src_configure
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index da5c8105738d..a8e293ed0d3b 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,3 +1,3 @@
 DIST cmark-0.30.2.tar.gz 246033 BLAKE2B 487f5adf47afdd4133e16b6cca1403cd555f8722b47c423960909de73aacac1d0f8b16311f6d5349addb5f03a86562545bb2ec80771b822bb8e5b82816375124 SHA512 aaa9b2103cf89c522f9b42a2b43c07ecf75e07eb42214c0be5de17682ea1faf9c85e3dd28fe91d446b69a34f9980bcab6e276a99b42540c40c9ee1481b3a0d17
-EBUILD cmark-0.30.2.ebuild 740 BLAKE2B 58b82661b5f5f41e0982dfd2dc1a7f6e5db8546eee411c1167ea978e13b0e8cb7f71c947a7d8c785cdf4910d7212ec4b8e56b169a18db03af8c6f8bc00166123 SHA512 0904fd6f9ba39fe14ffc1b41ad05217d8732867452bbc629a8e06d4b06b5cd725a71ed5fa04769c23bd65d2f837893cfe5c4a6bbe7c8114485925f8a49eaad46
+EBUILD cmark-0.30.2.ebuild 746 BLAKE2B 51d1fe7e75800bd75e4d3d3ac891d0b53eed5e1544b41ea70587989334a4b6b3fce6a0feab6e3dc96743c4f0f5e664dafa0a188853f514255b52a360224269a6 SHA512 ebc8cba1e8d7f4dbf6087812c41c54a44ba0b771991befed29d85703d250baa92f0912120364e9fbf5db741e7fe8ea132c73f69b5b4d53e437dd9a7c60a0d706
 MISC metadata.xml 504 BLAKE2B 5b9b29ddcf02b115bc37aeb217236e5092363991b75247f7d7c5da7e7fe0c5bf15ff0a397b332faefd2b150ff9cc239d4996caf6131306240efd641bffe52431 SHA512 f2ebd2271483a1847c63df11e0e6fa057abe8f19323d86f0632904e03ae321b1e689a98ab941e4d7ebaa50ee9220242f1488b35b08f73cec736df5c0a0024713
diff --git a/app-text/cmark/cmark-0.30.2.ebuild b/app-text/cmark/cmark-0.30.2.ebuild
index 4c15b66535c8..1e7f618916af 100644
--- a/app-text/cmark/cmark-0.30.2.ebuild
+++ b/app-text/cmark/cmark-0.30.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 0e1b2cca38d5..0057ca1e75b1 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,6 +1,3 @@
-DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
 DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
-EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B c198997bd2b46f796e5ce31812830be1073d02fe4d716d5cd7e9d04c01b3bc792134e0f715f330f73e5e73e083206fda8211269eb9cfcda83e85221572fa0ef8 SHA512 774cae08ce0940d27e2bb4961509e005fe134bf2eeb59aa3b60dd98aca1786acc4bd6b6d438d8f936424eaa17a3bc174b77f89dbccee4908c23c3aebe2005e0b
 EBUILD djvu-3.5.28-r1.ebuild 1538 BLAKE2B 9ee4ff87d2d3e6923896d445bf78ef3b9aca12d766d7382febbe59311e7b7e3f8f56eb349ebbf8df1574ed2af9a77801314d7a5591275795eb3a65bc5ea0330f SHA512 bf0fe79f7a6379c4d385694a2fab27fe367654d3ae9ac30392d8114e617dd85aa6b890693605ecced5d0e5f6974d76fa85b01fd5cce4c048f9a598c898e0c56a
-EBUILD djvu-3.5.28.ebuild 1460 BLAKE2B 0676c99f9d5a56f052ee72787096fbcf109e4bf18783ec5e0f3d8604af04b4e927916951ec5c0936f73f42a6e65a4eb66f98148ac99921c1682f57cd15b22e2c SHA512 c90c9f93d60fc510a6da17027d3f85b9b15867e1c83359ba3c34c87c71083a6d3602eec24731dd8c9fc36117a271691bfb405366a5c43830c7796310b4b9cf3d
 MISC metadata.xml 949 BLAKE2B 9939279d34f7bd0490545cf17c0fe6e959588f54f88792e025fe2fe8c2e57f0f57fdf173b167184ec04985419e8b74cc746c854d11c8cdc8d171eafa733a7087 SHA512 a8d88216161337ad4fa504f40c5a2a3d4a1394dd87c374934bfa1f1a875027d552b44e20f962b84b826a9da9d96b7228a7ce75d06ca3d6192a58d74fa04ab537
diff --git a/app-text/djvu/djvu-3.5.27-r2.ebuild b/app-text/djvu/djvu-3.5.27-r2.ebuild
deleted file mode 100644
index 2887ff6e9fbf..000000000000
--- a/app-text/djvu/djvu-3.5.27-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic optfeature xdg-utils
-
-COMMIT="a00b7618c22fb35b030582147a4479c4cf41c349"
-MY_P="${PN}-${PN}libre-git-${COMMIT}"
-
-DESCRIPTION="DjVu viewers, encoders and utilities"
-HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="https://ajakk.github.io/${P}-${COMMIT}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug doc jpeg tiff xml"
-
-RDEPEND="jpeg? ( virtual/jpeg:0 )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
-	|| ( gnome-base/librsvg media-gfx/inkscape )"
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
-	# We install all desktop files by hand.
-	econf \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		--disable-desktopfiles
-}
-
-DOCS=( NEWS README )
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	use doc && dodoc -r doc
-
-	# Install desktop files.
-	cd desktopfiles
-	for i in {22,32,48,64}; do
-		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
-		newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
-	done
-	insinto /usr/share/mime/packages
-	doins djvulibre-mime.xml
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	has_version app-text/djview || \
-		optfeature "djviewer or browser plugin" app-text/djview
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.28.ebuild b/app-text/djvu/djvu-3.5.28.ebuild
deleted file mode 100644
index 1a910c109796..000000000000
--- a/app-text/djvu/djvu-3.5.28.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic optfeature xdg
-
-MY_P="${PN}libre-${PV#*_p}"
-DESCRIPTION="DjVu viewers, encoders and utilities"
-HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="http://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P%%.3}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug doc jpeg tiff xml"
-
-RDEPEND="jpeg? ( virtual/jpeg:0 )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
-	|| ( gnome-base/librsvg media-gfx/inkscape )"
-BDEPEND="app-arch/unzip"
-
-DOCS=( NEWS README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
-	# We install all desktop files by hand.
-	econf \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		--disable-desktopfiles
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	use doc && dodoc -r doc
-
-	# Install desktop files.
-	cd desktopfiles || die
-	for i in {22,32,48,64}; do
-		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
-		newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
-	done
-
-	insinto /usr/share/mime/packages
-	doins djvulibre-mime.xml
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "djviewer or browser plugin" app-text/djview
-}
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index d8028ed023e7..83e86f79c784 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,9 +3,9 @@ DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc
 DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
-EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1806 BLAKE2B 8017f7637b75bd1f93cd79afd4a2210119046afc36686bf5c970ba2e8f23040e6250fcb7347ce45f4999cc7f408432a8fddfe641f30799b557261c884835779a SHA512 fe7abd8eefb51b9123d91d1e1804bdf8ff62795eb19af0556b4c4d6e293ad864cd8f577131514e892318d7c76d4934c636a071dcf3164c595116fb8ac54d918f
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1800 BLAKE2B d2266ff1659bb71a0ce95854c028327c47e34faec2842c3f479a822d8818daa8eef152108eb5eb49931d53ca07fbab5dfb3ca60a69c94acfc5edfd33d5d47a30 SHA512 524ee2896ae4bbdb463eff7f6c9f3c6707a91b121e194b2528b9d1c287e56f588ede2f1764c5412e00fc1c3c793b01fcd18724a81c3874d814f5bf3caef5ac5a
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1800 BLAKE2B d2266ff1659bb71a0ce95854c028327c47e34faec2842c3f479a822d8818daa8eef152108eb5eb49931d53ca07fbab5dfb3ca60a69c94acfc5edfd33d5d47a30 SHA512 524ee2896ae4bbdb463eff7f6c9f3c6707a91b121e194b2528b9d1c287e56f588ede2f1764c5412e00fc1c3c793b01fcd18724a81c3874d814f5bf3caef5ac5a
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1833 BLAKE2B b3e8e7cba229bb5b1d7204a9a78c0cfb592cc5caef91b85257960a6e37515782e692a8396db3fa3b8ef7fdb8cc2dd734cff2134e2f18d5b2875bd1ae6ab44a9d SHA512 06b575f8767ece925d8c25265f168a7fc0532026a194f913e2cbca1fd2e3464a2aeb33c9c285491e6f5713b444ebab520c289eb4c3e387f29842ba4f496d49e5
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1833 BLAKE2B b3e8e7cba229bb5b1d7204a9a78c0cfb592cc5caef91b85257960a6e37515782e692a8396db3fa3b8ef7fdb8cc2dd734cff2134e2f18d5b2875bd1ae6ab44a9d SHA512 06b575f8767ece925d8c25265f168a7fc0532026a194f913e2cbca1fd2e3464a2aeb33c9c285491e6f5713b444ebab520c289eb4c3e387f29842ba4f496d49e5
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1813 BLAKE2B 419eb1e7d29eb4607a04b637c8e94ac86a60c7c7f0fe88fa752385c20c8e4296fd687372fb6a12bd359cee40381a10b46fb75d54e694f84a0cb1b3a753af8405 SHA512 ec90b4a4e5e3c270dc44cfbb2448cf8d3489c244a96f9249a10d634ab7c0e21f1c5fb890e76bd4adb7c9c40d0cb8d518984aa1707f468f90b78ef12582d789cc
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1807 BLAKE2B e9ff97321b7b218e7316d515a81bba140a81880298d90a9905cef485286dc2997f12f60a29524f1737186821481196f14f06fabc539a95c6ef69a5bba9e4559f SHA512 fba24577c117e24fed2554031a165a5fd0c62bcbe30ed5527873690101c3014907a6cfec4ae8f39fa8e0a41d403345c6bb5cc217f0dc29e533f84ee8be93de98
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1807 BLAKE2B e9ff97321b7b218e7316d515a81bba140a81880298d90a9905cef485286dc2997f12f60a29524f1737186821481196f14f06fabc539a95c6ef69a5bba9e4559f SHA512 fba24577c117e24fed2554031a165a5fd0c62bcbe30ed5527873690101c3014907a6cfec4ae8f39fa8e0a41d403345c6bb5cc217f0dc29e533f84ee8be93de98
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1840 BLAKE2B f91b5eb46fdab513b051730de0a1acd510872b296b15a5477629c86d8c7370099a14a1ab509179cdfbd73e9da6967630291b0826e2be66bc8af687f69fc92a6d SHA512 f4dd8b2a43393c8dac877d843cbd70da8839232d263e8569d64ae4d017bf6182b29d534d78f2603e494f523edee524f42009f0d6480d38966aae14f516167c38
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1840 BLAKE2B f91b5eb46fdab513b051730de0a1acd510872b296b15a5477629c86d8c7370099a14a1ab509179cdfbd73e9da6967630291b0826e2be66bc8af687f69fc92a6d SHA512 f4dd8b2a43393c8dac877d843cbd70da8839232d263e8569d64ae4d017bf6182b29d534d78f2603e494f523edee524f42009f0d6480d38966aae14f516167c38
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index e3188ba498f9..6c957cfa7620 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.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://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index ee19a3db01c8..c173cd212615 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.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://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index ee19a3db01c8..c173cd212615 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-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
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index b9ce7d99daff..c94e3db4beae 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.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://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index b9ce7d99daff..c94e3db4beae 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-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
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 0e5a2289820e..1066234b9b30 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2334 BLAKE2B 658b7b6398ab89a0df0467d454156d5c4c88bfc359151f62963b029235baf1edf2d3659629060b23118d60867858f35c2a54d861d96485174b81fda82fb8ed92 SHA512 fd31fb510e337ae775a6866b46bcbd4acc8f18dbb1bdd8315052acc5b884fe9d1dd9bc5b02c75887f16fd04017441ff20f705155aa08d0b532e09e4c65bf3274
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2341 BLAKE2B 6b650cd47b119613e244addf3cee71c50f4c90d4c4bee724a04f0393c55621eb8c805964147aa17f504cc7237f92111f7adeeb514e10ef91ffcc10ec11cbaf5b SHA512 95c5129e7bb5fc413176f00ea8451a9cebf0d52c44c353bcf00e00880df77d9eb7aa3eb2e1b758cbf125e5e8352bb5312fbf458a80ea9dd1547096bae1d0fb9f
 MISC metadata.xml 414 BLAKE2B f10f5576731ded90514b956bb032bf6472634a509e709e998b0120ced275cea6d7027b18623b8f7d8198b6137a9566eab1b0462626a20693655c791b9763952e SHA512 f844b8d60c1c3413b8eb647bdffba6fb08e09e7f62df9e122ad6d69f9f67ec67711a66ec840f1ef92edefef83bd5e77103a10b0feeeb4a08f98680274c3dd93a
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 1e1416abedfa..ba35adf04592 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -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
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND="
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 6b7b8a96a583..7d6fcf4605f0 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,6 +1,9 @@
 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.2.tar.gz 991782 BLAKE2B ece8c4cbac2c242c23b4b8c5ab2daf1037705dbf58ad29b4863dd01cb30b2d98e11828f2b9d1ce3823aec419c871cc3dd1092e4659e10ef3e3cd2df867255be4 SHA512 886635bb55c5f0c774445e4a0f14d39e2d08eeb964257037062c2e97c2cf3348be8c631ff5e7a13144936127761964bdc60ff1e0dd6f63b292a655626f91ef62
+DIST enchant-2.3.3.tar.gz 990877 BLAKE2B 310b66931e803ccb643a47c1476122a558de7a192b50f532d4cdababe55d398268bf5bfcc0ed556d665af88f6c183c1871147d302ad39a7ebd4fc29e1ab16967 SHA512 c97764a8f219033b440cbfb820624f54993b19ba1f38b56f20336889304f753c7c513008bb92cd1424bfbf528c2d473f35bef93d9140063612e3a270fd000deb
 EBUILD enchant-1.6.1-r1.ebuild 1625 BLAKE2B 8f42b0410fa9b7565c5eebb849fa32c8850e8d77d65d34cc5f69a6ae553acf3bbf702e85d134387e8b2a75ad22f43426021d65b5ef4ac4f8e92cd6b3236c0d9c SHA512 fb0da3b82a95b9af44b7f35c05c204f6eaf2529fe72dcfe00b2e9a0ba6edfccdacda4f87e0e167548d66b2256beef4177bf4ee7fbad9a4817ed5688270531de3
+EBUILD enchant-1.6.1-r2.ebuild 1409 BLAKE2B a97738ba4d5106c8ac058fc8c184fe6e43f010d6bc68451710060eea06253a0c959691c6a5bfce6054a739c7af0ee5e150dba302988711e4aba93f435a98bf37 SHA512 32cdc506270fd6a5fa957a59410472b884c203b62c53b06e8ebf9c2489e4dd889cb84005ccb92795047459b6968cc68dab243e0f387d007ebe9a65447727e10c
 EBUILD enchant-2.3.2.ebuild 1234 BLAKE2B db4fc98f82f8dc5a139a01c61836629e128138482e78bdd7ad3b99b0b1a1a0a52f5c7c352fa6094fccc0ab42f3adcff8bc4e730aaa3cfeb13560e5a0f64967e4 SHA512 4e55587f310f6970002bed29142c20ae42afa67995624f6785aa102534b2ae837dde841bd1db201a1b302cd0bcce78fb068d75debe1435d696791d3f6e552bc5
-MISC metadata.xml 537 BLAKE2B 6cb7c6968b6f90f2c29d2f7d3d731f947431b0648e7de6300599ca1f6d67544300484cc794309d27ce8878c068c2e8b5aadaa9fd6670d4388aabba2c1ef470a3 SHA512 140143a602063450d3ad55cf0374d42c255f689326978aca64f9c9f529eff6bb97b31bcaa798f34322d4e8c541478796f227e2c164cf1fa6e8538158c0f9fc60
+EBUILD enchant-2.3.3-r1.ebuild 1306 BLAKE2B dc86e08f340c6c3803d4d70d49c0770b1677b1f8175fe5e7285a8ce4e51b8962391fa1521a3cbf9e16e01830df35e28a1ee90f6757acb2043813697843c1cdf0 SHA512 b430157cf7dce2efb3bb1ae06e57a5d553ca90bc7260b72e36c4e2d346a72cc0b926fa90b9bd31cd3cce0ce28ae99a33b33755fa7eb5790f2132ec4912f80233
+MISC metadata.xml 626 BLAKE2B 292276574828700f2688f2a5b1fc09a1c57a0e39ea89067bb728ac773654ab7ae073be8d2af1cd68f8d4f28f7fcf9fb2f7782db63c0ab7f457d389ab66c95c18 SHA512 894afee900f5a285cbd7715b7fd689e645013c134dbf5a8b5bd8aee9dd886793010a907ed6164d393896648a1932721bc404a7a96e38fe1705705dbd5848bbff
diff --git a/app-text/enchant/enchant-1.6.1-r2.ebuild b/app-text/enchant/enchant-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..d4302d6ca527
--- /dev/null
+++ b/app-text/enchant/enchant-1.6.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV//./-}"
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${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 ~x86-solaris"
+
+IUSE="aspell +hunspell test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( aspell hunspell )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-text/enchant-2.3.3:2
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-libs/unittest++-2.0.0-r2 )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
+)
+
+src_prepare() {
+	default
+	sed -e "s/build_zemberek=yes//" -i "${S}"/configure{.ac,} || die # bug 662484
+}
+
+src_configure() {
+	local myconf=(
+		--datadir="${EPREFIX}"/usr/share/enchant-1
+		--disable-static
+		$(use_enable aspell)
+		$(use_enable hunspell myspell)
+		--disable-hspell
+		--disable-ispell
+		--disable-uspell
+		--disable-voikko
+		--disable-zemberek
+		--with-myspell-dir="${EPREFIX}"/usr/share/myspell/
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/enchant-2.3.3-r1.ebuild b/app-text/enchant/enchant-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..f40c183d7f32
--- /dev/null
+++ b/app-text/enchant/enchant-2.3.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+IUSE="aspell +hunspell nuspell test voikko"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( aspell hunspell nuspell )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )
+	nuspell? ( >=app-text/nuspell-5.1.0:0= )
+	voikko? ( dev-libs/libvoikko )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-text/enchant-1.6.1-r2:0
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-libs/unittest++-2.0.0-r2 )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable test relocatable)
+		$(use_with aspell)
+		$(use_with hunspell)
+		$(use_with nuspell)
+		$(use_with voikko)
+		--without-hspell
+		--without-applespell
+		--without-zemberek
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
index 3033ca238ad7..3d5f422a24ed 100644
--- a/app-text/enchant/metadata.xml
+++ b/app-text/enchant/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
 		<flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag>
+		<flag name="nuspell">Adds support for <pkg>app-text/nuspell</pkg> spell checker</flag>
 		<flag name="voikko">Adds support for <pkg>dev-libs/libvoikko</pkg> spell checker</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 7ca74e8b4b63..0254b4bd3292 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,8 @@
 AUX 41.3-fix-build-with-meson-0.61.1.patch 1385 BLAKE2B 70740f1424234b056537cd2781aed5c9b114aa6eaa629d48a24022de0a6ec789630a8ab32b8451655b049e3b55db88895654cdd78cee89d4d91858cb60237a47 SHA512 588b93f599b31cd80ada5b599b267ba9eced928b3b9597c43dc1319f41996df056704860cbf7ebe1815b0e91ffd467fb019d7ec64eb09f08d1a969fbea55f46e
 DIST evince-41.3.tar.xz 2889368 BLAKE2B c6ef9b4c126f938ef8b50aa65d8591e0ce02e7404dd1984bce27e0acce6e62462d42665ad19992cb2fa22afd09d6da49ecdbbb51eb209518d415966824523628 SHA512 b00422ef0fd752e5afacea2db852ad71d8d16514945a9a54c54967cecd2b1f5058b762ec53eb9057b8f583d5e1e3363c2b7ae1f4434fa6637ad45c5217f082cd
 DIST evince-42.1.tar.xz 2850652 BLAKE2B 4fb03270caf1be548a82f9094973e584807c497171cef960f344c14158420e02a0fed6d84dcc8d09d3a7f2e8a68f69ffae36398fe6e747d86e3a63132d5a36d6 SHA512 d8ea086b6530c186ac48d88fa2546cd8abd8a075d79037c1f0bf76e63b28914b04a58af83c96e44e04d625fec674f3989bfd51472cd458be9c903a1a4512d8df
+DIST evince-42.2.tar.xz 2854836 BLAKE2B ed8b9e6117d2d456e59d5fd4aac664b73fb450589a04b04b3ada7f1606781001c5ab75a98d425fdf00409e2f4abad59f6a140f39df4ca6bd82a641caaf944062 SHA512 81e93eb5575169ed1a31fdd321a1d7080b4391ddf1ebf13ce49df5ede8bb5f578094b55b2e1075f0a418ef21e8b73f02b259c2bda44b317ea9f551372ee3b860
 EBUILD evince-41.3.ebuild 3094 BLAKE2B fe2c2043c253f814971a5b969362ee476888cf84d77aa3c2c3fbe9739f5c0bbca71fa4e299443b37b3cd50a915a0cb23dc515ab9f589f36c3669283d810250e5 SHA512 8e433656bb0a3a0906a70e76face51562382024dabb7354114010517e6134cd25fe46f1a0def22d748445730273c58db2ba22f8c57731cb12a95cdb264cc7950
 EBUILD evince-42.1.ebuild 2985 BLAKE2B 87fee16941d147f814ec070aafbe49511543d52a2e7002f18b81e6808603f2af6762567a53e3094fb5ea8094b2042dbf5b1a95a364e613b4027351ff9b895def SHA512 f0f2767ed97610288c524e6724c070ca386d6261138660eba4778676c7b124c2781f73591d41b63954ec25c56018d067e664e20ea097d2af23ff5b97bc179c58
+EBUILD evince-42.2.ebuild 2985 BLAKE2B 87fee16941d147f814ec070aafbe49511543d52a2e7002f18b81e6808603f2af6762567a53e3094fb5ea8094b2042dbf5b1a95a364e613b4027351ff9b895def SHA512 f0f2767ed97610288c524e6724c070ca386d6261138660eba4778676c7b124c2781f73591d41b63954ec25c56018d067e664e20ea097d2af23ff5b97bc179c58
 MISC metadata.xml 882 BLAKE2B 5a52fc8a3986b5a07774f6b157e0c13b3c29a6f5d9bbbedba6367a0dce8a057c6c43ac9b2864a98ec4413e66365971935e4f111ae2be0d2430769f3fcb2b5047 SHA512 73a18d8f42a94322d8292b4ace3bc256dd170af87f160f9e33c12c3b5c76c2032beebbb7eaf9facd2f9d9ee8d669f0f5f805dfeef5c406f75f13f90105521f9f
diff --git a/app-text/evince/evince-42.2.ebuild b/app-text/evince/evince-42.2.ebuild
new file mode 100644
index 000000000000..c8e4f7b17473
--- /dev/null
+++ b/app-text/evince/evince-42.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.44.0:2
+	>=gui-libs/libhandy-1.5.0:1=
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.40:2
+	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-22.02.0[cairo]
+	>=app-arch/libarchive-3.6.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		>=app-text/libspectre-0.2:=
+		dev-libs/kpathsea:=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-4.0:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10
+	)
+"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gi-docgen-2021.1
+		app-text/docbook-xml-dtd:4.3
+	)
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddevelopment=false
+		-Dplatform=gnome
+
+		-Dviewer=true
+		-Dpreviewer=true
+		-Dthumbnailer=true
+		$(meson_use nautilus)
+
+		-Dcomics=enabled
+		$(meson_feature djvu)
+		$(meson_feature dvi)
+		-Dpdf=enabled
+		$(meson_feature postscript ps)
+		$(meson_feature tiff)
+		$(meson_feature xps)
+
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_doc=true
+		$(meson_use introspection)
+		-Ddbus=true
+		$(meson_feature gnome-keyring keyring)
+		$(meson_feature cups gtk_unix_print)
+		$(meson_feature gnome thumbnail_cache)
+		$(meson_feature gstreamer multimedia)
+		$(meson_feature spell gspell)
+
+		-Dinternal_synctex=true
+
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 0347b0a976b1..5b885beb29f1 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,8 @@
+AUX ghostscript-gpl-9.55.0-no-force-libstdcxx.patch 307 BLAKE2B 6476fd5635a6eae5c2a8ac680ce00214524d7c62e8c5ff331145f3b7cbcc5e1ad2e3486d5abbe8388dcdbb1712315df6e7b5c0f328657d0baecb012843cdeeee SHA512 4b62991bd456ddb2f0a974f41c842ef9afa5912cf8f53275bafe08ec9168a85a4720c02d0f3d843b31f2956a0c65cb86ed7ee5085fc0426ae1ea299b2e2c400b
 DIST ghostscript-9.55.0.tar.xz 67417724 BLAKE2B 87827856aa60c2c4a4ed209bc4203a837107df0404af036a48e5baa23fccfc945a97fe328a80b15c7357fc71acb82721d4b96e5f726d8c9d836fee031916aef7 SHA512 42c7e05ba72e9fdd626c5412187b13fc3c9459cae57dfe49ddd3011bf4e2cbd10bc88f09068a9f777c2ec6ae881cd737fd700ab62ec5108f2aca69152588f38e
+DIST ghostscript-9.56.1.tar.xz 62589232 BLAKE2B c0457c98e3f13047d9015d9d1415e2935e142d172aa8c560e68250a4110ccb52167988af70e63d86fc3f462a5d521ac45f7b758cb8d1492670930d9b2dc2e196 SHA512 fe5a5103c081dd87cf8b3e0bbbd0df004c0e4e04e41bded7c70372916e6e26249a0e8fa434b561292964c5f3820ee6c60ef1557827a6efb5676012ccb73ded85
 DIST ghostscript-gpl-9.55-patchset-01.tar.xz 2940 BLAKE2B 450498f0bd191d5936de1c2bdff659f075c39f7f7fefaf85b438f51967c4a8c294c6c887b36d5c0429d3677fb06e171e77da4b81ec911efea96df5b107d489dc SHA512 87411e68a078f77171128392962a9cd7a639bf6082447c658a50017cbf3f4e3ebce63af46eb9befdf2c1317de3a7a17e389f4de6e3aeae83d519b1c7b36de3c8
-EBUILD ghostscript-gpl-9.55.0-r1.ebuild 5092 BLAKE2B 54b6fbb7b8c29a522a8a75dfa1f423bfc11538822ede6940277f052d8143c35aa8cf17f72b58cae3ed60e5d5698287dcbf2657fb603fcdeaab215f493f79a8de SHA512 4a398746c4c357d5123b5fc8690d884227ca8685a365cd81097aa955cecc89bc28ce2cbb699077452adb681e13008bc69f7d355ce1c57f19d8732cd998d4ea67
+DIST ghostscript-gpl-9.56.1-patchset-01.tar.xz 2960 BLAKE2B c43f00dce6d1aada40c8e628a1032afe1bf9789b3ad69d9dac2ae94ba040a380c01884173f0ec05ba59240421dc5a53cae45adbbb13dccc9c366b1a6dea7794f SHA512 a444c687ab0f2c3f945f6854991799c2aeca3c410eba4bc53ad7bcc68b0ba8d187c09baebabb6581144781d35b4f2d4e29ff625ca55b0f640a033ba27e993f30
+EBUILD ghostscript-gpl-9.55.0-r1.ebuild 5158 BLAKE2B 8c355e6d6286d5d63376d89af80797de3b8975131f56cdcbd68ba7f4694d5cd221e9f375eca2e3ffa205e2d633c404d3b2c5c1766bf2a4c1cd6e4fa4fb5f038e SHA512 d8322a42acc21741207f560f3fbbb4fa1c99ea4cf73742c498b526dc6e6abe6beda369ad5a6463f8ae07a1f5de110ee6ffcc2922cc4ef29b0e0e1818f0fd2873
+EBUILD ghostscript-gpl-9.56.1.ebuild 5022 BLAKE2B 88651aa61d3432cd07502cf839d5fd5174f1fecef73d65d7fe0635f045c85a45695756d0addf67aba1b222dd0dab46d493d4397523a414ff19879e554d2e6fd9 SHA512 52b144914081280f5186a32b9c0e87c41e492ad8c91b71fa02bcfd8a65324fdfaee4873a2895c84dc2e0e46bdf03ba75086299ee3f030aa552e4701694c646c2
 MISC metadata.xml 765 BLAKE2B dc8466ca08f1fa1891cc60e886bfdd4cccc517c4b355ba6d7697acdece16657982adbfbd4f5709b3850dfba1293ce269b17f9c05bb92f5e5531f3c7debd13613 SHA512 7f4dba7c256642b532cb7418507169a2554e0c4058011ff8dba802f93d677a824b8ae7896840369f06c801ca4a7d27fda86f8c6a344127f65f61ca6e3a02c0ee
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.55.0-no-force-libstdcxx.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.55.0-no-force-libstdcxx.patch
new file mode 100644
index 000000000000..e10522af9017
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.55.0-no-force-libstdcxx.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/784173
+--- a/configure.ac
++++ b/configure.ac
+@@ -857,7 +857,7 @@
+     else
+ 
+       save_cxxflags="$CXXFLAGS"
+-      cxxflags_to_try="-std=c++17 -stdlib=libstdc++"
++      cxxflags_to_try="-std=c++17"
+       CXXFLAGS_TO_USE=""
+ 
+       AC_MSG_CHECKING([supported C++ compiler flags])
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
index 63b3a363c410..2af192b34ec5 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
@@ -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
@@ -60,6 +60,10 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.55.0-no-force-libstdcxx.patch
+)
+
 src_prepare() {
 	if [[ -n "${MY_PATCHSET}" ]] ; then
 		# apply various patches, many borrowed from Fedora
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild
new file mode 100644
index 000000000000..b2c8f3467830
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches
+# See 'index' branch for README
+MY_PATCHSET="ghostscript-gpl-9.56.1-patchset-01.tar.xz"
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/"
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+if [[ -n "${MY_PATCHSET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}"
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cups dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	>=media-libs/jbig2dec-0.19:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=media-libs/tiff-4.0.1:=
+	>=sys-libs/zlib-1.2.7
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:3 )
+	unicode? ( net-dns/libidn:= )
+	X? ( x11-libs/libXt x11-libs/libXext )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-text/poppler-data
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ -n "${MY_PATCHSET}" ]] ; then
+		# apply various patches, many borrowed from Fedora
+		# https://src.fedoraproject.org/rpms/ghostscript
+		# and Debian
+		# https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches
+		eapply "${WORKDIR}/patches/"*.patch
+	fi
+
+	default
+
+	# remove internal copies of various libraries
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd ijs || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with X x) \
+		DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd ijs || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/Resource/CMap"
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index 6f84b60489aa..e82dd0ed2b78 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,5 +1,3 @@
-DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
 DIST gocr-0.52.tar.gz 445401 BLAKE2B 1f22f5377bb95053e3ab4ede074b3fceca4065f9ca0ede05a8023ebe807f41074f5ead84e133281e98be7f68f13b036dc759cccaf4a5688bf776f62f2de1970a SHA512 e2e6e690e7a32e32237c8b64b1a11719680c560592349df43f4b230f3c92bf324f98e473979b0913c42e33e8abbaf27952b6af173ea06eb5535878a9f608ce6d
-EBUILD gocr-0.50.ebuild 1194 BLAKE2B f2d7b20dc9437bc249deb9c752c516e366245b7f5fc3aaa26ba428bb360cc81b9298412e5be996ad9fb16e3a54f7389564b0e65f6c929a4a0c9328b78e197867 SHA512 8ce80abb20a31d902076ae3408812cbabe6a7911301959a542e639cdfeffdd51940d8a54aab5da71a035fabf7a8e0ce4a7fe27568c623a361e0dda0573eb41a0
 EBUILD gocr-0.52.ebuild 1194 BLAKE2B 8a05f160994b651bf1cac3706819fe008c8399842026660e02a55246582d7a6766b59b2d3667c824af02ee97533c2726a17dcf233958a2bf91c4eac0a455ea70 SHA512 2c7d435942ac5d38c57d823c2c6c6f26a4cf121583445638c78545763aceb268251dbc1dd6b36561b2346e611014b48387929608a9a4b1191da9ab34ba3866db
 MISC metadata.xml 242 BLAKE2B 6d6452effca096b9ddfe9cf937bae671b0395d8757aa1c6e56be35d80495d6d6ad96c992c297191853da2e915094175cfc63d7ff74eab76885d5641ecb2c6632 SHA512 e0ecf1bfae6c474b11ceb51240d5cce9978c17adc03c606327ae7086bfc55ef20da3934c25ab4ecef4dfd4db63f73f5ccb44670c5e860357eb4da1af2eb2d02f
diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild
deleted file mode 100644
index 3517d1e07a87..000000000000
--- a/app-text/gocr/gocr-0.50.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An OCR (Optical Character Recognition) reader"
-HOMEPAGE="http://jocr.sourceforge.net"
-SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc scanner tk"
-
-DEPEND="
-	>=media-libs/netpbm-9.12
-	doc? (
-		>=media-gfx/transfig-3.2
-		app-text/ghostscript-gpl
-	)
-	tk? ( dev-lang/tk )"
-RDEPEND="${DEPEND}
-	tk? (
-		media-gfx/xli
-		scanner? ( media-gfx/xsane )
-	)"
-
-src_compile() {
-	local targets=( src man )
-	use doc && targets+=( doc examples )
-
-	emake "${targets[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install
-	einstalldocs
-	dodoc HISTORY REMARK.txt REVIEW
-
-	# remove the tk frontend if tk is not selected
-	if ! use tk; then
-		rm "${ED}"/usr/bin/gocr.tcl || die
-	fi
-
-	# and install the documentation and examples
-	if use doc; then
-		dodoc doc/gocr.html doc/examples.txt doc/unicode.txt
-
-		docinto examples
-		dodoc examples/*.{fig,tex,pcx}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index e866730df1b7..1dd00fc54799 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -1,3 +1,3 @@
 DIST groonga-normalizer-mysql-1.1.1.tar.gz 548788 BLAKE2B c2f06ffa4aaf52266dabf1397d592b772a10a45fe8b9184ffb7fc5f30a8db3c81011c19a80d3d14a228ea47b4b6ba21b7ab7f81e283533beef4596065d0c4b6b SHA512 40686a50133149b614057907c58f5b37d596fcaf697b4a6f3e68b776ac8c728cdd4c8a6e7c5676fe92ff96a4358b623f2b3740f6b72d317f1650c006cfb34369
-EBUILD groonga-normalizer-mysql-1.1.1.ebuild 683 BLAKE2B 827d3a2d18c44f0e7d2e14c7a9adbc2053e33bee4a211372789d950639fbe01895382343bc429ae75e77f5136cb16433d45d7f759113396db097088f456f7131 SHA512 b69be880d2e87f8a92f2ebdf38d0e07d186f9b1db96e510b70c723be83dd5054a3fc7560bd767fcc93d9ee114af203e185d387dcd1dc4b977e112f5fe0393daf
+EBUILD groonga-normalizer-mysql-1.1.1-r1.ebuild 677 BLAKE2B 368be93acf4abda9d1dd9b4a4d1ee9531da750abcac6773e7281d3578704434731a18a81b68303954eefaed46f9882a7619c7919a96fdaac20c30c0552176b37 SHA512 cf0ff0f0c291db0c40b84f000d207bfcccf4e0d37eb8720d37f4bb216833172d774974ea1fe3780924b721d93e28c03a0f1cd357ad0e583c1cf3cda36974543d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild
index 86f8be4f031a..c2a7aacdc072 100644
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools
 
 DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
@@ -11,20 +12,21 @@ SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 DOCS=( README.md )
 
 src_prepare() {
-	default_src_prepare
+	default
+
 	eautoreconf
 }
 
 src_configure() {
-	# ruby is only uses for tests
+	# ruby is only used for tests
 	econf --without-ruby
 }
 
@@ -32,5 +34,5 @@ src_install() {
 	default
 
 	find "${ED}" -name '*.la' -delete || die
-	rm -r "${D}usr/share/doc/${PN}" || die
+	rm -r "${ED}"/usr/share/doc/${PN} || die
 }
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index d0f96103b5d3..98cb4b648358 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,3 +1,5 @@
+DIST gspell-1.10.0.tar.xz 432484 BLAKE2B aee73d1745720d7c5bef1264ca717866321696953a8c0f2a538e7c8ea2133b8c666b1521280fd6c4f1a9333f178b2559bc21e462f94f7e217480bd3cb5068068 SHA512 8c776f2ea388ab145bc53de112ddc8e737c65ce7be0518edfe695f3e677a89c57a4826eb0fcdc39c5023bd1839ebd60a6a25eb8ac8e3363d0c406994828b743f
 DIST gspell-1.9.1.tar.xz 424252 BLAKE2B 436e6af50f7d1058dd7692c22b5a5e18c25cc76ea6816193e48728f7e1d55ef29af26127403a40d594a2125e4d3e1ee889abe067d2c065de74ae95ca431e5fbe SHA512 72f1fb384e02bb73397b457c3e8a7b98393c9fab5c0dad07f84d1db3f6b75c093663cc83c13fefe868424c503abc2fb89c8b045d0495dd43ddcedad025f23bca
+EBUILD gspell-1.10.0.ebuild 1525 BLAKE2B 0adbf3faf4893c8d279a848111d68ac5aefd8d48f2ee0ba5f9135b33ae3d1866d37848d80daed35b0ee0a2db2dfeaeec386a5ea74ef8d4c9546d4679217eb948 SHA512 b2a1da5cad0bf01eb03d90398a5f8a56f1a1e7b7b2ac0f9947bc58045ad4af26411b9a784e55b61234b38257174c91cebc9742d84f829067ff9e91bf803a74ad
 EBUILD gspell-1.9.1.ebuild 1508 BLAKE2B 3bc7ce7b37f35fc7d8916421d73bbb7c0af3de238e7308270664172737dde15e5d56010077c41734d78b0903efdedc6bff97d41c68f9d728875724d392e029c2 SHA512 b5fe49ebbd959c5a3860e1c9eaa0412b93bfe3e48a640665a8795a7890232b91890c99a82b6688222206e2bb37793e2fe66400dc98fe36c36b3e1f756c9f2a76
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/gspell/gspell-1.10.0.ebuild b/app-text/gspell/gspell-1.10.0.ebuild
new file mode 100644
index 000000000000..4fc667187f18
--- /dev/null
+++ b/app-text/gspell/gspell-1.10.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=app-text/enchant-2.1.3:2
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	dev-libs/icu:=
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/dbus )
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	test? (
+		app-text/enchant:2[hunspell]
+		|| (
+			app-dicts/myspell-en[l10n_en(+)]
+			app-dicts/myspell-en[l10n_en-US(+)]
+		)
+	)
+"
+# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
+# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
+# however a different backend like hspell or nuspell + their en_US dict might be fine too,
+# but we don't support them at this time (2020-04-12) in enchant:2
+
+src_prepare() {
+	use vala && vala_setup
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx dbus-run-session emake check
+}
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 76ce9fa0c611..7f25029b156e 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,8 +1,4 @@
 AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
-DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e871e21eacef88416f98226046e99a2a0a27c3354119715f320df1653ad7065c1c9a4a23b3081971df4d72c6fa19c SHA512 e4d0822592675115c7c2121d6ed066f997d315fecea384caeb506de1933f6bd60fd0dea57dcdafba85465f9f6b922ed168db57ce725bd7f19689d30624412f1b
 DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
-EBUILD highlight-3.57-r100.ebuild 2392 BLAKE2B ea840d9f56ac50e22d0a21c0339b696a6b1de4f82f281e0afab93b54e199239b986a70e1795e146ef469d8108a2ff179deef726f646d6f7b6f1053e791f8aeb6 SHA512 e50889e2b8a1b62c8706f399c2fddb04fe405ca824e4d3291c99620a604d3f1bc5aa1f730a6a7985029b93a92d5f210ad37f2d4aca945907f95cd120f02b6f47
-EBUILD highlight-3.60.ebuild 2392 BLAKE2B ea840d9f56ac50e22d0a21c0339b696a6b1de4f82f281e0afab93b54e199239b986a70e1795e146ef469d8108a2ff179deef726f646d6f7b6f1053e791f8aeb6 SHA512 e50889e2b8a1b62c8706f399c2fddb04fe405ca824e4d3291c99620a604d3f1bc5aa1f730a6a7985029b93a92d5f210ad37f2d4aca945907f95cd120f02b6f47
 EBUILD highlight-4.1.ebuild 2405 BLAKE2B d7945a424f4f958f15c384973acbe0192b473bf913a9bfcb7b01ea3684e5eabc5bcc0f981c9922db2851944a7851239e0dca672f75558763f1911b05e7edfd7b SHA512 b4354913bfde963192077d2f5824b29806dbb8498b4630f30e688169697fe2ddaecd00ab6d9dac021c201d20f874343f161e6b918d21cfcf32e5ed7e8ab89939
 MISC metadata.xml 331 BLAKE2B 3c864f08058c451342b7f7799f36e901f392207b36114dd123bb3faa59f04fe3b00d8e65cee4ad3bbbe44606bdafbd246c64d5fce03cd54fc64cd40cfde59788 SHA512 eb96ee44971855de0b12f9e230d58714acb54de1b0a814c0681f8c31124a5c3e39290e2fd17523b2b52b65efaf30f64580f00777a8e9c908779b582577897906
diff --git a/app-text/highlight/highlight-3.57-r100.ebuild b/app-text/highlight/highlight-3.57-r100.ebuild
deleted file mode 100644
index 8b9689954ce7..000000000000
--- a/app-text/highlight/highlight-3.57-r100.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit lua-single qmake-utils toolchain-funcs
-
-DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples qt5"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	${LUA_DEPS}
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
-)
-
-myhlopts=(
-	CXX="$(tc-getCXX)"
-	AR="$(tc-getAR)"
-	LDFLAGS="${LDFLAGS}"
-	CFLAGS="${CXXFLAGS} -DNDEBUG"
-	DESTDIR="${D}"
-	PREFIX="${EPREFIX}/usr"
-	HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
-	HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
-	doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
-	conf_dir="${EPREFIX}/etc/highlight/"
-)
-
-src_prepare() {
-	default
-
-	# disable man page compression
-	sed -e "/GZIP/d" -i makefile || die
-
-	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
-		-i src/core/datadir.cpp || die
-
-	sed -r -i \
-		-e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
-		"${S}"/extras/tcl/makefile \
-		"${S}"/extras/swig/makefile \
-		|| die "Failed to set Lua implementation"
-
-	# We set it via eqmake5, otherwise it forces clang...
-	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
-		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
-		-i src/gui-qt/highlight.pro || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/gui-qt > /dev/null || die
-		eqmake5 \
-			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
-	if use qt5 ; then
-		pushd src/gui-qt > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake -f makefile "${myhlopts[@]}" install
-	if use qt5; then
-		emake -f makefile "${myhlopts[@]}" install-gui
-		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
-	fi
-
-	if ! use examples ; then
-		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
-	fi
-}
diff --git a/app-text/highlight/highlight-3.60.ebuild b/app-text/highlight/highlight-3.60.ebuild
deleted file mode 100644
index 8b9689954ce7..000000000000
--- a/app-text/highlight/highlight-3.60.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit lua-single qmake-utils toolchain-funcs
-
-DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples qt5"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	${LUA_DEPS}
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
-)
-
-myhlopts=(
-	CXX="$(tc-getCXX)"
-	AR="$(tc-getAR)"
-	LDFLAGS="${LDFLAGS}"
-	CFLAGS="${CXXFLAGS} -DNDEBUG"
-	DESTDIR="${D}"
-	PREFIX="${EPREFIX}/usr"
-	HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
-	HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
-	doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
-	conf_dir="${EPREFIX}/etc/highlight/"
-)
-
-src_prepare() {
-	default
-
-	# disable man page compression
-	sed -e "/GZIP/d" -i makefile || die
-
-	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
-		-i src/core/datadir.cpp || die
-
-	sed -r -i \
-		-e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
-		"${S}"/extras/tcl/makefile \
-		"${S}"/extras/swig/makefile \
-		|| die "Failed to set Lua implementation"
-
-	# We set it via eqmake5, otherwise it forces clang...
-	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
-		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
-		-i src/gui-qt/highlight.pro || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/gui-qt > /dev/null || die
-		eqmake5 \
-			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
-	if use qt5 ; then
-		pushd src/gui-qt > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake -f makefile "${myhlopts[@]}" install
-	if use qt5; then
-		emake -f makefile "${myhlopts[@]}" install-gui
-		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
-	fi
-
-	if ! use examples ; then
-		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
-	fi
-}
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 2b3eb89f7911..91e41113363c 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -2,9 +2,11 @@ AUX html2text-1.3.2a-compiler.patch 247 BLAKE2B 83c719d6dbbc18e347ca45e6e0df8958
 AUX html2text-1.3.2a-urlistream-get.patch 186 BLAKE2B 600aac564090a318cd600858360b16e4cedc0005981d8c392ca450b7182fd0497cdbed6388d9429406756734ba2a204baaf314b73a2f69978574698e631289c2 SHA512 388c30725c72e3d7b372544b4a4fec871d3069fe050aec3212b047d8bdb0c31575e2703e46374b3b7d0422ca8cf2ce2f2d3960d56c32977d85a93d4d94b41659
 DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
 DIST html2text-2.0.0.tar.gz 162901 BLAKE2B 878ff3bfb55523f2bd2721f2320b55729ac84e250fe651c2347b8cfb0f6d524c18c4e820e255b474d59b5179c255b8acbfc51f7213539979b5d3977c42383ebd SHA512 94f2cf3f5085307cc2cf5e264b35621029e57142d6e4d832eee2c447860338c947687be5e8c81367696b0b04432a44537a1545a820991c621b4036393ad6f4e8
+DIST html2text-2.0.1.tar.gz 187962 BLAKE2B 326e3e190e1f062c9fa2057e5774c62366ef40beb1bb6aa586e58f0a46c97c8a505087287b2afffb5847d6a967307413b98228ce97bb9e286c0ad962b6fb331d SHA512 b9116a93d82d28853acdd534320ca4bc27fd4b0d6b07c8513324bdf736d15e5322e8f06f5c640030e4f8fda2d87c643e80bbc2f7b3f0f6a600ea9531891054fb
 DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
 DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
 EBUILD html2text-1.3.2a-r2.ebuild 958 BLAKE2B 8ec2e489b36030befdc0c0eba73feb43d0a723ffebabe9222666edfe9592152992a4b25385566326cde8fec7270c80bb8526125f4c13c9d4e1bb2c092932f157 SHA512 16881d04627f3d372edf2dae0640e1c7fc41a68b4f68934728d1030683cd3358243c88e2ef0309770cd1646d8bb0bb57e4c7228502c7a78f51b229eefe8d4275
 EBUILD html2text-2.0.0.ebuild 886 BLAKE2B 780ae465e27819ac3583d900c9a5fbfb208d291072f8dc47604bbe857a6bb61b42c46f6516fb1fd6652dfd8dc7d9d797ac1e2c3e3e4c75bf53f5baefde962abf SHA512 876343870bbab2e889c4a62edf67d84d2bc1a1cbb13d95e72e25950015186cace38231d5c445a20c72ac99197dde98964c66f3c5564f02a35027916b772133ca
-EBUILD html2text-9999.ebuild 886 BLAKE2B 780ae465e27819ac3583d900c9a5fbfb208d291072f8dc47604bbe857a6bb61b42c46f6516fb1fd6652dfd8dc7d9d797ac1e2c3e3e4c75bf53f5baefde962abf SHA512 876343870bbab2e889c4a62edf67d84d2bc1a1cbb13d95e72e25950015186cace38231d5c445a20c72ac99197dde98964c66f3c5564f02a35027916b772133ca
+EBUILD html2text-2.0.1.ebuild 925 BLAKE2B 1c5ff0129584d19f5a4a449775ac52ed8df2b50f246ec6e855031583669bbed942f89501e3b9eec469b7a6fb304fb53e1f50bf60553e44dcb24367c1cc7bb576 SHA512 2c837b2ce2eec4d5090132beeb03e1dcdb51fd8b804ecef7ccaeec8edf56648fe63f65d6307d6656d9b7f5dace48b20bd13d7ef4c7be774a07fd06d0303714d5
+EBUILD html2text-9999.ebuild 925 BLAKE2B 1c5ff0129584d19f5a4a449775ac52ed8df2b50f246ec6e855031583669bbed942f89501e3b9eec469b7a6fb304fb53e1f50bf60553e44dcb24367c1cc7bb576 SHA512 2c837b2ce2eec4d5090132beeb03e1dcdb51fd8b804ecef7ccaeec8edf56648fe63f65d6307d6656d9b7f5dace48b20bd13d7ef4c7be774a07fd06d0303714d5
 MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
diff --git a/app-text/html2text/html2text-2.0.1.ebuild b/app-text/html2text/html2text-2.0.1.ebuild
new file mode 100644
index 000000000000..124d0962c321
--- /dev/null
+++ b/app-text/html2text/html2text-2.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
+else
+	SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="HTML to text converter"
+HOMEPAGE="https://github.com/grobian/html2text"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_configure() {
+	# non-autoconf configure
+	tc-export CXX
+	./configure || die
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		MANDIR="${EPREFIX}/usr/share/man" \
+		DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
+		install
+}
diff --git a/app-text/html2text/html2text-9999.ebuild b/app-text/html2text/html2text-9999.ebuild
index f7558b5e8e28..124d0962c321 100644
--- a/app-text/html2text/html2text-9999.ebuild
+++ b/app-text/html2text/html2text-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
@@ -19,9 +19,10 @@ HOMEPAGE="https://github.com/grobian/html2text"
 LICENSE="GPL-2"
 SLOT="0"
 
-src_prepare() {
-	default
+src_configure() {
+	# non-autoconf configure
 	tc-export CXX
+	./configure || die
 }
 
 src_compile() {
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index d80cd7216045..5f76db3869a6 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,8 +1,9 @@
 AUX kjots-5.1.0-akonadi-21.12.0.patch 8215 BLAKE2B a192b70f325a84423b88144fdb5dc70a07b10c84cb0feb8faf74859fd1668f97db6972841bad74e313afba46c09cd2d882297cc72b1c8c00e9b5dfe68874fb75 SHA512 5487f7ea196479a64e72d8a8fe2f9f7ba7ed60c3932703795f0698325c737d08aff3c63d36ef60a9c66f2660f6c5318239c493db926d50a98df61256be0b9f65
+AUX kjots-5.1.0-akonadi-22.04.0.patch 2800 BLAKE2B 86c4b1cb8e1890e35c12b55b4c5db4b9a4c292b771827c12339a311fdc2603a1634430d39bbe14e7dfe6e7b7b2a8038c52ced44c31a76064675732cdd2db8504 SHA512 75ee080a7d8c1a7096548514758e805a105bfc920ca9cdd8f3de8fcc738b1b60d374549ee2249b699546ecc89721d38ed9958cf6dfd583e924eed5532e5698d5
 AUX kjots-5.1.0-implicit-dep.patch 983 BLAKE2B ca6a6b7b8e72aa0729d3e7ca9d5ecdf24673ef33ef8b752dd5513b93fd25d4b6c1adebd8a8b238d29d04c2bd6802f3303d968effed54d16dca30d6a96815fc11 SHA512 7c68f0807d764222b5b4b8114d4cbd7bfc4922d735b1a12de621bed943d666a4fefbf17ce7ea43eb6cca029cb77b1fb7d217279b3be1cb5a99a3db0f5fc530b8
 AUX kjots-5.1.0-missing-lib.patch 683 BLAKE2B 719f3c4ef39856c33b683f4c7edca664f89510f6b1f21ffd2ca285eb63db4b729c9b2091c704452adbda326eaef61ebba9b3ccce643548c1bdd2f3044687af92 SHA512 c87c741b036b5958faa3a9c892be469ea73e8809807da8f000fc55ae4219996731907d458cacae3f08eb0c3fb8d40e391490f03047dbfed900a3253bb46536c3
 AUX kjots-5.1.0-speech-optional.patch 2921 BLAKE2B daa773ddf2c40dce83891a3afc35c209343d2e9a71673dce669132aa998fdfa225eab03fa8df0bcdd0a1c9694ebfa117c4fe9da129b63979aa37fe797a74edc7 SHA512 a7f4b30b04e1bf6bc403a9baad213d92f96fe147b7f5a279a2f19d3f0758714dfc3c99bbeced7bea6bc2a36e3246407152e4e276c162ade88f1de71fed0b2af8
 AUX kjots-5.1.0-unused-dep.patch 1423 BLAKE2B 154509cafb0c5822e5ceff10513967e3899d474fb471bb312e0686d6e2875d57c5a7bb8b7392efb211c74f0d31e274a62643998132bdcfc09334ffb26c78c1b7 SHA512 ebad6d5f26af8ca1c55302f9a2fbedcfb70f07bf09cfc8fa4446bdac7ac9ec182523659701e35a69d559772e65786958d3ef434fef4bdf9d75420b5c41241269
 DIST kjots-5.1.0.tar.xz 184972 BLAKE2B 28bea486bcaa552b7463f9a2132230d5729ade7a2eadb06f66f958c660117bd3a1976d6da14f1339abfbd39930708fe77ae923042a0bc8ca59bf074e409375ae SHA512 71c30e0810157cf3d039e683d368cfa9fa3ec88918eee2d85477a9eb9f073af43dfb2318957019f35503d484e2521289bcb043ff9bfc2822eb900a2f5b8d5d62
-EBUILD kjots-5.1.0-r2.ebuild 1488 BLAKE2B 14a659b4a2e627fbeb9112ea16568dcf459ccfecb586aa59a2f4b9d6a552503bce68b8061fe9b28200fc36a54475d7b4c884931f100a6ee4141dfde39c730c44 SHA512 4ef7c7e3753bb342042cc8c933bd488b35b620d1ab1d3f591caa3aa57b06a7cd403839881319e3ff3bec475406258c5678d0404914052032d39cf1a065cecce4
+EBUILD kjots-5.1.0-r2.ebuild 1543 BLAKE2B 65e2142e188113e795cd50d8fcdb25f052bad9530d96401c16ab6cb6b1a4b2b3c377d86e5c8d449c9af3d0c27d3a00e298448152c9a81c1659e3361797094526 SHA512 ae3dd31eae3507ac0f0664c06820c4c571ee2afbc6d86d9bfc0cd266b4de66358326d39ef64fa51e26a8bbcdef8cf592496171ff671a74620fd5626889a94fd7
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch
new file mode 100644
index 000000000000..a5ef2cc2cdf9
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch
@@ -0,0 +1,87 @@
+From b9d91006eb3ca1c6e495d0f3d1cc32775a26538c Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Tue, 1 Mar 2022 23:33:19 +0100
+Subject: [PATCH] Fix akonadi includes
+
+---
+ src/kjotsmodel.cpp                           | 2 +-
+ src/kjotswidget.cpp                          | 2 +-
+ src/noteshared/notecreatorandselector.cpp    | 2 +-
+ src/noteshared/standardnoteactionmanager.cpp | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+
+From 17f373bb728cbc553c5fe644563ebd015eda4075 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer <wbauer@tmo.at>
+Date: Fri, 1 Apr 2022 08:00:34 +0000
+Subject: [PATCH] Fix build with Akonadi 21.12
+
+---
+ src/kjotsmodel.cpp                           | 4 ++++
+ src/kjotswidget.cpp                          | 6 +++++-
+ src/noteshared/notecreatorandselector.cpp    | 4 ++++
+ src/noteshared/standardnoteactionmanager.cpp | 4 ++++
+ 4 files changed, 17 insertions(+), 1 deletion(-)
+
+diff -u a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp
+--- a/src/kjotsmodel.cpp
++++ b/src/kjotsmodel.cpp
+@@ -21,7 +21,11 @@
+ #include <AkonadiCore/ChangeRecorder>
+ #include <AkonadiCore/EntityDisplayAttribute>
+ #endif
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include <Akonadi/NoteUtils>
++#else
+ #include <Akonadi/Notes/NoteUtils>
++#endif
+ 
+ #include <KMime/Message>
+ #include <KPIMTextEdit/TextUtils>
+diff -u a/src/kjotswidget.cpp b/src/kjotswidget.cpp
+--- a/src/kjotswidget.cpp
++++ b/src/kjotswidget.cpp
+@@ -34,8 +34,12 @@
+ #include <QDebug>
+ 
+ // Akonadi
+-#include <Akonadi/Notes/NoteUtils>
+ #include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include <Akonadi/NoteUtils>
++#else
++#include <Akonadi/Notes/NoteUtils>
++#endif
+ #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+ #include <Akonadi/AttributeFactory>
+ #include <Akonadi/CollectionCreateJob>
+diff -u a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp
+--- a/src/noteshared/notecreatorandselector.cpp
++++ b/src/noteshared/notecreatorandselector.cpp
+@@ -24,7 +24,11 @@
+ #include <AkonadiCore/EntityTreeModel>
+ #include <AkonadiCore/ItemCreateJob>
+ #endif
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include <Akonadi/NoteUtils>
++#else
+ #include <Akonadi/Notes/NoteUtils>
++#endif
+ 
+ #include "noteshared_debug.h"
+ 
+diff -u a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp
+--- a/src/noteshared/standardnoteactionmanager.cpp
++++ b/src/noteshared/standardnoteactionmanager.cpp
+@@ -25,7 +25,11 @@
+ #include <AkonadiCore/CollectionModifyJob>
+ #include <AkonadiCore/ItemModifyJob>
+ #endif
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include <Akonadi/NoteUtils>
++#else
+ #include <Akonadi/Notes/NoteUtils>
++#endif
+ 
+ #include <KXmlGui/KActionCollection>
+ #include <KLocalizedString>
diff --git a/app-text/kjots/kjots-5.1.0-r2.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild
index a948d3a45db6..7ef5fe968253 100644
--- a/app-text/kjots/kjots-5.1.0-r2.ebuild
+++ b/app-text/kjots/kjots-5.1.0-r2.ebuild
@@ -51,4 +51,5 @@ PATCHES=(
 	"${FILESDIR}/${P}-missing-lib.patch"
 	"${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580
 	"${FILESDIR}/${P}-speech-optional.patch" # bug 835128
+	"${FILESDIR}/${P}-akonadi-22.04.0.patch" # bug 840272
 )
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 69b496b53ea9..d23e9a567353 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,7 +1,7 @@
 DIST lesspipe-1.91.tar.gz 121965 BLAKE2B 93c169b2b1a81db7e7b569718a43152a8f2b9ea95258047a00ae4940509817a3eb861fdadb6bafc5861c49e805ce910348a57f634bdae57317811ac6fbfc6945 SHA512 d080ceaae019d8885a53c8abb26f4a159b78578f68c2b9a024960aa69509651e3b6638e78bd6e2e57c23d81123d9a3cab167736f253ba4276a3889890d594bd3
-DIST lesspipe-2.03.tar.gz 166602 BLAKE2B a90324726f0401417c0f452f489463ac2ef2a710b790ef41c306803dc5c981637530abe034048c0739c1cd698b7901fcdcc074350d1d2a87f848ad5c4f9807ac SHA512 d83b4532f7f1cb58c48e274b34ad1f16c3392b120fbca1d66ff45997e1a28ca8804574e19522745f56344944fa8219ea0457dcb9579bd9b9fe7a8df8a82113f6
 DIST lesspipe-2.04.tar.gz 166831 BLAKE2B c33620b1c2714b01a89eaaeaeccfd72e62fd5123270ec84d3e27e914bda8f734758b36ea850126aa1ecd6ab36b9442577ac591024c373bdf6540b95816ed750b SHA512 04312d21c4f45b1630efd597ffafd69fc46ceff1fd5872d296a7811940f9d34da805c4ef4fa543af839de7e8bb4225c6ef5e680e9675eae4f56de669ec975669
+DIST lesspipe-2.05.tar.gz 167135 BLAKE2B 6f54a68a3857fcafa19148ba798d6ac49b2693e547e88a4a4fb6a178768d75ba8ae08e808a9e08aabfe903538bd401e3bd25e22ec240bf3a52365df729d87b9e SHA512 b4220b28fb609060735663067f5a738cae32d12e90efc397db3749e4dcfa7bfc063a4458c1f39b8a43be3b04effdc00a25c4feebd6e9a3b23f0064b879bbb698
 EBUILD lesspipe-1.91.ebuild 1735 BLAKE2B f09055204a532dc057d43bbf1113c9bc7467f06a97c1ac26555dfc207842610fb863ee485a8b790e436c580f52bcc9ea3533c0ae771331bd031acca9189bdcba SHA512 7b47ec9975fa13326a09998fb059fa81f03f6c2b28e364a12e7e8b6e9e6ca201c64f5a650def68b132856f0b15a9524f82e5089992632db3069a42db7db3b43f
-EBUILD lesspipe-2.03.ebuild 1134 BLAKE2B 01cc742355be55724425e79132ed7acee8f945d34f836027083aba49ce9fdd67ea5332d6757f74f2ca063360f44c770aa56c0204740ca71452443c6f68d5af86 SHA512 33f9c95a38c54e3f47971453bd5a7699730ac3715bc46463a34b58c367d43777b7ce24f031656f14433f73abd60d6f2107bb49b544afc8c25dc87b949b8d884c
 EBUILD lesspipe-2.04-r1.ebuild 1241 BLAKE2B a74271a5e3777c9988cd1ae5221837468dd7ac241afc62413e06aac6e89b69fcf66ff94fdf2e029836786f9ae04d7011ccc0f00b49fea7f29c4fab83c5cf7598 SHA512 9ae0f89a7044b34ab5d6983e1e3dad36b42ccaa857554e551bef2b5ba059ee243a9d04b07c179426ae9d9a0604fa26ac56dd5289dec14d6854e5bc612b17d50d
+EBUILD lesspipe-2.05.ebuild 1241 BLAKE2B a74271a5e3777c9988cd1ae5221837468dd7ac241afc62413e06aac6e89b69fcf66ff94fdf2e029836786f9ae04d7011ccc0f00b49fea7f29c4fab83c5cf7598 SHA512 9ae0f89a7044b34ab5d6983e1e3dad36b42ccaa857554e551bef2b5ba059ee243a9d04b07c179426ae9d9a0604fa26ac56dd5289dec14d6854e5bc612b17d50d
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.03.ebuild b/app-text/lesspipe/lesspipe-2.05.ebuild
index ece7aa8140b7..dc26753ae52b 100644
--- a/app-text/lesspipe/lesspipe-2.03.ebuild
+++ b/app-text/lesspipe/lesspipe-2.05.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit bash-completion-r1
+
 DESCRIPTION="A preprocessor for less"
 HOMEPAGE="https://github.com/wofr06/lesspipe"
 SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -31,6 +33,9 @@ src_compile() {
 src_install() {
 	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
 	einstalldocs
+
+	rm -r "${ED}"/etc/bash_completion.d || die
+	newbashcomp less_completion less
 }
 
 pkg_preinst() {
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index dfc5bf5b41bd..ac9ba88d9df5 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,5 +1,5 @@
 DIST libetonyek-0.1.10.tar.xz 1494000 BLAKE2B 1c47b410050380d134d96b5551f0c9186c24aa0ea52c801e26655e3013f030e92198d8e3f19e8a341744206eeaad2d10ca130f286fd42c8a9c3b56f773cfa7d5 SHA512 516a14fcb7b7b5898484a4263d593a036ac728b90144da9d1c22a5d0fdffc879839e19a7b390f99d924c390d433e64433fb08939b1e04ca24359315571c5772b
-EBUILD libetonyek-0.1.10-r1.ebuild 1289 BLAKE2B 877e867d9b733e51bc113301f5fd0ace23b710131f1224dd3ea17e01cc16f8ea1eabdfea9895d70cbb9a76914e167192ae5927efa69dd5041b072cbbe2fa78a0 SHA512 e976dcefbfd858cbc5773e224c2935a4a74c60fde91fa0d2809447ed0ec3e74ed3d72fcd1c44d01a6c8f9cde77dec18b904ea27016a91f8ccfb0f03798efc8f2
+EBUILD libetonyek-0.1.10-r1.ebuild 1296 BLAKE2B 19ca223d13a857ce796f2f5903d3bc533717cebcbc3d2c89d137b53ab5878774fedd54651dad7a0ba67888ae67fba13ffc0c911a90f11a1f404a4162661d4ced SHA512 6d57415fa1728831c08224e2216bd19772e79f77db660116965de168ac8fb39646e0dd37d2d6ae065ed950fdd38c0e2311fac2f5c37a348bf9684a2f25fec349
 EBUILD libetonyek-0.1.10.ebuild 1227 BLAKE2B 8b9d5d6e7f5ba4f359789de601f3342c402076f618ae8ef8a5d458cedc204f61ccabf1f7e105fbfd425fb777efaf0874b0df6ac13d2bfba8277c45f22b9d6d55 SHA512 6fcbe6c765e07e1bfa5b49436dfd30e334bd1b2a5f511b1009d1c59dabfdfdb3f77ac60cf61c71dd5048b63b65a100d972fbb2cef5df73a1a482dbba4c84d8a1
-EBUILD libetonyek-9999.ebuild 1269 BLAKE2B 88400841ba8cfab02e93ae101488e37ce337cf32de6afc3389ac9b8c58d0a084a077d0a9becf34a42319d772d08592582003b6455da789a4b87055e112637955 SHA512 e6b8b76335fd85cda6fc148f53ca98f36701ba12d6a698328f6c67757114a1df8f5897f77e2f374cefeb2b5290f7c3aae12c880f7708bb0ad492a084db746488
+EBUILD libetonyek-9999.ebuild 1276 BLAKE2B 92899b54029c3adacd40ae83060d17453b8246cd748a334a9d694565699e4041c1e4d0152bae510f94146bd2a453ab1d6e2f6b05c920bd38c86479eb0d87d585 SHA512 a816f52f1d7f844db8ea56cd8bd10a04e94e55148ec46c7de80baa3c84825c2f67c4307acf8a0dde2a6fee7e64357d4f01c9e27c4f306a447e1360444a0d2ea9
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
index 7493c2947bb9..b2d0bb4788dd 100644
--- a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10-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
 else
 	MDDS_VER="2.0"
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index b7576e139572..85eb33c30553 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 0a1dd09d21a4..ec8b73f638d9 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1,4 +1,6 @@
 AUX libspectre-0.2.0-interix.patch 654 BLAKE2B 5be37013c202c2191c8169ebd5b769737a361ab8adde830ffc4bf8487faaf5b1875e1eeb1baae0af0150001a784dad2449e4c6d2259e570dfcd9578e1dae0f00 SHA512 9ccb697cc2cce7798bfff799f7e041d02967af49832a692a3dc7292b52a31f1ebe37fe3b2f02b4908f7e38aaee11028b9e949512fbf02bfb4c8886fd5a7a3bba
+DIST libspectre-0.2.10.tar.gz 436690 BLAKE2B 8c1d25225a212b7e8d2bab7cffa4298509450cf727e38d0be22d27ed5fb161a0f838967afa3f8aa265c2bd243431bbfb92976cf51ee52ee7d3b0479000215546 SHA512 01738f452f99878beaa528b15d8df463ca22d625306d636e1a6199ade9f068d284f1def3882e954a06e5f066937343f79d0c2197fbb19ab53ef1ab0540c72f2f
 DIST libspectre-0.2.9.tar.gz 433384 BLAKE2B ed75a7013763a86c0f0702e0e47dcfb8401db6c957ed4851ecc85e27db6a49c8d4dae6443b302bcce5b0ae0da18dce3294a010eee5531a253020a650c19388c5 SHA512 7c24b5c83c6d356c89417d09dc76566afbe886ec189fe80d030a239c23ad25b061db071768117fa06805aa3d86f749fb232b7491bd7d467f26a40e348e74d5d2
+EBUILD libspectre-0.2.10.ebuild 1009 BLAKE2B 632e01ce3021b82d812d76d15c7ef045b31cba536ea1165a8593462294cea430ea38e411149e6467720944de53021791a6d29fb29681fdbba05dd602c0bf9958 SHA512 bda932e203d7cea4e76e3ea20f2af09d951beff91e9dd2225b71128fe3a692c7ad906a8995ad6c0719e21869361659612c13d53c19129bed965c37e50ccec07a
 EBUILD libspectre-0.2.9.ebuild 1144 BLAKE2B bd829cd2c5aa92fd93783eac3b22f550c5fd123824a068f440196bc9dc110c04c1aa4fea2603ead48757689b931fc6c105cc32408205e1c3988092012523c137 SHA512 554a65314e07c90c8053495b08a9be2b22dd46e07b5098bceb795f3af92c392acca11416260565a05c044b48dcc7bedae69a19d9e2cfd9097c90d761c74ab61f
 MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
diff --git a/app-text/libspectre/libspectre-0.2.10.ebuild b/app-text/libspectre/libspectre-0.2.10.ebuild
new file mode 100644
index 000000000000..04e44d862e05
--- /dev/null
+++ b/app-text/libspectre/libspectre-0.2.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library for rendering Postscript documents"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
+SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug doc"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND=">=app-text/ghostscript-gpl-9.53.0:="
+DEPEND="${RDEPEND}"
+
+# does not actually test anything, see bug 362557
+RESTRICT="test"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug asserts)
+		$(use_enable debug checks)
+		--disable-static
+		--disable-test
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+	if use doc; then
+		doxygen || die
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index 43d878444141..fa189c79c5e8 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,8 +1,5 @@
-AUX mandoc-1.14.5-gcc10.patch 1304 BLAKE2B d7f5c74cc4fc0da250eff19dc54c541bc1fe974f902242a17a3f287a1c83cc5afbfeb9de56269445bb99ce58fbd6b37a20efa7642f465df3726f78d267d2ddbe SHA512 3114fd538a235c9f558ab1b1e94b322b98216fc20f04ccba3999fcee453a1cc30d00d97f5011c10f9c0e8a1299151a654c7d5cfbef4136ebde301a72542cedea
 AUX mandoc-1.14.5-r1-www-install.patch 637 BLAKE2B 2550351e29db19b43de500f039f0563af8a720ef3bf7efa60ac715ca956d7dd0d13d0e092ae2749e3a76fc456eacf0260ca6fc03d324e08bf287bd8d4ac56dbf SHA512 5ed589e1322a2bbd261eb56aee8376526b80cf72eb5eafbc6e2772018c924913db0fb27eb7a50ec2509640e03e41d11e88401f76293d1d4230e777e39056c9fe
 AUX mandoc.cron-r0 87 BLAKE2B 2fb4946dd2a9025f5bee78e61c11d77d6c6b9b32f9d17c11ea4f0d890e54b42817981e1cd4c568229927fd04bd0592e53ce18192f8359dded28be8c8690904f6 SHA512 74bdb16bc498d741128f1b6966afec8e21eb6899e26d20cf57cb0408ae6bdc63d75538dd355a21ae55593c359fbe707a56bbcdf6e78d557d4b53570db56fd6b3
-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 2921 BLAKE2B 99a34559def0b24a1f71e639363428f7bedc332fca27b1deaf8a279027e587f2cb606076ce11429eb8e2e60859c94859a8d5bd175303d32fac552ee6b16ea5af SHA512 c7802078dea385214874d42e401b97e7e91d208f32202f1b4770ebabf3bc7266bf8f263a1d167aaec692a493d38a35e78836c8fb24820df53f9badd89bc8fba1
 MISC metadata.xml 376 BLAKE2B c9e309738edb58e62de763b93af8b88fc0c939afa0a471a9c8e83c989bb515b1f6acdde23fb74d8d277d3e111219857f715c7107136fc82f8179907474653a75 SHA512 ce13542ac914c6dc4de722325319c7f49b93fab7b2baf0625d749c793068750800f1af55f15c199e38029a27b523b14b441fb964cf3850fb6c69607cc2a6b99d
diff --git a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch b/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch
deleted file mode 100644
index 6d976683772c..000000000000
--- a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://cvsweb.bsd.lv/mandoc/compat_reallocarray.c.diff?r1=1.4&r2=1.5
-https://cvsweb.bsd.lv/mandoc/compat_getline.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
-
-https://bugs.gentoo.org/707254
---- mandoc/compat_reallocarray.c	2014/12/11 09:05:01	1.4
-+++ mandoc/compat_reallocarray.c	2020/06/15 01:37:15	1.5
-@@ -1,8 +1,0 @@
--#include "config.h"
--
--#if HAVE_REALLOCARRAY
--
--int dummy;
--
--#else
--
-@@ -23,6 +15,7 @@ int dummy;
-  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
-+#include "config.h"
- 
- #include <sys/types.h>
- #include <errno.h>
-@@ -45,5 +38,3 @@ reallocarray(void *optr, size_t nmemb, size_t size)
- 	}
- 	return realloc(optr, size * nmemb);
- }
--
--#endif /*!HAVE_REALLOCARRAY*/
---- mandoc/compat_getline.c	2015/11/07 20:52:52	1.1
-+++ mandoc/compat_getline.c	2020/06/15 01:37:14	1.2
-@@ -1,8 +1,0 @@
--#include "config.h"
--
--#if HAVE_GETLINE
--
--int dummy;
--
--#else
--
-@@ -22,6 +14,7 @@ int dummy;
-  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
-+#include "config.h"
- 
- #include <sys/types.h>
- #include <errno.h>
-@@ -64,5 +57,3 @@ getline(char **buf, size_t *bufsz, FILE *fp)
- 			return pos;
- 	}
- }
--
--#endif
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
deleted file mode 100644
index e23baa856a58..000000000000
--- a/app-text/mandoc/mandoc-1.14.5-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="https://mdocml.bsd.lv/"
-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"
-IUSE="cgi system-man"
-
-RDEPEND="sys-libs/zlib
-	system-man? ( !sys-apps/man-db )
-"
-DEPEND="${RDEPEND}
-	cgi? ( sys-libs/zlib[static-libs] )
-"
-BDEPEND="
-	cgi? ( app-text/highlight )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch
-	"${FILESDIR}"/${PN}-1.14.5-gcc10.patch
-)
-
-pkg_pretend() {
-	if use system-man ; then
-		# only support uncompressed and gzip
-		[[ -n ${PORTAGE_COMPRESS+unset} ]] && \
-		[[ "${PORTAGE_COMPRESS}" == "gzip" || "${PORTAGE_COMPRESS}" == "" ]] || \
-		ewarn "only PORTAGE_COMPRESS=gzip or '' is supported, man pages will not be indexed"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# The db-install change is to support parallel installs.
-	sed -i \
-		-e '/ar rs/s:ar:$(AR):' \
-		-e '/^db-install:/s:$: base-install:' \
-		Makefile || die
-
-	# make-4.3 doesn't like the CC line (bug #706024)
-	# and "echo -n" is not portable
-	sed \
-		-e "s@^\(CC=\).*\$@\1\"$(tc-getCC)\"@" \
-		-e 's@echo -n@printf@g' \
-		-i configure || die
-
-	cat <<-EOF > "configure.local"
-		PREFIX="${EPREFIX}/usr"
-		BINDIR="${EPREFIX}/usr/bin"
-		SBINDIR="${EPREFIX}/usr/sbin"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
-		EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
-		MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
-
-		CFLAGS="${CFLAGS} ${CPPFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		# The STATIC variable is only used by man.cgi.
-		STATIC=
-
-		# conflicts with sys-apps/groff
-		BINM_SOELIM=msoelim
-		MANM_ROFF=mandoc_roff
-		# conflicts with sys-apps/man-pages
-		MANM_MAN=mandoc_man
-
-		# fix utf-8 locale on musl
-		$(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
-	EOF
-	use system-man || cat <<-EOF >> "configure.local"
-		BINM_MAN=mman
-		BINM_APROPOS=mapropos
-		BINM_WHATIS=mwhatis
-		BINM_MAKEWHATIS=mmakewhatis
-		MANM_MDOC=mandoc_mdoc
-		MANM_EQN=mandoc_eqn
-		MANM_TBL=mandoc_tbl
-		MANM_MANCONF=mman.conf
-	EOF
-	if use cgi; then
-		cp cgi.h{.example,} || die
-	fi
-	if [[ -n "${MANDOC_CGI_H}" ]]; then
-		cp "${MANDOC_CGI_H}" cgi.h || die
-	fi
-
-	# ./configure does not propagate all configure.local
-	# settings to Makefile.local settings.
-	tc-export AR
-}
-
-src_compile() {
-	default
-	use cgi && emake man.cgi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use cgi && emake DESTDIR="${D}" cgi-install www-install
-
-	if use system-man ; then
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}"/mandoc.cron-r0 mandoc
-	fi
-}
-
-pkg_postinst() {
-	if use system-man ; then
-		elog "Generating mandoc database"
-		makewhatis || die
-	fi
-}
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index e712fae73b5e..0ee6bc436ce5 100644
--- a/app-text/manpager/Manifest
+++ b/app-text/manpager/Manifest
@@ -1,3 +1,3 @@
 AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
-EBUILD manpager-1.ebuild 708 BLAKE2B 7bd7c743b76ec0c754681bf4d3d9a0cbb9680426c9b44a18733fad82f2b4313f8cbae47961dfb42a18589b011996f9d48f52e042846e179230e914818e008a49 SHA512 e437b65353f4b25d2481682015d676664fbdea54df2c032657b8e43b6ccc403d263cd6fcb653fe85eda049a50616cbb749893e23d56457de356ab3ab2b7cebbe
+EBUILD manpager-1.ebuild 715 BLAKE2B b821303c28c491e42c2dee45c4b24037f9358efb5a4c31eb761b12712a1bb89f5bc92de56429a1322a01882fd75dd9e24050d4c2439a2ba4ff5bf9eff3683353 SHA512 d4a6af5a819a52a005cef283e3984804b75406d34d3ac547d615eb5b56fbb8f4f7a6fbe8ef92c129c3829691d027af986a178463cc808a49f9df07145270b692
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 49301d4d54ef..625fe3ffedb5 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S=${WORKDIR}
 
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index b0c0855a2603..15faad69fe8b 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,7 +1,7 @@
 DIST master-pdf-editor-5.7.90-qt5.x86_64.tar.gz 15962243 BLAKE2B 4331a5d17ed9a0ff7a70c353907a4c0d5e99db447760f6103d412eabe0064b1e4ac59ca85bb0cab2bffc5867c8ccde96f68e7ceee227b7b319d93b70482f233d SHA512 823c7212cd3d469bb972e7da66e6eada31149c0bab2a6c577e537ca203862d0fe862e8c9b0cbb479eca0557da4b69a91a88ae0c9215d3b5f105288a9c6c1f2bf
-DIST master-pdf-editor-5.8.20-qt5.x86_64.tar.gz 16755926 BLAKE2B 7694b825ca846767a0bf776fdd637595d4bd9fe8a9525c2212be7cd186aa230fe6446e157dabdf0a6c2314b49f2a987d2a0b62ac377bec1e3f3e58302668c05d SHA512 006478e65f55e2e24afd9f9581cd3f3ea8cc38c156a7e5c62410fa5bbb94482b627ca4645cbb91d3fdcdda1a779ccda6825107ba65b60b8d50d034b409eabd61
 DIST master-pdf-editor-5.8.33-qt5.x86_64.tar.gz 16917660 BLAKE2B 9461759f75c1c8dde19d5434ce9f404093695385d66777ebe71086a5992ff02830743fb4d87a118605a75f50d53732333a9c51f63acf370c5e53aff04ab47a0c SHA512 e6010a427abe424b0f6c9a6af16280f09445a51c46c62b7c6d58dfb5580cd19486741e9389ef835c33d7ca2e5c1eaffe6b2ccf1046c83c6f7746ba4c446ab28b
+DIST master-pdf-editor-5.8.52-qt5.x86_64.tar.gz 16425989 BLAKE2B 7cb43b2595f32e36a19b7b71ea8d2ddf2ac9e62873f781d45fd4ef2840918d6ee79dc4c23991ae2aa8469fdeaa5b4b2db8ab509609e47079eab3206d2e72c7fb SHA512 c1936eed6c8dc2080d00e0efffcd02782a2dfda321a525d92c82c9e65ea39b140059300359d4d9aabc98d3ba44d07b2a998a6d8f5c7e6a4b3815a85dbd34530a
 EBUILD master-pdf-editor-5.7.90.ebuild 1092 BLAKE2B 0d43d8511a262454d533e3961fc1f313de5e17638cab6178cc4357edfa750a80dde9e0e32c32a05c522dfb699738054ad2953fd489e754158558780c6fc697cf SHA512 8870aba2272c522a995fa2cda76530e0847e3ba06102599595e8dcc2d1209b0a2b6588876fd3292e938e9c69c8a5fa3561922a788149cccdea7ccece18901e56
-EBUILD master-pdf-editor-5.8.20-r1.ebuild 1133 BLAKE2B a57f7c94e36afcf532b6512dc3e0e53992c98ef9b137135931573f56aa36419a4e0405ca9bd7a0c7de9fc4809f636a42b334083deb22a8cea3b8591bdab6e3cf SHA512 a8911c0a09f113f1cefb276190f8574e3565563fc4d2349509bac38e7a688f5ea8eb23ec4255ade3b51124e4f87445b998db824720b6f492b8da67e6a4f4a491
 EBUILD master-pdf-editor-5.8.33.ebuild 1133 BLAKE2B a57f7c94e36afcf532b6512dc3e0e53992c98ef9b137135931573f56aa36419a4e0405ca9bd7a0c7de9fc4809f636a42b334083deb22a8cea3b8591bdab6e3cf SHA512 a8911c0a09f113f1cefb276190f8574e3565563fc4d2349509bac38e7a688f5ea8eb23ec4255ade3b51124e4f87445b998db824720b6f492b8da67e6a4f4a491
+EBUILD master-pdf-editor-5.8.52.ebuild 1133 BLAKE2B a57f7c94e36afcf532b6512dc3e0e53992c98ef9b137135931573f56aa36419a4e0405ca9bd7a0c7de9fc4809f636a42b334083deb22a8cea3b8591bdab6e3cf SHA512 a8911c0a09f113f1cefb276190f8574e3565563fc4d2349509bac38e7a688f5ea8eb23ec4255ade3b51124e4f87445b998db824720b6f492b8da67e6a4f4a491
 MISC metadata.xml 398 BLAKE2B 77ea4e0c5491a2722b46aed4e28ae0dc69dc59b68b44d527bde9b29647a3051b515a806729efe587ab80e08befe791871c043b4cde22755a69bcc73ac7d775a2 SHA512 8d84545bedebf1d841388e3c36c6f5e3bf696de1b008629c6ec367e5040e73a7a971bc8ea93a9ce1096471c01d0ed541deb3d9fe17d4c2ad37d598c614c88906
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.8.20-r1.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.8.52.ebuild
index f944cce74811..f944cce74811 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-5.8.20-r1.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.8.52.ebuild
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index 930bd2065d8d..fe8f5d2aef88 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -90,7 +90,6 @@ DIST markup5ever-0.10.1.crate 34668 BLAKE2B a13f39ba93a26a558a8f03ebbbaa98bf2c7c
 DIST markup5ever_rcdom-0.1.0.crate 25165 BLAKE2B 4123ee804991e9be31e6a4dbcb7dcce12bb776d22e4409ad388678a92965834acb9b1b2fa51e6472ee2c0db156e4a75e5b6db5f6b6d4220159ab93b056d0418c SHA512 7c21836fcdd45bfdef7305327255291c92d75d3329798d31abab26297de8c381e41b4419fb7ac631310835d590b63751a63bdd87e2697ea3dfdd6599033433c7
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST mdbook-0.4.15.tar.gz 1508364 BLAKE2B 8f0a883908378b440528044136233bc6d481c7c0137cbd0875aee11654246f103c5e301276838bd403a68715eec48ea2d31f6e746f5996a354733f5c3a8c0046 SHA512 da5b1dee3718bb89f61438f39ee72d4d4db42034e620699b62e21513d1ee9f1cb9163456a4673d66c96d83ebd9f35f8b4d5c0829752a500a72f1561fa14060bf
-DIST mdbook-0.4.17.tar.gz 1510324 BLAKE2B a77fefd2bc50b11f8606deaa9c380e40dffa1ed534548621181817b7eb2234964097461ab5f7d2d3300ca37d9f37ae210acabea29e848de22d818930b51406c1 SHA512 9190e01ea29ee22f8994e361caeeca6d459f8bc064a5d8bc51e461eb852fdac6c857f745ca4fce62130f49bba4d7dbb839dbca5dcddbd94d025d4a4516a155a6
 DIST mdbook-0.4.18.tar.gz 1510868 BLAKE2B 4b47b41fc03fb923891b419098bf553dbbfb0066b1d51bfd58e3cc69e1e686f7bdb5210b6b4cb19f09c35cd6e926ede3378e49debd5a54d838c2028d44186aaa SHA512 f209d8882ff317deb3356a5de0d39c71fe0c51cf80874f0edc56c7ddf46b537c7194c58172dd5f704554bf0724cb0899ecb61b1eeea467226fa83c0679c336f5
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
@@ -227,6 +226,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST xml5ever-0.16.1.crate 41282 BLAKE2B 3a1a634244a138faf665ca3a287bafb54adad829a1e8edc541d6cd6a2357c5afd00114e340f33b0735139a630475a58d7e5d36bef094574efcceccfd08b57778 SHA512 20ad09f202336950c13867d69582a12e5daba671d5ffc79d3f8a69a13f7911b04e135cf5791a24744d6bb909b10e6eef5d5f0b52b5d1124ead2b1017e4d4c4ee
 EBUILD mdbook-0.4.15.ebuild 4810 BLAKE2B 76238f023f2c83406c6983157093b97201bc559889c4b4615dc8683d11cb1d8eb8eff77e018bb07d86d97e1f3d9ebb63916aef314544bd5c389b6a27ed0364f8 SHA512 867eff6a8a4a20a2b2cf992f8b482637b55a1db60b906d6370b083fa2edceaaaee59a29cb323570e6d3152bb5d77ed1a8095934ffb6e8057974fed6d13daef3d
-EBUILD mdbook-0.4.17.ebuild 4778 BLAKE2B e106a26b37216b306c64809e52db0cafd1223bd7d7ac789ba39168818d0bdbb52af2bc6c39538a381992a65efb2cac8af1fcd942b1d7c43acff385b9d7277082 SHA512 34bf0fcba5a09a6dd413b6256e226fb3dbdf3d2b861bb0153f21d3e88dd97077b6a27abd8a1ee8fec0d16d78d48142ee037aed0eb73f6cd40a111df9522cc0c2
-EBUILD mdbook-0.4.18.ebuild 4778 BLAKE2B e106a26b37216b306c64809e52db0cafd1223bd7d7ac789ba39168818d0bdbb52af2bc6c39538a381992a65efb2cac8af1fcd942b1d7c43acff385b9d7277082 SHA512 34bf0fcba5a09a6dd413b6256e226fb3dbdf3d2b861bb0153f21d3e88dd97077b6a27abd8a1ee8fec0d16d78d48142ee037aed0eb73f6cd40a111df9522cc0c2
+EBUILD mdbook-0.4.18.ebuild 4777 BLAKE2B 6d4eb0a04f619f49c114e08fcba683e736c8d9d035e0b49ad5c40b6049cc2a5498e74b631adbdb92a5bff07cea0edf8c44a92082e77254e478a5ee4b9c22d03f SHA512 ac193784b16e5af26c0e1ed52c78fea23e9b0fa601a294ec4f1e02bf6187e3921f21a4b4ac229d6534f37e9bf22f24ed98d076bc2f2d5ad40fa9cf74ecba8836
 MISC metadata.xml 327 BLAKE2B bb56613ec49f3b00a39b3131534cb064154ca05d46fda58d4e1d0c601e49561b4d73bc3d075e378e7ab2df720560d169fbe9fd39b40171184aa8e88d8f7291a4 SHA512 e678a70558e83d27e5c0146174d9e740f3ec2e6bdbbb17e61b71fdea6879d61b7babbd9437ee9928dc0322e65a0863b3909bffc7b3ad9313566c5de5baa17f62
diff --git a/app-text/mdbook/mdbook-0.4.17.ebuild b/app-text/mdbook/mdbook-0.4.17.ebuild
deleted file mode 100644
index d8ca08e385d4..000000000000
--- a/app-text/mdbook/mdbook-0.4.17.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick-0.7.18
-	ammonia-3.1.2
-	ansi_term-0.11.0
-	anyhow-1.0.43
-	assert_cmd-1.0.7
-	atty-0.2.14
-	autocfg-1.0.1
-	base64-0.13.0
-	bit-set-0.5.2
-	bit-vec-0.6.3
-	bitflags-1.3.2
-	block-buffer-0.7.3
-	block-buffer-0.9.0
-	block-padding-0.1.5
-	bstr-0.2.17
-	byte-tools-0.3.1
-	byteorder-1.4.3
-	bytes-1.0.1
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	chrono-0.4.19
-	clap-3.0.10
-	clap_complete-3.0.4
-	cpufeatures-0.1.5
-	ctor-0.1.20
-	difference-2.0.0
-	difflib-0.4.0
-	digest-0.8.1
-	digest-0.9.0
-	doc-comment-0.3.3
-	either-1.6.1
-	elasticlunr-rs-2.3.13
-	env_logger-0.7.1
-	fake-simd-0.1.2
-	filetime-0.2.15
-	float-cmp-0.9.0
-	fnv-1.0.7
-	form_urlencoded-1.0.1
-	fsevent-0.4.0
-	fsevent-sys-2.0.1
-	fuchsia-zircon-0.3.3
-	fuchsia-zircon-sys-0.3.3
-	futf-0.1.4
-	futures-0.3.16
-	futures-channel-0.3.16
-	futures-core-0.3.16
-	futures-io-0.3.16
-	futures-macro-0.3.16
-	futures-sink-0.3.16
-	futures-task-0.3.16
-	futures-util-0.3.16
-	generic-array-0.12.4
-	generic-array-0.14.4
-	getrandom-0.1.16
-	getrandom-0.2.3
-	gitignore-1.0.7
-	glob-0.3.0
-	h2-0.3.4
-	handlebars-4.1.2
-	hashbrown-0.11.2
-	headers-0.3.4
-	headers-core-0.2.0
-	heck-0.3.3
-	hermit-abi-0.1.19
-	html5ever-0.25.1
-	http-0.2.4
-	http-body-0.4.3
-	httparse-1.5.1
-	httpdate-1.0.1
-	humantime-1.3.0
-	hyper-0.14.11
-	idna-0.2.3
-	indexmap-1.7.0
-	inotify-0.7.1
-	inotify-sys-0.1.5
-	input_buffer-0.4.0
-	iovec-0.1.4
-	itertools-0.10.1
-	itoa-0.4.8
-	kernel32-sys-0.2.2
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	libc-0.2.100
-	log-0.4.14
-	mac-0.1.1
-	maplit-1.0.2
-	markup5ever-0.10.1
-	markup5ever_rcdom-0.1.0
-	matches-0.1.9
-	memchr-2.4.1
-	mime-0.3.16
-	mime_guess-2.0.3
-	mio-0.6.23
-	mio-0.7.13
-	mio-extras-2.0.6
-	miow-0.2.2
-	miow-0.3.7
-	net2-0.2.37
-	new_debug_unreachable-1.0.4
-	normalize-line-endings-0.3.0
-	notify-4.0.17
-	ntapi-0.3.6
-	num-integer-0.1.44
-	num-traits-0.2.14
-	num_cpus-1.13.0
-	opaque-debug-0.2.3
-	opaque-debug-0.3.0
-	opener-0.5.0
-	os_str_bytes-6.0.0
-	output_vt100-0.1.2
-	percent-encoding-2.1.0
-	pest-2.1.3
-	pest_derive-2.1.0
-	pest_generator-2.1.3
-	pest_meta-2.1.3
-	phf-0.8.0
-	phf_codegen-0.8.0
-	phf_generator-0.8.0
-	phf_shared-0.8.0
-	pin-project-1.0.8
-	pin-project-internal-1.0.8
-	pin-project-lite-0.2.7
-	pin-utils-0.1.0
-	ppv-lite86-0.2.10
-	precomputed-hash-0.1.1
-	predicates-2.0.1
-	predicates-core-1.0.2
-	predicates-tree-1.0.2
-	pretty_assertions-0.6.1
-	proc-macro-hack-0.5.19
-	proc-macro-nested-0.1.7
-	proc-macro2-1.0.28
-	pulldown-cmark-0.9.1
-	quick-error-1.2.3
-	quick-error-2.0.1
-	quote-1.0.9
-	rand-0.7.3
-	rand-0.8.4
-	rand_chacha-0.2.2
-	rand_chacha-0.3.1
-	rand_core-0.5.1
-	rand_core-0.6.3
-	rand_hc-0.2.0
-	rand_hc-0.3.1
-	rand_pcg-0.2.1
-	redox_syscall-0.2.10
-	regex-1.5.5
-	regex-automata-0.1.10
-	regex-syntax-0.6.25
-	remove_dir_all-0.5.3
-	ryu-1.0.5
-	same-file-1.0.6
-	scoped-tls-1.0.0
-	select-0.5.0
-	semver-1.0.4
-	serde-1.0.129
-	serde_derive-1.0.129
-	serde_json-1.0.66
-	serde_urlencoded-0.7.0
-	sha-1-0.8.2
-	sha-1-0.9.7
-	shlex-1.0.0
-	siphasher-0.3.6
-	slab-0.4.4
-	socket2-0.4.1
-	string_cache-0.8.1
-	string_cache_codegen-0.5.1
-	strsim-0.10.0
-	strum-0.21.0
-	strum_macros-0.21.1
-	syn-1.0.75
-	tempfile-3.2.0
-	tendril-0.4.2
-	termcolor-1.1.2
-	textwrap-0.14.2
-	time-0.1.43
-	tinyvec-1.3.1
-	tinyvec_macros-0.1.0
-	tokio-1.10.0
-	tokio-macros-1.3.0
-	tokio-stream-0.1.7
-	tokio-tungstenite-0.13.0
-	tokio-util-0.6.7
-	toml-0.5.8
-	topological-sort-0.1.0
-	tower-service-0.3.1
-	tracing-0.1.26
-	tracing-core-0.1.19
-	treeline-0.1.0
-	try-lock-0.2.3
-	tungstenite-0.12.0
-	typenum-1.13.0
-	ucd-trie-0.1.3
-	unicase-2.6.0
-	unicode-bidi-0.3.6
-	unicode-normalization-0.1.19
-	unicode-segmentation-1.8.0
-	unicode-xid-0.2.2
-	url-2.2.2
-	utf-8-0.7.6
-	version_check-0.9.3
-	wait-timeout-0.2.0
-	walkdir-2.3.2
-	want-0.3.0
-	warp-0.3.1
-	wasi-0.10.2+wasi-snapshot-preview1
-	wasi-0.9.0+wasi-snapshot-preview1
-	winapi-0.2.8
-	winapi-0.3.9
-	winapi-build-0.1.1
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	ws2_32-sys-0.2.1
-	xml5ever-0.16.1"
-inherit cargo toolchain-funcs
-
-DESCRIPTION="Create a book from markdown files"
-HOMEPAGE="https://rust-lang.github.io/mdBook/"
-SRC_URI="
-	https://github.com/rust-lang/mdBook/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)"
-S="${WORKDIR}/${P/b/B}"
-
-# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable
-LICENSE="Apache-2.0 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_compile() {
-	cargo_src_compile
-
-	if use doc; then
-		if tc-is-cross-compiler; then
-			ewarn "html docs were skipped due to cross-compilation"
-		else
-			target/$(usex debug{,} release)/${PN} build -d html guide || die
-		fi
-	fi
-}
-
-src_install() {
-	cargo_src_install
-
-	dodoc CHANGELOG.md README.md
-
-	[[ -e guide/html ]] && dodoc -r guide/html
-}
diff --git a/app-text/mdbook/mdbook-0.4.18.ebuild b/app-text/mdbook/mdbook-0.4.18.ebuild
index d8ca08e385d4..c10d0f673b2f 100644
--- a/app-text/mdbook/mdbook-0.4.18.ebuild
+++ b/app-text/mdbook/mdbook-0.4.18.ebuild
@@ -231,7 +231,7 @@ S="${WORKDIR}/${P/b/B}"
 # CC-BY-4.0/OFL-1.1: embeds fonts inside the executable
 LICENSE="Apache-2.0 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index a48f9e268820..c985cab37f7e 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -12,6 +12,8 @@ AUX mupdf-1.19.0-cross-fixes.patch 5740 BLAKE2B dcc38e628e1c0ddde9647d06ea8c5812
 AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a72e7557e89b3830ac55bc713982065d1ec7055b84b91589c8b98a690d037c0fb6c90480fd89989e0f90cc49f9b97 SHA512 24cb6885c174bbfbe5ddc2e8f9a15c5154aa5699a19b5931d60ebb761a7587d717dbb65fba45070f963c0c3f432f8f58c00537d10b050546173a48f5c729a7c4
 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
+DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
 EBUILD mupdf-1.18.0-r4.ebuild 4358 BLAKE2B 67d3b045314556eb3e81a668015e36115e7729436a91bfebededdf316bce062bac229c64b63f0aebae7553b8a5595fa0d4db53bb7a7a9b452a087967cd04547c SHA512 90dd0ae5d0376dafbce8b19d711d92ab9debceb467578f0e529881b219e8b3166fe5ec1f0b535036300a1e4a60d9969ba21450ca54b6f7e18f8631b035b8a4b8
 EBUILD mupdf-1.19.0.ebuild 4465 BLAKE2B 28283005cf1c4c688cf24544bedc20683d2e043221c74a3922e3f86b6affddbf8a0e62c8d79f8805bc5c5a508e999a57c4d212f6ec3f4b88036b512ea0251017 SHA512 ba83c50f6bca1cfcaabc7410f4fcfc842cdf8e4381ed7763af895cac78861f0f585069fd8b92d50bdc1e22baf30b56533a00b4ebfd8d0cb7515450c5f19eaf5b
+EBUILD mupdf-1.19.1.ebuild 4496 BLAKE2B b9155416a7e2f6a3e1e67af8257fdcfec1a9cb7fe8e5d830136bd93dab56491838dfe8b823d4acdbfb37a9d40e7dbee410a5516984bf6796a1ce7ecb70c95fff SHA512 dfa33556bcf1112bbb43db367d541afbeb6b3d3134e86efeb045f66417520a87d222fc6278d77683e1d9dcafd5ad82044c899ac6f283ff572bad9e1ec6962b1e
 MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild
new file mode 100644
index 000000000000..6fb208168306
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.19.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="+javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+	dev-libs/gumbo
+	media-libs/freetype:2=
+	media-libs/harfbuzz:=[truetype]
+	media-libs/jbig2dec:=
+	media-libs/libpng:0=
+	>=media-libs/openjpeg-2.1:2=
+	>=media-libs/libjpeg-turbo-1.5.3-r2:0
+	javascript? ( >=dev-lang/mujs-1.0.7:= )
+	opengl? ( >=media-libs/freeglut-3.0.0 )
+	ssl? ( >=dev-libs/openssl-1.1:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="X? ( x11-base/xorg-proto )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+	"${FILESDIR}"/${PN}-1.19.0-darwin.patch
+	# See bugs #662352
+	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+	# General cross fixes from Debian (refreshed)
+	"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+)
+
+src_prepare() {
+	default
+
+	use hppa && append-cflags -ffunction-sections
+
+	append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iCXX = $(tc-getCXX)" \
+		-e "1iLD = $(tc-getLD)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+}
+
+_emake() {
+	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+	#
+	# Bundled libs
+	# * General
+	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+	# recommendations. It does not mean "always use system libs".
+	# See [0] below for what it means in a specific version.
+	#
+	# * freeglut
+	# We don't use system's freeglut because upstream has a special modified
+	# version of it that gives mupdf clipboard support. See bug #653298
+	#
+	# * mujs
+	# As of v1.15.0, mupdf started using symbols in mujs that were not part
+	# of any release. We then went back to using the bundled version of it.
+	# But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+	# when bumping and check!
+	# See bug #685244
+	#
+	# * lmms2
+	# mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+	# It is therefore not appropriate for us to unbundle it at this time.
+	#
+	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+	local myemakeargs=(
+		GENTOO_PV=${PV}
+		HAVE_GLUT=$(usex opengl)
+		HAVE_LIBCRYPTO=$(usex ssl)
+		HAVE_X11=$(usex X)
+		USE_SYSTEM_LIBS=yes
+		USE_SYSTEM_MUJS=$(usex javascript)
+		USE_SYSTEM_GLUT=no
+		HAVE_OBJCOPY=no
+		"$@"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	_emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+	if use opengl || use X ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+	fi
+
+	sed -i \
+		-e "1iprefix = ${ED}/usr" \
+		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+		-i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+	_emake install
+
+	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+
+	# Respect libdir (bug #734898)
+	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/ocrad/Manifest b/app-text/ocrad/Manifest
index 96dd8b390c9c..19d6babdf34f 100644
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@@ -1,5 +1,3 @@
-DIST ocrad-0.26.tar.lz 91450 BLAKE2B 9ce2324c30ce3236689236ff2f7079d89078c61c4c78efef8c7c34fad2351fdc59a67a1ef995b3ec1b64620f7262563126c0305e3ffda3c5ec04ee5cf4c39a05 SHA512 6cf4c97c4dbbc3a623192de2da261e4854dc3082a26d9731fd00feb8ed371cb18d41f5a8ed992f98e2a00aed68d60f1f3aa90b05f8472431fcf5bc5e3d10e70c
 DIST ocrad-0.27.tar.lz 91709 BLAKE2B 4dd152e6ccbd41d2ce7e7e3d4fc38e30af4f0bb9c36e32b1f32e67772347af133cf67a8b89c03d5c9924a1d4ffa009205b80609cdb96a59b3dbeb76709a8e8e1 SHA512 2a4731e0e26eefe6d37b08859c4d3cc2b54180411b0f846f7b7e873b9da5b4596ca3c6042ee42284a07aadfeb96d953dce3e95ce2410e48624d1b6020750539c
-EBUILD ocrad-0.26.ebuild 741 BLAKE2B b83ff39ca3eef412ea85a4ae8ced8a1425ac823a7297e22b4ea042c6e3deeacc11b93c402aaf65b8f4fc140961927a478b77d5092f9cc49f48a4150a81116e71 SHA512 f6fdb86395f1bb67f971f64d8e8e294df1850ed657cdc72d2bcf196c002498e26edfe49b1e963f1e5ee9bf4932800e9bff9a48bcfd0e49c97f1e3757d131e476
 EBUILD ocrad-0.27.ebuild 788 BLAKE2B f637f6731cf32336a5e775e55f5ff3a47cae1edd25d30032d2553a2976877e16bab4c11bc099b7a792bac38dd9585f788652125fbcc19b0d2f8b0d3a7b77d07f SHA512 db4aef8384dc9d4a103aa46b721b898dde07b1197a286527a28893b0c3d1169361b40dc0775a29d8fb86cbe969c822e26c1f9a9b6051cce2203c83e13c68b080
 MISC metadata.xml 419 BLAKE2B 4fc7676b5c98871fcf256365d75d6e778ff10dc528a9a4c890bdda6b7c279ade210f6548f032ea8970e52a493d7c85ed606263ffcd91457e5b9b8b754de43862 SHA512 1462ecbd11fe23ed10f4db07b5bd0672c711159f0c9b72b8502336b1337a43a2e91c0efd2a81e4c5f127596f4a959c0901d1de6b0dde96a8bf1126c105b41ebb
diff --git a/app-text/ocrad/ocrad-0.26.ebuild b/app-text/ocrad/ocrad-0.26.ebuild
deleted file mode 100644
index 8a51b1c52434..000000000000
--- a/app-text/ocrad/ocrad-0.26.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
-
-DEPEND="$(unpacker_src_uri_depends)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
-	# ./configure is not based on autotools
-	./configure \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		--prefix=/usr || die
-}
-
-src_install() {
-	default
-	doman doc/${PN}.1
-	doinfo doc/${PN}.info
-}
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index bb9b4683089c..cb8466f20795 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-r7.ebuild 2091 BLAKE2B a76a0ca3bb06d29f1d797e3110f66649204e0c2972c150e4ac42bad7249b44f257a5fbbe549de41a430172f7714530032935ad9d98cef1e6e744eaf99f8d1ae6 SHA512 c3c5d3565da3fafff674bbca32b0c945bc32dff000ba0b000e2968495bcd7fad8425473c86753cdef0b4a61598d9f98d7e813b2483167b8d62a18ff65b8c3e1a
+EBUILD opensp-1.5.2-r7.ebuild 2098 BLAKE2B 2f08bba773adf3277f0cb55216777d036a3f8612c6798a45965184fa7f855ba6dbf428abb5fe05d6b4f597ab2111bab799de1e22f6e31b07878699e67b8e9f76 SHA512 5b5517bb8ba18cc068e4e9551a79cc72eed2b1423e55f58515e39fcbea2c5ab948cd68bf26b1b964ebc58456dc0aba2e7213aa755aaa445a0af0d2a3fcd8f1d3
 MISC metadata.xml 321 BLAKE2B 5571226bba817c3d5cc47e0bd7d67e82399403e24e7773104f33b13bf40d95113da9613db2bd77408557e6793b9efb6d435402a7b680d07e1e3e6952614bdedd SHA512 95c0d6759a91874b81b707e479eee48bf67ba762584587b4027b583e42d63a83018a3243fe81b6649090d1e0167ab825b591dfccbd3a8db9078b1a80f729de15
diff --git a/app-text/opensp/opensp-1.5.2-r7.ebuild b/app-text/opensp/opensp-1.5.2-r7.ebuild
index 0611f6bab276..9f6b4f539bb4 100644
--- a/app-text/opensp/opensp-1.5.2-r7.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r7.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 71ef3dc0ce95..62c61c5d0bb0 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,6 +1,6 @@
 DIST pelican-4.5.3.tar.gz 1397896 BLAKE2B 86651f627af67c571ea65a7ddfe7b62747fd2798575d6c4f29455da9b2371ce22ff42d715f148925724764e0a9fbb8aeba1dea401226856d3681b520dbb0a7af SHA512 b1ef5f145b448f6af2e25a1adb399521d4c5f7eef3ee2aa5ab9e50c223623b5c9961622e5cd835a3cb72dbbe905da6ac9217128f2459a35892bbac9b9cb6d26a
 DIST pelican-4.7.2.tar.gz 1401737 BLAKE2B c277844c0c153f71aae051dd8897e9abf8fd1ddc7c49251aaa7b85b7324a85da0ded74e8328a4b64ec79b8e6b4e143d5496b8535900c8a88bfa6198489c0a80c SHA512 9fbf2ecb3c193e976e01a4d095095ac55d56fe45aa24467d91635bbecb9df933ccabd6a456e14c6ee14ce0a845820be8d887917af314e13c7a3eb830cb0ce7e6
 EBUILD pelican-4.5.3.ebuild 1427 BLAKE2B 6ad0b6a55dd7c7f8c0773d3fc4145ad435238d70e7539c405b485564200b40e21e9de1a4d6b546811a744ffa66ed9fc5066c6e18d7377af237c8692f7a31c666 SHA512 d5e598875ab2b68150ecceda3cd0235b139b38d3cb4c638b53d12951b698603af6ede5156b55d3edce3737b712a8ef990b59c577a981ee9417a2cbe0ef10d500
-EBUILD pelican-4.7.2-r1.ebuild 1485 BLAKE2B 975820f13237b6992d37eab147f3ad9a75537468847874e67d0e639c9a2efa9e4c874aa452ce6fb231546174bdbd36f8e13ce3e3ad4e8519fed13f30239f62f3 SHA512 1c6771be9a93c279c7610bc359135b32724bb46b55ec575d86d0836c460422b25502985f265b2109383c0f579843be834e0c363ec144bf3241935872259fc8f4
+EBUILD pelican-4.7.2-r1.ebuild 1492 BLAKE2B 0e46cbb8718b3c407c0187dc67526a1857cac3a26ac6b53431b8d27e3153871e5466a07154665b7037c5d6f06a137d53b6008143d6bcd04d1a65ca19ea135e32 SHA512 e6e274b05d0ae893c6d7764eafcd4fc1f18a840d28a5591610f774846065a941c52ee622d4aacf49f3e80bab3300d59eca97c68c1bcbb1e3ca6a2ae395490fa9
 EBUILD pelican-9999.ebuild 1479 BLAKE2B e59c32738a088a5cff6f2d94c6b5c7d3d65533e30f6207e4ca6c2d1f2bb32ec9ac9b8b3cfb9e7241f35de6cb992fe0e0f7f249ea3925219ac437d204440f6204 SHA512 d42118d548e2f7f8dd73bbceb2af56062cf48adb26321e276652cee657812a3e7764b126b5f0a785ea6a508f94341d603bfacd7553ab78bcc05010e4854b074b
-MISC metadata.xml 521 BLAKE2B 3ee9aa732c04e18344d408fb83ae7da1b4b6f93f1ea9ac00fee4c71e94b8cc2631b3b5c3341ecb4f4402625a3d1666af9e295b1b669fa5fac21aab76d82061a5 SHA512 291638d6a7a59b65bb49016a85177864f89bdbac17f3b4fe8341ccb4c876bb935520e949ecc592f6cd7fd5de57397319b7e8acb2ecd62f823a77e0532a3ebb58
+MISC metadata.xml 438 BLAKE2B 4b720595a6a1fde51470943c2ff8c070e6c5cc54f46edef595d918f8fda032772091ab15c42f49137f09f996cda3e30d1c9dfd0442ffc5782550b5c7372696f2 SHA512 9831ed0ef638b572fc548cd3d57020454af4964bff9481a10e7ff0cde5f2d68959216d0dee0497ba6ec448b150f339fccad1f9eee8bfed1ea092dfc27cac0f0d
diff --git a/app-text/pelican/metadata.xml b/app-text/pelican/metadata.xml
index ac8365be630a..7b14026889dd 100644
--- a/app-text/pelican/metadata.xml
+++ b/app-text/pelican/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>djc@gentoo.org</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">pelican</remote-id>
     <remote-id type="github">getpelican/pelican</remote-id>
diff --git a/app-text/pelican/pelican-4.7.2-r1.ebuild b/app-text/pelican/pelican-4.7.2-r1.ebuild
index 9c365026ac33..368acba99bd1 100644
--- a/app-text/pelican/pelican-4.7.2-r1.ebuild
+++ b/app-text/pelican/pelican-4.7.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="doc examples markdown"
 
 RESTRICT="test"
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index e39078845e4a..fa5141dec5d0 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -6,5 +6,5 @@ DIST po4a-0.66.tar.gz 4240059 BLAKE2B 1d88665b8aa0d7f81854c97265f483934adc51503c
 EBUILD po4a-0.63-r1.ebuild 1372 BLAKE2B 1f74822760c0db37f0644721e1c7b8f17635c268b7ed802e4ae60127c0d59a7c073faa8706b3455adfaa952869c603ab843f96f2fefa994eeed04b997eeb2431 SHA512 82f12d2cc7b3a27e5f1aa2ebe65870855b164b4a4127d1396fe6c015865107e03ccf9e8d655419d3e70a147b2b08b95aff625510408973427dca7e5a051781e9
 EBUILD po4a-0.64.ebuild 1385 BLAKE2B d8dc3462be2d9ad83c9046542c7c4878b0708c6097af240e5165a1d03ae118a0619a63e5c508ede6b85b7470f4221dfcf22a11f7aeb5f2c10c61bd86bbe83873 SHA512 eb30319d6d96c536cf8c2344a6b160306170db4ca973dcb17144aaf617bef7882555b3525b41a81f81db31a9ca26ebcba9e0f40f630e7829ba685cf901a05da7
 EBUILD po4a-0.65.ebuild 1411 BLAKE2B 0450c2b8a4258daa5a36024a03bcf7566f171761eb0145684d6a79c3c2996ca41f01f20f231251f24e16afd13193b65bcbca356740a2546c1ab05e7434bfdc7d SHA512 66a22a0d55bdd5aa71aecb5d9a275a9d5d043d395e7e2b3d629366a85f4903125b12991918f63127b56eb6a52561335bb11005beb2d47fa0051bbb6da2f370be
-EBUILD po4a-0.66.ebuild 1411 BLAKE2B 33ad0af6a847784c1c54ff0b414d0e23dcbe7ed794bd8de7a9ac3ac0d0bec71576a4d1bec74b0edb0ad75e90e0254efaa9d8a3128c2aa06ba32a721d84ac01eb SHA512 c246ce90626308b3cfcc307ab367f5226dd577e190470de4a912d51bcd632aac8abe1710fef73e9dfdc51fba5567f955709269c42c464fe7d3c7d12a42c18ee0
+EBUILD po4a-0.66.ebuild 1418 BLAKE2B 9aa2684be0d127669e41075f6dc2fab1ad8bde74f1ca3fdb28cf083f8c893abfb3a9848ece01032ac2aae3872db0150271a1e5b862fe263898ae8ad245e64ce3 SHA512 d4b9ef67696e7aadfc874d874f92c41d51901b7e07f4b0e25ccefababdbdd140090a3e9128f1599143b7b675bad4829a6af01f3bffb82f70c1cb43f7663ac78f
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/po4a-0.66.ebuild b/app-text/po4a/po4a-0.66.ebuild
index db6bc3212044..9e119d269b2b 100644
--- a/app-text/po4a/po4a-0.66.ebuild
+++ b/app-text/po4a/po4a-0.66.ebuild
@@ -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 ~loong ~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/poppler/Manifest b/app-text/poppler/Manifest
index eea9af23dc58..67ac472b3edd 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,11 +1,10 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
-DIST poppler-22.01.0.tar.xz 1801984 BLAKE2B f238636a0b1f07e0b70de99d8f0b3afcb7e2424c9dee4a044edaa5bd34753061e58a7c530792264ffb5a520cb4dc7dc52de17573fda350de97bef6346048fb76 SHA512 c6ea908a9188483ca588ac81d3e92dd15a405f90d36cc7059e618c8a7e3e9faeda82717aba5df34adb4a0a94e2fbecd472acec44972272349cc8d5a57b7405d1
-DIST poppler-22.02.0.tar.xz 1807024 BLAKE2B 97d27fb6d31535b5fce0aa518d00ab9da218a8d49dcb45dbaa5ab3cc669d8ffc75e07bd617b5fe9842c8b7b8ac843e9aa07ee0d31504f1e2b6c4f89b2177add6 SHA512 61867241d6d076dae554d654a8ad3b1a073079bad31f45170516b886fabb4c238ff2d49705924da219e128eb4052ac6337121967347600e54f61790dd0eed487
+AUX poppler-22.05.0-missing-include.patch 518 BLAKE2B 7ade72f27a3d0b9fd32fb83113b71e74a0cb6dad42c6c79648edd7fffbe4c20fb716e3fb87e4e130620c63e7b5326a9d76ee24feaf074bd0ffef4f9007d89ea0 SHA512 d6a0d5f466f3af935bcf78b6f87f3b078076dbf7da9c3c7296f9731e14a197e7bf87057fb4dfbf1746790d9e02e485d762595dab70ad78b4ecf6e5913dc8b2db
 DIST poppler-22.03.0.tar.xz 1809940 BLAKE2B 0307e9225645b289105fe5a55a712ab821a0961a5dd53467b7db41432d74ec763e9ab0494f6b4d1bed94f7b0c2a74cb849878ad5f0c877fa4df0888f97a10ef6 SHA512 f87bbff4f394f192095da0c00bdf8b5c70b7eb864941225aad2025e91283c3c42a0016a772e7e9ea73a86746251928fc64500f923e8fd841adae1c6e67d72569
-EBUILD poppler-22.01.0.ebuild 3330 BLAKE2B 1c7ec6c2c9c73b4aa986b64c759ae00b84861e5ac6fa3baca3cfa25a2f415876aedd7128dc165aa884e75be5a80049ba4d140a77c336ee2ff771a315b6d2ff99 SHA512 6ca473ecc0db537dff052c2ac0c94e4c0f6bd71ca5d146f0497d7d4c7eb31a93881fdb078f82ac6deaa1d5f3776ec28649464f72aa8a39b4d238ecd932db2095
-EBUILD poppler-22.02.0.ebuild 3338 BLAKE2B 8b05c54797c29bb7315eb938b0b1a314778c8b3c1c96399dd1366d452b90a8c09887ba6e08e0b868b1286b1de6d1bafe0c6a3fba69436e21c4dc212ead409944 SHA512 af04053679a47d9b27c7670a9892b040c0addf151ab064469bbde184797e9f861a475b2204afe570c776f47b5274af20326427ae6e859e5f524c9fa32be3b668
-EBUILD poppler-22.03.0.ebuild 3333 BLAKE2B 9900e1de078e0832cf1a17377286ec1e7f34fe3bffdf405a49688955a4c6febc341095fccbb70948be0d2adfad4a86d0bd106742fda653e1f2059da08c8d3a81 SHA512 4da711673185c8f21437360a379d32f0c7491c0293a63f647817beead041e136be162e1156bccd7da3cf28cff00034698edd5e2a7f5be177283ec5d39f1ad969
-EBUILD poppler-9999.ebuild 3338 BLAKE2B e6b2e92da3b5125500df25ba41f8502b8db04304c01d78fd2165af5b208b65ed137d293bee4540a3a10a81f373f41dd694da912a6c432fde906ac110204690d1 SHA512 4fabe5c0d0139f82b5d4561870a2ace251cc41cd74afb6381ea7b51824c5d6081e4135cfc9181d75bb5edb7213b1b469770481149c78c2819922c1daaea4fac5
+DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737
+EBUILD poppler-22.03.0.ebuild 3330 BLAKE2B 37880159ec5f793338c8449151889c386058580ac92251ec3394db60128413d173d072e86859c8d8737d36e2c49c62981a5ce923263dccea48ad434961beb3ec SHA512 c2b911637f3a267838bf7a5b106d15c444711d279cd2f1725580748a18764540afa4a3670176845a8eb795c32f7be5ad106e13e7663876a4fb5cb420fe723097
+EBUILD poppler-22.05.0.ebuild 3398 BLAKE2B 81cffac734d2445079c70c9d4e28b68bf87aa9d4def2f31b94facc4cd1fbba54d16edf4c9db48adecb694148ec34993a2a7ca135ec05813bc2df31302faaa468 SHA512 19db76a558bfcac69b041e41c09bcdc39ec7a4af28190796caa4dd1d19fd2defb1a90d8d06f3638839bc56364e2a44156d13ddb0a17e1f184be147d8b8cabd34
+EBUILD poppler-9999.ebuild 3356 BLAKE2B 6cb589dfe9159ae555bc837794751f6ba3fea2ecdfd860e31aaf50f44311cb343b7f7c1cd9dc5166916cd019b17402772834e167e1bac24217a8b95ed90232f1 SHA512 77dcccb818580ef0baea683be7bfe01ba6445463384b517c182e353ab8fc29dc048ef728de62bc187cc81b17fbc7f66a90f44a0b23be5f868024aedc187db8a3
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/files/poppler-22.05.0-missing-include.patch b/app-text/poppler/files/poppler-22.05.0-missing-include.patch
new file mode 100644
index 000000000000..9dfdcfa12406
--- /dev/null
+++ b/app-text/poppler/files/poppler-22.05.0-missing-include.patch
@@ -0,0 +1,18 @@
+https://github.com/freedesktop/poppler/commit/5d543e801d304e4cdbe12506f62c340d509f12f3
+
+From: "Tobias C. Berner" <tcberner@gmail.com>
+Date: Thu, 5 May 2022 04:59:42 +0000
+Subject: [PATCH] Fix c_time usage
+
+In 2656d986d01da5aea4f51c75e4deee569ca88064 the time type was switched
+to time_t, without including the necessary ctime header.
+--- a/cpp/poppler-global.h
++++ b/cpp/poppler-global.h
+@@ -25,6 +25,7 @@
+ 
+ #include "poppler_cpp_export.h"
+ 
++#include <ctime>
+ #include <iosfwd>
+ #include <string>
+ #include <vector>
diff --git a/app-text/poppler/poppler-22.01.0.ebuild b/app-text/poppler/poppler-22.01.0.ebuild
deleted file mode 100644
index 47850488dd64..000000000000
--- a/app-text/poppler/poppler-22.01.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2005-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/117"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND+="
-	boost? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if tc-is-clang ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-22.03.0.ebuild b/app-text/poppler/poppler-22.03.0.ebuild
index bd70207b1626..f6a73f037df2 100644
--- a/app-text/poppler/poppler-22.03.0.ebuild
+++ b/app-text/poppler/poppler-22.03.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/119"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-22.02.0.ebuild b/app-text/poppler/poppler-22.05.0.ebuild
index 35b2f4f41bef..4f4a7d09522e 100644
--- a/app-text/poppler/poppler-22.02.0.ebuild
+++ b/app-text/poppler/poppler-22.05.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/118"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/121"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -26,7 +26,7 @@ RESTRICT="test"
 
 DEPEND="
 	media-libs/fontconfig
-	media-libs/freetype
+	>=media-libs/freetype-2.8
 	sys-libs/zlib
 	cairo? (
 		dev-libs/glib:2
@@ -34,7 +34,7 @@ DEPEND="
 		introspection? ( dev-libs/gobject-introspection:= )
 	)
 	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
 	lcms? ( media-libs/lcms:2 )
 	nss? ( >=dev-libs/nss-3.19:0 )
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
 	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${P}-missing-include.patch"
 )
 
 src_prepare() {
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 68361e6ea96e..0f25d94a5279 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/120"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/121"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -26,7 +26,7 @@ RESTRICT="test"
 
 DEPEND="
 	media-libs/fontconfig
-	media-libs/freetype
+	>=media-libs/freetype-2.8
 	sys-libs/zlib
 	cairo? (
 		dev-libs/glib:2
@@ -34,7 +34,7 @@ DEPEND="
 		introspection? ( dev-libs/gobject-introspection:= )
 	)
 	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
 	lcms? ( media-libs/lcms:2 )
 	nss? ( >=dev-libs/nss-3.19:0 )
diff --git a/app-text/ronn-ng/Manifest b/app-text/ronn-ng/Manifest
index 92e7944f5805..d56535351280 100644
--- a/app-text/ronn-ng/Manifest
+++ b/app-text/ronn-ng/Manifest
@@ -1,4 +1,5 @@
 DIST ronn-ng-0.9.1.gem 69120 BLAKE2B 9da30156104ef448c458199ee33fb5369f7d97c7bbeac8072567127b964456a34226bcc15f72d6f2875f524175d31ec9652a282b369e818748790cd07f290786 SHA512 5ad7dc426d9bc77bca86fbb06775a3b19f1b8d79f5a4331d117e9fa394e7a9c3b0440b70b993672d77a24f56f5da3ebd0e41a5183f4330707b7ddb83c9108bdf
 EBUILD ronn-ng-0.9.1-r1.ebuild 1042 BLAKE2B 3dafc566661b2c26aa5bef3c7596d1bc3dfff4b5a8da62b9e86690512739010f19e24c86de1acfc0a65271dd47c98e0a9eb99422d228ea1121c045926c9f0fd8 SHA512 0f8e700b14cf6978b4c976bf0491e9e5df8ad4c0ee0f3548978ecba5fd720a7c907dc37e85e8e621802b7d716409df759089232458548bea7dcd63f539d54cd9
+EBUILD ronn-ng-0.9.1-r2.ebuild 1091 BLAKE2B 4f51ce0cc44590403c89d53bb2e6e8c70388d1c3268997c4564fb754f6e75d9e3b4645e5aa9b83d1aa503f4c337b6feacdc2703e5e219751620efa7dcd0c2146 SHA512 cf25ccfa3e0bb54da01a6e137341bae9175fd638de59b009c00a1bd5f5c16586b31079f9ba5e1116d16729959df645f87eb407b505d9d5354d165bffe334fac7
 EBUILD ronn-ng-0.9.1.ebuild 863 BLAKE2B fed56aad57398dcd1ef31bc4eb8306763bdbcb5ed1279769dd36b450bee1d50f33549b980d30a003b28b1e1024ef976e56996e6460125cfc6f0a4de1b5d978bd SHA512 86a2137c9f8437c7de9b79a2a6a04a29af3e4dc6fccda25639f8873533a7cbdcc547d9c66134d4d366491267729155402c7d27960144a1e44e67cc99b9d95af7
 MISC metadata.xml 342 BLAKE2B 71ab5a2d2a9e2d20165f54c1cf79f483768c3637cc87a32acf80708d79b3be9d24408a330ed23ad837848933b0a40f1165f60d7b7e08146a28088a4d9d558630 SHA512 92e6778f8a2f44a81dfdbbd6699ce2186cc48b801f5c462c99b4bc35f79806ff154d72bec2916d79dc7435c1a9b75f2bf3842b7dba2b132335afc38d00d22780
diff --git a/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..17a0b8f79daf
--- /dev/null
+++ b/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
+RUBY_FAKEGEM_GEMSPEC="ronn-ng.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Builds manuals in HTML and Unix man page format from Markdown"
+HOMEPAGE="https://github.com/apjanke/ronn-ng"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+
+IUSE=""
+
+RDEPEND+="!app-text/ronn"
+
+DEPS="
+	>=dev-ruby/kramdown-2.1:2
+	>=dev-ruby/nokogiri-1.9.0:0
+"
+
+ruby_add_rdepend "
+	=dev-ruby/mustache-1*
+	${DEPS}
+"
+
+ruby_add_bdepend "${DEPS}"
+
+all_ruby_prepare() {
+	sed -i -e '/mustache/ s/0.7/1.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	# Make sure that we always use the right interpreter during tests.
+	sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb || die
+	sed -i -e "1igem 'psych', '~> 3.0'" Rakefile || die
+}
+
+all_ruby_compile() {
+	PATH="${S}/bin:${PATH}" rake man || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/ronn.1 man/ronn-format.7
+}
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index f11de5dcd188..2eff8565862a 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,6 +1,8 @@
 DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
 DIST scdoc-1.11.1.tar.gz 12482 BLAKE2B 2632da654730a373f03955f0b3bb190c8d6beb2fd4e4b05c88a4c86d384b26c51a8f032e6b2ef8d4d795638c1981a4d5500384f3103411869c7097a2ba1466ff SHA512 28b676a2ba69a101034c47378c4b66c94bfb9903d680a1871020fd8772d0990a4c91678738f71d37bfca06e27991ef782047c6503d375ce69df744caf6b459de
+DIST scdoc-1.11.2.tar.gz 12746 BLAKE2B f4cb2c400103c1f2247a2bee79dca9ae5c50b8397c65edbdf4d70265a4596f85e0c47aab014699c4d63929b258db8ae3ff6728a9b95f212be9db1fa657e5b93a SHA512 3fbf1a74b222dd88410636124e4b6ca73f7e77f67d512cf430a878fefcaa5c6c13a1e9f6c0c9654de15353f94bb1bd528665acebc2293bebb325501d1eb6cda3
 EBUILD scdoc-1.11.0.ebuild 1182 BLAKE2B b52c95f0dbabac5b4eb7487cd48e59bd1b361a3a944d53c7b007bb52c7b3f0c68c6d80cd22be964b97d95f82474722a005745cf34c9d0ed0d36dac0887183e86 SHA512 a810dfca019775b6aa54e76dd8f2d411550360e86ac883498ba9e769224de6067c225eec31e93735a4f5fc6585507e780fd94c4ecf19b77677188d7118537a2a
-EBUILD scdoc-1.11.1.ebuild 1197 BLAKE2B fe17671505392413faef92b5bcdb3f44b487064b19e522486fbe65dd1b7adde2c8e3fcf7e0807428891447214631ca066e3754e6e90b4cc79c292781ff5621e7 SHA512 842b99af5aec1a9166cb83330a9a789bf2329cbcff0eaf23488a908f860dd4949fd391fc26bbfba0a652ffc23761eb819a10693edb025957a2d38213e94592d6
-EBUILD scdoc-9999.ebuild 1173 BLAKE2B 873f1def0a103e8c431fad6ffbf902a9e97ed543d29f738e0ff4799be7f5d49449f50b30e4f37ae5310f7ede07e15f76a395f553756f1d048b3f36ee8aff0b4c SHA512 4ac9391cd7564179179a1951469c73e798c12a6ad3b82c72019d64e6364c943c02251b43344d5e7a1f4e9f1115c941b2e5b89065be25d00002cf5b6dc8fe3af1
-MISC metadata.xml 320 BLAKE2B b51cd1a5d791144917631d54e5db482c1476d2e0a8261a58fe08ddc8e607c598b685709ad5a58d731f4001226a3ca9b3f8b210811cf91b608e574d3423a2141d SHA512 1ebee9d9288054cf6016b9cafe91124b9482647f5cbaf1c9608ea602a86eb172fe014f52a33f2f8fdd018ffb52cbf1a1b54ef17aa4986e4011f57ee115959f92
+EBUILD scdoc-1.11.1.ebuild 1192 BLAKE2B 8021b8570d9004ba4960f5770d0582a339ec49f9ed83f75ba66698c9d524031946aecd9f22f952264456b26e85cc6f3482fc75193f806f0a61174dd87ad9d020 SHA512 56f2c2a50b62b138e7b9f1c6b48e8abbd849a5a34061f0b7b9079d54efbdbfd002808c7ab56fd12ce528ba2ce6f68243bb31c8ddb918c90d8995d938c9870b0d
+EBUILD scdoc-1.11.2-r1.ebuild 1195 BLAKE2B d7a01cda165f90306aa09b3f5ca6e679b77e91c75536f9d8f8414fd543a7f2ae3b9c02ccafea06d6999b085da89f96d6f2ea9504c7b73f0c971edd350c10da21 SHA512 fa30b220458077b4b62223b193f6e89a0ab03fc1885c56a18a3161cdc70ca4320814e74bfbd09cb9a176a92afc603cea44198093ad7da414da6749e71082b4c4
+EBUILD scdoc-9999.ebuild 1195 BLAKE2B d7a01cda165f90306aa09b3f5ca6e679b77e91c75536f9d8f8414fd543a7f2ae3b9c02ccafea06d6999b085da89f96d6f2ea9504c7b73f0c971edd350c10da21 SHA512 fa30b220458077b4b62223b193f6e89a0ab03fc1885c56a18a3161cdc70ca4320814e74bfbd09cb9a176a92afc603cea44198093ad7da414da6749e71082b4c4
+MISC metadata.xml 244 BLAKE2B 84f30692e3204f2cc9c6fb00681686fc46a46a1d2a21ecaeebbe835a23c500b20595b801bb77a7fbaadc68388be6d00ece46451f7d9acf4106c3ac3d6eda37da SHA512 6400b858fd8736ed5c2d5966968a0da9bbf4498c6b2c839587d928b523847a633418882b8e950f22be960580da05eb70337c9a3ee407e0e47c131982c502c54d
diff --git a/app-text/scdoc/metadata.xml b/app-text/scdoc/metadata.xml
index f185a00aa221..5ee60cd0b383 100644
--- a/app-text/scdoc/metadata.xml
+++ b/app-text/scdoc/metadata.xml
@@ -5,7 +5,4 @@
 		<email>bman@gentoo.org</email>
 		<name>Aaron Bauman</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">swaywm/sway</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-text/scdoc/scdoc-1.11.1.ebuild b/app-text/scdoc/scdoc-1.11.1.ebuild
index edae9c69b757..22b84e1fade9 100644
--- a/app-text/scdoc/scdoc-1.11.1.ebuild
+++ b/app-text/scdoc/scdoc-1.11.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 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/scdoc/scdoc-1.11.2-r1.ebuild b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
new file mode 100644
index 000000000000..c40dcd50d0fa
--- /dev/null
+++ b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
+	inherit git-r3
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' \
+		-i Makefile || die 'Failed to patch Makefile'
+}
+
+src_compile() {
+	local MY_HS="./scdoc"
+	if tc-is-cross-compiler; then
+		tc-export_build_env
+		MY_HS="./hostscdoc"
+		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
+			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
+		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
+	fi
+
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+		PCDIR="/usr/$(get_libdir)/pkgconfig" install
+}
diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild
index d162fe258aaf..c40dcd50d0fa 100644
--- a/app-text/scdoc/scdoc-9999.ebuild
+++ b/app-text/scdoc/scdoc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
@@ -35,10 +35,11 @@ src_compile() {
 			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
 		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
 	fi
-	emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
-	PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install
+	emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+		PCDIR="/usr/$(get_libdir)/pkgconfig" install
 }
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index ab37fe44a3fe..3d2dd97a51b7 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,5 +1,5 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
-EBUILD sgml-common-0.6.3-r7.ebuild 2538 BLAKE2B c7cd5d54769217e6769dfa5d3ff19ab6b425acb4a5d9d72f507671726816a896c3cfc0f2d5e6314aaa7826e9fa29246c6447ca761a8339bc58a20a558259a411 SHA512 225a99ad7bf1b9ea4246240e487dace6ccb3edfb9bd40513ef91aab1ca4e13cda308d0cdd16dd686a5b16e8783a08187c0bc760b91937ebd4b97132724af13df
+EBUILD sgml-common-0.6.3-r7.ebuild 2545 BLAKE2B 11d064bb173468f4498df9ff321d0d0f5efacb102cf300615e9ee27b1ccc31308706d2a3a4ed1689b755570af62bddef025950c344849b78b1981fec38da5d65 SHA512 026edcd1ce8d4e14e4abbaee8b5146f7cbdfe1efc2a940c5a55aaef41b6b87260da80d653aad33d584d083ef62d5f33bf64edb5c08d30d40bdc5caef9ddf5530
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
index d8abdc835b6a..0363e17c1eaa 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.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
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 # install-catalog is GPL
 LICENSE="FDL-1.1+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/tkman/Manifest b/app-text/tkman/Manifest
index 0dfe39a63d15..60c98bf8540b 100644
--- a/app-text/tkman/Manifest
+++ b/app-text/tkman/Manifest
@@ -2,5 +2,5 @@ AUX tkman-2.2-gentoo.diff 2321 BLAKE2B 5ea163cd50fbf1f2b30aa9e009a350d3c6df4fc0a
 AUX tkman-CVE-2008-5137.diff 11645 BLAKE2B 4d628679de1bfad459badbe4fa610c316871b801e01438f52e6c1c3906e325b752dc3de8f5556fb6f9cab7ed83908aee7bc341ccf6700d29f81fdf334be31012 SHA512 60c65badeaa93d5e032117152905bd3c06985d7694fdec8c9ef9d0816446a865c45a1a4e7ac2dffc8eaf76163514de30663b2185fe6ba8e27a2cf9276aa09f4f
 AUX tkman.desktop 149 BLAKE2B 20e07ce0d89b6887329c47cf1d134466855118a24e6fe2f800ec678a0823824ab9a9f55c4d13d349d7f178654de8449463cc641b243e1ac56536b9b03f92b1e8 SHA512 d73c6ca978f0538c1b02f321cc4f45eec496c3e978229fc7eb373190d447c4d0c7639d0eaf8a3b7cc22d569e6a9088dd8371799874b41b13bb758c75369e572b
 DIST tkman-2.2.tar.gz 229273 BLAKE2B 3015ce0ecb224f1c01e1513cff1a55d3a95362753436a981630f7133c56a8b8f03030d5d368cb4a5a631ecfb2f0f9afbdec37a2d5b0e9fe74add82142172ca06 SHA512 31adaa4017282a6e6fba18a5f72c07c7d7d3bc63ef043b214bf68ec4837c73d4e0679d8b7513b0bae3984e1737e797ca886e15150b2e1a9cd288bbd7491a8777
-EBUILD tkman-2.2-r2.ebuild 757 BLAKE2B 0604af632ca47e04e1f3f46b1f24b621a6b1f13af74ccf68375e93534f0e746b647acd1f53776044b7aa262896b546d3cb26ca65482d8ad34333f1f8c6ed5123 SHA512 d1c7e0b6b5b3dab64dda587a11c85f5df89dc11a7cbaf2a04cb881ec49b64f5f7744afa48ae8ab360af798f35eaf2bf63a2495403fa8f949a62190ce0f95e8b3
+EBUILD tkman-2.2-r3.ebuild 757 BLAKE2B 885a8f04b6a9c285f7c475e31f79f286820d86c9fd1ca3282649f1027a046d87d36245f955ca78d7b872a37d4f529d4ece3dba2faf7130261d7c03ee5f3a40de SHA512 46c70807707e8e1d8cdd3a8b54fbac10eef851e2a7f9430197adaf77f1a9b0cbf39432d1f3b28a1c327d718a1ffa5af2a2f0128c1c79b595c525353e249113a1
 MISC metadata.xml 243 BLAKE2B 2307a4532e529127018ad864fee582691b7f866ebb493b0804fdc586e56e2325f79cd6ce93ff781c9741c60f9e8fd19b896833fad36bf686bd0b7c9727593977 SHA512 f591a0cb9455271d0056a2407da505db0306a56019549b0101a412e822d0b531f1d4ea39ca53b4b7ab9b2ccc500113c752e50665a72ddf9aa68fbc4c492abeb9
diff --git a/app-text/tkman/tkman-2.2-r2.ebuild b/app-text/tkman/tkman-2.2-r3.ebuild
index 6efcee2408f7..dea248e90be4 100644
--- a/app-text/tkman/tkman-2.2-r2.ebuild
+++ b/app-text/tkman/tkman-2.2-r3.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,8 +15,8 @@ KEYWORDS="~amd64 ppc sparc x86"
 
 DEPEND="
 	>=app-text/rman-3.1
-	>=dev-lang/tcl-8.4:0
-	>=dev-lang/tk-8.4:0
+	>=dev-lang/tcl-8.4:=
+	>=dev-lang/tk-8.4:=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index 7c04bee3652d..5b7b2512b2c3 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -2,5 +2,5 @@ AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9ba
 DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
 DIST tree-2.0.1.tgz 57213 BLAKE2B 977f3bd606881f92f7e39fb167205b468f77408a2fa3ff14c20eeab0e6f194115d2d41a3919751c9c9d103ae185dc231710a464f0c57ea244e8a410782503d6f SHA512 11a45136d62ee7b4acdb599025ddddc250f3b95c46c94cea132bdc226357561bbae3ed874a99e554d2e01a93eaac639fb89d8a2539964ce788540ac3537f0e4c
 EBUILD tree-1.8.0.ebuild 1030 BLAKE2B dda6d49d3582067f9504129acb79111f7696f6d04bc5f15099c86a6775ea8075c7eb6dc016de73810657ffe051d875a3115742342b5640da06d90ed85f3c5a87 SHA512 0836995a09b56e93f1f3fbc87cd443115d401512c19682f745f9152d1212372129707b6a21db6ce73b23b2fafd9d48b6b996011f852fe284a17236f7b89a8951
-EBUILD tree-2.0.1.ebuild 1006 BLAKE2B ef8b714336dd86d3c73e7bc2820b9cc79c652080a34730e48c781bf7146b84e11d0ed2bc965181e0f020e64673ea9e64c47d2b378671946b72ad27ae83980bfc SHA512 2397fe51a3ee5d9711f4fdf2bb3cae95aa502ffcac1781776118d7104f92233839abd7de9e4002b8cfb46ef85951fd3191df2d0e96068b1edd6701b270651373
+EBUILD tree-2.0.1.ebuild 1013 BLAKE2B 82708437b1c83306b8742ce5023391e0c8009375719ceb9e5d5bd6343991a3b76615f718dbeb792dfa90203c6be432a5b55fbd139ee6728328d7f921284838d2 SHA512 6d8bb2fd0c7249a566b940af7041a62003822225340cfa202e6b35192bde1f3d0116e193a30a14fe2e27927d64b8273b4c0796499d821f975c2346ee584d8324
 MISC metadata.xml 582 BLAKE2B 58d776e2a0478f77ba165f80ff3f097d18d51e7b9a234bbd769917f704224ca80b842ddd874ca44f81bd886d0e64354f4004f7099f54bcba7e2b87911251f4dd SHA512 063693cd9029b3a05fc1e8c87fea9de1c5ad3f23bb663b2da81504d9a75c2199054a622d63790b28bd5e65f546f7b8c9c02788e0b5f0c0d36b2d10ecb7cdb9dd
diff --git a/app-text/tree/tree-2.0.1.ebuild b/app-text/tree/tree-2.0.1.ebuild
index 3abae6ee3bd9..4c7a39b7f496 100644
--- a/app-text/tree/tree-2.0.1.ebuild
+++ b/app-text/tree/tree-2.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 4a23270adbc8..4a91764316e2 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -2,6 +2,5 @@ AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8
 AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22
 AUX xmlto-0.0.28-dont-hardcode-paths.patch 845 BLAKE2B 37618989b609bc7dd2d94d22fad0562d6e0580541d8f6ec2a222316da89a6744a16cac9b4cd446ef80f58cf415f4a784aefedf53349ea85e98cf33000b7799b6 SHA512 9947787a1c3ebbd0a73e271ebab3dfcd01b7aad3bcaa627e7a236947bc7edbc23696c38f96aae62785013e2ac8c5171ce6f386f655676a4cde8d820f49d5df7d
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.28-r6.ebuild 1434 BLAKE2B 0d9830777786cdad0b056f0f9e4b3c60d7dae2c5fa89bcd90e81d9b0e7a538523f5ee918f7944c18179bad04a0eaf581c1bc4f83e40f02856e70fb89c3282987 SHA512 e6e3c76f5a90e308f29f2a2b4cf61f3d5462322c92a6537be718b73e007e5b2ab92d501d4be72580feb4da8a14ba1f75e0bfcb62b3d1f4856e305202b49e7ea5
-EBUILD xmlto-0.0.28-r8.ebuild 1488 BLAKE2B 7b0beb595005bcc8593a89ae80867c91c3a1c73821f4f4d35fe5232916ae296dd5114aa4a545801c5ef5d56816fdd4c6714822ded8bc37bf98f76142c9eec445 SHA512 ba8134f8bce0e5b7cae48b7c28ae28a5e4e0969311ecf591c23e1486f8f1941ca9d1f61056572e78a8ab930dbdeddceaa6fc077e6b63ea61e1fd4d0ea094171e
+EBUILD xmlto-0.0.28-r8.ebuild 1495 BLAKE2B fb48fd354d2837e842b3400014f768119d962345f9dd37cba16ef65517d8bf3c9933ed306d558f408809e513d171727383f7a54c207edd773dd46a15d4880fd9 SHA512 09a4b2c9467c8dc35301dd733207f82bc7f6ccdd9f764da50bfdba5de120ce66c388e181e709ae22e08164e5fdde79ea74aca8a95bf8658b6004e3bf1645022f
 MISC metadata.xml 324 BLAKE2B 3cabb2600d6843ebecec023a16fef87a40432202ff195a6130e57f97802d4c0ed2e82ffee506c65afe554291f05c64c7ae2fe524c708db7a9c6bf4a71c4c8710 SHA512 19ed2fabc04f96b1b61495e2fdba674ca4b4a9a1cee11b3cb13baec6d9e7fe0d82b653a0cbb523de3fcd4ed1ef18d8111686f8b618db9924674ee274ae5a21ed
diff --git a/app-text/xmlto/xmlto-0.0.28-r6.ebuild b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
deleted file mode 100644
index 9188b524d598..000000000000
--- a/app-text/xmlto/xmlto-0.0.28-r6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://pagure.io/xmlto"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
-
-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"
-IUSE="latex text"
-
-RDEPEND="
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	|| ( sys-apps/util-linux app-misc/getopt )
-	text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
-	latex? ( dev-texlive/texlive-formatsextra )
-"
-# We only depend on flex when we patch the input lexer.
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
-	"${FILESDIR}"/${PN}-0.0.28-allow-links.patch
-)
-
-src_prepare() {
-	default
-
-	# fix symbol clash on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	# We don't want the script to detect /bin/sh if it is bash.
-	export ac_cv_path_BASH="${BASH}"
-	has_version sys-apps/util-linux || export GETOPT=getopt-long
-
-	econf
-}
diff --git a/app-text/xmlto/xmlto-0.0.28-r8.ebuild b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
index 319eaa49c811..dd8d9b968fc9 100644
--- a/app-text/xmlto/xmlto-0.0.28-r8.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 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 ~loong ~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="latex text"
 
 RDEPEND="
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index 402506bb9d93..f8ff6b5fd018 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -4,7 +4,7 @@ AUX xournalpp-1.1.1-nostrip.patch 1037 BLAKE2B 5016e48f6abd9368ae703f693efe3ae84
 DIST xournalpp-1.0.20.tgz 14895705 BLAKE2B f1a4721f4f0b2f0e666c7466d7ddbd1f299172576d5f86b4ab8150d3bf05231cc7bb40e750394d892fe8ce32b6106e29456e3e9fa976b1bf07a808bf1bfff953 SHA512 c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346
 DIST xournalpp-1.1.1.tgz 15093900 BLAKE2B 87988bc78a0d904f1e3533e393bcdfc7b76517f6cc13343cb63ceaa83de25eca885274238ce45840334ea653964c9cd1834fc22d5b2c89a731ae5616f01f22c8 SHA512 efba97d26f624e3a1b8164ef6333a0f1d2992d0245414bdb51692d845965f6c37071f687520b43a94f713465796a16cbafd8929fd3bf8e6c3face847df92251d
 EBUILD xournalpp-1.0.20.ebuild 919 BLAKE2B 7528a7ca321f0d96b1e6bf3577457aa71e079599674064dc0e9be296a39736399daeb03fce279f965f25366921245a386ff374fb52236a05a5bbea0c6d8476ed SHA512 93e304cfa2d0e63523eda840b7e65572bf7ec1263cbf02d60c8a5dbc91b6efd587f53921cba2705d138150480cebd53317efe0968f36046ab351d8223532a9d4
-EBUILD xournalpp-1.1.1-r1.ebuild 1020 BLAKE2B fcf320ceb2c2f98ea1f67733e35dd635fad716ef82ef51d6d7ef6be2918207c4f5c669f0bc6996aafdac83cedab2f398968402afe9f30c8b7ca4dd1e3a54e36b SHA512 fb359216608c29ab46fedf91bb1a6b9ccec6f91a1fc53da5e809508c76993e87d524cc8167faa7b8271fc1935af898bbe31655dba5fe29bcc668e7c479855058
+EBUILD xournalpp-1.1.1-r1.ebuild 1019 BLAKE2B cfb457309d08b611980b8e0d8d995f4274b48126c64fee196296b7a89983149f5b76500aba2fd0c10e61b7db57257d8684b5d93b3476791ad70ec47af907280e SHA512 5c31277a74affc8d22e7bbf51e9ea78b53d51b01126bc95ea5210bfdeffa60a2cd7882911a6a00a0e8b225a26d79c9ad53e52055736981eae4c45f0dfe9326c1
 EBUILD xournalpp-1.1.1.ebuild 883 BLAKE2B 359cb7146ce2b94f0bfc8a836c589b0d7212cfcc2e76bb4c5c7aa476652494c0c0541718ca2c72e1b877db971ec66e7ad9731218a9472736726cc4f77dc3eff8 SHA512 41f852b1c631f229e3e9e9de8b80233eb4b0c9dc1a06eff9e2afdf761b5640f7fb788259815a29864077c256642dff5228a45ff2b68bb47a987c457fc2b24610
 EBUILD xournalpp-9999.ebuild 1020 BLAKE2B fcf320ceb2c2f98ea1f67733e35dd635fad716ef82ef51d6d7ef6be2918207c4f5c669f0bc6996aafdac83cedab2f398968402afe9f30c8b7ca4dd1e3a54e36b SHA512 fb359216608c29ab46fedf91bb1a6b9ccec6f91a1fc53da5e809508c76993e87d524cc8167faa7b8271fc1935af898bbe31655dba5fe29bcc668e7c479855058
 MISC metadata.xml 221 BLAKE2B 4b8e1435358aa300f6debd1760de3509ae9e0ae2678b4d55057c3940efa9b15d62881ac988725e58cce5d2cf63d1de6791cb0b98aa797eecbcdd29c85d8a682f SHA512 40bf10d939c1f6ba4a0594cff7f4a44c16660489226a9a23a6e9327a43dbf757b42a8be0bc8d82daa8818b90c1b4f8c3d093a6b9f36ca15dc36301cda2a308dc
diff --git a/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
index 761bc8769f66..fdf5361b9d3c 100644
--- a/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
+++ b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
 	unset SRC_URI
 else
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 ~ppc64"
 	SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
 fi
 
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index b07daafa3aa8..8404c3340c98 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
 DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc
 EBUILD zathura-cb-0.1.8.ebuild 895 BLAKE2B 9b6a276bcbd0685f05aec8f492b25f168be8ff1d5a2395f91c336fd6ec33205a70084f2dbc7dc88c7322f47c9c65c072ae922650bfbb6f730cee25319215955f SHA512 a4d85eb270e731c207c8ac69646f35302f6ebcb5ba80711d77203d7cd8cece902808ac41f3a7b598d910fe3ff84daede5eabbe780572159142488a436f9c9232
-EBUILD zathura-cb-0.1.9.ebuild 893 BLAKE2B 10d8d81684467fc0676cec24e554fbd204b9d58ce6df85d2ce9873d193a8aa89bc349afea4457546c11e02207b6e4a2bf1dff76c1202bf7f2284fd25850223d0 SHA512 284c23d10550e71915600ab7a7d6f491d2e97334ee7c0d51fe1f690a5c992f427202c0eb0de443be45695b03a11dafa331bef59b5c7c79cddcadea560f7303b7
+EBUILD zathura-cb-0.1.9.ebuild 891 BLAKE2B 8439b1ae6c5f9a8fded47aa5755804a208617e3289d3ef43c48255fa1fa4836465f2c5a43fb4ee3201cee420942f4599cf7b9951a25ddc11ddd513609d532c4c SHA512 b0f4cbbea4d60f5994c8e7cbeac8fd1742bf995e453f1491b96f2f7eaada8773ebbb5ff3627edbe485f16a0e01e7f22af2335f0d1537b5527a8e8801efe8d67d
 EBUILD zathura-cb-9999.ebuild 898 BLAKE2B 591b8e8c047fe736b2271d6ee4f685b6443fc7919146ff8dfaae88bddaa3c70d3aea48f766f3bece87d3360e5437bc2ff55a85e8c8442bb0eef59e2e9be8dc56 SHA512 603db72b8c1e77da38575f97d6523dbd02a8c32823298ed2532e0871353854c2cf4280f35f085eb02968ff999db9f5630bcd7666d71f70c0f71413c27acb77c5
 MISC metadata.xml 583 BLAKE2B ca246e0a76aa83c55397bb48f58b196e816b11fa1c873a49b21ebee38512566d377b23ea926377ae8a08325d8494e49a12aad7caa2b8a3a19a1342ab2f8178ce SHA512 81c6f5d849fd80dd4b226db01e97f34ce8ae6affafd6b680ae31130484859983f1f1c7eaa5abaec9ca9c225fe7a7b3ecd0481f44fc9861b8c488e3c0aba24166
diff --git a/app-text/zathura-cb/zathura-cb-0.1.9.ebuild b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
index 3686e39e9456..c0c5faa1ea50 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~riscv x86"
 	SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 9e5391b66a7f..ae270753891c 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -4,6 +4,6 @@ DIST zathura-pdf-mupdf-0.3.7.tar.gz 8957 BLAKE2B e25412423ba8ec7c9c96d320129f9a3
 DIST zathura-pdf-mupdf-0.3.8.tar.gz 9198 BLAKE2B b873d3352d4f324d5dfceebe0ca1cd13e5e5b9bbedf89a5fdae553a2d2cf59ece455bbe931fc021310a7be3c765663ef73931016d48abaedaf2d3488f96d0866 SHA512 5742f22fc919af390a8a42f64640c36aaf1499a20d1c6603e70cc47b3f6634dafc94a31bfbb30c88524ac0c18c040f0fd6c63d236dbb556784cb17a9b0446374
 EBUILD zathura-pdf-mupdf-0.3.6.ebuild 802 BLAKE2B 0d21f475acdc3b1db922101a735e23aa981ed6eac5f9998cd9f6c149ffbf4f127a76bff6dd2bb95fc610ad29367f498325de498f259a14ff46a5c8462b9822c5 SHA512 9f9e1d8f6600d6689a8f67d20cfea8a98b2884522e2e213ae48b33b6c229433f2e10cc502b7ee60672ead65ac6385096f812b07318dd4f082faaf7eae8a96c84
 EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 770 BLAKE2B b03dbb81d5570940d90c4f91c755a5c95ff9e09b9932a44e8a0edcad2811762f8ddf20d78fa17dafe91d3e7984c9bbe5f0c9b7cb89032f1d6fee4a1dbf42db9a SHA512 3284605db9a02201670e81ce465bd8c3005b4755114ba2e92dfe76fd60242d5cfaa5ce32bc1ed53f90be60213a5ed7e089db4ae98ae6f81380b5d06e4ec8b6d6
-EBUILD zathura-pdf-mupdf-0.3.8-r1.ebuild 785 BLAKE2B 336dfbe9ca9871b1d71fee5cbd51f6fc769f5b9907c8a00ba61863df404448d127cfe7fe406eb2fc21f1f40bf4651d37a2260584356f18d5b2c62e650f356653 SHA512 92bcb8d41fcaf8c50db35bb4e32c03112e09713a67741acf52897063679251337a5c29ea6fed0d3cfdd0c6f68c3b9911b0017e2b8c928dd01fce3b5a93262f10
+EBUILD zathura-pdf-mupdf-0.3.8-r1.ebuild 783 BLAKE2B 109154aab7093f5633d5c8a348f42a15b7c0bdd965243a37c2e82e8166e83969d26c81382a59970ffc280e88a59e29f2d0f1954a10eb9287c1059d1552c3e25e SHA512 775d4efa31db84951a599099515305e860c89989f1b4889ac85b81e06b92b928b44371633766b2d8525ce579a34be48a13a1825753ba54dae78aa4c86c6dbd82
 EBUILD zathura-pdf-mupdf-9999.ebuild 800 BLAKE2B 8ba3913b6ba61dbc596710d20d0eac03ff8b9b7e047cb813068967535581ccfce9e090e207c050612e40f349e9ae261cba9946de0b8a1b63ef2df61ef761b8c4 SHA512 67a0f4320d42f8dcebe092ccb71fa3b1e21afd9292d7a7cd549ff6ef7fa79d9a493d61be06996b180787cdcfbd02934685c0ee83f4cf923e7aa3ec302e715bb2
 MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild
index 439355423fb1..650adb455eab 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index c9ffca2c47e7..937516a335c6 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
 DIST zathura-ps-0.2.7.tar.xz 4488 BLAKE2B 4513173a2f9ca725abf8444516a78fd789286b082a1146ab5d0dee504cdda92962f3e6cef46f24e0307bc5ea6bb6595577fac2dfbd2d4ef0cf8e69d34337baf5 SHA512 86cf4cea8f32e446960c7727745711d6bb6723bb41127ccba335fbdaeb78e9f681ce4104b2be8718a2f19e06aef30d49ae7c90091fa0774b5ffe22303cf37d5f
 EBUILD zathura-ps-0.2.6.ebuild 785 BLAKE2B ea456f3cee1a359e4176d2cceca60445224f0c0f2b63e19376ad1875ecc84f579a59f77c3626b11df22a416b41c60fbcbc08119c08d327e4591f151fa53b4166 SHA512 ded381a60d4e220c4f5a71bb89873daafa9a6135763727d41c30a8ae87b90f07a7b2ccd9e2c65bef06651c0d6a2c7705aa72bf9aad5f9b17f78f7d79efe2f618
-EBUILD zathura-ps-0.2.7.ebuild 783 BLAKE2B fd0580968eda5cab5aea8a4d073d0891db52ce8f25b431ef037f8f8d3e7904adf12605e8f129ebdf530c99f8199d8596aca6f0a51eae1eabf1a05cc1ad2d6aa4 SHA512 27e382034e7c50c6465390a6e10a80858b07d484e1c243f214eae1757a75382949c9bd5ceba206882f4d6caf48fdd6894a87b902799b98d4b18a14bbfc2ffdc8
+EBUILD zathura-ps-0.2.7.ebuild 781 BLAKE2B f581fde3682b0204d8fc2c20d1493a3aec77b9a814c9d77ba6e643277564dab1d34d4fada1291a4578d6067c5c240ac9a5193825b7f238292734f688428814fa SHA512 64cfeb56fd004ff828956beb60f3afb286547848ae95351b67186d87acfca14b587634672656eeffd1a92b6dc13c8aae05cd67b89a1629d73f1202f62eed47bc
 EBUILD zathura-ps-9999.ebuild 788 BLAKE2B 5cca1dd318b0b42d25d5256c8a8ac041982ec42aecbad33f74fb41ec1ee9304725913c93d29ff6fa7dce1a7c120eaa1bb546c7c84c1acf38153650738146197b SHA512 87db8d6a258a48923eed12296c924e253cec2201780c24f169b7a22118818b394e9c1ac674a748377a49de4b39f02257c469b0fd4ad0cb81d9287ab8d7fd0b47
 MISC metadata.xml 583 BLAKE2B ca246e0a76aa83c55397bb48f58b196e816b11fa1c873a49b21ebee38512566d377b23ea926377ae8a08325d8494e49a12aad7caa2b8a3a19a1342ab2f8178ce SHA512 81c6f5d849fd80dd4b226db01e97f34ce8ae6affafd6b680ae31130484859983f1f1c7eaa5abaec9ca9c225fe7a7b3ecd0481f44fc9861b8c488e3c0aba24166
diff --git a/app-text/zathura-ps/zathura-ps-0.2.7.ebuild b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
index 52b16b0f9b8d..97788ac057dd 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~riscv x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 4aa689975ec5..d1c217d68594 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -4,6 +4,6 @@ DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 70916ac23624b8e55b39bc2b9329fc5d992d3e2
 DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10
 EBUILD zathura-0.4.7.ebuild 1355 BLAKE2B f5e59096beb3e8cc13dde9cb887a1ceea87c7ee22f28f1599e235240c4e065da858ffadb96c3c702602684b6c0f6c6ed9018cf039ad16077f6f6b041d1c4f3fa SHA512 a1996b203c933b5e6e3661151bdba217ef131cd1e895ad2328c6cc6207b7f841434671671f7cc49af97bc6554fa366c9cc16f8eb38eafbb6bbf584b41632c3c4
 EBUILD zathura-0.4.8.ebuild 1414 BLAKE2B c9e53786f10e0bcdd9057124a365b050881a640e7dd42e87a962b71aaa0702d7090a43b360dc92976456ccaaa1af84160bbae95a9a21a3fc315b116303a3aaf7 SHA512 fc53625f6057cc6433c61e30b8beb9e37c83772ee6eae7ad3177e4f00d8de56223ebcdd728a9773b9fadc93746295cb99e1331a1c6763c6fbb9108539987f95e
-EBUILD zathura-0.4.9.ebuild 1358 BLAKE2B fa5a04a11ded704fdf8ba5bbb0e6992f2070666c694e4a3358d2ecb3e2759f81e2b33b1a730ced52f3c8a331a400a8e4d6d092330eeaf9976a5d21543e654bc8 SHA512 a640afa679ac3ca691d9ce4e15a12e86fa9384059f2e9cccf6fe70b56676432e4e7d8d7f0c8a47a3ac14dfc110808d5be74f9bee121c73065d6021f7a36f3fe7
+EBUILD zathura-0.4.9.ebuild 1356 BLAKE2B 0dbdb617975ef7f2eb8cdb9124f1157fead06a0c07c411e67f37789835e5986d63730133b6bcd6faef8d66eb553fbac590a8714fd6d2bdafae35b1d036f3b9d2 SHA512 f8d02199612725c86bb762baaa075f90939736bec26c7db952964ff2a3023393d9f89cfb003f3cd7c9c99475e1fd22746827bbabefd302f40dbd5041e2d27bc7
 EBUILD zathura-9999.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
 MISC metadata.xml 769 BLAKE2B 417d92ddfcbc7c2352a79c4275022515fa0bf31b7c06058bb29452f7e15882b59ad3d2b92a2aa8063bb54120377e028449c0e253cd2aeab719a92e4853a3eea7 SHA512 9f7284f67e9bb6b454670393431546685ede815937bb06f7a73ebf25c9cbecca734a8e09753ffc803f8f44ce3a67002c59e31d98bce6185b4237e5d499e3165f
diff --git a/app-text/zathura/zathura-0.4.9.ebuild b/app-text/zathura/zathura-0.4.9.ebuild
index c368be85b53a..4b5f9deeebfa 100644
--- a/app-text/zathura/zathura-0.4.9.ebuild
+++ b/app-text/zathura/zathura-0.4.9.ebuild
@@ -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/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index 8fa12fd6554a..66b9fb80d6cb 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1,5 +1,3 @@
-DIST zotero-bin-5.0.96.3.tar.bz2 61236517 BLAKE2B 3de6d41349f9cc405dd3d44e8e456169d58bdd1f4522c31cd168182878839fe8ca6280eff7339bcf3d66c87c7d4f5af55d768551abcff3cd579342cae37b64e3 SHA512 0777ec41bc151b0bd30076f8a7f59e431c3435728b4d85298421ef11aea5b7c1e122d3bb7fcc5551bb8c4472922796d9508a56df7a0913515d8568fcf3ca6fee
-DIST zotero-bin-6.0.4.tar.bz2 68409133 BLAKE2B 9aeb7cfc8e12f7cdd8aa595fa46564d873c51603295f2dd802ba7ad8baaf59e366fb85d5b98c6614222f98449c800e58b7fb190cbb80a1991beb0c69669d6da2 SHA512 14f759dab9e02253f7be8269575fabedc79556cc81eb1bcfaa5d945280b174545b9f23b2c190824124503f353af6a0416c15ecea99a81f5f000207a1eefe84b9
-EBUILD zotero-bin-5.0.96.3.ebuild 1758 BLAKE2B da6782640b9aef3c697d0f60fd1cc87d1b76539e1f4ea1d23628b769d2b0a0230000a0f4707e317fef3792fd6248e950086ffa0aaf14f52c52a18ed3d422caa9 SHA512 4359f979d921def27016d05e3ef65018f8cf6c2bdf8caeb51bbcb3263b88c6129e4ff645a14018d4a45ae024703aea23a3a5782fcc5016fc1d0fba3d79db1357
-EBUILD zotero-bin-6.0.4.ebuild 1772 BLAKE2B 2131d077455d567c5d1d7667a14b6026513020cf6e575afbda0c7b0ef30b4ac55a5d15f710e1d907d3c2ea444c8d5ac9325971c9d252a7ecd3cac5f0c1f9b659 SHA512 dd47676fe9f547aeb3966bb518217e3a583effd50edc05b7da5329b74fe3e43c66d263a19160e87069f7ad35b37382b75dbc0a980adce241bd1036cb686754c5
+DIST zotero-bin-6.0.7.tar.bz2 68578108 BLAKE2B ba1befc180978104396b059dec098e3cb273b19ddeaf9994588ce761752549a6962b31dc4ffcc749317403512df7686beae399a75c66328d24ba256963efe6bd SHA512 a8e060ef062d64e17e78c30018e227e08662fea6dc9818121401aa6bb3f9245b149bfeb0a90f1d4d13243eb705ca8e184deef1bf76f3db395a23470b7bfe0f1d
+EBUILD zotero-bin-6.0.7.ebuild 1771 BLAKE2B 259f08a7adcfa1545bb1426def80c19ab0d6250cf4e3bcba43a703e8bf72a15fbebbc82316bee18f193d6b4649e429118c51f86f39e4f98bd4334cfef2e6f6bb SHA512 a7b57e4234c04ec3f365296436f4eb1b348488f96e65bd460533139c5c13463f2a008bfaa6ecbefced8ba408e00d3648c39914433d884c1c861d859c209ee163
 MISC metadata.xml 398 BLAKE2B ef8965041b1ddb5dafacd8d3b913c2c272b50460607018468446993062620044b77ee4033d9811979768aafba6def9b3e06775d48f8f194f7ca95ec6ad048c5c SHA512 5a67ca8cbadcfa83e38f983b3e448073970e71f2d2a3c0756d8cbbe54050382095df564bdd5e52b0976a9588f882d814a71179957e09e429a2881a7f48041e53
diff --git a/app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild b/app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild
deleted file mode 100644
index 0b2db122a690..000000000000
--- a/app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop xdg
-
-DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
-HOMEPAGE="https://www.zotero.org"
-SRC_URI="https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}.tar.bz2"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	dev-libs/atk
-	dev-libs/dbus-glib
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-
-S="${WORKDIR}/Zotero_linux-x86_64"
-
-QA_PREBUILT="opt/zotero/*"
-
-src_prepare() {
-	# disable auto-update
-	sed -i -e 's/\(pref("app.update.enabled"\).*/\1, false);/' defaults/preferences/prefs.js || die
-
-	# disable default oo installation questions - manual installation is still possible
-	sed -i -e 's/\(pref("extensions.zoteroOpenOfficeIntegration.skipInstallation"\).*/\1, true);/' \
-		extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die
-
-	# fix desktop-file
-	sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop
-	sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop
-
-	default
-}
-
-src_install() {
-	dodir opt/zotero
-	cp -a "${S}"/* "${ED}/opt/zotero" || die
-
-	dosym ../../opt/zotero/zotero usr/bin/zotero
-
-	domenu zotero.desktop
-
-	for size in 16 32 48 256; do
-		newicon -s ${size} chrome/icons/default/default${size}.png zotero.png
-	done
-}
diff --git a/app-text/zotero-bin/zotero-bin-6.0.4.ebuild b/app-text/zotero-bin/zotero-bin-6.0.7.ebuild
index 831f9a1eb8cf..b9f2fd5004e0 100644
--- a/app-text/zotero-bin/zotero-bin-6.0.4.ebuild
+++ b/app-text/zotero-bin/zotero-bin-6.0.7.ebuild
@@ -8,6 +8,7 @@ inherit desktop xdg
 DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
 HOMEPAGE="https://www.zotero.org"
 SRC_URI="https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}.tar.bz2"
+S="${WORKDIR}/Zotero_linux-x86_64"
 
 LICENSE="AGPL-3"
 SLOT="0"
@@ -40,8 +41,6 @@ RDEPEND="
 	x11-libs/pango
 "
 
-S="${WORKDIR}/Zotero_linux-x86_64"
-
 QA_PREBUILT="opt/zotero/*"
 
 src_prepare() {
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /app-text
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)