gentoo resync : 25.03.2022

27 files changed, 792 insertions, 55 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index bec273c14803..45c70767f2f1 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index abbb88a91eeb..f7863f2e83d3 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,3 +1,3 @@
 DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
-EBUILD bdf2psf-1.155.ebuild 678 BLAKE2B 8004a9359bef3f975bb70aceb4e1bcdf417b3b5e475606f4cc7846b724bce95e96b0d7d56932cddc04fc09439a41573837e1008dec38946b0f88750189203cab SHA512 2b65c85a5682775b3b5e89528ff961a805bb6e09a5f0cf70760cd69201bbc4737c5d0f7323acddbf3cc264ee104d2c9ab14357c524305781db0a71058b963e77
+EBUILD bdf2psf-1.155.ebuild 685 BLAKE2B d841255d52e658998bfd699929d9fc40b3a2956f0498292ccbe04d60908749fd208d8e2075c733694ae3756ca21e663e0c1c55e06400e116a8b92824f383d7cd SHA512 de7a1cdd6208e62369d4d574b4260d284c7dba2ea86834f6139fef6161f5a7d3f2ac967e8fee0a9b320ce4e998806e6f70146052319e534c2c2adf6d73e7a6b9
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155.ebuild
index e3c04746c942..ecd93be01bea 100644
--- a/app-text/bdf2psf/bdf2psf-1.155.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.155.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=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 8be175c439e8..917f571cbd40 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -10,7 +10,9 @@ DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbc
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
 DIST calibre-5.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
 MISC metadata.xml 304 BLAKE2B 0d93b1c7606c37cb8b7308b507a1d2988a05f780a93ae80c98e021f5af75128954d57b102afc1d96728872c81bf0adc40e32b31197dfa825cd040af3a8739fb7 SHA512 e193c0b78ed4140b695c44d273310207c9f2f745bf31589c69e81230a9eed68fa1c361c1e3f68a60e135ef0628aa480002229871f4a50f4000aea6df7e5f067d
diff --git a/app-text/calibre/calibre-5.39.1.ebuild b/app-text/calibre/calibre-5.39.1.ebuild
new file mode 100644
index 000000000000..a9f64cfe2e57
--- /dev/null
+++ b/app-text/calibre/calibre-5.39.1.ebuild
@@ -0,0 +1,316 @@
+# 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/dblatex/Manifest b/app-text/dblatex/Manifest
index 1ffa196c6f40..6a39617ef54f 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -6,5 +6,5 @@ AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f1
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
 DIST dblatex3-0.3.12.tar.bz2 1693272 BLAKE2B 9310ce5db3b5f92e183f2656c5b1881edaf0208ae4f78f853332c844258fa38d443921fc42c03301773b1451ce272a538c305d765acbdc6eafbdcf25ebf5d2d3 SHA512 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
 EBUILD dblatex-0.3.11-r1.ebuild 1828 BLAKE2B e8076d8450189cf9d9dac43bcb0c8f1659da8d8e83ae7c73b8c3829e4dd95e7c8b7016f7c67060ac5fa32dfcb83c29197a33facf4f070224379ff0c5f4ef8c61 SHA512 a967e261d36f2e05a030a7fbe18956e4bdf01acadc6601182347af035b477ce4812ce106fc6dd28e82b0a86c08a25abed5eda29f867d44b152daace7ddbd8eb6
-EBUILD dblatex-0.3.12.ebuild 1746 BLAKE2B 3833a415e1eb17abe794d08d2a116f3c007aefab8636b342586b3a82a67276d6ae0058b49038c54102900e09868241896091e4fbbd6b18da84d7c3b1ec072525 SHA512 dacd041c351cbc1cac238b504d2ad8b1dc6281d8bf795622fedc821956762c7a27c92b8cbdaf71934727ae74af0fbbac9b6dcda30c63eb648bbd952a55a21035
+EBUILD dblatex-0.3.12.ebuild 1752 BLAKE2B 37ded2992b94b95bd62b8f55ef1a2d99248ba584ddb56704434d63a5a4cc4037ec0aa1967cf587f98fa433ee338887314686340874206b552acd137a4131d598 SHA512 a9e1a539907ee30891dad0b8fe3ae437feb95909713af941479263f07d1f05deb59aa3389f2540baed4baa624b1241df85afa6d0f0fda56241b4c568ec8d7861
 MISC metadata.xml 897 BLAKE2B 69cf8c98f3fac7953dd17d5c07a9f9fba7fa37b695278c1be26c876853544cca2cbb709e0ba77738b486dc9e1d8cead92987bd2d1d0397863c3bd0666686c4fe SHA512 b5c063210953d13518e480063fbec129e69c4123e035a0a39e5618baa03508c29963afe3b18b8b0424cca747a4484f06a18d717bc843f0bd2d5c9307317c188e
diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index cad3460da6c1..17da88fbf400 100644
--- a/app-text/dblatex/dblatex-0.3.12.ebuild
+++ b/app-text/dblatex/dblatex-0.3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-$
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="inkscape"
 
 RDEPEND="
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 3c8d542749b6..7ca74e8b4b63 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,5 +1,6 @@
-AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a6816326a17527d91b68d481d23ed3ad982211c07c412a61157d17cecafa591cc80482ec22abad3ce29101068bbd5 SHA512 703d9b5ca4e718660fe5af2d59a60b3187beda965e3a7b6eeaf1f7bf61013f3acde54b0ba89c8b493b1f0b1950cd52893ff1fb00a74c6d97645df29a1829902c
 AUX 41.3-fix-build-with-meson-0.61.1.patch 1385 BLAKE2B 70740f1424234b056537cd2781aed5c9b114aa6eaa629d48a24022de0a6ec789630a8ab32b8451655b049e3b55db88895654cdd78cee89d4d91858cb60237a47 SHA512 588b93f599b31cd80ada5b599b267ba9eced928b3b9597c43dc1319f41996df056704860cbf7ebe1815b0e91ffd467fb019d7ec64eb09f08d1a969fbea55f46e
 DIST evince-41.3.tar.xz 2889368 BLAKE2B c6ef9b4c126f938ef8b50aa65d8591e0ce02e7404dd1984bce27e0acce6e62462d42665ad19992cb2fa22afd09d6da49ecdbbb51eb209518d415966824523628 SHA512 b00422ef0fd752e5afacea2db852ad71d8d16514945a9a54c54967cecd2b1f5058b762ec53eb9057b8f583d5e1e3363c2b7ae1f4434fa6637ad45c5217f082cd
+DIST evince-42.1.tar.xz 2850652 BLAKE2B 4fb03270caf1be548a82f9094973e584807c497171cef960f344c14158420e02a0fed6d84dcc8d09d3a7f2e8a68f69ffae36398fe6e747d86e3a63132d5a36d6 SHA512 d8ea086b6530c186ac48d88fa2546cd8abd8a075d79037c1f0bf76e63b28914b04a58af83c96e44e04d625fec674f3989bfd51472cd458be9c903a1a4512d8df
 EBUILD evince-41.3.ebuild 3094 BLAKE2B fe2c2043c253f814971a5b969362ee476888cf84d77aa3c2c3fbe9739f5c0bbca71fa4e299443b37b3cd50a915a0cb23dc515ab9f589f36c3669283d810250e5 SHA512 8e433656bb0a3a0906a70e76face51562382024dabb7354114010517e6134cd25fe46f1a0def22d748445730273c58db2ba22f8c57731cb12a95cdb264cc7950
+EBUILD evince-42.1.ebuild 2985 BLAKE2B 87fee16941d147f814ec070aafbe49511543d52a2e7002f18b81e6808603f2af6762567a53e3094fb5ea8094b2042dbf5b1a95a364e613b4027351ff9b895def SHA512 f0f2767ed97610288c524e6724c070ca386d6261138660eba4778676c7b124c2781f73591d41b63954ec25c56018d067e664e20ea097d2af23ff5b97bc179c58
 MISC metadata.xml 882 BLAKE2B 5a52fc8a3986b5a07774f6b157e0c13b3c29a6f5d9bbbedba6367a0dce8a057c6c43ac9b2864a98ec4413e66365971935e4f111ae2be0d2430769f3fcb2b5047 SHA512 73a18d8f42a94322d8292b4ace3bc256dd170af87f160f9e33c12c3b5c76c2032beebbb7eaf9facd2f9d9ee8d669f0f5f805dfeef5c406f75f13f90105521f9f
diff --git a/app-text/evince/evince-42.1.ebuild b/app-text/evince/evince-42.1.ebuild
new file mode 100644
index 000000000000..c8e4f7b17473
--- /dev/null
+++ b/app-text/evince/evince-42.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.44.0:2
+	>=gui-libs/libhandy-1.5.0:1=
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.40:2
+	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-22.02.0[cairo]
+	>=app-arch/libarchive-3.6.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		>=app-text/libspectre-0.2:=
+		dev-libs/kpathsea:=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-4.0:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10
+	)
+"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gi-docgen-2021.1
+		app-text/docbook-xml-dtd:4.3
+	)
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddevelopment=false
+		-Dplatform=gnome
+
+		-Dviewer=true
+		-Dpreviewer=true
+		-Dthumbnailer=true
+		$(meson_use nautilus)
+
+		-Dcomics=enabled
+		$(meson_feature djvu)
+		$(meson_feature dvi)
+		-Dpdf=enabled
+		$(meson_feature postscript ps)
+		$(meson_feature tiff)
+		$(meson_feature xps)
+
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_doc=true
+		$(meson_use introspection)
+		-Ddbus=true
+		$(meson_feature gnome-keyring keyring)
+		$(meson_feature cups gtk_unix_print)
+		$(meson_feature gnome thumbnail_cache)
+		$(meson_feature gstreamer multimedia)
+		$(meson_feature spell gspell)
+
+		-Dinternal_synctex=true
+
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/evince/files/40.0-internal-synctex.patch b/app-text/evince/files/40.0-internal-synctex.patch
deleted file mode 100644
index 8c45548c639a..000000000000
--- a/app-text/evince/files/40.0-internal-synctex.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ce976d98317535d17d8aabd67729918a94b24cea Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 12 Apr 2021 23:07:50 -0400
-Subject: [PATCH] build: always use internal synctex instead of automagically
-
-We don't have a separate synctex package and would have to pull in
-all of texlive-core; so instead of fixing the automagic use of it,
-just remove support for external synctex, as that's easier.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index abee124d..63c5040c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -251,7 +251,7 @@ config_h.set('HAVE_DESKTOP_SCHEMAS', gsettings_desktop_schemas_dep.found())
- 
- # *** libsynctex ***
- synctex_dep = dependency('synctex', version: '>= 1.19', required: false)
--external_synctex = synctex_dep.found()
-+external_synctex = false
- 
- # *** Mime types list ***
- mime_types_list = {
--- 
-2.26.3
-
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index aa8a06300919..a1c2c97eac2d 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -4,5 +4,5 @@ AUX jabref-2.10-test-jvm-props-args.patch 1846 BLAKE2B 1d278c20ecfea4923d4e28bb8
 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 3936 BLAKE2B b028c2117e2c2981244e69e74e2bd0541509cb2a4bf0b038917698ebac17e195714e88dd41a15483df9cbbd1b58883059ecf90d1a3e8625ffc2c6eb10bfaca62 SHA512 7822d3e1ca3b43e493811dfe6d5ad713912f48658fbc775ace264c3cfa34915c244f61a419c5712de117f61fb1c835d6bd7e9c1ca8f895c6da83fa8a20ce7101
+EBUILD jabref-2.10-r7.ebuild 3935 BLAKE2B 202a442a9381f6e6544db4a31b7b4564d8ca8195de7fe5031b5665b58e3d56ecc7d91aab90a2fa32485029deae3c0efabd8f41363c3d145e29eec9bf7cc5b3fa SHA512 6a5a2910ef854042621d86505aa3b842d0c3ad103fc5f393cf4751e92e88edb27736996041f9fa858728657a641080730e22523528217d6d6c3c3a5174ed9ee3
 MISC metadata.xml 538 BLAKE2B 42838a006f22851a46a0327962db710293807bf0a88ada771d14a55109d4b304a3c128547d9e9fcbf98c7d7f4807ce40310f32040109d7531f22c5f2cf93e050 SHA512 6023ce4d2b7ce8165511cc356dc99fcfb2b6f6c16064ea64558c96d83973ae8dd826b8b4a0fedac134f4609739d15fa981a444900b4b281d2f4c85affc5a8087
diff --git a/app-text/jabref/jabref-2.10-r7.ebuild b/app-text/jabref/jabref-2.10-r7.ebuild
index 852b9fb5305b..b2b35d23a70c 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/kjots/Manifest b/app-text/kjots/Manifest
index 11e071388f30..d80cd7216045 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,7 +1,8 @@
 AUX kjots-5.1.0-akonadi-21.12.0.patch 8215 BLAKE2B a192b70f325a84423b88144fdb5dc70a07b10c84cb0feb8faf74859fd1668f97db6972841bad74e313afba46c09cd2d882297cc72b1c8c00e9b5dfe68874fb75 SHA512 5487f7ea196479a64e72d8a8fe2f9f7ba7ed60c3932703795f0698325c737d08aff3c63d36ef60a9c66f2660f6c5318239c493db926d50a98df61256be0b9f65
 AUX kjots-5.1.0-implicit-dep.patch 983 BLAKE2B ca6a6b7b8e72aa0729d3e7ca9d5ecdf24673ef33ef8b752dd5513b93fd25d4b6c1adebd8a8b238d29d04c2bd6802f3303d968effed54d16dca30d6a96815fc11 SHA512 7c68f0807d764222b5b4b8114d4cbd7bfc4922d735b1a12de621bed943d666a4fefbf17ce7ea43eb6cca029cb77b1fb7d217279b3be1cb5a99a3db0f5fc530b8
 AUX kjots-5.1.0-missing-lib.patch 683 BLAKE2B 719f3c4ef39856c33b683f4c7edca664f89510f6b1f21ffd2ca285eb63db4b729c9b2091c704452adbda326eaef61ebba9b3ccce643548c1bdd2f3044687af92 SHA512 c87c741b036b5958faa3a9c892be469ea73e8809807da8f000fc55ae4219996731907d458cacae3f08eb0c3fb8d40e391490f03047dbfed900a3253bb46536c3
+AUX kjots-5.1.0-speech-optional.patch 2921 BLAKE2B daa773ddf2c40dce83891a3afc35c209343d2e9a71673dce669132aa998fdfa225eab03fa8df0bcdd0a1c9694ebfa117c4fe9da129b63979aa37fe797a74edc7 SHA512 a7f4b30b04e1bf6bc403a9baad213d92f96fe147b7f5a279a2f19d3f0758714dfc3c99bbeced7bea6bc2a36e3246407152e4e276c162ade88f1de71fed0b2af8
 AUX kjots-5.1.0-unused-dep.patch 1423 BLAKE2B 154509cafb0c5822e5ceff10513967e3899d474fb471bb312e0686d6e2875d57c5a7bb8b7392efb211c74f0d31e274a62643998132bdcfc09334ffb26c78c1b7 SHA512 ebad6d5f26af8ca1c55302f9a2fbedcfb70f07bf09cfc8fa4446bdac7ac9ec182523659701e35a69d559772e65786958d3ef434fef4bdf9d75420b5c41241269
 DIST kjots-5.1.0.tar.xz 184972 BLAKE2B 28bea486bcaa552b7463f9a2132230d5729ade7a2eadb06f66f958c660117bd3a1976d6da14f1339abfbd39930708fe77ae923042a0bc8ca59bf074e409375ae SHA512 71c30e0810157cf3d039e683d368cfa9fa3ec88918eee2d85477a9eb9f073af43dfb2318957019f35503d484e2521289bcb043ff9bfc2822eb900a2f5b8d5d62
-EBUILD kjots-5.1.0-r1.ebuild 1415 BLAKE2B a1e6a7c83209627ec20b9f6a9b470964dbbb2d94f09e3950c11b6d7414538592c501f09f0aef808c87fe8f4194b9627a92f8759af47a534292e73719fd022e73 SHA512 c6708d59c260f9637d3fe653629810a94b564145c0d076d743aba934fc8ad008e8aeaf79d1f895ce3df0f49764b300a8afdfcd76bcca12ab7acbd7c5592fa7b7
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+EBUILD kjots-5.1.0-r2.ebuild 1488 BLAKE2B 14a659b4a2e627fbeb9112ea16568dcf459ccfecb586aa59a2f4b9d6a552503bce68b8061fe9b28200fc36a54475d7b4c884931f100a6ee4141dfde39c730c44 SHA512 4ef7c7e3753bb342042cc8c933bd488b35b620d1ab1d3f591caa3aa57b06a7cd403839881319e3ff3bec475406258c5678d0404914052032d39cf1a065cecce4
+MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/app-text/kjots/files/kjots-5.1.0-speech-optional.patch b/app-text/kjots/files/kjots-5.1.0-speech-optional.patch
new file mode 100644
index 000000000000..95c3309bd5b9
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-speech-optional.patch
@@ -0,0 +1,82 @@
+From c552b158e46ccdefc5c8382911aca907e177d63d Mon Sep 17 00:00:00 2001
+From: Igor Poboiko <igor.poboiko@gmail.com>
+Date: Sat, 19 Mar 2022 15:44:50 +0100
+Subject: [PATCH] Allow compiling without KPIMTextEdit/TextToSpeech
+
+---
+ src/kjotsbrowser.cpp | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/src/kjotsbrowser.cpp b/src/kjotsbrowser.cpp
+index fd6e6dd..8864f79 100644
+--- a/src/kjotsbrowser.cpp
++++ b/src/kjotsbrowser.cpp
+@@ -15,9 +15,13 @@
+ #include "kjotsmodel.h"
+ 
+ #include <KPIMTextEdit/RichTextEditFindBar>
+-#include <KPIMTextEdit/TextToSpeechWidget>
+ #include <KPIMTextEdit/SlideContainer>
+ 
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
++#include <KPIMTextEdit/TextToSpeechWidget>
++#endif
++
+ #include <QHelpEvent>
+ #include <QToolTip>
+ #include <QVBoxLayout>
+@@ -37,14 +41,18 @@ public:
+         : mBrowser(std::move(browser))
+         , mSliderContainer(widget)
+         , mFindBar(mBrowser.get(), &mSliderContainer)
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+         , mTextToSpeechWidget(widget)
++#endif
+     {
+     }
+ 
+     std::unique_ptr<KJotsBrowser> mBrowser;
+     KPIMTextEdit::SlideContainer mSliderContainer;
+     KPIMTextEdit::RichTextEditFindBar mFindBar;
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     KPIMTextEdit::TextToSpeechWidget mTextToSpeechWidget;
++#endif
+ };
+ 
+ KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr<KJotsBrowser> browser, QWidget *parent)
+@@ -56,11 +64,15 @@ KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr<KJotsBrowser> browser, QW
+     d->mFindBar.setHideWhenClose(false);
+ 
+     connect(&d->mFindBar, &KPIMTextEdit::RichTextEditFindBar::hideFindBar, this, &KJotsBrowserWidget::slotHideFindBar);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     connect(d->mBrowser.get(), &KJotsBrowser::say, &d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
++#endif
+ 
+     QVBoxLayout *lay = new QVBoxLayout(this);
+     lay->setContentsMargins(0, 0, 0, 0);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     lay->addWidget(&d->mTextToSpeechWidget);
++#endif
+     lay->addWidget(d->mBrowser.get());
+     lay->addWidget(&d->mSliderContainer);
+ }
+@@ -129,6 +141,7 @@ void KJotsBrowser::contextMenuEvent(QContextMenuEvent *event)
+     popup->addSeparator();
+     popup->addAction(m_actionCollection->action(QString::fromLatin1(KStandardAction::name(KStandardAction::Find))));
+     popup->addSeparator();
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     if (!document()->isEmpty() && KPIMTextEdit::TextToSpeech::self()->isReady()) {
+         QAction *speakAction = popup->addAction(i18nc("@info:action", "Speak Text"));
+         speakAction->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-text-to-speech")));
+@@ -137,6 +150,7 @@ void KJotsBrowser::contextMenuEvent(QContextMenuEvent *event)
+                 Q_EMIT say(text);
+             });
+     }
++#endif
+     popup->exec(event->globalPos());
+     delete popup;
+ }
+-- 
+GitLab
+
diff --git a/app-text/kjots/kjots-5.1.0-r1.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild
index dd1910ad60f6..a948d3a45db6 100644
--- a/app-text/kjots/kjots-5.1.0-r1.ebuild
+++ b/app-text/kjots/kjots-5.1.0-r2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE=""
+IUSE="speech"
 
 DEPEND="
 	dev-libs/grantlee:5
@@ -30,7 +30,7 @@ DEPEND="
 	>=kde-apps/akonadi-notes-20.12.2:5
 	>=kde-apps/kmime-20.12.2:5
 	>=kde-apps/kontactinterface-20.12.2:5
-	>=kde-apps/kpimtextedit-20.12.2:5
+	>=kde-apps/kpimtextedit-20.12.2:5[speech(+)=]
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -50,4 +50,5 @@ PATCHES=(
 	"${FILESDIR}/${P}-implicit-dep.patch"
 	"${FILESDIR}/${P}-missing-lib.patch"
 	"${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580
+	"${FILESDIR}/${P}-speech-optional.patch" # bug 835128
 )
diff --git a/app-text/kjots/metadata.xml b/app-text/kjots/metadata.xml
index d925f2439758..fa80953797d0 100644
--- a/app-text/kjots/metadata.xml
+++ b/app-text/kjots/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
+	<use>
+		<flag name="speech">Enable text-to-speech support</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 3c3adc8cba7c..2ca165b7a819 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -6,9 +6,15 @@ DIST qpdf-10.6.1-doc.zip 6850012 BLAKE2B 866bfd1261f392b9e666a948c4002a625952950
 DIST qpdf-10.6.1.tar.gz 18518114 BLAKE2B a51e856cf6af380845b30a396d2f4a73ddc2ea6d85ce29198744b781556782d9b9e02a3b575c2f94aa1bcbb5e94818e8a4d7e19625258032b09f2e5d98f6efca SHA512 01bc02da2e389423d575053f1460638efb0af069bc63cd898b958e7105990c21670a281c834e3d72846542c74f2bda083f1cb786b4599332fec5b817934e44df
 DIST qpdf-10.6.2-doc.zip 6850957 BLAKE2B cc287e7b5dee4829a150b536ae2f092a1773fd7b1449ef7c249893cde756b82e503579149c4907f9d7f268de1f34c393d02ff96fe071641f55f8d6c33e164a39 SHA512 aecce306e334f172b9d3beb3f1a0d56eb8e5066682fc549741c1c5db2f0390b050f55fb97a9f2bd5efc48fc5c654dde0b14772c05d22ee6605ca9231f8b28bff
 DIST qpdf-10.6.2.tar.gz 18524447 BLAKE2B caf5b0c683c26ace1afbd83c454a4a787bbf49ac08d1ace8652e57866fba3f0f2e05b97ab36db59db78c5dbcb841935ddbd2fab5e57bd92c33e1eec776e83d1c SHA512 87a76c5e199b9af9744114120649f80aa271347262646c1b4a3c6008668f8a5ec215f6389a1f3202a61904f1ba74db442df59132f5090555b29ccedea60481f0
+DIST qpdf-10.6.3-doc.zip 6852725 BLAKE2B 407b5994d3c3f80f71e60da12ebecf2c977fecb9e42be1aef32586b7b743bb62acc9662bc02fee174f9738f3e4e43e2769a5df415ae4bb9fb80f16b9d00cfd0e SHA512 780c25df78bc0360a17de85b0701f2e929677b02989d47c6e26b57749dd2315bb21511de9d8d40670a4745254c5c17fcf1c649233be1a0255b5a661f5dcda61b
+DIST qpdf-10.6.3.0cmake1-doc.zip 6894533 BLAKE2B 7c14f3de5225b90fd40ba8200b076c937d431a8dc5064d3ceb308c7d42f3624fe85ada7ed5661b7f3809e58ed8f6d3e55417782ebd6842cd9c60f09f896ce658 SHA512 b6a43476887371039922691c14f40be5d69230868c8f0c49555fb163ba339a6cfbebc7b140bf90d27e66e0fc864e69d8ee08d737ef2edf893447b5e49ee59920
+DIST qpdf-10.6.3.0cmake1.tar.gz 18241584 BLAKE2B 24231d6d5692052d1d4de74e2ccd150fa65efbdef94d2ea0823f9ef569ba7034f3b801ef3071d9d82da57e8c76952a215235190b6b5153b18646d582463ac0fb SHA512 27a8317eadc02370875ecb0f9c1d90e38c1538cde5f58d8a698891250b92525e26c6d523db595bf1ec675d5ddfe215a7483ff67f70febad5e14c808d466b8736
+DIST qpdf-10.6.3.tar.gz 18573584 BLAKE2B 3b6ee845163ab6593ba3d85e8563e4f56f57a831e2bf67fd3a2ccd19aaca47af8c50e03dede233380442384e5bb8fa3fc317a8c54732d2cf3bdfd7d152210a4c SHA512 c584b7443984b0f28eec2fbff054096b9a14a10858dda0c6b370d7a19e34c395ee15a8dc0770d3d85773281cd79944f029fb3bfad55833a2c32ff7e1a751c149
 EBUILD qpdf-10.3.2.ebuild 1251 BLAKE2B a6c12b3178f671060f2c01633ec3a6b0de3343ca9087998ca54a3364f06ae055d442595ad173057c936c55024cb90b81f170d09259f2d14b7f82aa414c7701df SHA512 84fe44d555383379f59fac01481619e3282ee334e862ba16df186f58ecf73ced5a6a1877e2ac8519ae604850910c07133b4e1cf60be0caeb29d129e81cb7e8c2
 EBUILD qpdf-10.4.0.ebuild 1247 BLAKE2B e769fc2ee7cb79b7311f193ef3cca6d2733255f24ce4c1d854ce0f7d4a2c6c49a9d7c4d351be4faff5d76ad098c3f144e54130699c6a307551af0e8196a2de4b SHA512 e5642af4915aaad62124c6df5c2bb8d16d5006c0e84166b4ee9cd37468bcc34b71d8cd556d7b84d2d2b68b036724a007581dcf1eb53f425d6245a9215bd14149
 EBUILD qpdf-10.5.0.ebuild 1887 BLAKE2B 61a270a2743e608c1d5131774d30b0aec81338c8d3d427d2d5093b57bc671594361b2e10be669b03057f24e50738e1205f1fb03a2dabcef0fd858791ffb8cf2e SHA512 553425265679b4c58a2a0c612cbd3c1ceab7e6031436d1b15297ff9a32276caf3cfb4c478305b0ca0dc0982a65bf0062bb522b47274d92856a86920f4b8d8bb1
 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
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-10.6.3-r100.ebuild b/app-text/qpdf/qpdf-10.6.3-r100.ebuild
new file mode 100644
index 000000000000..1cc2e3c951f6
--- /dev/null
+++ b/app-text/qpdf/qpdf-10.6.3-r100.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake bash-completion-r1
+
+if [[ ${PVR} != 10.6.3-r100 ]] ; then
+	# See https://github.com/qpdf/qpdf/releases/tag/release-qpdf-10.6.3.0cmake1
+	die "Please update the ebuild / be careful with using it, as it's for previewing CMake!"
+fi
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="https://qpdf.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz
+#	doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )"
+# TODO: make SRC_URI generic
+SRC_URI="https://github.com/qpdf/qpdf/releases/download/release-qpdf-10.6.3.0cmake1/qpdf-10.6.3.0cmake1.tar.gz"
+SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/release-qpdf-10.6.3.0cmake1/qpdf-10.6.3.0cmake1-doc.zip )"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# subslot = libqpdf soname version
+SLOT="0/28"
+# Unkeyworded testing version for CMake
+# Do not keyword -- qpdf 11 will be the first released version w/ CMake
+# This version is for packagers to test.
+# https://github.com/qpdf/qpdf/discussions/676
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples gnutls ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+BDEPEND="
+	dev-lang/perl
+	doc? ( app-arch/unzip )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+	local mycmakeargs=(
+		-DINSTALL_EXAMPLES=$(usex examples)
+		-DINSTALL_MANUAL=ON
+	)
+
+	if use ssl ; then
+		local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
+		myconf+=(
+			-DDEFAULT_CRYPTO=${crypto_provider}
+			-DREQUIRE_CRYPTO_${crypto_provider}=ON
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use doc ; then
+		mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die
+	fi
+
+	cmake_src_install
+
+	# Completions
+	dobashcomp completions/bash/qpdf
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_qpdf
+}
diff --git a/app-text/qpdf/qpdf-10.6.3.ebuild b/app-text/qpdf/qpdf-10.6.3.ebuild
new file mode 100644
index 000000000000..a0421758bb94
--- /dev/null
+++ b/app-text/qpdf/qpdf-10.6.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/qpdf/${P}.tar.gz
+	doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )
+"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# subslot = libqpdf soname version
+SLOT="0/28"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples gnutls ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+BDEPEND="
+	dev-lang/perl
+	doc? ( app-arch/unzip )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+	local myconf=(
+		--disable-check-autofiles
+
+		--disable-implicit-crypto
+		--enable-crypto-native
+
+		--disable-oss-fuzz
+		$(use_enable test test-compare-images)
+	)
+
+	if use ssl ; then
+		local crypto_provider=$(usex gnutls gnutls openssl)
+		myconf+=(
+			--with-default-crypto=${crypto_provider}
+			--enable-crypto-${crypto_provider}
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docompress -x /usr/share/doc/${PF}/singlehtml
+		dodoc -r "${WORKDIR}"/${P}-doc/.
+
+	fi
+
+	if use examples ; then
+		find examples/build/.libs -maxdepth 1 -type f -executable \
+			-exec dobin {} + || die
+	fi
+
+	# Completions
+	dobashcomp completions/bash/qpdf
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_qpdf
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 4e0110abe6f4..4a23270adbc8 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -3,5 +3,5 @@ AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6
 AUX xmlto-0.0.28-dont-hardcode-paths.patch 845 BLAKE2B 37618989b609bc7dd2d94d22fad0562d6e0580541d8f6ec2a222316da89a6744a16cac9b4cd446ef80f58cf415f4a784aefedf53349ea85e98cf33000b7799b6 SHA512 9947787a1c3ebbd0a73e271ebab3dfcd01b7aad3bcaa627e7a236947bc7edbc23696c38f96aae62785013e2ac8c5171ce6f386f655676a4cde8d820f49d5df7d
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.28-r6.ebuild 1434 BLAKE2B 0d9830777786cdad0b056f0f9e4b3c60d7dae2c5fa89bcd90e81d9b0e7a538523f5ee918f7944c18179bad04a0eaf581c1bc4f83e40f02856e70fb89c3282987 SHA512 e6e3c76f5a90e308f29f2a2b4cf61f3d5462322c92a6537be718b73e007e5b2ab92d501d4be72580feb4da8a14ba1f75e0bfcb62b3d1f4856e305202b49e7ea5
-EBUILD xmlto-0.0.28-r8.ebuild 1490 BLAKE2B e78ce11b8550451cc51ea21456ec0af754c6d94bc0adc214adaaf0e315e2f7acbd5513fcc0f657ee946f38732c5c085bc5f6bd2dd63f7462e77b9634058d97cd SHA512 bc26bac1a7d1bb90ffdd17c9bf46d4d87413291a6b4ff7b71014681b97a1d5ca3c02dd54875a5b405139bd59df6c4ce7565a347b24c3d01c47ac19e534b196ac
+EBUILD xmlto-0.0.28-r8.ebuild 1488 BLAKE2B 7b0beb595005bcc8593a89ae80867c91c3a1c73821f4f4d35fe5232916ae296dd5114aa4a545801c5ef5d56816fdd4c6714822ded8bc37bf98f76142c9eec445 SHA512 ba8134f8bce0e5b7cae48b7c28ae28a5e4e0969311ecf591c23e1486f8f1941ca9d1f61056572e78a8ab930dbdeddceaa6fc077e6b63ea61e1fd4d0ea094171e
 MISC metadata.xml 324 BLAKE2B 3cabb2600d6843ebecec023a16fef87a40432202ff195a6130e57f97802d4c0ed2e82ffee506c65afe554291f05c64c7ae2fe524c708db7a9c6bf4a71c4c8710 SHA512 19ed2fabc04f96b1b61495e2fdba674ca4b4a9a1cee11b3cb13baec6d9e7fe0d82b653a0cbb523de3fcd4ed1ef18d8111686f8b618db9924674ee274ae5a21ed
diff --git a/app-text/xmlto/xmlto-0.0.28-r8.ebuild b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
index d28ba15e6679..319eaa49c811 100644
--- a/app-text/xmlto/xmlto-0.0.28-r8.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND="
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 102bea1b73f1..1ad30fa8a2c0 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-tools-41.0.tar.xz 38696 BLAKE2B 6e742e0a5c05c07fb3eb80fc10201650597fb36702edb1d9fc022895daf2837daed15a2b69b8bed7aaf0106139c7138e8f13b65b63cf18971e14eaeb0068b061 SHA512 76b8f9568942426698716d655bc2e7a614a26e40a820d1f4ce5021a54c6baa081d494bda06657cfc1c11999e14a8601c97ae51bb3519555b8ee1111489c0e10e
+DIST yelp-tools-42.0.tar.xz 38788 BLAKE2B 9dc34f4b32c9e705f427bccad5ff3c2cd222a1391a780dde145ea894e1065fc873fd4ef020d1b7809b653c8237fbedb7f0b07d684d8d906b7af7a0fd8ebf79e4 SHA512 ff6168a33b2dedd12f7fb5d5aa6394a554b7ad8956cc7121e5f1a520f9fb20bd4cad93e22b5e8b2f8aa82ca5a1711a0634d8619c731e46730084e28f29725786
 EBUILD yelp-tools-41.0.ebuild 938 BLAKE2B fcf0fe7e317d01bebcb1367f6b4fc2a6634031bf699b6f1b3f1dd4466904214f026e12a81cf5090c72ce0593715f1ba8dea4ee597161258c38f1cd46cde3dbb5 SHA512 b510ec02125d500cd606cab89f52230ecbb1339d71c97d4287f66e0583ad7584034cc39af7d987a8d01bb5357819f3dee918ef11f0a303853852f47369d72d8a
+EBUILD yelp-tools-42.0.ebuild 942 BLAKE2B 9c603b683ff08aa4bbe6843fb253e28cb217759a1e285bc617df00da9ea4edab1412c51e86ff841a352b5da449532db5d9dee0dd0ecf2b08f9a0d348d8599a2c SHA512 1ab63b8274adf359b1bd87740b78ec0077b998be4a684ac90945c238210a1ea698ffe2204600affdf7b2cc3e73407ded3e781d5ec933de3e43e789991ca47291
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/yelp-tools/yelp-tools-42.0.ebuild b/app-text/yelp-tools/yelp-tools-42.0.ebuild
new file mode 100644
index 000000000000..24a0d5b029d9
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-42.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome2 meson python-single-r1
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	>=gnome-extra/yelp-xsl-3.38
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/yelp-{build,check,new}
+}
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index d2cd67a980a2..9e5391b66a7f 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,8 +1,9 @@
+AUX zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch 719 BLAKE2B e8fee9b67dd4e3156eb48a69505bb81533751e29c9f05a46c5f93ea069eda042f72a24c4af1f804c28d2058ffe0d6ed646ba8f97610b113069cbadf05c841664 SHA512 a4b4a5b2d207ecd37a05d38f18f1f6a2df2acfaacf7a03fc97b14c3bf04441b3e0caa9aca30551fb4e12e0d41d1c4760d8033fb1c7a6b13dd8475453b59b529e
 DIST zathura-pdf-mupdf-0.3.6.tar.gz 8925 BLAKE2B ee74a1655da7d16070b8909dd0f44239eb21055a40a525b766dc3d9e81f84377abe0623ba33925a25739bccf885f8967496be30c27e421d30b1a78dd64b84aee SHA512 f6783c3fc08849d7dc6fd527b7fcdb51d4ef9214379ca6b4dc6d29e75b10f37e3ada2046e205449a7d0465f07e65a6cf3f2f44fba98360cba16676e705390a97
 DIST zathura-pdf-mupdf-0.3.7.tar.gz 8957 BLAKE2B e25412423ba8ec7c9c96d320129f9a3e71a974a118476f2720a356a0c51476f7c827d16b4fbb00d4cebcd803e75ff34b5e7d5c024db57fae17861c137487e021 SHA512 1e27bcf0fc2eb730e77d3dab7c25575e0ae830ca251f380d740a4b8bef588122d279b2c97a7b75fb749daaf24bb458cd54ec7a11321d75bfb5c1b4b0dc0fccac
 DIST zathura-pdf-mupdf-0.3.8.tar.gz 9198 BLAKE2B b873d3352d4f324d5dfceebe0ca1cd13e5e5b9bbedf89a5fdae553a2d2cf59ece455bbe931fc021310a7be3c765663ef73931016d48abaedaf2d3488f96d0866 SHA512 5742f22fc919af390a8a42f64640c36aaf1499a20d1c6603e70cc47b3f6634dafc94a31bfbb30c88524ac0c18c040f0fd6c63d236dbb556784cb17a9b0446374
 EBUILD zathura-pdf-mupdf-0.3.6.ebuild 802 BLAKE2B 0d21f475acdc3b1db922101a735e23aa981ed6eac5f9998cd9f6c149ffbf4f127a76bff6dd2bb95fc610ad29367f498325de498f259a14ff46a5c8462b9822c5 SHA512 9f9e1d8f6600d6689a8f67d20cfea8a98b2884522e2e213ae48b33b6c229433f2e10cc502b7ee60672ead65ac6385096f812b07318dd4f082faaf7eae8a96c84
 EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 770 BLAKE2B b03dbb81d5570940d90c4f91c755a5c95ff9e09b9932a44e8a0edcad2811762f8ddf20d78fa17dafe91d3e7984c9bbe5f0c9b7cb89032f1d6fee4a1dbf42db9a SHA512 3284605db9a02201670e81ce465bd8c3005b4755114ba2e92dfe76fd60242d5cfaa5ce32bc1ed53f90be60213a5ed7e089db4ae98ae6f81380b5d06e4ec8b6d6
-EBUILD zathura-pdf-mupdf-0.3.8.ebuild 831 BLAKE2B c2f8f64744a4aaa57708745edb3d3256e22f51d0e96643376fb79b3af96e2904000b2a2b0fb5af9123d886da83d91544787e1e29e3bc485b507f3e7e2a33bd3e SHA512 1bafe45d1a7c84105845607d3676c5cfb912d49d1263316d6a1f39eee2315078ff3b52231d9f07a4276cd30aa789e92c75d467c26e5c3453739181d487676424
-EBUILD zathura-pdf-mupdf-9999.ebuild 846 BLAKE2B d950486cfcd743d7eb94028936de5987a8e179fb27b4b7bed7bc777990839b917beaaaf817deb847d7f7397a316940f608e5e7eea7f32b7a40a399a6884a0f5c SHA512 239dfe881f0c965a5e61efae8add848111e2f3734743bf4c66aefce9b1076ec05b4dac92ba64c122358ba50e3764fcda3c549eec629d82e484f0b6223c5cf905
+EBUILD zathura-pdf-mupdf-0.3.8-r1.ebuild 785 BLAKE2B 336dfbe9ca9871b1d71fee5cbd51f6fc769f5b9907c8a00ba61863df404448d127cfe7fe406eb2fc21f1f40bf4651d37a2260584356f18d5b2c62e650f356653 SHA512 92bcb8d41fcaf8c50db35bb4e32c03112e09713a67741acf52897063679251337a5c29ea6fed0d3cfdd0c6f68c3b9911b0017e2b8c928dd01fce3b5a93262f10
+EBUILD zathura-pdf-mupdf-9999.ebuild 800 BLAKE2B 8ba3913b6ba61dbc596710d20d0eac03ff8b9b7e047cb813068967535581ccfce9e090e207c050612e40f349e9ae261cba9946de0b8a1b63ef2df61ef761b8c4 SHA512 67a0f4320d42f8dcebe092ccb71fa3b1e21afd9292d7a7cd549ff6ef7fa79d9a493d61be06996b180787cdcfbd02934685c0ee83f4cf923e7aa3ec302e715bb2
 MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch
new file mode 100644
index 000000000000..9c4de3d0fe9a
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/835592
+--- a/meson.build
++++ b/meson.build
+@@ -20,7 +20,6 @@ girara = dependency('girara-gtk3')
+ glib = dependency('glib-2.0')
+ cairo = dependency('cairo')
+ mupdf = dependency('mupdf', required: false)
+-mupdfthird = cc.find_library('mupdf-third')
+ 
+ build_dependencies = [
+   zathura,
+@@ -32,10 +31,10 @@ build_dependencies = [
+ if not mupdf.found()
+   # normal build of mupdf
+   mupdf = cc.find_library('mupdf')
+-  build_dependencies += [mupdf, mupdfthird]
++  build_dependencies += [mupdf]
+ else
+   # build from Debian's libmupdf-dev
+-  build_dependencies += [mupdf, mupdfthird]
++  build_dependencies += [mupdf]
+ 
+   libjpeg = dependency('libjpeg')
+   libjbig2dec = cc.find_library('jbig2dec')
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild
index f77ce12d862e..439355423fb1 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild
@@ -33,8 +33,6 @@ BDEPEND="app-text/tesseract
 	media-libs/leptonica
 	virtual/pkgconfig"
 
-src_prepare() {
-	sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
-
-	default
-}
+PATCHES=(
+	"${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch"
+)
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 657da8ef975a..ee7721ceea68 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -33,8 +33,6 @@ BDEPEND="app-text/tesseract
 	media-libs/leptonica
 	dev-lang/mujs"
 
-src_prepare() {
-	sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
-
-	default
-}
+PATCHES=(
+	"${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch"
+)