gentoo resync : 06.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
commit: e68d405c5d712af4387159df07e226217bdda049 (patch)
tree: 009ab0f3d427f0813e62930d71802cb054c07e30 /app-text
parent: 401101f9c8077911929d3f2b60a37098460a5d89 (diff)
66 files changed, 542 insertions, 921 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 45c70767f2f1..ce722a06e792 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index fb50dc768431..b0bd7b400668 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,3 @@
 DIST ansifilter-2.18.tar.bz2 436432 BLAKE2B 43c592e83a967ee86404332a464d57d202a73651b2e29da2d1d21163d295b6efba96ecb5861dacfa89b8f567c0367f7a32b8e658f8cefad82c5982f2f2bf70bb SHA512 ef7febed1fc31f5c7503648e4fc0a7aefc3da8e30ea649bd6f03eac2904667fb779049106ccb77ad16fbf655e979f6651b25b84ab126c940c66bedee115a28e2
 EBUILD ansifilter-2.18.ebuild 1104 BLAKE2B 0ea12120d3091076273db9c7d056bb36b902e464c525bfd832186688169ee9ac779ed787041e9dabbe96c2fb1f29366a1e4c2c2c1424331a956fc48d6c88284b SHA512 03834a0796df4733241ea1f329f2e783b7056d18a069f584a3c5f593aff797dc6717ccf50ce9e3f11c1da3aa841092c7990155d4dcd61a3706da83004277de59
-MISC metadata.xml 222 BLAKE2B b5daf033ea46a708411a54d1b465effb557d4f48cef8f0f4b6872917da7e8efbc9b69db6e04f6331c7a27b473d1ea83e2bdf54247e7c6b427c94c492e62ef21d SHA512 52f592a4e8342cae9f7a982302b75c68af50523b23b4d8a13b5434b150d3c0e812ba66a13b8d5d093e59b64ccbb550640064aabd9748a200e63d170d0b6f327d
+MISC metadata.xml 254 BLAKE2B 27bfad9e03763fd082b0adc7a602dbf9f51b6c6ede654b4fa61e434e9c9452a301259197291dd45bb6d5486e1797fd8c15383c4bf88f3a0a08c116dd9227b5d6 SHA512 a08ace91187b9c474aea7738fedcbb2a65e52a19f004a781376f04f7fa6c4b867e43645764854108ab21410b6675246b00514c4754e8f22732790e6fc6dbc2d6
diff --git a/app-text/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml
index 0563834f5561..4c0df79c2637 100644
--- a/app-text/ansifilter/metadata.xml
+++ b/app-text/ansifilter/metadata.xml
@@ -3,5 +3,6 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 917f571cbd40..14afc3c1a151 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,6 +1,5 @@
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
 AUX calibre-5.16.1-zeroconf.patch 1457 BLAKE2B 104ba007fbb051cf07bf55fcc30f58469e989dc842a4a046c8e212a2f971b27c497346466a15b380080fd54cc8c561bdbad5bbaa5b1917d7f8a748bb289d1b2d SHA512 e15a2659f1663e77a80b9148180b0636228d483cef7395aa0e7a45eb41e57b541bc91c1a87ed1439e3a3e43a167882af5ce6d493e4723220c8665c1d1341e302
-AUX calibre-5.31.0-jxr-test.patch 943 BLAKE2B 39742add85bfb6abbc7d3a01b2018e6c47279ecc3e78d46f70c6e661b77304f2b739a5d44b9b106a0089559043691a3c751c020685abc53ba08a9a8b52fbc76e SHA512 aa1efc13bbbce430832ef20e41634c1f5d833544dc566d102314d80b4f3ce1fb838ca9916c559fcde4401531434bf2095647ee3dc79bcf87cddd56ddb9f347d9
 AUX calibre-5.31.0-qt-image-test.patch 691 BLAKE2B b0eb6e3a5f74277b967d2002ad1090107a4a131fa2c1107fdb9ea0ca8593e7872e73a4c6d657670b5de1a1296567fa87f5a891514e379b83925a8d0c55154bdc SHA512 29a86e8416eff1f47f49790472480ebf6dc4c0dc771d045b0c3ea632e0df6d05f5fe23adac9510135b944757dc84c1f96cae55ef4860dc68bd68ee6a3ab3902b
 AUX calibre-5.35.0-jxr-test.patch 827 BLAKE2B 0a94ac5b12ee2ec732d3ff68979c2060b0b218eee27409b3c351a9cc0b6bccce2260b8b387b442ae10f31483b20bd6d672f7d5424f7d9a8297a1bd14af2f7793 SHA512 259a3b4882bf0fbb01cb22974e219a621a2b337d6f638234a806148b11142fdbf9ac36ae38e71fcb7e18bd61362b34cf3c221ba1df317ec6ea8668591ad2d3ff
 AUX calibre-disable_plugins.patch 709 BLAKE2B bfc3fb85203fd64296793d58099e9d43bd173d3545954960fb72c16d42f5e09d4a99205339012cdcab512d46f0fcb08aa6c9410e848c83782a776accfd654710 SHA512 deaf4ad84aa1d688ae67ba4bd09ab7f163a7a33d498d9e9fe1e6d24f3fb9599757f9d6cb7c3d14953b6a0cda482d1427fc6fb6343d5cfe94223ff6b6e2f4b507
@@ -8,11 +7,9 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
-DIST calibre-5.38.0.tar.xz 38365980 BLAKE2B 1c6939e69abde52426d32ab56a91f9b31f687f1d20792c5b360bf5563d72384db395b29e63d8becc1e196f54522a8643588109891943eb1fa525a5395873bb3e SHA512 2744e9d0d3f6daa578360ffb8334adbc49b4dc41100fbe0820b73e4a5a1e24c70c1e75bf1f03b9590f2a64d6c0c7710b26884356567f51200d5c00fe23ed5772
-DIST calibre-5.39.0.tar.xz 38372008 BLAKE2B e56513c918d7ac3e7f1b28e98dc82c29170577991714185791b0723daa4adbd404a6fac6584c7d2ad7ceafc19ab6aee519ab0c2d5f0bcc66f4de6236d7096b68 SHA512 ea6c739339603abea890a06f43c16522746352bde3abaebd6f2fa64771ec63800a62bd7f0cd47d1c7fb865a6cd73f9ff7522d71d7f4f593247f8eeb93a9263f6
 DIST calibre-5.39.1.tar.xz 38375212 BLAKE2B c9205b84180cdf3e98ca30729815f0c3f6b490e1df855119b3032689417b4218d26ce4c6f56d93d040fd5b88924fc432102c00af3286f85b7d5a72a536ab1ece SHA512 47a3be38a24b9e690102108abd1f2385d792721adec637f6de1cc8504df8cc0e3577786add3f48a10c2bc995320d65370d002afaea6ea13b6131b8b6767f27fa
-EBUILD calibre-5.16.1-r1.ebuild 8515 BLAKE2B c9dc7b66d93d6020cde09a360b0aa92894eafab75e7ca4f18a1a9a9286c6eb4f2af17fb162583fcc05088775abd0fa28ff849888775d964a396ab09cfcc02eea SHA512 cd76c560e8acfeb4e41de7ae8cce3fd4294b54ac7bee585ed562a596791054a7ad2918f09105b86587271002f7690b681ac9bc3e53bf1e5657b80f94aa37cbe9
-EBUILD calibre-5.38.0.ebuild 10398 BLAKE2B 4d0a5485c6d720e270adb31cbc442106c0289a3807d6a18fb0f0c24e519d6f7e15af5ebf978d3f947ccc44703fbea8d2b942117640daab29456241897d1cdf9e SHA512 c8af58ae4cf0a8d7895444eb044fe68fb69919efb0324ea6b4c6fb94ed3b66349deeb60bd03959f10139be3b639b7ce7939de37bd0dded54dd932e1d2cfc9660
-EBUILD calibre-5.39.0.ebuild 10398 BLAKE2B 4d0a5485c6d720e270adb31cbc442106c0289a3807d6a18fb0f0c24e519d6f7e15af5ebf978d3f947ccc44703fbea8d2b942117640daab29456241897d1cdf9e SHA512 c8af58ae4cf0a8d7895444eb044fe68fb69919efb0324ea6b4c6fb94ed3b66349deeb60bd03959f10139be3b639b7ce7939de37bd0dded54dd932e1d2cfc9660
-EBUILD calibre-5.39.1.ebuild 10398 BLAKE2B 4d0a5485c6d720e270adb31cbc442106c0289a3807d6a18fb0f0c24e519d6f7e15af5ebf978d3f947ccc44703fbea8d2b942117640daab29456241897d1cdf9e SHA512 c8af58ae4cf0a8d7895444eb044fe68fb69919efb0324ea6b4c6fb94ed3b66349deeb60bd03959f10139be3b639b7ce7939de37bd0dded54dd932e1d2cfc9660
+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
 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 32b84b85f211..f0ce3cbefb85 100644
--- a/app-text/calibre/calibre-5.16.1-r1.ebuild
+++ b/app-text/calibre/calibre-5.16.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
 
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 qmake-utils xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
@@ -176,7 +176,7 @@ src_install() {
 	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+	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.
@@ -207,7 +207,7 @@ src_install() {
 
 	addpredict /dev/dri #665310
 
-	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	PATH=${T}/bin:$(qt5_get_bindir):${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
 	"${PYTHON}" setup.py install \
 		--root="${D}" \
 		--prefix="${EPREFIX}/usr" \
diff --git a/app-text/calibre/calibre-5.39.0.ebuild b/app-text/calibre/calibre-5.39.0.ebuild
deleted file mode 100644
index a9f64cfe2e57..000000000000
--- a/app-text/calibre/calibre-5.39.0.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# 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 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	dev-libs/snowball-stemmer:=
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/cchardet[${PYTHON_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-		dev-python/jeepney[${PYTHON_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-		>=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-python/zeroconf[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=[jpeg]
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sip-5[${PYTHON_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-PATCHES=(
-	# Don't prompt the user for updates - they've installed via
-	# an ebuild.
-	"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
-
-	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
-	# We don't (yet?) package libjxr and it seems to be dead upstream
-	# (last commit in 2017)
-	"${FILESDIR}/${PN}-5.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:${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="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-		"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-5.39.1.ebuild b/app-text/calibre/calibre-5.39.1.ebuild
index a9f64cfe2e57..ec684bf96296 100644
--- a/app-text/calibre/calibre-5.39.1.ebuild
+++ b/app-text/calibre/calibre-5.39.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
 
-inherit toolchain-funcs python-single-r1 xdg-utils
+inherit toolchain-funcs python-single-r1 qmake-utils xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
@@ -196,7 +196,7 @@ src_compile() {
 	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
 	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
 
-	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
+	PATH="${T}/bin:$(qt5_get_bindir):${PATH}" ${EPYTHON} setup.py build || die
 }
 
 src_test() {
@@ -229,7 +229,7 @@ src_install() {
 	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+	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.
diff --git a/app-text/calibre/calibre-5.38.0.ebuild b/app-text/calibre/calibre-5.40.0.ebuild
index a9f64cfe2e57..ec684bf96296 100644
--- a/app-text/calibre/calibre-5.38.0.ebuild
+++ b/app-text/calibre/calibre-5.40.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
 
-inherit toolchain-funcs python-single-r1 xdg-utils
+inherit toolchain-funcs python-single-r1 qmake-utils xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
@@ -196,7 +196,7 @@ src_compile() {
 	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
 	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
 
-	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
+	PATH="${T}/bin:$(qt5_get_bindir):${PATH}" ${EPYTHON} setup.py build || die
 }
 
 src_test() {
@@ -229,7 +229,7 @@ src_install() {
 	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+	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.
diff --git a/app-text/calibre/files/calibre-5.31.0-jxr-test.patch b/app-text/calibre/files/calibre-5.31.0-jxr-test.patch
deleted file mode 100644
index c39508474b68..000000000000
--- a/app-text/calibre/files/calibre-5.31.0-jxr-test.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Avoid calling libjxr's JxrDecApp as we currently don't package it.
---- a/src/calibre/utils/img.py
-+++ b/src/calibre/utils/img.py
-@@ -119,8 +119,6 @@ def image_from_data(data):
-     i = QImage()
-     if not i.loadFromData(data):
-         q = what(None, data)
--        if q == 'jxr':
--            return load_jxr_data(data)
-         raise NotImage('Not a valid image (detected type: {})'.format(q))
-     return i
- 
---- a/src/calibre/utils/img.py
-+++ b/src/calibre/utils/img.py
-@@ -644,11 +644,6 @@ def test():  # {{{
-     despeckle_image(img)
-     remove_borders_from_image(img)
-     image_to_data(img, fmt='GIF')
--    raw = subprocess.Popen([get_exe_path('JxrDecApp'), '-h'],
--                           creationflags=subprocess.DETACHED_PROCESS if iswindows else 0,
--                           stdout=subprocess.PIPE).stdout.read()
--    if b'JPEG XR Decoder Utility' not in raw:
--        raise SystemExit('Failed to run JxrDecApp')
- # }}}
- 
- 
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 819fb14a3ffb..da5c8105738d 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 733 BLAKE2B 626642b2db6194a4d975b13a78d9d1ea41e479acdba8b9102a7aff257644dad633fb86c234bc515ee0087788e03d750904a7e400c59a4059b8b457b61b4ab10f SHA512 15e82a99258da3804b2f348b812978689ce019fc8a8662e64e0bacdd3e3c8aed6addbf4c3847ad800b4be2a85fab5cf369883d2bf4d3703df197a5b73cb9a1f6
+EBUILD cmark-0.30.2.ebuild 740 BLAKE2B 58b82661b5f5f41e0982dfd2dc1a7f6e5db8546eee411c1167ea978e13b0e8cb7f71c947a7d8c785cdf4910d7212ec4b8e56b169a18db03af8c6f8bc00166123 SHA512 0904fd6f9ba39fe14ffc1b41ad05217d8732867452bbc629a8e06d4b06b5cd725a71ed5fa04769c23bd65d2f837893cfe5c4a6bbe7c8114485925f8a49eaad46
 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 97d0f495a45e..4c15b66535c8 100644
--- a/app-text/cmark/cmark-0.30.2.ebuild
+++ b/app-text/cmark/cmark-0.30.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index a4e3a8196b2e..3de1b83180a0 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -5,4 +5,4 @@ DIST coolreader-3.2.59.tar.gz 13596218 BLAKE2B a59d11aff93166de77add5d2305390681
 EBUILD coolreader-3.2.57-r2.ebuild 1842 BLAKE2B 647a7505a9dcaf911e578921e8717914cef1024d72747d3764daa0c0002061dfee09060f2b64cda4a1d84d43a24887e6f2c9e6119baec1312ae3ea7d6f880ea6 SHA512 f823e37f65570aae5072cc9245c3a39ac0e5510d4d2ca1edfe00614e48878948d2db1e501283bfc05db57cabf91bdbc9f6bf98c59b758d3cc4f49a66e08eacda
 EBUILD coolreader-3.2.58-r2.ebuild 1844 BLAKE2B 5c697ca212fedc718a1493f82dd8cac76dddecc0d4a8ba875e8e578788f0e4a5240bfe5a6dbaf09184fd8a244e30b586eebe5ea0a663441734b4c88a50eb8cfe SHA512 c0634cc6d7cc072c16b3407ac26ae46d570c88126de9a1cc6b4f2d8f83b14e4b91bcbb5333a58f56e73c943ab261889155aa9e99476082571d642c43068cca1a
 EBUILD coolreader-3.2.59-r3.ebuild 1938 BLAKE2B 4ccca5f23ea21d1f6b77b4774fd4d759ef354edbb9c4cc5b648ac900848e75e3b120cc29d5e8349c8c277032e76ee40e5f75ee8e658344ff4f0135654ab63ab8 SHA512 9e8084f5b208af65fa93426c0a9d188efb24dc8f1bd42d1e2bf672f5d2c11c7dc2def48b8f97cbd8159cb4840c44f25c41cda2222d825e0d359340a0a20ea30f
-MISC metadata.xml 625 BLAKE2B 19c586a05d2469157d23709430c5929215eaab28ab25e124526c685fd0dd87c2ddbafa06968927cfbc74f29317c290296b000eb42443bb87f20e6d50615298d6 SHA512 755074e5507e33fb110368c6ce25055a449534c7458127500ac233955abcf167394eb265b5ad5b680c2cf06c57c479909870935e63ceabd91b4db583ecb95d8d
+MISC metadata.xml 630 BLAKE2B e179265deb3518a96cea13ec64fb83105edd9475bd6c9c47462e804d3f1ab3b4bfdc3b1f8911d1724a11f667d74fa506877e9e7340e5b6565702e8479cf71982 SHA512 b7eed2a628b86440649977391e0fb18ba3422b66f54a46ec60ab39cb9f4ed997b8efeae51c2efadb152d93841d05ff3c00303269a7368e93c0bf2d55d2b1645e
diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml
index d51eccb7c80f..5db08561fc93 100644
--- a/app-text/coolreader/metadata.xml
+++ b/app-text/coolreader/metadata.xml
@@ -12,6 +12,6 @@
     <flag name="wxwidgets">Use <pkg>x11-libs/wxGTK</pkg> instead of Qt5</flag>
   </use>
   <upstream>
-    <remote-id type="sourceforge">crengine</remote-id>
+    <remote-id type="github">buggins/coolreader</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 17fdf894c646..6416079c0aec 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,4 +1,6 @@
 AUX gethopt-undefined.patch 358 BLAKE2B ccc264eece330bc0c8979731410488b070c91e73381ed4f00ff95f04c5f023948f304dd70c0f8ec4ff67abf266d80ce8931fa46f53486e2e0e003f151fbda4b7 SHA512 a7504f3ab60ff49b72e475e558e128522757874d4328abf7e488313dff7c2fc3650fffc12a03109601a14348f24f21a83ed0e83f9d6fe1176207ac2692800dc1
 DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
+DIST discount-2.2.7b.tar.bz2 102685 BLAKE2B 1af4d47248e4a65ea1517b03d0b1a0b15eb79bdb7d1f00779515e2a1113b2a923f5d9e5d0a93d63cfc6c7257f11d3825d9baa55c7f2252fe3d2513785ab67ae3 SHA512 d68ffb85ae3e6d6ce8a2e506609bd4cb042617e350d113dd632a1ed81adb0b076df75ca4e70e97d43f3a3a2907555a9f28087a3762f41806289c526af3c55806
 EBUILD discount-2.2.7-r2.ebuild 1697 BLAKE2B f6a68291682e44d6adfa9fdb40fe7e1c1bbac2c0981fd86f223344053c6510b27b4c734613c0acc4f29b31f5ffc862924ceaeda442fc7a52f27f111d6ce7e882 SHA512 cd1653e485b7785f630017210eb5268ac7c42c362cd95e2bea38f977f99c79cfd3aef8c35aa292d6764868f404bb74f77b068596a3b17c7001488c7a0c761308
+EBUILD discount-2.2.7b.ebuild 1652 BLAKE2B 1f103a53134e6efdf07f512fd512f8d88cb022d5b2592de6eed09262de304106681e145387f3df96a3a9020b417e2c220aa6b7a1005011a7a17e7eab4ee428c5 SHA512 7aea9488cb0e4ea7d5d769c115f85ee8c7f38aa4e639bc673690de6574b88be50fe86cdf37fd9749cba68160a5cd616d00ca24a2dc3a41abe695b4e2dc777044
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/app-text/discount/discount-2.2.7b.ebuild b/app-text/discount/discount-2.2.7b.ebuild
new file mode 100644
index 000000000000..e496c2708756
--- /dev/null
+++ b/app-text/discount/discount-2.2.7b.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Markdown-to HTML translator written in C"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
+SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+
+	# for QA, we remove the Makefile’s usage of install -s.
+	# Drop ldconfig invocation.
+	# Force “librarian.sh” to respect LDFLAGS ($FLAGS should have CFLAGS
+	# at that point).
+	sed -i \
+		-e '/INSTALL_PROGRAM/s,\$_strip ,,' \
+		-e 's/\(LDCONFIG=\).*/\1:/' \
+		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
+		configure.inc || die "sed configure.inc failed"
+}
+
+src_configure() {
+	local configure_call=(
+		./configure.sh
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--prefix="${EPREFIX}/usr"
+		--mandir="${EPREFIX}/usr/share/man"
+		--shared
+		--pkg-config
+		$(usex minimal '' --enable-all-features)
+		# Enable deterministic HTML generation behavior. Otherwise, will
+		# actually call rand() as part of its serialization code...
+		--debian-glitch
+	)
+	einfo "Running ${configure_call[@]}"
+	CC="$(tc-getCC)" AR="$(tc-getAR)" \
+	"${configure_call[@]}" || die
+}
+
+src_compile() {
+	emake libmarkdown
+	emake
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(usex minimal install install.everything) \
+		SAMPLE_PFX="${PN}-"
+}
+
+pkg_postinst() {
+	if ! use minimal; then
+		elog 'Sample binaries with overly-generic names have been'
+		elog "prefixed with \"${PN}-\"."
+	fi
+}
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index 4af649e22e97..b0bd3ce1b62b 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,5 +1,3 @@
-DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb
 DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
-EBUILD foliate-2.6.3.ebuild 1202 BLAKE2B c3e662e2218eb04cb4be8090eedeea2325c49d586e52040f5dcf976cfbdd9f029e0c9d41fd5b9165d9d760d46d3afcba116b85063b76187e816017f81148f9c9 SHA512 4e2c3de331b47ae613dd90d5fba956a4c7ed80788737a321e9a91612004328cf1f6cb6c286964431bbf8d88712c98fc219aa91efad5fa6ca358a5f4a70c5d6b7
-EBUILD foliate-2.6.4-r1.ebuild 1210 BLAKE2B 8fa95a0d012751c378194e284391d30f0f4dec8e13ab8bc299cd3bbc4633a9385528dc0cb5576172a9e91abeec157ccc564492c1402b0009cc50ecac5a692ea0 SHA512 01d4b52af39728a8cfe02810c8c154c99451aafb90eae8791be2bd70f4cb7fdc9111b0bcaf51109b9e5b38bc83abf9b383f5a8c61354116c94f169e39e61ada7
+EBUILD foliate-2.6.4-r1.ebuild 1209 BLAKE2B a7fe923d57fa27a16801b79bf2df542e433f1468b23d0b3fc5c8d5fea1cac01f58e49cf39965c22ea210c0a1e4943b82a59378af7b553a276469fb5b5c32e2d6 SHA512 50a32d65c494b6f490dec3d3e0bbc3278ad32fae499e3194668422989de622cfc1d15c6ffd01ea2a82b52fa3e54a0642cb204884f6369b23647461d1d907c058
 MISC metadata.xml 607 BLAKE2B ab5cffaca496e55fe6c7cce465104fe2c0010d4ef6110c816575944d7f48ae94d834ac61430e1c722daca0ceb739fdb4e2ad35b2afef010675726aea967d2ea2 SHA512 7e1d53bcd78408d6ef3803871d131beced46b118555d7daf0ccc0abf6233d3892568ca3264f1b123f20524d56600cb162c53057fb38a0811571a98ca0051573b
diff --git a/app-text/foliate/foliate-2.6.3.ebuild b/app-text/foliate/foliate-2.6.3.ebuild
deleted file mode 100644
index 9aa32642596b..000000000000
--- a/app-text/foliate/foliate-2.6.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg-utils gnome2-utils
-SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="gtk ebook reader built with gjs"
-HOMEPAGE="https://github.com/johnfactotum/foliate/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="handy spell"
-
-BDEPEND="${MESON_DEPEND}
-	sys-devel/gettext"
-RDEPEND="dev-libs/gjs
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	handy? ( gui-libs/libhandy:=[introspection] )
-	spell? ( app-text/gspell[introspection] )"
-
-src_prepare() {
-	default
-
-	plocale_find_changes "${S}"/po '' '.po'
-
-	rm_po() {
-		rm po/${1}.po
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_po
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-text/foliate/foliate-2.6.4-r1.ebuild b/app-text/foliate/foliate-2.6.4-r1.ebuild
index f6ded40f0ee6..d7d5bfc423bd 100644
--- a/app-text/foliate/foliate-2.6.4-r1.ebuild
+++ b/app-text/foliate/foliate-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/johnfactotum/foliate/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="handy spell"
 
 BDEPEND="${MESON_DEPEND}
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 4b3fd18d112d..35aeccff4094 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,5 +1,5 @@
-DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
 DIST grip-4.6.0.tar.gz 147222 BLAKE2B ee5c10ca47ca0e9089d2618dc765a4ca01f4927da8c4256a251a9cf90ee15d63eb6136848cef0005d5f3af1f12b603f6f0fd55b65840bf542dcb9cd29ff35518 SHA512 483170996e593593781b684986dcb8eec20afb02dca84a9f5baeb3917220706332037f7b18f504aba8aa7d1d1c3587a1af18d6d5628f1e96517511c0be40a6ac
-EBUILD grip-4.5.2-r2.ebuild 764 BLAKE2B a6052b65931aa1ba8fa8d1943a6621dcf749aef2e26830026347d69936615809dd163c073dde46389cd81269ac45a68cb9871ce6e2bd62c5fdaaf1395c2f7f18 SHA512 2330d10a8f6186414dc77bf85a19e4069aac540fb2de217cda68f06fad313b740b0f5547238dd801b6ae748de9bb4dae82e0a1ed15da2e61cabf13c365a738ce
+DIST grip-4.6.1.tar.gz 147894 BLAKE2B e4f6b5c72e98b5d8ec443c794e95ff0a4250526dd7381f5a28da7d1119b607970593c4b3c22a49ec7da7d772e984abb2a0984ed7290b007e48cddf49bfc290ae SHA512 73eb80995457faa10ba5f174c8151c821f4bd9cda066099ba249cc5aad668e6adef267410ddd24fefa1d1e444c276a10a0881ec5e528bc616d3c4d98a8427b3d
 EBUILD grip-4.6.0.ebuild 765 BLAKE2B c416b4bad1593370f9811d2b587487b2a809955016f2688fab75ba1ee90ea3e0c8362067adb91e3b095b78ed987353a53f888935e312c22804134616f79b59d1 SHA512 a23265346713fd6cdf9dc7a4d7ca8961608122970575c80d429b288776f72864ecceab87f860cb47939b56cef38440e2b3523c6e153497b6eabb9d23f6bd6b21
+EBUILD grip-4.6.1.ebuild 766 BLAKE2B ef33f5589054c37d80e1eef425da07092d070fbff7fcab544cc9864babe38431c38010d4c63df5dfb05e67ab7834cf8b226b8ce5e35a589c16929b2042d5b7f1 SHA512 1b84cb7904abdd599d96b40dc50422a3e1b7f1b95bdf40857901b343e62f0ff2e9b2d4593d8c0fe9b510157ea82feb0f7ed24f5542af13278c20b00dac8451a2
 MISC metadata.xml 365 BLAKE2B e01f58764eda42b4e6d7ece18b3f2996fe55e640d91cdba317f1f9677a59b114d7caab6c2ea7556f1962e30b8e2b453814179d7e978b52c4c07fe6e89d9a4978 SHA512 286ffe7168abf8d980ad5e713a31751241901246c6b2fe8372942e50bef53a70b3ff17045e99cb951c968309fcab5c9776a1fb26222c0ea4edfa467e8209eb4b
diff --git a/app-text/grip/grip-4.5.2-r2.ebuild b/app-text/grip/grip-4.6.1.ebuild
index 77bd4c342234..1dc8182a71d1 100644
--- a/app-text/grip/grip-4.5.2-r2.ebuild
+++ b/app-text/grip/grip-4.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
@@ -13,7 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index a1c2c97eac2d..25eb0b45eddb 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -3,6 +3,5 @@ AUX jabref-2.10-skip-failing-tests.patch 14972 BLAKE2B bbe4e6b4b94890cfe0db1c03c
 AUX jabref-2.10-test-jvm-props-args.patch 1846 BLAKE2B 1d278c20ecfea4923d4e28bb8ceb1af35b23b8ca7324d68a1852f289bc29ecf8bed44a483b13d87e9e9d48162ac56d6d09f5cdb42e41b25d7ddedfa20b0cf3fc SHA512 b81aa6b7e2c65409180dedcf4e0e1bdd65f32b64a72ec2588b9fcda1caa31d3dfd82690c975ef1ca39a2040f549b97267643a5b1633812bcddc0a428f9330429
 AUX jabref-2.10-test-prefs.xml 935 BLAKE2B 6429d261893c8388d4f2f5ee8328a649ded5d9756f48187d77a317a97bf20ef4d3c9da5c29a754e40548a774ab59bb9dfc2ef3e2e0d1708f1b9fbd7b3d15fd90 SHA512 e9ab3bb2faa4eda9e2fe8f282c9b669934d94d0461baa0cfbfddfffd3a7abf5c75f7d164ef6d5ad46f54aa7783c560c87ccfba82ec8cc98dc6dc0c6aded029f9
 DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
-EBUILD jabref-2.10-r6.ebuild 1998 BLAKE2B bdc1a0ed3328e781f096fdf6cbceca743b44adefd551386d05d6c2f2ffaae4640fc3f2ce42228f4928bbb51aa4e896d0248a97fb88823dcd605f1c12efedd533 SHA512 ed531c193206bbbd19313b5baafa9942db8e9a9fe9e05abfc12931ea9b23c430fe240875f889bbf9b3e9df8610a72e63740b730db5de9cf72c877ab13e8e0a65
-EBUILD jabref-2.10-r7.ebuild 3935 BLAKE2B 202a442a9381f6e6544db4a31b7b4564d8ca8195de7fe5031b5665b58e3d56ecc7d91aab90a2fa32485029deae3c0efabd8f41363c3d145e29eec9bf7cc5b3fa SHA512 6a5a2910ef854042621d86505aa3b842d0c3ad103fc5f393cf4751e92e88edb27736996041f9fa858728657a641080730e22523528217d6d6c3c3a5174ed9ee3
+EBUILD jabref-2.10-r7.ebuild 3934 BLAKE2B 8cf3addb28717913e11c301cd60a8898e1fdddde3b6e5fa4620c60704c225fa5721bc9a669f1b5717aa476898c61d4f723bf423d6fa42a7236bb7ea0019f63ba SHA512 982e684fb4c89045fed2e06fea786e4f691f7b4a7aeb0e4a2c6fce505a3f20825974ee29033782ec3f6d8cd28a650d0438149542c5bbc3834ae9744f50e571f4
 MISC metadata.xml 538 BLAKE2B 42838a006f22851a46a0327962db710293807bf0a88ada771d14a55109d4b304a3c128547d9e9fcbf98c7d7f4807ce40310f32040109d7531f22c5f2cf93e050 SHA512 6023ce4d2b7ce8165511cc356dc99fcfb2b6f6c16064ea64558c96d83973ae8dd826b8b4a0fedac134f4609739d15fa981a444900b4b281d2f4c85affc5a8087
diff --git a/app-text/jabref/jabref-2.10-r6.ebuild b/app-text/jabref/jabref-2.10-r6.ebuild
deleted file mode 100644
index 6a4ad2464020..000000000000
--- a/app-text/jabref/jabref-2.10-r6.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
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit desktop java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="https://www.jabref.org/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/antlr:0
-	dev-java/antlr:3
-	dev-java/fontbox:1.7
-	dev-java/jempbox:1.7
-	dev-java/log4j:0
-	dev-java/spin:0
-	dev-java/microba:0
-	>=dev-java/glazedlists-1.8.0:0
-	"
-
-DEPEND="
-	virtual/jdk:1.8
-	${COMMON_DEP}"
-
-RDEPEND="
-	virtual/jre:1.8
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# If we cleanup it complains about missing jarbundler
-	# BUILD FAILED
-	# taskdef class net.sourceforge.jarbundler.JarBundler cannot be found
-#	java-pkg_clean
-
-	# Remove bundled dependencies.
-	rm lib/antlr*.jar || die
-	rm lib/fontbox*.jar || die
-	rm lib/jempbox*.jar || die
-	rm lib/spin.jar || die
-	rm lib/microba.jar || die
-	rm lib/glazedlists*.jar || die
-
-	# Remove unjarlib target (do this only once we have removed all
-	# bundled dependencies in lib).
-	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
-	# Fix license file copy operation for microba bundled lib.
-	sed -i -e 's:^.*microba-license.*::' build.xml
-}
-
-src_compile() {
-	local EXTERNAL_JARS="antlr,antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
-	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
-	eant \
-		-Dgentoo.classpath=${CLASSPATH} \
-		jars \
-		$(usex doc docs "")
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
-	use doc && java-pkg_dojavadoc build/docs/API
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.10-r7.ebuild b/app-text/jabref/jabref-2.10-r7.ebuild
index b2b35d23a70c..2dfca56aca17 100644
--- a/app-text/jabref/jabref-2.10-r7.ebuild
+++ b/app-text/jabref/jabref-2.10-r7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	dev-java/antlr:0
diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
new file mode 100644
index 000000000000..03a93beeeca0
--- /dev/null
+++ b/app-text/kramdown-rfc/Manifest
@@ -0,0 +1,3 @@
+DIST kramdown-rfc-1.6.5.gem 4608 BLAKE2B fb62c69a186f80da15555937209b59af370a5c9dd742d5a704e4af73931728fb7337162848af02dab7d7ee520c7883a82b00adcc0e4b5ab97020f9fc530ee42a SHA512 0bd9f24bf793e9a92f7a479a75a739cea4bfd8cdd20ee9c4bd52b8de5c7fe71db777ac0826412e132b2c227dfcf9c4b333f3bfb648f4598599919a64a21bce69
+EBUILD kramdown-rfc-1.6.5.ebuild 649 BLAKE2B 9e26f558df1325b5d87b6043e9f0656c0d7d8ce77572d804ce22110f478695f376f346591270328e1d55dfbf2a6927ccdf957dbb4d9992bcbac59a547811ad68 SHA512 a754314dc538b0a543f63b607f4fce2aa6b26f808d8df3562545a434de67cc0998453d094de9f049691cfe96af9ebc182b4b223310a432c11eaafda723cd61fe
+MISC metadata.xml 247 BLAKE2B aa1ac899418ae6358314e4cbda5c7db1a4f1e7fd8587e101508aa77bfe6d127e1c7bc762c52a81810f22baf7cf6a3a3a22da3810beecdccc5307c42d028dbbcc SHA512 b93f40a4fe9148f409cb20b5db2233ef29cbd27ce7dfeac19e0f3d9cb6b81c6eb2fcb19ce31739eb83911298f089f0bec7e372b5581fc3c839174129f3ab36cc
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.6.5.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.5.ebuild
index ea795b2d7efc..ea795b2d7efc 100644
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.6.5.ebuild
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.5.ebuild
diff --git a/app-text/kramdown-rfc2629/metadata.xml b/app-text/kramdown-rfc/metadata.xml
index 06c61aaee4c8..06c61aaee4c8 100644
--- a/app-text/kramdown-rfc2629/metadata.xml
+++ b/app-text/kramdown-rfc/metadata.xml
diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
deleted file mode 100644
index 2c6199a35ada..000000000000
--- a/app-text/kramdown-rfc2629/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST kramdown-rfc2629-1.5.24.gem 51712 BLAKE2B bedca34835233e6db72b52ed634f07efa97a121903097230c95cc8db60c14662f697a5e02df5b87d8f2fa8614ac5bbc22d0a018d5dd339229da14c3517897c0e SHA512 6e358ad09afef4768e9c1698732c2058040f05180a8fda36c96dbbc68e670c8bf509ebdd92f51d9696b5305fb54398885230daa09b82ac5805a5c4d4eb10a4ba
-DIST kramdown-rfc2629-1.5.26.gem 53248 BLAKE2B 2df5ae9715afd09ee2388280838687d4dc4694a9d2c309847c56986afe86b53a4bb4fdbdc0805f8bb2811fbce502b837d60ce96ff18d9b51b2e6ffc62ba6b65c SHA512 978d216d8ff4df309dad6408fbc5164c65e4a0a857d0e4599bdfe9763f68af7c3ea0a90827ef4f5d3102d3972d4cae85673aeac4f6cdd510fd3fa6ed6756b1b6
-DIST kramdown-rfc2629-1.6.5.gem 54784 BLAKE2B bc51d59303f4537881cf2af54167bec64b5760d11725582444a169bd05d34ed3a43ec8d3e412d8da725f3180cdeb502901bea9eb910e1d5d1590e16c1f701385 SHA512 a7c202770b699c2d06236418d54df1a52d6918c2c53b18d18a8988a274cf216e1c949777274b1f10ec7905ad5467678b209f420c365caf513422ff95d43fae6f
-EBUILD kramdown-rfc2629-1.5.24.ebuild 653 BLAKE2B 7bb06b55d72f27e09787ba115c14faaa3b2fbce1ecc0dfa7c1c0681cba6cf8eb3a895c98da9390b1923c29e98df7c4e9bcc5066833bb8253c409b7b71acd6f55 SHA512 0eec3f27b5a5c385a1bd70a0f71c9cd5a9fac465277cb854afd0b9f4d151ab8bedda7368e93f9083520ccc42170dec3aa04036656cdac74915146d5d698b0e1a
-EBUILD kramdown-rfc2629-1.5.26.ebuild 653 BLAKE2B 9a11565110ea45f3979b1c14ff00a83986d5ae953e1c8444c33f591d6efd0a9a9d0b248ee3a680caf36afb98d7c72cc58f02ccf943474cd6decdd59b599c4420 SHA512 b6a4a3026de6d50319fc5cf7635f5eb63ea6b6ef7466f2160440dc0a307b38d0ea56dbcba3e53f096ede60c7d40741a926e6f3bf197ff7d1dbff1be040b36239
-EBUILD kramdown-rfc2629-1.6.5.ebuild 649 BLAKE2B 9e26f558df1325b5d87b6043e9f0656c0d7d8ce77572d804ce22110f478695f376f346591270328e1d55dfbf2a6927ccdf957dbb4d9992bcbac59a547811ad68 SHA512 a754314dc538b0a543f63b607f4fce2aa6b26f808d8df3562545a434de67cc0998453d094de9f049691cfe96af9ebc182b4b223310a432c11eaafda723cd61fe
-MISC metadata.xml 247 BLAKE2B aa1ac899418ae6358314e4cbda5c7db1a4f1e7fd8587e101508aa77bfe6d127e1c7bc762c52a81810f22baf7cf6a3a3a22da3810beecdccc5307c42d028dbbcc SHA512 b93f40a4fe9148f409cb20b5db2233ef29cbd27ce7dfeac19e0f3d9cb6b81c6eb2fcb19ce31739eb83911298f089f0bec7e372b5581fc3c839174129f3ab36cc
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.24.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.24.ebuild
deleted file mode 100644
index 057efaabbd87..000000000000
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.24.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser"
-HOMEPAGE="https://github.com/cabo/kramdown-rfc2629"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend "
-	>=dev-ruby/certified-1.0.0
-	>=dev-ruby/json-2.0.0
-	>=dev-ruby/kramdown-2.3.0
-	>=dev-ruby/kramdown-parser-gfm-1.1.0
-"
-
-all_ruby_prepare() {
-	sed -i 's/json_pure/json/' ../metadata || die
-}
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.26.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.26.ebuild
deleted file mode 100644
index f0ec06c97afc..000000000000
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.26.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser"
-HOMEPAGE="https://github.com/cabo/kramdown-rfc2629"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend "
-	>=dev-ruby/certified-1.0.0
-	>=dev-ruby/json-2.0.0
-	>=dev-ruby/kramdown-2.3.0
-	>=dev-ruby/kramdown-parser-gfm-1.1.0
-"
-
-all_ruby_prepare() {
-	sed -i 's/json_pure/json/' ../metadata || die
-}
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index 879862fb9ea0..85bb36991ce3 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,3 +1,3 @@
 DIST libabw-0.1.3.tar.xz 318808 BLAKE2B 234ff797bf3798bc7f14f2b3f0d0cc2d80eda2a6ba2d656288c26e58d53b9798003d7f45ad7c9a0f504da36c8c8ba367f8fe5b565a85fbc6a1f1627d89e7e353 SHA512 0d2646e1bad1e11b3da43714ac5931fc67ffdbc4e7a25a44ef5b6e6a41de1e0ae14596b4a87cceb07bf56dbbe9344622b3d60afcb054ee0ab8577ca8e9b5c289
-EBUILD libabw-0.1.3.ebuild 834 BLAKE2B ccd33ad9c142658d555b1ee31788f6d2e7477dd2a996c84a31e4d2905323c815f0547d4ae63b9b0cb3863beb1cb1d57e6054b1c0673f856b7442dbbca6b103c3 SHA512 323ec2ddca6e4deea8938f1bba01f77b68a75ad784b6e1a04c2e183592eb56e43e7605ccd00e9acff6135529a4b5d8a52bbd8ae254aa4584854c56208f540819
+EBUILD libabw-0.1.3.ebuild 841 BLAKE2B 805a551f86ed65f389badf5e7acf0682ae6deec84c7b89fdd51420d3165c389be07d25ff17d7f6747ad0d2c1e9ac68bc7031ae195828aee9239c57ba22cc2a9d SHA512 c2d6029973738513f5e4621b6633ab93c484c1021d9f086f21512f5e5b3f76d3ec540f79ea24cadb80e0506e4e5c4567797023663295ebaa9f564a70653902fb
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libabw/libabw-0.1.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild
index 71115f275264..a62943210fa2 100644
--- a/app-text/libabw/libabw-0.1.3.ebuild
+++ b/app-text/libabw/libabw-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 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://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index ffb14c5b4f13..d37fd643959b 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -1,4 +1,4 @@
 AUX libebook-0.1.3-icu-68.patch 991 BLAKE2B d8b7cbd831e65cdd82131d13c50558e2ffe4ed5ab72c6f576267921176ff5d65be2a0c71b3c1cbd853db9456d6a7c20ba27516fbb7f4b7a83e22fa0680cd23ad SHA512 5378d95e926e4b385b8dfa957254b5a1d2b943be5562124b897ead5a81e2922a39d37768afdd010e18655f2a184d82c837b19ab7f862b19ff71c0d5e664c076b
 DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
-EBUILD libebook-0.1.3-r2.ebuild 1053 BLAKE2B d2b59bbaa3c6a6aeaefd06f3e5bdad8c8f6597355eb114041e5c7aac3bbd7818fddeddfe2a211218376dd67a32acbf8f19cd3b89558056431424479fd16e8ed4 SHA512 c1492ad0a0936977bdd26fad7abedae7b7c501d5c0a37a74aea0f2a867641c81e313c9dd9a90bfe6053a94244c3d4c4c57501ca780169772795242ca9b2c5163
+EBUILD libebook-0.1.3-r2.ebuild 1060 BLAKE2B f9773daf3ff61b9b9f6fdb02129e0cc7c15935b1b4791e7d663ebd42f670daa0f8773c1f8022a40aa40a0b009c6b089e7e5f8b981a2c0574849680f8459b26a1 SHA512 44d1167b204b3646a260dafde91561950c06220ab2e76592e98f40dbc59335b0701e2908088932c8f7a349677288f4b7d69b6045d234ebb19b77dc75641f01b9
 MISC metadata.xml 405 BLAKE2B 2fe3d17abd0096e52a5cffa70d0647a5ed74dce11306a4e0e0f9bb7fb61ea5b39feeb170a8eb01be813a8dd755b7c45a25b7685f3fed5c0032f715cf1dde3074 SHA512 78312f4eb96a691f86e8e4fd8d247dbf18d234a30b6d73d69691074043ab16b0212912d0234977e403b2e41739d9463d0216a8a2f121203de267b0e850402e4a
diff --git a/app-text/libebook/libebook-0.1.3-r2.ebuild b/app-text/libebook/libebook-0.1.3-r2.ebuild
index 28eae3a3163b..af3d44da21ea 100644
--- a/app-text/libebook/libebook-0.1.3-r2.ebuild
+++ b/app-text/libebook/libebook-0.1.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="doc test tools"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index ec185dbcabb9..86b2c4f7113e 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,3 @@
 DIST libepubgen-0.1.1.tar.xz 324380 BLAKE2B f2dd4ee4987aa69f3972f83fe6348e8f0d4ba2d5c2f8f871e81d7e9dd5dcc00e10fc2be27fcbbb6170f5a673b86c62261fb8d25ff3bf788cda726e64a254ec7d SHA512 9d911384672b5394ff1df3280a5c9fe12888530c41f177aa100f135954e2ec279b64193f8388f12c96f6a6e587483ce853e74fe45b29fb748a930512dd011c2b
-EBUILD libepubgen-0.1.1.ebuild 741 BLAKE2B e5e79eb8ac5c1c872b680549b5de8d0952cb750fbfd7510720e7d5b530838cabc38f1ee80a45b2f448bccd88baabc92dab33a68124eff183afcf4e4d5649d108 SHA512 d08a77434cddab008e2b5576e9c1b1c4fc3fbc9987503e4948731f2d2b56584c9b630f92cc56e83e997684cacfdc2a09e6b625c741b368f6e7d5d4e68aabe249
+EBUILD libepubgen-0.1.1.ebuild 748 BLAKE2B dbf43e5897f94835e3cd87481c73d08e19c0e30dd5092a17ff35bb44592154d35acb9ec65da687671a32c9dd9ff1b5829f59aa9c5ece551066b65a9a8c118935 SHA512 8fccbe0dda6ec26e56333ec7160ee9ca5323a677eafeac6c3fe0bb867fc18928fb008448e7dcd02c31fe22867e5d132d2310e234204a011d149e180a61a46021
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
index 3b3e96693e44..6623d64ea80e 100644
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index 4d718b93693a..1129207601d6 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,5 +1,5 @@
 AUX libmspub-0.1.4-gcc10.patch 752 BLAKE2B b59c1feef001da863688cf108dd30b3624577eb6cf7c8fadb8295cc6a0336dcd98c39c79dd369c3ed239da12574439737e85fe6bb5d7d0a1aae85d0d72c28686 SHA512 f38730c9e552dd1b0264b789e5138c7c09feb717934bc0d80bf65797343422d64f9d0173edae47af15d89a1bd352636ed56de74b7f3d5bfa69030cc1e994db00
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
-EBUILD libmspub-0.1.4.ebuild 1190 BLAKE2B 43d070a2a540bdc46ef7e28f99b2dc0369f3cdb2325e2e414df66a337923c00ef19ad8def589b3c60214d54b205e6c7d9b01ac9766beafbe00e96924ba8dce63 SHA512 fce9184ccf431a2a467d046ea500388901e640bfcd5e91b017405ba564bc1084ff4d0fa81e5db987b8cc87d9e29155a69ef38d7941fc752dca11e1c1874732ad
+EBUILD libmspub-0.1.4.ebuild 1197 BLAKE2B 049eb92ffe98fd5139ab50d1d44cbbc8ef94622115557f783f02937ae9039754dd2f7bfd5cd96657e94d810175665eccff8f9681a56371564bc0a687ac98d6b1 SHA512 d8468be4d8f25db577a94e7d0a21ba2a3b8875384aac58e4255e97e9e7c8dd3e322c980ba7ce5dd656dfc7c739782634b625eddc559e8e962ab665f72405cf0a
 EBUILD libmspub-9999.ebuild 1151 BLAKE2B 4f0eed197827389f11e711580c3bbbf5cd1f8aa739dffa66b4e10c1eb97fda3ce8bd0b9a0d2e4474b66cfb36f52a687359015ce56f73bbc541be60d67d5deffa SHA512 ed227a0116d226dec8e94d1ef920123a1a35d73200972f87ea3c6a725c52af143843f8f01b64dd79a650810e65a4eedaf908b41c22e0c6f74756ca8a034a7082
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index aac80c71a965..718404439721 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 DESCRIPTION="Library parsing Microsoft Publisher documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index f4b8c612cfb1..0aa51012cdd2 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,4 +1,4 @@
 DIST libmwaw-0.3.21.tar.xz 1457212 BLAKE2B 19e0893c186f273f5743a397da895f653cca1300febcac90353951c6ca66405c2481aac6083017f4ec00a31ee0f08e8e77dc579019396e23930a091de2d8903a SHA512 1b6aab4f3e76d1d7a3c15cc175642c62f826172c9fdef558617b87a98d056a05d817caaccdc199197670f84ada448b65cce61f5254ed8e1d7634a637d3367384
-EBUILD libmwaw-0.3.21.ebuild 1013 BLAKE2B 3c741c8bc6e6c1a65ea8ed24d32a8f0d00286c93f92b80bda796cdb040c98080b29be016c8b548b720fc5f14447a225847a48e55a4a6a5f8c4678a4cbfaf8c7e SHA512 32f096bbad136c93920fdd74594b22ffd448030660fbb602be6379da3b66a36194ec5a4412a692a263be8bbf1c50d3ba51aac4efe5cfdaa018267a87244106c5
+EBUILD libmwaw-0.3.21.ebuild 1020 BLAKE2B b19205d4116c24361887793924c5367355abc21c0b48e860c1733d861236d18684f74d3b7dba3951146681996eba288bb33d75fb39a27fe159e7956a71c4e396 SHA512 69235c97940703ada6318e1f93b53aea3c0a2eb7722a2a29fc8773d161d237abddc48f1a7a06b59f49667be51fadd258103c0c1f6b2679048d87bb81b198b75b
 EBUILD libmwaw-9999.ebuild 1016 BLAKE2B 9000ed0395fe4a35c333a638eb6dd96974b7a6471ec29d5904f4b4686b23a6593ee82c94516e0efff83c4861e4a013ba875499fb1ec1d53c10764d37b1c5d650 SHA512 b9a1c5684dd554884f8dab0b84c4cb7d5d68470cae41153988176a3954de510b660d54223a14e28d13ac5568afb02c80e5d79ddbdca0633f6c975f4627988c82
 MISC metadata.xml 404 BLAKE2B 95ac1c73023ff52b4a0d1754f9d37b6c2ffd82f49f16122058f853e40ce15dd9b2fbe6ecc24bdf86e82addc27b4a6f9cd7478560fde845b696f62a1645abdca7 SHA512 858235729f5091f06699f4b32ff14890c139c5e0adff30172da79e3fec4b4452e8529c401a0273b1799706e0ade449451f10b84555ade12022bf62e37098ac07
diff --git a/app-text/libmwaw/libmwaw-0.3.21.ebuild b/app-text/libmwaw/libmwaw-0.3.21.ebuild
index f78b63dd62cb..3c35ea5b1c46 100644
--- a/app-text/libmwaw/libmwaw-0.3.21.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.21.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
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 7b98f942363e..8a982612ae28 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.2.tar.xz 341760 BLAKE2B e596b3ebd23c8fff2a1675b1076ba6b4403bb41358972b50eb946610108f5968ef3e553478aec8c6211f8b476030033e7d334cb4deccc7d6bdfba3914821abf5 SHA512 409d3df82ac522b39bdd0ef4f0a781b906e246a8e6f502009c095eea90d672c482a7fc5c7f998d89952bc598c6f51357346ed6df490c25cb48e1318e27c50dab
-EBUILD libqxp-0.0.2.ebuild 855 BLAKE2B afc5386a7957c177247f5f61d1c308d1399d0f2c42bdfeb5b03c1c6d47655634ad5125afc55847a6cb84a39ebbc71a65af52a2fa8eac950ff0da428986b73d3e SHA512 f6cda0a3dc9f72bc22354aaa4fc42912a13dc2e44407887f89756dab3aa440d8b24d4a1087b48e179cc43d7217de42384367bb6dc268d628691bfbd3ab16a2ca
+EBUILD libqxp-0.0.2.ebuild 862 BLAKE2B e1043859a6f36ca9f63486036bc4d6fdfdf5f30002af310105c8dedb978c0f81adfaddf637aabf36e2123aaae6e7825a53ee1b045b2302164d7632c5c8129fde SHA512 d069ef00cd8125fe39261dc4a6a5b49cf6db0f0c6956531b76803a0aa8677bea0f999e2faa3e73c952695434c726b5842a0000f5db9e1813a82a94c93cbb1e89
 MISC metadata.xml 327 BLAKE2B 8b5db6bc2658fb6562c3332510024acd140204299b814b71c8626bce90139ab93603cdc16d4d8bea00e89aa2c7379f4f1bcb1775f2a95e0a3de108ca8f719aca SHA512 cf829b3d3501142c8509558f456cb5723faf955d61442355f65d74868c8c00217f4bbeb472d39f729d3810737bdd98592d6eda63fef6f3dcdf25a19ac41b6c78
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index b8a7b7ad69f9..1b88010e8bae 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
 IUSE="debug doc test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
index 2c5821b5f297..617cc0a59a8e 100644
--- a/app-text/lowdown/Manifest
+++ b/app-text/lowdown/Manifest
@@ -1,13 +1,7 @@
-AUX lowdown-0.10.0-dont-install-static-lib.patch 467 BLAKE2B dcf6e7e61025248ad62af0534a9a04d8f113889ab8a909f746e26928733c243c49bafff41eeac0fb618bd49ceb980998b41c54b7ac62790868419e3e384a1d21 SHA512 9d4ba6ed91376b9013c6104d1157721efcda390471d9b89716573a74f73167d469ba23769197f7c8ea8f534c34920f1329313660579722f85f53291153b22cd2
-AUX lowdown-0.10.0-linking.patch 1569 BLAKE2B f69db3407a8175fcb7f267a9b7328c7830cc01589d71405e528f8cf96270c2b17bc607de21ecf88afd2b9589fd71e60fa3f19c82f35bc3cc65273cb7e49f330d SHA512 a50e9a6e1461bcf315c6ac05d6a1896b21d35e4ee25e26f925fb21dfd347a74d95ee45ba2a0373557a8245e2c608b34018f041d3fb70aa49927568408da524ca
 AUX lowdown-0.10.0-pkgconfig-libmd.patch 309 BLAKE2B 617d3af07f0414fce674573e48f86f541f3b6c6c6b1649d7ba4302b0817fa8a8edf0beb1d0628c7deb79eb64934089b8ae9ff8f50171f3e94cd93427464a9c59 SHA512 f40f0a04deb70708b3059ccce394cbb78b8ba6020db4df62533abe1d3d125e1372947a5c249b9aa9a655b9b67f3f448a8963fe53fbd7d13c87b637143b36e9b0
-AUX lowdown-0.10.0-shared-library.patch 1847 BLAKE2B 42d32a96aed20ac8419805c4d5e3f3ae5bde9801121452fdad68d085c618c22064770ebe6b021d25f104557c149a1f1e279873987400161b5a57e9313023a36a SHA512 dafec418078bdc9ca047fb69e299a5508d2be12f7ce37cd34322ef7d415031cb8db7b8f688f1f5d100398672eccc7cecd0de290fd748252655a8813f9ae2991d
 AUX lowdown-0.11.1-linking.patch 1330 BLAKE2B adffc64357e84d9f6ef82b4c85e0c7302995304859c20c5dc1c6ab3f4c32c0aca4d4c5739f43515386f00f59e4ab58a2c9d3e9ffde15a338bdcc210de5ab9ad5 SHA512 47c44d73eeac0a7b607c16afe8a24e9ee9a75672e90119cc63d577bd39db69d1dce8985a90535504f33eb1ea39728a175bcedd718730cf47fb822a0a0169aea3
-AUX lowdown-0.8.4-configure.patch 770 BLAKE2B c91c27b9d7a33435515214ab8701ee0c5c2ea79b074e4ba8f96d57d0ced14ca77a918258cdbcb60b6ad9522e14f298b707b69aa70aae3e89b9b061c91905da72 SHA512 b768fade94fc2369e75d4c59b13cc2a053c3edf8502e246abd0a90123a9483f2160ab470c2c162cdf439dfacf4fd184751a069d6b008775f6ffa8bf4eba85463
-DIST lowdown-0.10.0.tar.gz 547397 BLAKE2B 93d87e3aca2466398a625750b928062fbafd26311899e52ddd8264218675e78d30714c920f3331619fcd510a92cc6046401c946f5bd1465d6fd46f26937318ac SHA512 7454e618607628ec0a1649f44f5ec64f8778ecaa151f6aad4984935e297abfe8e84ffc321d3c93cec5d336ff14b6bf9a0ff9054e7363cc58ba708a5b60db9048
 DIST lowdown-0.11.1.tar.gz 571320 BLAKE2B 28fe8cb4f164618be602770c602f3ce51c0f0e765fb9869b82cb29c50bdbe0fd92c09c10074d8968108eca59096d7e176531eb56cb2b40f1d9c00a3f944e3b8c SHA512 5a8ca9d731171b97daed7a9095bc4206d2bed9095fa267eb9270782770247743f1a096c5235fd301320418c37a478fbc71552ade105eba0e756ff687835d4efb
-DIST lowdown-0.8.4.tar.gz 520735 BLAKE2B dc66b92f285b186ca83b9fad1cccfef9b395233ef56756e9ea9071b5502cd81dc6ce2d67d7ef265dab8953010af0907cd76125cd4442cfbfc2bcf8c63e097809 SHA512 cd46ead69ed038bf3ccf848b784327d66c78dd8adbc9ae4bfee660b9b1e52844ac8c7ad0377f8f38a3fee0d2e523f979a22d6b547c7964304accef0951cfca34
-EBUILD lowdown-0.10.0-r1.ebuild 1090 BLAKE2B 86a81147c8526d853cbe6a685ba7dba5457c0c806703f56f08926e2f11818ca3d741b530d12ac5cbf3016ccc77767bca42edc2abc8d16ec366eb1738d5679172 SHA512 14362d2ad669c06bfccf72b11cf1731d7dfe38a3467a3df7d20a8554b8c78c048f57b473027000a5510128d1307973683f400336ad94bd232398c60959c104b4
+DIST lowdown-0.11.2.tar.gz 576599 BLAKE2B 579a5257a0c37882c1b5269d8196a974b3ac73be146ba424a129c9421091c462769f065350ede1b8437371141c17c24fa5ac4bdc65f393a92835d6e981c5b181 SHA512 f49ba1358a6de9ab792cf1fb7586e0e326b8ba9a153c234079825534cbdc2d10b6af32d5612b11490b97dbd6c0bea10a79752bf1ad7e7d8af871aa20332fed9e
 EBUILD lowdown-0.11.1-r1.ebuild 979 BLAKE2B 203bb3e6a99fd8e256c02464a3b015925e0c5a8e1293bd1c16ddad4a463ab1f11718771ba2d722d316bcb17dfa3a8ccdcc04a82aa6e86afa782e66d01deabaf5 SHA512 c7271fea2e918847f42cd24b47d95589e4d37900d433d5d56b178317cfb06647a4674f23802ba3b26ebda67730d4266d659f3359263e3bb93d6faeb6d6bcb697
-EBUILD lowdown-0.8.4-r1.ebuild 793 BLAKE2B bd37690ad0713dd2d74fba662ac26f6cde745eb3ae57b19a44bdf8b9b62f559f3217b16e97848657f9b962627abb58bc42a1ef2c442a6455bea67419e62d8655 SHA512 8dc701ba341787364ae600391f2945d3f4d1fb5a47fdbcfffa4eada6f5a10aedd9b3403876b9f78afec654790822bae3a3cb0976629161b9804b9a0f34248d4d
+EBUILD lowdown-0.11.2.ebuild 979 BLAKE2B 203bb3e6a99fd8e256c02464a3b015925e0c5a8e1293bd1c16ddad4a463ab1f11718771ba2d722d316bcb17dfa3a8ccdcc04a82aa6e86afa782e66d01deabaf5 SHA512 c7271fea2e918847f42cd24b47d95589e4d37900d433d5d56b178317cfb06647a4674f23802ba3b26ebda67730d4266d659f3359263e3bb93d6faeb6d6bcb697
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/app-text/lowdown/files/lowdown-0.10.0-dont-install-static-lib.patch b/app-text/lowdown/files/lowdown-0.10.0-dont-install-static-lib.patch
deleted file mode 100644
index 4a120c32ed29..000000000000
--- a/app-text/lowdown/files/lowdown-0.10.0-dont-install-static-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
-index f13a364..d013a1c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -153,7 +153,6 @@ install: all
- 	$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
- 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
- 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
--	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
- 	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
- 	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
- 	for f in $(MANS) ; do \
diff --git a/app-text/lowdown/files/lowdown-0.10.0-linking.patch b/app-text/lowdown/files/lowdown-0.10.0-linking.patch
deleted file mode 100644
index 1581e94b7c9d..000000000000
--- a/app-text/lowdown/files/lowdown-0.10.0-linking.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d013a1c..c9de4d4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -130,8 +130,8 @@ installwww: www
- 	$(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots
- 	$(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots
- 
--lowdown: liblowdown.a main.o
--	$(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm
-+lowdown: liblowdown.so main.o
-+	$(CC) -o $@ main.o -L. -llowdown $(LDFLAGS) $(LDADD_MD5) -lm
- 
- lowdown-diff: lowdown
- 	ln -f lowdown lowdown-diff
-@@ -141,7 +141,8 @@ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
- 
- 
- liblowdown.so: $(OBJS) $(COMPAT_OBJS)
--	$(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)
-+	$(CC) -shared -o $@.1 $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) -Wl,-soname,$@.1
-+	ln -s $@.1 $@
- 
- install: all
- 	mkdir -p $(DESTDIR)$(BINDIR)
-@@ -153,6 +154,7 @@ install: all
- 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
- 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
- 	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
-+	$(INSTALL_LIB) liblowdown.so.1 $(DESTDIR)$(LIBDIR)
- 	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
- 	for f in $(MANS) ; do \
- 		name=`basename $$f .html` ; \
-@@ -271,7 +273,7 @@ main.o: lowdown.h
- 
- clean:
- 	rm -f $(OBJS) $(COMPAT_OBJS) main.o
--	rm -f lowdown lowdown-diff liblowdown.a liblowdown.so lowdown.pc
-+	rm -f lowdown lowdown-diff liblowdown.a liblowdown.so liblowdown.so.1 lowdown.pc
- 	rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
- 	rm -f $(PDFS) $(HTMLS) $(THUMBS)
- 	rm -f index.latex.aux index.latex.latex index.latex.log index.latex.out
diff --git a/app-text/lowdown/files/lowdown-0.10.0-shared-library.patch b/app-text/lowdown/files/lowdown-0.10.0-shared-library.patch
deleted file mode 100644
index 0adfe762fb57..000000000000
--- a/app-text/lowdown/files/lowdown-0.10.0-shared-library.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit e33536ae131e31adf77d3258c0cdd3da10868534
-Author: Kristaps Dz <kristaps@bsd.lv>
-Date:   Thu Nov 4 12:27:21 2021 +0000
-
-    Generate a shared library as well.
-    
-    Earlier, the library interface was just moving too quickly.  Now, I
-    don't think I'll be changing it much---if at all, unless to add new
-    front-ends.
-    
-    References https://github.com/kristapsdz/lowdown/issues/45
-
-diff --git a/Makefile b/Makefile
-index 475f780..f13a364 100644
---- a/Makefile
-+++ b/Makefile
-@@ -118,7 +118,7 @@ REGRESS_ARGS	+= "--parse-no-autolink"
- REGRESS_ARGS	+= "--parse-no-cmark"
- REGRESS_ARGS	+= "--parse-no-deflists"
- 
--all: lowdown lowdown-diff lowdown.pc
-+all: lowdown lowdown-diff liblowdown.so lowdown.pc
- 
- www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
- 
-@@ -139,6 +139,10 @@ lowdown-diff: lowdown
- liblowdown.a: $(OBJS) $(COMPAT_OBJS)
- 	$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
- 
-+
-+liblowdown.so: $(OBJS) $(COMPAT_OBJS)
-+	$(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)
-+
- install: all
- 	mkdir -p $(DESTDIR)$(BINDIR)
- 	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
-@@ -150,6 +154,7 @@ install: all
- 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
- 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
- 	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
-+	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
- 	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
- 	for f in $(MANS) ; do \
- 		name=`basename $$f .html` ; \
-@@ -267,7 +272,7 @@ main.o: lowdown.h
- 
- clean:
- 	rm -f $(OBJS) $(COMPAT_OBJS) main.o
--	rm -f lowdown lowdown-diff liblowdown.a lowdown.pc
-+	rm -f lowdown lowdown-diff liblowdown.a liblowdown.so lowdown.pc
- 	rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
- 	rm -f $(PDFS) $(HTMLS) $(THUMBS)
- 	rm -f index.latex.aux index.latex.latex index.latex.log index.latex.out
diff --git a/app-text/lowdown/files/lowdown-0.8.4-configure.patch b/app-text/lowdown/files/lowdown-0.8.4-configure.patch
deleted file mode 100644
index ad7bcb69d631..000000000000
--- a/app-text/lowdown/files/lowdown-0.8.4-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c2e2715..4fe977f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -143,7 +143,6 @@ install: all
- 	$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
- 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
- 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
--	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
- 	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
- 	for f in $(MANS) ; do \
- 		name=`basename $$f .html` ; \
-diff --git a/configure b/configure
-index d1c16ab..941f185 100755
---- a/configure
-+++ b/configure
-@@ -92,12 +92,12 @@ LDADD_STATIC=
- CPPFLAGS=
- LDFLAGS=
- DESTDIR=
--PREFIX="/usr/local"
-+PREFIX="/usr"
- BINDIR=
- SBINDIR=
- INCLUDEDIR=
- LIBDIR=
--MANDIR=
-+MANDIR="/usr/share/man"
- SHAREDIR=
- INSTALL="install"
- INSTALL_PROGRAM=
diff --git a/app-text/lowdown/lowdown-0.10.0-r1.ebuild b/app-text/lowdown/lowdown-0.11.2.ebuild
index c0a7c32c57ec..203b145ffc66 100644
--- a/app-text/lowdown/lowdown-0.10.0-r1.ebuild
+++ b/app-text/lowdown/lowdown-0.11.2.ebuild
@@ -19,10 +19,8 @@ DEPEND="virtual/libcrypt:="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/lowdown-0.10.0-shared-library.patch"
-	"${FILESDIR}/lowdown-0.10.0-dont-install-static-lib.patch"
-	"${FILESDIR}/lowdown-0.10.0-linking.patch"
 	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+	"${FILESDIR}/lowdown-0.11.1-linking.patch"
 )
 
 src_configure() {
diff --git a/app-text/lowdown/lowdown-0.8.4-r1.ebuild b/app-text/lowdown/lowdown-0.8.4-r1.ebuild
deleted file mode 100644
index b517049ebd47..000000000000
--- a/app-text/lowdown/lowdown-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="VERSION_${PV//./_}"
-DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
-HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
-SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/libcrypt:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/lowdown-0.8.4-configure.patch"
-)
-
-src_configure() {
-	CC="$(tc-getCC)" ./configure || die "./configure failed"
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" AR="$(tc-getAR)" $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
-}
-
-src_test() {
-	emake regress
-}
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index 996d907e13c7..2830ea00b3f9 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -20,6 +20,8 @@ DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST clap-3.0.10.crate 190580 BLAKE2B 0286717f1bf5315ee97809d0fd7dc860b6b82b83b6fdbd5c5477420bfd7d783583320ebff3548b13b0d7f8f399b11598f9a6a1cb670db0169ada31dd886e0129 SHA512 df152686241d9298b7f0838ad8151bf09a57076105af90ea6cd161c730f7ca978c9046dd3fb34005e0c8b84227bd768e3b5f8969a2cc28b158c84e69892a870f
+DIST clap_complete-3.0.4.crate 22317 BLAKE2B 2f69d411c6c41a8ef584cb58014310e0d1431134ff0721972d71ab0e2c9c97b8fb35c3145fd1e43375c69a174ee5f327cead3331107ef31d65ef216bb3c72b58 SHA512 87c8ba56350f0e1a7dc7a453b93e8ade77186cbe123dfbf01bb5b04995f1c3d960b564f8ea1127eb54f19e511a7a586836b2d3e2365892f156e684972359a307
 DIST cpufeatures-0.1.5.crate 10419 BLAKE2B 77e0eb2c8b1b638b9812ebb3a1ac5c48b9c2f7690fa9ef7a9c14a49a880958c2a39afc00e981115078bec98725e4f76eb338465935017958caf5922f3f124933 SHA512 700c31a677867df05c69ab098575c66d4d9f2de077431f938c1e0036492e00e876e6c563b705e22cc82c937fa01049b42d577c9b4c84ede4fee774ac30362478
 DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
@@ -88,6 +90,7 @@ 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 memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
@@ -107,6 +110,7 @@ DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a7783
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST opener-0.5.0.crate 12350 BLAKE2B 5992f6d564ae14b609aff2d0415c4d7414a8cafebdccb9ac0b66056cd2968f346d63855d8251b153414115c6c8d8cc91134ab53d6b714df78f2c3c858b22cf8a SHA512 4a9be4d280cc5039d080bfaa318b47a80dfa930f3e60068ca10346aeac421abc8575d7eef3649061847e24ad3a6262fb58ab183f6f2704f429e9674f392c30a7
+DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
 DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
@@ -131,6 +135,7 @@ DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffc
 DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
 DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
 DIST pulldown-cmark-0.9.0.crate 115000 BLAKE2B b627deaf477b27eabb1086f2d4b81450e8d9247c6fb931514e87c9d7b49850bb38bf4aaa8738cf6a74214f00260804c0bbd001e3150c8cd3bde1edd07c173eaf SHA512 57151704ea4e46138b5712d32a67600569615886d7b9f1329324bac2e26ec5cbee3a3db1634348b485bc39e8ccd4531ece3ae377efcce9a4b8e128cdad9792bd
+DIST pulldown-cmark-0.9.1.crate 114955 BLAKE2B ee295f4b65dee11c0b39054a4613cbfa1058a8dce05dc298bacc151e049dbe3f05b1739205ac345a98e70662187932d226c0d0667974b3c6a6f55882b566564b SHA512 466d6b4ceee89e1a8c71ff7ab8fc1000e7ef1d9bd22193a152358e1dad28c0c1bbe619caf71106d74eb376805dbfd2b888a0626c8c2851bd814d348873843306
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
@@ -145,6 +150,7 @@ DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350
 DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
@@ -153,6 +159,7 @@ DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764
 DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
 DIST select-0.5.0.crate 60423 BLAKE2B 96520bd4ce08fdc86836aa7132b92578668795926747900a52d382c8a3fc27a491d9f06454bdc0aa3acf69de20849bb67311be3021a629041a46ae5900b2b232 SHA512 f76fcc87dcba0e2b2804e82e12f744c2a7609080e85dcc6c3eb65ee470ca832d693d3e206c72241d2155112701f0c96a1716f4b666f2e0118b245ec55032d043
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
+DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST serde-1.0.129.crate 75300 BLAKE2B a6f1a7df810f3232da585bcff86a7905785f82b2c434a87e2ae7e5cc0dfa8aee2dde47b301fdea17ee885fed54698c607a1334a9faef1a83840b9b111668ba6c SHA512 7c520bd5d9d5ba05c4b696413ab843ba36b22b0a4d8bdb2883eecadd2f69153fa90f57689f861ee5c9ac36536698b7694837cff45c615ec4892fc6b035c25482
 DIST serde_derive-1.0.129.crate 54697 BLAKE2B a5921822dbc1761ccf5e5951f60f27e4d2d263491cdddc870acd8cb069bf3194be9099911edc161bc1b037bb4c0551bf8918214d13b52cbb94ab98675dd5b672 SHA512 f4a418a5431a4d9b47f5555e485a81485bc7fa050fe137f8145ac02615cb21ea6d06ffa88e8f2c404341885e51f45750c273382adec1eea20bff9ea7a18b85f7
@@ -166,6 +173,7 @@ DIST slab-0.4.4.crate 15725 BLAKE2B 54f3d5e4e76aee03d52f25e2927c03c10d89fb7ff62d
 DIST socket2-0.4.1.crate 41364 BLAKE2B 6b1ab3dc342a30467a9579a2dea338e3f5e2a73745f68cd65ee4f34cec390ad67794d2e32d21b01675ed6ce2136c8faa07ea7b8e262a5848cc9b1320e1e53a2b SHA512 71eb3e8d15cf4e88f801d740230710b5b52ff1434526c0e61e950168979ee715dd8acec217d1a5d6f50fa49536558ef94115902f936302d81737eb163db4b8c4
 DIST string_cache-0.8.1.crate 14423 BLAKE2B af0c9b9f52a246d5537ac2831be6aea462ce253b086baf6fb1773f760d566ba70917b686c2c732f60cff4c30068c5800b7c26f73763e9ef825b2fa619f6a7c00 SHA512 476aa99da2d83de7eabe68b3dc2d064cb549e2caa2b708459f883cc0a8f27bed1b1607abb1481959cc26046cfd4c44886bb87bbef5aba95a195a9d850311915b
 DIST string_cache_codegen-0.5.1.crate 8243 BLAKE2B 3ce7bd89edfdd58260fb58e7b954eec503dab2562d13274f401a0af5f7e5152a660298e9884f578e361557225c67c80c0342e5c71d47aad7ec43a47ea91c617c SHA512 c3aeb752cbdbcb78cee6156b726264d182e77b3d6ac89066c366d87d8bdffc32d83e6e59a40471f07d7c827717db25fa6fb489dbd3a650f2fc252a7c85f4ecae
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strum-0.21.0.crate 5296 BLAKE2B 6910f08a5dcbbe6008b777a2948a8f01ca18d30be76ff6a89dcfcb28b05353a860fc1b59412933b9c54b9ad424a1366e0b81773e38b04e9a5f9a038b2d1bf082 SHA512 687a99aa93616e16510213b66f53be35561d19cd19f9776084e9d6d33f8576f5eec7a806a0e48997da2b41e6f563a05424c1d5cb5ab2b4a2310cfe1d3b10a5a6
 DIST strum_macros-0.21.1.crate 16280 BLAKE2B 48e4eb3f5e5431684a4688feb55cbf024a810b39df37fa869b4d417bf16c245c3eb901fe2c544da206f1dd4a3c2e62653b4080a9dc02eb446c6795225b34d857 SHA512 85ea12f8e03f04c427b99e027065279bd559ea1c51532c6f35cc842218e350e27349258f0fe25f5efc9fca047387da3ec5d670f94a50d574b15f4b5f1c99ddea
@@ -174,6 +182,7 @@ DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1
 DIST tendril-0.4.2.crate 37138 BLAKE2B 444fd1ac19fa456075534123f73774f95f36b296afbb4b1e82a6c306971928c851dd663ab6baf09cd20f65b06e7ad46a726690df19bf00c3dddd164420b815ae SHA512 84cce485442a2e1ee6f8806a20dff038b1ff446d22ecfc9865c9ec8bcd209afe0748c7dd31f89c45cd5fd98e34abc1faf3c7a21b6d4bd5863e53d295bb700b3f
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
@@ -217,4 +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
 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
new file mode 100644
index 000000000000..d8ca08e385d4
--- /dev/null
+++ b/app-text/mdbook/mdbook-0.4.17.ebuild
@@ -0,0 +1,257 @@
+# 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/pelican/Manifest b/app-text/pelican/Manifest
index c16a359bca46..433fbbb238f9 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,4 +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.ebuild 1432 BLAKE2B 7bb5c272ff4c0c5b490bc16e8f62b2ca2a4f3abf36fd014a3830c401641c48b888624ec72accbb47493ee97115013e03e7b603680d3799e553e5704135678383 SHA512 4c2c6c48c9c1b75277f71cb9a4c452f5e313bd0e7d073004ee8cc96c6e9b426cabacc484a3350e3a60bdc709c99bfc3f450d038848fa4cc5b0d7b025b704bd3b
 EBUILD pelican-9999.ebuild 1422 BLAKE2B c60d1e169af3170ef94baa62be09d7d089de05c7f282c7f69461530ad9335c894ae020d05a024667e6c16e86663924edeeff6df6b0bdb1bd668dbccdb0379e1f SHA512 bf0b1881f75b42c9db16b7b8604b8e0f2543d579b78033ddb0292cf2dd21fc64e7000211d2dfe127202f8231483035a7c1117e6eace2194150b026f299188269
 MISC metadata.xml 521 BLAKE2B 3ee9aa732c04e18344d408fb83ae7da1b4b6f93f1ea9ac00fee4c71e94b8cc2631b3b5c3341ecb4f4402625a3d1666af9e295b1b669fa5fac21aab76d82061a5 SHA512 291638d6a7a59b65bb49016a85177864f89bdbac17f3b4fe8341ccb4c876bb935520e949ecc592f6cd7fd5de57397319b7e8acb2ecd62f823a77e0532a3ebb58
diff --git a/app-text/pelican/pelican-4.7.2.ebuild b/app-text/pelican/pelican-4.7.2.ebuild
new file mode 100644
index 000000000000..bc44f2e4f3c2
--- /dev/null
+++ b/app-text/pelican/pelican-4.7.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples markdown"
+
+RESTRICT="test"
+RDEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst )
+
+distutils_enable_tests nose
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/samples"
+		doins -r samples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 475d37b3a19c..f85eca5b2b1c 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,5 +7,5 @@ DIST poppler-22.03.0.tar.xz 1809940 BLAKE2B 0307e9225645b289105fe5a55a712ab821a0
 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 3338 BLAKE2B 28fdcef00e520a468f0bed2c6a82e2aafcd78943ae1e7d6c2e03d1a3c3be2e26412ef8f6f19e99d3add9b51de90f71ccc449e65cf5ed5277a35ae3f7ad4a1801 SHA512 1a2a060803939614762adcc8c2ed956e559c0a72cdb854e8b71df82307e0424e4b57962ab519f59aec5691429840b477521c502fe942bf485f94d50eb3e43918
-EBUILD poppler-9999.ebuild 3338 BLAKE2B 28fdcef00e520a468f0bed2c6a82e2aafcd78943ae1e7d6c2e03d1a3c3be2e26412ef8f6f19e99d3add9b51de90f71ccc449e65cf5ed5277a35ae3f7ad4a1801 SHA512 1a2a060803939614762adcc8c2ed956e559c0a72cdb854e8b71df82307e0424e4b57962ab519f59aec5691429840b477521c502fe942bf485f94d50eb3e43918
+EBUILD poppler-9999.ebuild 3338 BLAKE2B e6b2e92da3b5125500df25ba41f8502b8db04304c01d78fd2165af5b208b65ed137d293bee4540a3a10a81f373f41dd694da912a6c432fde906ac110204690d1 SHA512 4fabe5c0d0139f82b5d4561870a2ace251cc41cd74afb6381ea7b51824c5d6081e4135cfc9181d75bb5edb7213b1b469770481149c78c2819922c1daaea4fac5
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index a1d70422f692..68361e6ea96e 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/119"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/120"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 2ca165b7a819..ed54080ab386 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -16,5 +16,5 @@ EBUILD qpdf-10.5.0.ebuild 1887 BLAKE2B 61a270a2743e608c1d5131774d30b0aec81338c8d
 EBUILD qpdf-10.6.1.ebuild 1895 BLAKE2B 82efd2fa7f5a6d4057c99f52b0511567292b3f9c2d2d90e922bfe3004d7789c8d0c5bd7f8d6535c692162d0792765de4da41b7aef4902bb21a9c51382d6c362c SHA512 87a392c575c22b987e5a62f9889231a986264cb5ad7df080640e88e7101b69c4fae5155f14ec0c6c6316e29d7d003e65bab7ebd9767924edb505446a4fd898b3
 EBUILD qpdf-10.6.2.ebuild 1856 BLAKE2B f491e4961857ec4f4dc54852268f12a1c057b128e620ad242eaa0f691f58ced77bb0f113761b45c2c0b44ea6448cf091a5cfb99d2383953ca7a42d70767add78 SHA512 256fe8e5016f57b9c8ebbd36aa7c9c5e9cc85cdd05cd0dfa3c23510b4e985dbcebd173078ffef5a25f2f83a46349908fed79393d848a6803aeb8cc83d2c97ca0
 EBUILD qpdf-10.6.3-r100.ebuild 2277 BLAKE2B 80acb7e8284309501aad91a7f972ebf714951d6ac844935ab87f6367899d52912ed77f885f54ec59b6b686a10794fcf79ad0b1ad48c42d4dcdd0fd4e8f756ba3 SHA512 713f71be6278aa4e87aac0bf484242e250ffa759d8aeb63e6792e19bf40bcc013c62a52a5bedde86b9f42f6f307a9c5db0c5b206c23d8a8b2da5da5bd4d9f359
-EBUILD qpdf-10.6.3.ebuild 1851 BLAKE2B d54e544b356fe154fbd1cfabcf897883fd864dfe29de44750b7d25ec2efcd9213ccbeb0e12f02d2632152122f38adb325759c23587c9455bc79e17b67182d984 SHA512 1952a07b64d8b1eef90ab628f265463d75d3ede914353e11793e90acaf5a46eeb621198887426eac5c62ba73862875e59ee9dfc3d849fc2d6029aa616e798579
+EBUILD qpdf-10.6.3.ebuild 1849 BLAKE2B d84d248aca4af325222ed79c53f4af262a4da35165b900b0d55252c3cc469a750c52d77e03486744e849209ae07664cd0328bb376e80dce16e24c50dea89dbf1 SHA512 1b40af7fb811c5ec9c7ac9441a7a5472fff0a4af61d78bc510d10866b92fe9986d8ba1497fc5eb1f75a7b5881ae9ef01d80fc7373069b1ec746904fe23716dce
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-10.6.3.ebuild b/app-text/qpdf/qpdf-10.6.3.ebuild
index a0421758bb94..0c8ead682288 100644
--- a/app-text/qpdf/qpdf-10.6.3.ebuild
+++ b/app-text/qpdf/qpdf-10.6.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples gnutls ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 3e55495ffe67..36ea4b5b9fe9 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,5 +1,5 @@
-DIST sigil-1.7.0.tar.gz 21315598 BLAKE2B 29f7c682925d1e1bbff082e96b747ce32df82d78406ccd984b4f8de1f01944c35aa86587ce47a18687d5fe281b8cb656085b52d3a1e72ed17862501121d9d134 SHA512 9918bb0bfbe3d068c95bb31cd84a37a0fac6dd6be9e94cb382e8c0140cdb375f47384f33c62fdff7f27aed379037a4a64e8d4a1065ae297bb389e2be78597c16
 DIST sigil-1.8.0.tar.gz 21217901 BLAKE2B 78615652859d1f61bab18b1b248d342dc6892943a2310659859ab577981c4452fbaeb567758097427453c8dfe95e42b499616a423b5c11b42238f763ac0653c8 SHA512 1a911aac996d3519f501820f8da9c810db9793063e481a6169288d402ef7e6b797308cf7ca5517162d0eb4d80f38f968627bca676b724ea5be5109c427473c95
-EBUILD sigil-1.7.0.ebuild 1854 BLAKE2B ff67b41ebc8fb7939753b212070cd6cc2ebc15800e647b8988f01f8ec0c96c9b282b3694fc446918380921ef211d81c14ab1d677b7e1607c3b0c9548eaaae058 SHA512 2daad4895f948c7c946d3e20b0602f6486d816bc48f06b2d3f621a6b6144b19bb1e6fb02921212fe8aa192ff3b203bc989265ead5d4eda039c30293172521dd6
+DIST sigil-1.9.2.tar.gz 23225656 BLAKE2B 410b2cf1772158aa9b0d499ba54bb7fc176c479acf7e9f48c5113a4e253becab35b6b4aeaa83da249d7c36f824cb1ee9b7a2e95e29c023b37afed9e864f94134 SHA512 fd6a71ce3b05b08651476f86a166d1ccdbecca31b19ecfa31c9d18ebe4daccfd69cf51d687686917c401f4b6e26cc6a57dbae5f9b1d8ba49fe08ccdd0bdf75d7
 EBUILD sigil-1.8.0.ebuild 1855 BLAKE2B ff3a7e71bcfce93086fa4ceb1d37b4ea4cf25c01a92d3d4da1de7a2fdad2e5ac214f5f90e2caf96ac95e52fa8a298775993ed4cc71a621f2bcea6de56860b445 SHA512 98b95e6d8c2ad6db9c536f9e692670ba9040a556f4355456c328d5442b1eb213d5911b162897edfdb28fec4499af4a1c052cdd8f355ce30acbc08a392f0c07a8
+EBUILD sigil-1.9.2.ebuild 1903 BLAKE2B f6b1799bdd0e4a6ce0585615d34fa7ba63d080f1b6e43dbf37c7fc4c2164c91ce6302fcde09b2a85c10bbefeee62a763a09333f232ec659f358296a4eb941795 SHA512 5b220ed03c48801f925e0626520aff8c9c8fb263a66a758f42c171bc0c1d9b45fa1ef84184bcd4e16717c6be69271bdab254616f58e3be75e4f0d01c9cd8b0fc
 MISC metadata.xml 810 BLAKE2B 9790a33fa436de084e57410b5fea4fc477bef40dafbc9b0467b0b01a27dfcb9b6874df529f5e0ecc1aca5e48fb07adde0b3a8c99fdd1ff1bd14f6877ecfedc98 SHA512 8b0c12e38cf8516e139bc1277062f0499148b6eba417e9c65389dd5aa8fdae9b967cffbe066f5e3bee5ed11d2eac2d909c782dc3b3f1432b3f4515adb04acaf2
diff --git a/app-text/sigil/sigil-1.7.0.ebuild b/app-text/sigil/sigil-1.9.2.ebuild
index 56f93e6b73f0..312a494a7dfa 100644
--- a/app-text/sigil/sigil-1.7.0.ebuild
+++ b/app-text/sigil/sigil-1.9.2.ebuild
@@ -1,9 +1,9 @@
-# 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_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="tk"
 
 inherit xdg cmake python-single-r1
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -53,12 +53,15 @@ DOCS=( ChangeLog.txt README.md )
 
 src_configure() {
 	local mycmakeargs=(
+		-DTRY_NEWER_FINDPYTHON3=1
+		-DPython3_INCLUDE_DIR="$(python_get_includedir)"
+		-DPython3_LIBRARY="$(python_get_library_path)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+
 		-DINSTALL_BUNDLED_DICTS=0
-		-DUSE_SYSTEM_LIBS=1
 		-DSYSTEM_LIBS_REQUIRED=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DUSE_SYSTEM_LIBS=1
+		-DUSE_QT6=0
 	)
 	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
 
diff --git a/app-text/writerperfect/Manifest b/app-text/writerperfect/Manifest
index bb9a0f8c8ce3..87dbee04b1ff 100644
--- a/app-text/writerperfect/Manifest
+++ b/app-text/writerperfect/Manifest
@@ -1,4 +1,4 @@
 AUX writerperfect-0.9.6-gsf-buildfix.patch 428 BLAKE2B e141a4fb1a4515d1359d314dd066fa52edea3f5d69f14e06e08a8eef110a57b164011db311b9c6f0d563d7ca6e921d4082e6a61c6ea1d3a871f6d0dcb8049d71 SHA512 9446e3826173909177c091c752666a540aa5edf26aa0e7546b2e7520d64df5e8f4db578e79e6e86fb261118bcadc8f620bd7eee36d5d335812a00151c5dee5bc
 DIST writerperfect-0.9.6.tar.xz 330360 BLAKE2B da566fb8e1aae3708646b49b695cf26c5b64aeda1ca1df08ced2549ca8718840744ab011cb7567d1e371ac8e7ee6cfef6a67ee9837cf38b570a3794dc4682f81 SHA512 4a86a23ae2caa133066279994255d8ca7ee16f40ad646bd8ff434c7e4e1a29cf23db7e811b8eca1823dcf9e2456b2e8dbacf03bd5bc0377638fc52fc7d4495a5
-EBUILD writerperfect-0.9.6.ebuild 1942 BLAKE2B 3839bd4c54dad8cf969f5b00722a72d8161156679a198cdd73da03918619506789242cb5c88998fc5ad70587aff669a4c9e65697cdb5cbcae356690ca64e7edc SHA512 9463cde1539f9aa2485a35e69288941366d5b7d63d7ae348cc3409aad8946a9046ab9fa2e9437a483e967bd94e91de76d7176b4338a062f31ac987aa32791b35
+EBUILD writerperfect-0.9.6.ebuild 1949 BLAKE2B 4243745ba578fb634b53222b9073bf2e878b0ebd6995a730b9b3bf093b78313b66fa0d49a2819951a4b6b1fa311bce3ee4522e067110987e8dbd9d1d7b8d852f SHA512 67f0a8ef7648e646ae50e5c20b1255447ae46317923a98e8b9ec4dc82cb6f9635e2f60422b15c11de892e9b81f1fd2fd0e72dc692903afb04a046ca6d3a1a3df
 MISC metadata.xml 1793 BLAKE2B 65e352545bec3b9834f095c0ceed1f88e06668a887da40f413b40664d0d9dad0e8cf62f81130c0ba10f60a16a019030a02f6a655075509c64e89d9fe523be23f SHA512 3532c444e64a6e664eb1289091b2cc568f6c0f9f22191427c8c1b77713c29b13f7796db20bba598b4551106382839166ca8834b07771bd12a7b2d43c49f4fd52
diff --git a/app-text/writerperfect/writerperfect-0.9.6.ebuild b/app-text/writerperfect/writerperfect-0.9.6.ebuild
index a9f43a1e673e..2b9e931375ca 100644
--- a/app-text/writerperfect/writerperfect-0.9.6.ebuild
+++ b/app-text/writerperfect/writerperfect-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~riscv x86 ~x86-linux ~x86-solaris"
 IUSE="abiword +cdr debug ebook epub freehand gsf keynote +mspub +mwaw pagemaker qxp +visio +wpd +wpg +wps zmf"
 
 # configure fails if no import library is selected...
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 633412178e08..4aa689975ec5 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,13 +1,9 @@
 AUX zathura-0.4.8-meson-0.61-build.patch 814 BLAKE2B 692fa4e525d8ca5bad33e1e36a288832509da06399db895f53235709db2367e4011a58d6b6632ee8850677619e6cf8a8d419989737af4cbfc6b6ed04ed8ea83e SHA512 ebf7769d5775f60e57521bdbfbc5a749c584ed706dc0f28d63ec2b6de6e5324a1835ad6f66827301a8ccedb3f2e4b6d60822c0176d63a52173b37fbf36e8f5ce
-DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
-DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
-DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
 DIST zathura-0.4.7.tar.gz 199857 BLAKE2B c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f SHA512 adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60
 DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 70916ac23624b8e55b39bc2b9329fc5d992d3e2e3989b17bebf0f8b1bcb26ed943c15866c0b37e0a4a29fee7c264d6309bf1d036d770817e13a14a13af7499d7 SHA512 00d7b735154ff0e857f8a0a21c24b3fbbff8c166d93a34bee725072ee00f2870adecb956e9445334be2a84827778bd874cc1d4bda7f8b32e4468ea3784834b86
-EBUILD zathura-0.4.3.ebuild 1334 BLAKE2B b8887cbbf8b755c44d79bf4c517ea4c6669566b5576584cf5f6b20fd918ef53ca36ec8918608070548556978a776fa80873716c108e32be0e252f9acc350ea1b SHA512 c9a38f2029607e41eac29b14446028eb6969317360039add7b3d7d8fa9add0c3fbba40d900053db498c7d0e6e83af67f6aec774259a2bb7613f6901631b7bb39
-EBUILD zathura-0.4.4.ebuild 1347 BLAKE2B 48da5928fb897cb42e2d76dfe24b4d6b55aefd8fd336d41af466b00a01dd75d59566f0b1d9a57d982ed94d543f8862f8205979e2bb2c084b162c77219b9dbe2e SHA512 58a2e7db42b483c922412a74bd47e938355ce828b9aa172c1a2bfd4a10690892101641fada3ff080cbdd0ca9dc8e491768ac114ab36a7cb560061b830b393d2a
-EBUILD zathura-0.4.5.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
+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-9999.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
 MISC metadata.xml 769 BLAKE2B 417d92ddfcbc7c2352a79c4275022515fa0bf31b7c06058bb29452f7e15882b59ad3d2b92a2aa8063bb54120377e028449c0e253cd2aeab719a92e4853a3eea7 SHA512 9f7284f67e9bb6b454670393431546685ede815937bb06f7a73ebf25c9cbecca734a8e09753ffc803f8f44ce3a67002c59e31d98bce6185b4237e5d499e3165f
diff --git a/app-text/zathura/zathura-0.4.3.ebuild b/app-text/zathura/zathura-0.4.3.ebuild
deleted file mode 100644
index b73544c83c5c..000000000000
--- a/app-text/zathura/zathura-0.4.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.2
-	>=dev-libs/glib-2.50:2
-	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo[X]
-	>=x11-libs/gtk+-3.22:3
-	magic? ( sys-apps/file )
-	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
-	synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-libs/appstream-glib
-		dev-libs/check )
-	virtual/pkgconfig"
-
-src_configure() {
-	local emesonargs=(
-		-Dconvert-icon=disabled
-		-Dmagic=$(usex magic enabled disabled)
-		-Dmanpages=$(usex doc enabled disabled)
-		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsynctex=$(usex synctex enabled disabled)
-		)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/app-text/zathura/zathura-0.4.4.ebuild b/app-text/zathura/zathura-0.4.4.ebuild
deleted file mode 100644
index cccc28f4066c..000000000000
--- a/app-text/zathura/zathura-0.4.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.3
-	>=dev-libs/glib-2.50:2
-	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo[X]
-	>=x11-libs/gtk+-3.22:3
-	magic? ( sys-apps/file )
-	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
-	synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-libs/appstream-glib
-		dev-libs/check )
-	virtual/pkgconfig"
-
-src_configure() {
-	local emesonargs=(
-		-Dconvert-icon=disabled
-		-Dmagic=$(usex magic enabled disabled)
-		-Dmanpages=$(usex doc enabled disabled)
-		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsynctex=$(usex synctex enabled disabled)
-		)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/app-text/zathura/zathura-0.4.5.ebuild b/app-text/zathura/zathura-0.4.9.ebuild
index 08b6a2a8e21d..c368be85b53a 100644
--- a/app-text/zathura/zathura-0.4.5.ebuild
+++ b/app-text/zathura/zathura-0.4.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit meson virtualx
+inherit meson virtualx xdg
 
 DESCRIPTION="A highly customizable and functional document viewer"
 HOMEPAGE="https://pwmt.org/projects/zathura/"
@@ -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 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
@@ -23,10 +23,10 @@ IUSE="doc +magic seccomp sqlite synctex test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=dev-libs/girara-0.3.3
+DEPEND=">=dev-libs/girara-0.3.7
 	>=dev-libs/glib-2.50:2
 	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo[X]
+	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	magic? ( sys-apps/file )
 	seccomp? ( sys-libs/libseccomp )
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index d027b7b3d39e..8fa12fd6554a 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 398 BLAKE2B ef8965041b1ddb5dafacd8d3b913c2c272b50460607018468446993062620044b77ee4033d9811979768aafba6def9b3e06775d48f8f194f7ca95ec6ad048c5c SHA512 5a67ca8cbadcfa83e38f983b3e448073970e71f2d2a3c0756d8cbbe54050382095df564bdd5e52b0976a9588f882d814a71179957e09e429a2881a7f48041e53
diff --git a/app-text/zotero-bin/zotero-bin-6.0.4.ebuild b/app-text/zotero-bin/zotero-bin-6.0.4.ebuild
new file mode 100644
index 000000000000..831f9a1eb8cf
--- /dev/null
+++ b/app-text/zotero-bin/zotero-bin-6.0.4.ebuild
@@ -0,0 +1,73 @@
+# 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 || die
+	sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop || die
+
+	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
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
commit	e68d405c5d712af4387159df07e226217bdda049 (patch)
tree	009ab0f3d427f0813e62930d71802cb054c07e30 /app-text
parent	401101f9c8077911929d3f2b60a37098460a5d89 (diff)