gentoo auto-resync : 22:10:2024 - 04:04:46

31 files changed, 701 insertions, 267 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9a4c73cdfa28..142a8fb1f8ac 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index b362e8452fa7..ddad3561cccb 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -16,8 +16,11 @@ DIST calibre-7.17.0.tar.xz 45053400 BLAKE2B 93149c4fab7a25e1239c4b8c72b766e5ffc7
 DIST calibre-7.17.0.tar.xz.sig 566 BLAKE2B c041904919ef300f51ba7363daf7d2bc70fc8bb819ffef157e53c28f91b9716be56b1e95465180ecd67069241a5810b70ac08027f4837426a5426792fab05e49 SHA512 af88bcbf394ac6ec68c40d661545a17e956b31dd7797d1cc8490e090437206902a64c7a642cf1e34184e379c79066843959e1459eb1836bddbd615febbc85c07
 DIST calibre-7.19.0.tar.xz 45057708 BLAKE2B 888ddf4292b8c8931c811eb78d6e9b003139545947f2b7bf63fcd96d96caa050a0f93a30ed0313ccf9b4ebfb25c2df1be7f2806d5117a870d1ac34ad29669e39 SHA512 b1225d6d403a8c4dca321c108d270aa79cf65a450f7db90a4e4df5525e8c1c6eb06b4a2492de7b691f6a1a85ce09361dc3796311c46fa082d6e82829827022a7
 DIST calibre-7.19.0.tar.xz.sig 566 BLAKE2B 35a9f8987f0dfad0a14843f3db61f8b3442692dafdf9d253ed13c2071b7e8d9d4cec8012dad4b59b30013fdda790967cf42594a29c6a9a2a668bccda72ac2e72 SHA512 836a0138ed46b179fefe78bc678f6f8146fe5d8a1eb9111f02bcc804d96253281c918cc4ad7a3a860a3177babac9c6fd4b2e417361e59b7245d19bfa50f3f739
+DIST calibre-7.20.0.tar.xz 44795188 BLAKE2B 2ccb7fcd5acdf9f627d79f5656709a7eddee7545dd2c8a95bbb7d2dc61fb26dcf8c34c3c2d6b1514fdbb6b4d7c3fd3e98be72c778026c7b2bb4a42651c5e664b SHA512 3b6e2d4ed8d0755096b466f4bdcc8b6ca4810398caa2322c1efc30280680ff8b10dc5fb8cb763bed8fee82746e7c51c6f31f56e5d9689d5f43c671442004c532
+DIST calibre-7.20.0.tar.xz.sig 566 BLAKE2B 4d89a7781eb1500969ca75ddf01890bbfea6ecfde4e7173f062be6546e898f68a16e0ff7a3d76e5e17dc0abca617d381de24e18e72f4f05b5965b051f28e6cab SHA512 62dc9964c3a30477e22f832148fdaa57860559e2aaddccff107b37c399854ac3ca84097cd7072c2ee4e57403c7ed17286469f31f6efc3d790f63f438d9c78c79
 EBUILD calibre-5.44.0-r5.ebuild 8978 BLAKE2B aefccace3b939a72817f8c9cf36f4687d492af4ea84f8b588199dab1134989ebf030ddcf7609c834f4ea3b313dfb403e50af8c5e007309f0b3aa6e036128706b SHA512 63cadd04ff3ffb9b2d27fde04caf7caf43f981dd012cacd36569efc305db15aca09ddaf1875308368a8001e6b047cf44f55ff6a513d9d03428963fb171d4c45b
 EBUILD calibre-7.16.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d
 EBUILD calibre-7.17.0.ebuild 8155 BLAKE2B a060ef935f07e432387deef0774f3c9fe7e59e5d3a5e24280dc81f72e3e8dc8c1b25cc74d47bf6eb4962809996723772c88bb7b5b403e72a685f3d2a66f3c82c SHA512 c36e49975799de79a76f3bb18e3c6c3d200d719f6ca3a842109172afeb99793a23bb7867428b535ee93c135f926427f651c90ecd8a0ec9500ae1e9972d87668a
 EBUILD calibre-7.19.0.ebuild 8279 BLAKE2B 1e64819eaf366034eee54a940cd1c0babd6c52e33b963a06f150976b9f21daf8a480884ea9b4ccb5807ec2703028e87b46226b4510538f47a9f2e602b35fb682 SHA512 c7feea13639800e5cc07014d6b6abfe956e533c99235c959ada18ba24b882bd7eed246d2c204ae20e65ac0ad397211b9a3c6b642b51d41c3a08a81dbe545271e
+EBUILD calibre-7.20.0.ebuild 8301 BLAKE2B 1bfb0d59a8534d9ce75582ea3a15229e971ab0ef581e080001f4b6e87c765df586ace8f8441df1f627b70269d82e4e127c29cf90d0d232a743d95f51942334d7 SHA512 4f2f7b69a309bd20984c9b4f2c51e69cea140d1e7ab22ff97fbf8a0d8dfc07113573e0780fcdce131c5133dbc53c6e30132551d4062bb914610fc024a9c5aafb
 MISC metadata.xml 745 BLAKE2B 2e1e831d9e6a1f32596b4544a7237c020e2c027a3e872fc517e2557bd8b1be6d0ddb0335f5266159c0e0fbb8776e8d048916e716b77cd011da14bbd51779922d SHA512 3d0ef51069731cac8f751af461367d74151df517cab48c0fd66f1c3a2fab1d3a92f9a06118c700dd782fddbe0055bd379bd79f81f2dbb1adcc5b2a22a443e94d
diff --git a/app-text/calibre/calibre-7.20.0.ebuild b/app-text/calibre/calibre-7.20.0.ebuild
new file mode 100644
index 000000000000..f721bd14f670
--- /dev/null
+++ b/app-text/calibre/calibre-7.20.0.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+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
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-i18n/uchardet
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.10.0:=
+	app-text/poppler[utils]
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/openssl:=
+	dev-libs/snowball-stemmer:=
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.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/lxml-html-clean[${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[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/xxhash[${PYTHON_USEDEP}]
+		>=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtbase:6=[gui,widgets]
+	dev-qt/qtimageformats:6
+	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-gfx/optipng-0.7.6
+	media-video/ffmpeg:=
+	virtual/libusb:1=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	speech? (
+		$(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]')
+		dev-python/PyQt6[multimedia,speech]
+	)
+	system-mathjax? ( >=dev-libs/mathjax-3:= )
+	udisks? ( virtual/libudev )
+	unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig
+	system-mathjax? ( dev-lang/rapydscript-ng )
+	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+)
+
+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's packaging is recommended.
+
+	# 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"
+
+	# This is only ever used at build time. It contains a small embedded copy
+	# of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+	# have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+	# is to build some resources that come bundled in dist tarballs already...
+	# and which we may also need to regenerate e.g. to use system-mathjax.
+	#
+	# However, running qtwebengine violates the portage sandbox (among other
+	# things, it tries to create directories in /usr! amazing) so this is a
+	# wash anyway. The only real solution here is to package rapydscript-ng.
+	#
+	# We do not need it at build time, and *no one* needs it at install time.
+	# Delete the cruft.
+	rm -r resources/rapydscript/ || die
+}
+
+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}"
+	export QMAKE="$(qt6_get_bindir)/qmake"
+
+	edo ${EPYTHON} setup.py build
+	edo ${EPYTHON} setup.py gui
+
+	# A few different resources are bundled in the distfile by default, because
+	# not all systems necessarily have them. We un-vendor them, using the
+	# upstream integrated approach if possible. See setup/revendor.py and
+	# consider migrating other resources to this if they do not use it, in
+	# *preference* over manual rm'ing.
+	edo ${EPYTHON} setup.py liberation_fonts \
+		--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+		--system-liberation_fonts
+	if use system-mathjax; then
+		edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+		edo ${EPYTHON} setup.py rapydscript
+	fi
+}
+
+src_test() {
+	# Skipped tests:
+	local _test_excludes=(
+		# unpackaged Python dependency: py7zr
+		7z
+		# unpackaged Python dependency: pyzstd
+		test_zstd
+		# unpackaged TTS backend (optional at runtime): https://github.com/rhasspy/piper
+		piper
+		# tests if a completely unused module is bundled
+		pycryptodome
+
+		$(usev !speech speech_dispatcher)
+		$(usev !unrar test_unrar)
+
+		# undocumented reasons
+		test_mem_leaks
+		test_searching
+	)
+
+	# Some of these tests weren't practical to split out into distinct tests, so
+	# have a different control mechanism
+	use speech || export SKIP_SPEECH_TESTS=1
+
+	edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+	# 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 # bug #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+	mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	addpredict /dev/dri #665310
+
+	# If this directory doesn't exist, zsh completion won't install
+	dodir /usr/share/zsh/site-functions
+
+	edo "${PYTHON}" setup.py install \
+		--staging-root="${ED}/usr" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--staging-libdir="${ED}/usr/$(get_libdir)" \
+		--system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+	cp -r man-pages/ "${ED}"/usr/share/man || die
+
+	find "${ED}"/usr/share -type d -empty -delete || die
+
+	python_fix_shebang "${ED}/usr/bin"
+
+	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
+}
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index e3399aee26f9..b267bf5f0df8 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -2,5 +2,5 @@ DIST pdfjam-3.10.tar.gz 121928 BLAKE2B 5ff82abba43becb2792ff9e6a13dd3458d4b884e9
 DIST pdfjam-3.12.tar.gz 162802 BLAKE2B d22e78cdb1e0135b2d2a9d1269a7467417a2fd3f984e969434d59db82f94a6575ff12bf814c3f90081e8e08823d68577e43b243fb2f52160dffc9d425fc84f0e SHA512 c801f5dbfb2eebf185734d14974a00c3ca3b8edda349ed7d6e0017ac80136ea10cab7ab0dc77ec1a712f7e338c8c9e58d24d7b8b69a3b2116e0a6473fc0b1317
 DIST pdfjam-extra-20191118.tar.gz 15457 BLAKE2B 3d673ba68a1ee89cec7af0ec7d7fc61c8993b9ae328d3362a6bbbae47cbda2caa2e8f4ecd28424dd894c31d14754228b067389b61fa7845cfe5dfc0e2b5d9b8d SHA512 1d02abb9d81baf6edf3e51e2c7838df191a7a18b4b50518ee1ae3108020a274d7608570654ab540539d3717e51ef10f548c83c3480681bc20c9702280f694b8f
 EBUILD pdfjam-3.10-r1.ebuild 1194 BLAKE2B 83bf506cccd130d6e4c4c8df29b09b43c68e09ed2cf0b97cbf10bbe868c16256bb62a423237b9d8c69e937f361deedcb975506e637c703801bd9e0ccf02791c3 SHA512 853965b0685024e8f68fc621ed81091d883c2ff988d0e8a5be30f8fe6e880ed7a7ab3d719e7e9856a8fc9398c93f6714f283c1104f3b9ac8b199fb5280ecdc52
-EBUILD pdfjam-3.12.ebuild 1197 BLAKE2B 31c63d22b6854102814e06db4565dbd9d977ed574ef80bc59e66f2e5761190a7d72834f755d8cf1bf93b3fd0a8d71688aaf6b29b2af28b4dc0fecc5082941033 SHA512 3fdf911ed17e90d8d92942076e80278c738e6fcbee3fdbcea5bc8910a3147fb54b3665f0e28a3546d5b5a1bfd18de0696c199a4a05e84b34e5e18d158a89e210
+EBUILD pdfjam-3.12.ebuild 1196 BLAKE2B cb80efb18a2e87ad1e6eea7535e6745474c0806dbc194ff3e65ab92052d08e08d6fa125a785c0856fbff1da8db1918597ef2d73ae641f4f97ece482f907a4f08 SHA512 3d7159f9cb26ede6fc6257b426ea23cef4568edf533cf5e4824ad2a99a832d9595a2d42ec5341f0770066e1af4099a2c7c40db94d352431aed97b03349969721
 MISC metadata.xml 1123 BLAKE2B e7fe11916783d7e957d70edf6f5d6b55b011bb68bf712c5df0b5d0ac608f95f9d056c01dd38255b9f46572807d56e8509e895b15314d6086f3cd91556cd226ef SHA512 2c9c0147882455fd4cb707210ba9aef65983ba5929c0ab6bf8441dee8543b6839c5c7221fd01996fe1fd71b619c1f760ea0ff16617761b73339107b8206d7f47
diff --git a/app-text/pdfjam/pdfjam-3.12.ebuild b/app-text/pdfjam/pdfjam-3.12.ebuild
index 084765c1de2c..b936a43cee41 100644
--- a/app-text/pdfjam/pdfjam-3.12.ebuild
+++ b/app-text/pdfjam/pdfjam-3.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 IUSE="extra test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 064c846ae90f..51b036b4086b 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,9 +7,12 @@ DIST poppler-24.08.0.tar.xz 1912592 BLAKE2B f76ccb8d596909d671df34f6c028e6161ad7
 DIST poppler-24.08.0.tar.xz.sig 833 BLAKE2B d257fc092c8541daf2e88a852655827470fb4890316f0a9b334b18c736ea33500e52c3b6b238047e8e3ded6a155b4466dcfa3afabfede11ed89b3fa17553577e SHA512 5e5c0185db2f3c1e1639e1eead93cf9e282db403edb91750d8ec325ca69f4bfb026345f2e9a8a18ed23a5a02b308163f9b4a8d6a75f9e760414cd709681a25a7
 DIST poppler-24.09.0.tar.xz 1914488 BLAKE2B be6a388b9ca80aa6d86f05a69e712f5db8764653464ac0b511ed6d4b6090e796df041749f7c39519d3e6606e8c5692deadda9a60d5e8fc67931862676eda1b28 SHA512 1e8aea61d6bc1ce0d94bbcd0bb3b329a128b546082b2d74a005f6e36457c8c4632695ddddff6fe6e1e98cd40e5080e6b54eeb816846cb5e891d68b7051641151
 DIST poppler-24.09.0.tar.xz.sig 833 BLAKE2B 01c532ac962133ab85de72520a558b5f67ab27e8c260097b40a633f0f51978562c0ded7230828424712dbb931032d02d18179090fbc80dc926c1d58e8c32c2c2 SHA512 612b7b8a69ef4feb05c029cf925e5e876697abef4ee01575c3cfe68f20f7acd10103e18705c56f7c199707df648523553a6c87b8f39287ace03e444abf8750f2
+DIST poppler-24.10.0.tar.xz 1920580 BLAKE2B 5eee232c64f18083fa189b1839a7757c34f31a8711c4f173bfe0ded7c08d96618c9276fade85b3802cc79e31ca4b22f425904102f52a42985c9506f9cefbcf9f SHA512 5515b4c439cd2e92119aedcb8960dd82e6f78a1ffd82543d3649bedb3e0e8e97689ea592f4df347cc3c97d5d90c8518c13859f80be25f157b9aea78e62a31502
+DIST poppler-24.10.0.tar.xz.sig 833 BLAKE2B 241d939ab41687f3a5133418630624cc50f0de4cd00d45b3c7d2ea7afa083ac33b7dbb40a3493743bc6c5ba04f1c82c4bb0acae64f2f8658190fb7587a0097c3 SHA512 1c3668c8092bafe4169c2945b0bb2eeb1ab20097e1a45496837f2ce4edb4651272920583606b1746998a9313da6227814ffbbd22eb06195b21219673a9957a6e
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.06.1.ebuild 4447 BLAKE2B 9dd8e5dbd6e5985a5d9e21c0d3dc1c6da6a240d63db338ea06f2b1b4dfa1b175fccca4257d9da79e0deff5db1dec65c599a799a453f6962c39cad9f5073b1af2 SHA512 ef395755a8d3b41834dc0d91640aa527e3bee2a116510916c5e119b87085c401ffb7de73bc4eb1916d671b1bd493091226a4a54609c169e4e55b345975d7c4a2
 EBUILD poppler-24.08.0.ebuild 4449 BLAKE2B 325428375d2bca1fcaaaf15b0b23ed972f507127bddcca0ec5ff87bd4ef84e5195df23d225edd7397ab9d4ab983e6b079c4a2254b4c2497c01fc342641e9aca9 SHA512 d0f62169fbb6c99ac1dd0f352a57602b2590354836923b18eb6c24b395e1f9b6f60c0986196b4029f277095bac912457a0259c1fc643262263aafc44c80bc2f9
 EBUILD poppler-24.09.0.ebuild 4455 BLAKE2B c9a8dff1f1a8931a15aa835c135ad1c86650c73b2dabdab2b034ad0ea21f9ec5dc629ca8ec59ff2ff240604975a001895138e7c91447308b9b38d1cebceba060 SHA512 5574e1b7c7a6e7ca4f6275c63ceb4be233ea6af8d6bce0d16bfa78748956a23ee65a4674ebe45f58d63de7c6f564af34b31fd2e28b2a65b8a70e4a7bdaf33a48
-EBUILD poppler-9999.ebuild 4455 BLAKE2B c9a8dff1f1a8931a15aa835c135ad1c86650c73b2dabdab2b034ad0ea21f9ec5dc629ca8ec59ff2ff240604975a001895138e7c91447308b9b38d1cebceba060 SHA512 5574e1b7c7a6e7ca4f6275c63ceb4be233ea6af8d6bce0d16bfa78748956a23ee65a4674ebe45f58d63de7c6f564af34b31fd2e28b2a65b8a70e4a7bdaf33a48
+EBUILD poppler-24.10.0.ebuild 4456 BLAKE2B 35d08374784135e87c73ecb88727946c78acd3762dc87f68f6796608501aab22780929e665436cf07172da4c34295a709dc06083edc88fa47bf4b94471fbfcee SHA512 c55da2f0319e5d98e42a0bdb4eee86e8f802114ed2ccee61718718fca6f92c0c0afb1ae5515286d04b8fd545aea13e9ef72437822106937f7fd38652c4544310
+EBUILD poppler-9999.ebuild 4455 BLAKE2B e80ab3bcf12fe79a4d6ed9bd4b4876245c9ca5a7a4cfbb94facad8f10c07599afd0b363aaf1a9a7ec030a13e89d73e4bd5e64f511cedce3e93bdebf71b4b3eae SHA512 935a8e4f1e2b0f376ab8145381469da1c00792bd550005ecee2897ac132cbd770908b6f170bf67172b69bd6e67aff019e8195456a09b9c9a8f5c0439e4fb7438
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-24.10.0.ebuild b/app-text/poppler/poppler-24.10.0.ebuild
new file mode 100644
index 000000000000..0d9fac4f92c1
--- /dev/null
+++ b/app-text/poppler/poppler-24.10.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2005-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/poppler/poppler"
+	SLOT="0/9999"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
+	inherit verify-sig
+
+	TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
+	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	SLOT="0/142"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.13
+	>=media-libs/freetype-2.10
+	sys-libs/zlib
+	cairo? (
+		>=dev-libs/glib-2.64:2
+		>=x11-libs/cairo-1.16
+		introspection? ( >=dev-libs/gobject-introspection-1.72:= )
+	)
+	curl? ( net-misc/curl )
+	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
+	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.49 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		>=dev-qt/qtcore-5.15.2:5
+		>=dev-qt/qtgui-5.15.2:5
+		>=dev-qt/qtxml-5.15.2:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,xml] )
+	tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+	boost? ( >=dev-libs/boost-1.74 )
+	test? (
+		qt5? (
+			>=dev-qt/qttest-5.15.2:5
+			>=dev-qt/qtwidgets-5.15.2:5
+		)
+		qt6? ( dev-qt/qtbase:6[widgets] )
+	)
+"
+BDEPEND="
+	>=dev-util/glib-utils-2.64
+	virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+	elif use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if tc-is-clang ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	append-lfs-flags # bug #898506
+
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=$(usex test $(usex qt5))
+		-DBUILD_QT6_TESTS=$(usex test $(usex qt6))
+		-DBUILD_CPP_TESTS=$(usex test)
+		-DBUILD_MANUAL_TESTS=$(usex test)
+		-DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DENABLE_GPGME=$(usex gpgme)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_LCMS=$(usex lcms)
+		-DENABLE_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		-DENABLE_QT5=$(usex qt5)
+		-DENABLE_QT6=$(usex qt6)
+		-DENABLE_LIBTIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index dda3fe1c9b3e..30f9b48467a0 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/141"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/142"   # 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/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 15f1a78273ea..50b514223e09 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-cb-0.1.10.tar.xz 6300 BLAKE2B d541fb78f5ee52a22e58bb885103560bd544a9725cfe210f6b343e97429163a90dd0e9533e6c807134386e6f347bdd17cfc506ffe16642819eae4d1fd27c3b6e SHA512 b85894d052fda45933582299e8c3406413bcb47ed451d81f5906d7bfef94b169c59a57db8b37273c838381ffc7ba55205d714d2e2ec3b597371578a77e131029
-DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc
+DIST zathura-cb-0.1.11.tar.xz 6748 BLAKE2B 59abd86594ede671b65e03c5a3577804edd7235ce74b7242907b3e744fa0982e12490c6ed98e556aa6c79c30e21b1683e3dea96d2a884f04bfd50f592c80e0ee SHA512 f927c4021937505bbc83d47959f4275701449dc4e889dd4a92ef7feecfcdf5ae772d34bb787ef8638c5fe209a1851ce355740c2b80921139f10fc059bd67f39d
 EBUILD zathura-cb-0.1.10.ebuild 751 BLAKE2B 1a75b8ea62d2a133dc55649f24ba4f3e7b28bd9567dd6bcbdc284ec69281ec8dec2c13f7e7299481514c28bd7895cf60580cc50f61f7f586f8a779838dcc3f24 SHA512 e149f16a06605d328fe1bf072fb47c571a55d280da1877128c80a88ede1e203c1a168581c462189963ac1af2a0a3040f4aa4a6022b45ac96b62842f3b1e317ce
-EBUILD zathura-cb-0.1.9.ebuild 890 BLAKE2B deb04a042f3a225e5dd84d88268b71eb3ea6d379371dfcec2a710613112d93db5008f1af033a5c921cf39b90c3eab0cad618507355fbe8d87e9c6500feb0d7ef SHA512 c05e31dadcdbf15021e44cd2d6cf03321679e9f91f0a74940d5b98ca5e0529201ab2004f26f2a7a6c0b1ea13a821a5f97b4dbc165437261ad5996d360a86da14
-EBUILD zathura-cb-9999.ebuild 754 BLAKE2B 9ec95c5954bfccafdbcd282ef8532734b5c7617a079f5fb857e7ec6c2e6dd60c9fa94e4ebb13be203362d0113d52c1e5ae36644853b8a0eb63351b10d0263d70 SHA512 c3efb1e47eee5d760a14a229c781b5c149249129cdaae5da9fda28919c509f7cebf7995abfd76081ae632a275d080d0e8d740106421a83de7ce491133b6a0a5a
+EBUILD zathura-cb-0.1.11.ebuild 818 BLAKE2B 0d76c3052d404a7ea7153ae4ea0a20c5d0ac170b2dcf0427e371cc341dbbac889beadfb39d6f43cfc41b741c6c42afb1dd5f64816e2ce2abc0f2b49e8de344fe SHA512 822b87d2998f4c8e27a2603f3931b0630e4de3ee2629387c8e857ed078dd95b382b838c6e044a109374538ad4ccfe0ef4780f24e49bc2aeea127d03b8471f783
+EBUILD zathura-cb-9999.ebuild 793 BLAKE2B 3bc921101f771c89dc283a71e2f4eed3f76195e708b7f19867493d0e147fbec0b9559c3e627eab7f29da21eeec9034f6253eee847c31051fac08e9b71721c8ad SHA512 cb6bdee9cc8fa3a9abf9313e36d491a227c3e7054decb359eea8e1e4fdaaf6ca8d44a5eb05a57158b855d46a0ec435e0f679a01d7446f62f8dcee8c84d864290
 MISC metadata.xml 778 BLAKE2B 79a2c9cd2014b9e945d25384ef6faf7fa5a6685a15dc08874bb454add7cb515d6e0efc13ddb801698151c97f8fde3f8ff787b7230871ef3ffc4a138facccb666 SHA512 5461b530d3b11ad32cd25234bcbe5a352d45b7856c75949f8e3fd16981ee5dfd194eaed09e0af7e0d97ae6f0164bbdc7b1582f395aa0f95ec08012a202ab9ac0
diff --git a/app-text/zathura-cb/zathura-cb-0.1.9.ebuild b/app-text/zathura-cb/zathura-cb-0.1.11.ebuild
index a20b5eca3b9d..fbc4db911ed5 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.11.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit meson xdg-utils optfeature
+inherit meson xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 arm ~riscv x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 	SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
 fi
 
@@ -20,24 +20,18 @@ HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
 LICENSE="ZLIB"
 SLOT="0"
 
-DEPEND="app-arch/libarchive:=
+# Tests currently only validating data files
+RESTRICT="test"
+
+RDEPEND="app-arch/libarchive:=
 	>=app-text/zathura-0.3.9
-	dev-libs/girara
+	dev-libs/girara:=
 	dev-libs/glib:2
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
+	x11-libs/gdk-pixbuf:2[jpeg]
 	x11-libs/gtk+:3"
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 BDEPEND="virtual/pkgconfig"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	optfeature "jpeg support" x11-libs/gdk-pixbuf[jpeg]
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index fa6f6f40d74b..77dfd182eaa7 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,8 +7,7 @@ inherit meson xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
-	EGIT_BRANCH="develop"
+	EGIT_REPO_URI="https://github.com/pwmt/zathura-cb.git"
 else
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 	SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
@@ -20,9 +19,12 @@ HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
 LICENSE="ZLIB"
 SLOT="0"
 
+# Tests currently only validating data files
+RESTRICT="test"
+
 RDEPEND="app-arch/libarchive:=
 	>=app-text/zathura-0.3.9
-	dev-libs/girara
+	dev-libs/girara:=
 	dev-libs/glib:2
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2[jpeg]
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index c1aba58f22ae..99f9c2ac0452 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,4 +1,6 @@
+DIST zathura-djvu-0.2.10.tar.xz 9408 BLAKE2B f779eeeba40abe444960716b8c14c51c32a3830a3f779074ea773bd9ff0d71736433ed29862bdf137a34ebb934bb562aa14031c07dda5cf97ddf278e47feb750 SHA512 c743e60588e07fe18f7da8db1ae9ae997ffb50ef696258f1901523159ff4d29e5649b13d6e52f53cf79f19429083308390c0b4923081451bf5c4bfb9ac6e8903
 DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa1e1bbaa0faa750feb82db2e2b029a86bf759e642f92c0ba438ee88b9178969e5d2aec4f30d9cb049bd3bcd69639e SHA512 3c2815e7f1cdfb9fc594dc6ad65359245f322e5fa27f018fb9431747e4d474734f5efd134aaeb9dabde09b01de603b1d1dc7aede883b1ef81266e067b0490726
+EBUILD zathura-djvu-0.2.10.ebuild 697 BLAKE2B 4ccabc05ae7320a2df4609be90b6a43226bde588f2fa9f52761c551a60653292ae4acfcb21b995a9bb12578cc63d46950eaa7734955374e6a17bb801829b9804 SHA512 8a3f59819835e995a5729e62d4ba430c135609d05b3f830f461d46ad873a33fca2f45a5e348bb499149210d2a8fb21daa82baeed2b51f1b6bc293abaa6c9e27e
 EBUILD zathura-djvu-0.2.9.ebuild 630 BLAKE2B f6f9e996a739a30893f0bc3e00592a29d2a01d1307c4e8db8156746e12e0e8fc9a99ca1d31a373c7f66944e5ef2ff69a54c20e4941fc633af4c08dcbb3d05574 SHA512 11665cc089c5766d685a7b0f409df1e46c551a107b31b0744019d8790c5791f588f1501a60292d7efb571ea809a613d53ecf93f144a8093e551d45e185dd089b
-EBUILD zathura-djvu-9999.ebuild 633 BLAKE2B afb7ad74271cf203eb6da9844ccbdf157a872ba67d77c5f7bd2f2b638d12a67c2a9e0df5c03b0de99acc0ab8ed8a7dad63b62c97ad1a4d23cc47ec63b9021b9e SHA512 56e32f466e781d2340a5763749aea63defad52d9261e416ca31b5d3613837dc7ab13ce5b1ebcde969b6afa058c62ac27640b1416d0c1231fdca6a8438f7c020b
-MISC metadata.xml 593 BLAKE2B 8f65f361d05b40abc086c22e92410471cc128901fa8168c1e20154e6078f6b8cb54dd2a6c310bac3bdfc5150f59136fc1d3b998eb560d1e060f5958c05e4113a SHA512 34a075ad7219315a07090bc6451a202a5c9f7a9c7bd3022b5de7530f7f1322aa7f510b50f1fcc809e83c95c9fd91cc1b59b40b41adf2f14877d450273dcc82af
+EBUILD zathura-djvu-9999.ebuild 672 BLAKE2B 22d196a763779bc96f4fc5a8d865a343e403684b3a341798ff8e8627209639b453a97aef59eaa39f7f6394f6f56ae69073b40835d95c1bbf4fc4faa782068f7a SHA512 e953098b9f07132c978d6ce9541ffb478b95208e86c266ba4a5e1898a85f16a1f5c8608200cd3c59961533be90bdfab2da6f1ff0a0138267df16c08eb0097481
+MISC metadata.xml 650 BLAKE2B c91b23bc839a7e3f00b21f73a02d83912321e292de99c824797ed653c28bf66b52c6df39fec769e141231b1d2e2b595df95347e8c221fec6511f654901d6bd35 SHA512 1cb10b8e25b744b259ed71d896bb9cd971fc9e225cfb7ae59af9addd963d46994524a4587db6b096b13fae63087ecb94e75ad83abb16d829901f8d2b0371a0a7
diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
index c6b72890006f..e1340000498b 100644
--- a/app-text/zathura-djvu/metadata.xml
+++ b/app-text/zathura-djvu/metadata.xml
@@ -14,5 +14,6 @@
 		<changelog>http://pwmt.org/projects/zathura/download/</changelog>
 		<doc lang="en">http://pwmt.org/projects/zathura/</doc>
 		<bugs-to>http://bugs.pwmt.org/</bugs-to>
+		<remote-id type="github">pwmt/zathura-djvu</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.10.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.10.ebuild
new file mode 100644
index 000000000000..1cc4a9881a29
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+# Tests currently only validating data files
+RESTRICT="test"
+
+RDEPEND="app-text/djvu
+	>=app-text/zathura-0.3.9
+	dev-libs/girara:=
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-text/zathura-djvu/zathura-djvu-9999.ebuild b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
index 8b3af5827a64..7e8e1c555224 100644
--- a/app-text/zathura-djvu/zathura-djvu-9999.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
-	EGIT_BRANCH="develop"
+	EGIT_REPO_URI="https://github.com/pwmt/zathura-djvu.git"
 else
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
@@ -20,9 +19,12 @@ HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
 LICENSE="ZLIB"
 SLOT="0"
 
+# Tests currently only validating data files
+RESTRICT="test"
+
 RDEPEND="app-text/djvu
 	>=app-text/zathura-0.3.9
-	dev-libs/girara
+	dev-libs/girara:=
 	dev-libs/glib:2
 	x11-libs/cairo"
 
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index bd43e6ee3a23..bcff99449b8d 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,8 +1,7 @@
-AUX zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch 1015 BLAKE2B b2ba561909eafed3f1aef2efdf5596a2d0f1a933c1e60106eef9ce52f86c9182492b4e4959f274312332089863e4209204c098d4baa1885de28eeaafd04d803d SHA512 264d6b4eb035424a54eccdc8b5103142f6c822de1e4831303413b778769b520268f02139213d391294d1c407289e075148c227e6a0d8fe02ba03d401f9c0f067
 AUX zathura-pdf-mupdf-0.4.3-meson-mupdfthird.patch 1329 BLAKE2B 4932a6c7385b6983d97fa5a175aab47e0d972404bd051c9162682f588f1c3263aacda97ecd0615b11e1882983fe99f9a38325d4dcb8bd91c61aff5bf68ed72fe SHA512 85beddc896b90d2d5bc716619588a558ce412a35ec0e76b64dde1fd4861f9307f07de082dc87c13a1e791b1277451ee9d2d515a1784f138cad87d2cfb6ac3fcb
-DIST zathura-pdf-mupdf-0.4.1.tar.gz 9346 BLAKE2B f1998acf00696fd40577f6e53b597258e519d3862c5b6b29bec292aaa732acf0b7a80ddf1b2f62d95d9462fe811a73cd912009106394bf1aadfa76be9c6d1adc SHA512 bf3360cdf6195af3cace4c769536a49f1cf2167c70a65b560410db1a0098119d726e73baeea98ca7100653c17248056c484fc436558e52a8dc12e7b83ce789b1
 DIST zathura-pdf-mupdf-0.4.3.tar.gz 10146 BLAKE2B ca4edc56256d04e5ba42dd756976a3e444f37dfb5c1fff569329478c3053f7d48fa689d61b8769a73bac50e1244e74855705a9cd1cd25ed37a6927bd6c2ccf75 SHA512 ffab536d1cea26dd08fbb3808e0ff5d4b5b126bfdbd19a79101ac519ee9951d916b75c5b1b1e459f453087c936d84fa3839b4b84dd7f92398ba5cca87e186795
-EBUILD zathura-pdf-mupdf-0.4.1.ebuild 854 BLAKE2B 307d946230fec4726d71535c010e7f9a337903662fac5cb8c1479f43af0d37c77c422dc69cbe1403b2ae57d66e78d70b2ebe31ba7e4200dc2527370cffc6eca9 SHA512 ccdd7bc811922a3d3c2a0410a4ec5792b5522a8cca2a3762d6a76191295a0354653d41cce3ef9622cd86d5fe29ba8ed406ef69d2b7d7d9105d4e84ac22963c7b
+DIST zathura-pdf-mupdf-0.4.4.tar.gz 10100 BLAKE2B aa969ac9a702150d05e8c1dfc7f0f6752c0371c812a208f33ab19c14423b12636345544ce898eda3ab5517b895c832a91f3a6866468049e03b2d36a67d198c06 SHA512 c6297b8ed68a0797db2e7b295d7fc7cb4d099f24cd9faea49e1e2d0c61818b071297b57f6472c057010caf104053cc0866685349b33a61302280cb52bac055cf
 EBUILD zathura-pdf-mupdf-0.4.3.ebuild 890 BLAKE2B e67ace6a842d1e5c42d0ccba5ec7d2ac00f8c885eaabd3eb2ae6a131b3c4750a99a6c7da744b46e4141770c80e0cda08304eb4d5960648b4bbaab9de221c0ba7 SHA512 140a05db9dfad040197cfed16164a7189c14b3a433b53cbd740c7923ad998b90d85735fe58a996a7c65f43885bb495af8fd5fbe13c8aca8cbfa34f789e2ebbb0
-EBUILD zathura-pdf-mupdf-9999.ebuild 900 BLAKE2B 4448a6191e58ce573c005681719abbd9fd42db7d0d700ef13a21bd478f2b43410a618a4ad402d627691e7db2dce9ec178ca8afebed150617e0ca4fe84f4349fb SHA512 903cc40c480e1b8b42d1e8e9cfcf23e9a26b690546dffaf33a02a81e639e503aa411b69e5f29b7f3b85843e66638d499ec6dee3e158ac492765d35296d937e4a
+EBUILD zathura-pdf-mupdf-0.4.4.ebuild 976 BLAKE2B 12ef69f9250b997db331ffa24873cf2a06378e545c5f2f0759ca13582543d4d325648d2248cb715630556b9c12ffaf20d5188ce1dee07b121c039ebf585a13f2 SHA512 716af958d974feaf56874318974bb23fc6ab499adeb77f66c51b2eb8b7fdd97070df679603872e633b43e5339af0fa7e39da101c2139d3f96c730f9a452b6c38
+EBUILD zathura-pdf-mupdf-9999.ebuild 953 BLAKE2B 38b4471277e4ab14f95342a84ddcb2aba89b7b6a4e2025f7733d233d75fd8137df3077092bf636d2b160b44ad4d2071b4f5c152c6f027b04c2a523045c225fa6 SHA512 47aaa146e445596d3ff5a6cffdc0945fe6ea1a289a42d7bdc62b7c9894376324e89d4b286d4d240bc3d3d3e5e29d4e309438e3b2a693a460520f9bbb5ab1f6c7
 MISC metadata.xml 882 BLAKE2B 7942e40c627610201c9fac32b873a457af91e1643df2d77edb7b16e8d16b190b03232515268b5f00127a385ec0ae195993830dce2c128fc982f330663b44bf4a SHA512 9509293871df3131a4502669c6b1e5bf875a821f56d00d37a9d0fefb426e572be456908c9767884b625f5bac966ca4c83b433926d8b2118f28cffa06a6719788
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch
deleted file mode 100644
index caa0da05e37c..000000000000
--- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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,17 +31,15 @@ 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')
-   libopenjp2 = dependency('libopenjp2')
-   gumbo = dependency('gumbo')
--  tesseract = dependency('tesseract')
--  leptonica = dependency('lept')
-   mujs = dependency('mujs')
- 
-   build_dependencies += [
-@@ -50,8 +47,6 @@ else
-     libjbig2dec,
-     libopenjp2,
-     gumbo,
--    tesseract,
--    leptonica,
-     mujs
-   ]
- endif
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild
deleted file mode 100644
index 94db4774090d..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="+javascript"
-
-DEPEND="
-	>=app-text/mupdf-1.20.0:=[javascript?]
-	>=app-text/zathura-0.5.2:=
-	dev-libs/girara
-	dev-libs/glib:2
-	x11-libs/cairo
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-meson-mupdfthird.patch"
-)
-
-src_prepare() (
-	default
-
-	if ! use javascript ; then
-		sed -i -e '/mujs/d' meson.build || die
-	fi
-)
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.4.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.4.ebuild
new file mode 100644
index 000000000000..70c7609cebde
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://github.com/pwmt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF support for zathura using the mupdf PDF rendering library"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="+javascript"
+
+# Tests currently only validating data files
+RESTRICT="test"
+
+DEPEND="
+	>=app-text/mupdf-1.24.0:=[javascript?]
+	>=app-text/zathura-0.2.0:=
+	dev-libs/girara:=
+	dev-libs/glib:2
+	x11-libs/cairo
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/zathura-pdf-mupdf-0.4.3-meson-mupdfthird.patch"
+)
+
+src_prepare() (
+	default
+
+	if ! use javascript ; then
+		sed -i -e '/mujs/d' meson.build || die
+	fi
+)
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 8942ebaca741..9f269227159b 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -8,7 +8,6 @@ inherit meson xdg
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
-	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
 	SRC_URI="https://github.com/pwmt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -21,10 +20,13 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="+javascript"
 
+# Tests currently only validating data files
+RESTRICT="test"
+
 DEPEND="
-	>=app-text/mupdf-1.20.0:=[javascript?]
-	>=app-text/zathura-0.5.2:=
-	dev-libs/girara
+	>=app-text/mupdf-1.24.0:=[javascript?]
+	>=app-text/zathura-0.2.0:=
+	dev-libs/girara:=
 	dev-libs/glib:2
 	x11-libs/cairo
 "
@@ -34,7 +36,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.4.3-meson-mupdfthird.patch"
+	"${FILESDIR}/zathura-pdf-mupdf-0.4.3-meson-mupdfthird.patch"
 )
 
 src_prepare() (
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 157ab4eaaede..a0b9fd9284d4 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,8 @@
 DIST zathura-pdf-poppler-0.3.1.tar.gz 9259 BLAKE2B c1131d2acc0cf69bf9266969839f6fb4e043664a0a4648d033f9338b1219d75e34576a03380daf54bc8fe52cc8bd2244a93394e15f8ff0bbb980fb903749affc SHA512 a6ea7d61f05cfbc6229ec81580c539841916b44085aeb168668cfabd41aca2e5321e88605f092caaa3efc30bec25a2bb319c687920a22b1f7f53e4b1e470ec34
 DIST zathura-pdf-poppler-0.3.2.tar.gz 10623 BLAKE2B 985ce9664b74d798c6a5c858a79e9e3a6e82d837818f52e4115e622395ee39e765c356740c099a7f376517c3af81fb9335188950719930b9a902542fccd475e7 SHA512 5e6d748f9dfcc9e318ee7947d3a4d9acbbb30d6b45810a7c2fd2d0572d98872f5d594add8683b6579791fb82846a3d7854e84239ac5167c0541e700518a31043
+DIST zathura-pdf-poppler-0.3.3.tar.gz 10554 BLAKE2B b49f2d1cdab426f0e0c41d901af38fdb1931eea28d8d442f08a076945e6801b1a4032ed5e97c2fc6b96f361e9188b3c0c50d1d0e0c9a5a1bf7c427461cc92a3f SHA512 791b0e6cac29358226b2416e22527449d89b8544242d1b492b6017d52eb996aa9647e10259d475c5c84bbf4a19b680c160ac7e822e331c466c3ff5697913b003
 EBUILD zathura-pdf-poppler-0.3.1-r1.ebuild 769 BLAKE2B 9739bb8d87831e1d7d1e76630d4c9208b632e1a6bfbdfeb418c69b028f4a539005018a0a9406d027695431029207bc6f79eb3a1a18c5858995f9e8c768323648 SHA512 9cb9b2382197ce34557d5df70a7551e25bb31728a577e2590f77551b1e828b0dab858504252fa8d54f6b2cb31ea418fc7927e5fafb27f8208cbe7c263b4e655d
 EBUILD zathura-pdf-poppler-0.3.2.ebuild 788 BLAKE2B aaea7b8406aa1531dc5b9f09bcfbab5cdff6944490e53ba4edaad84f07fdb431eb806765874ae49b21b3c6ded82231b11a91978c3adf8bbe38ea6e841674f1a1 SHA512 5a814e4a139212de7594cb7f79f07ae815e70fa65ee8f0d508f16080712a89d74aaa0c675e67a3bc116c76c7caccfaaa43000ec27fb682da9624ab4643a08f76
-EBUILD zathura-pdf-poppler-9999.ebuild 784 BLAKE2B 250d92deab5a324dda81ffcd45211dc2c10240f5a216cd9cd9955d3de52d68e4d5ecfdca8057813e87a3cb1dff585815bec52e7375e53e9664dc4bc6488d57fe SHA512 21cf4fdd4ee4b078d5fec6faef7c30e8c92a022b4a60042b5e36995d93f1479904f23c71e706f3277c4eb1f52da9f25d416b6f9233de4b75cb599bb8bd4a4cbd
+EBUILD zathura-pdf-poppler-0.3.3.ebuild 871 BLAKE2B 37a311184dcd49adb50872d27767b8f226e53bf81eacc3c7fc7256818b54d05ab074badbc335d491e957dbd29c4d847992c865ef027ebd0bd6c78d7c23d7ff34 SHA512 e25f27c5460fa743d718669737ed99b60c9edbeafc431bc49089f2dc9f3a99e51c4e82b3fe876a006ba6f4795068f856e3d7190098bafe5ba2d180f447a629d5
+EBUILD zathura-pdf-poppler-9999.ebuild 846 BLAKE2B 87785758e69aa3fd95dc5ea51743db47d6960b8957b7c98dedf3eb67739d4cbd3ee428561e36ad98c036730ea734000a6c05f4fb023601c371fd0465c41b014f SHA512 de808860ded20f01304c99e66a0ad70d4a4f5b20399775a80f7c74f61b8fef69615b28722dbd7138680c6edda7b06b66e3edbba57834dd45e449f87944d122b8
 MISC metadata.xml 679 BLAKE2B 538fbfc611b4649d6efbee1e3d6802c4bc23859e549696431413bf865275c857bc6846c79d9d2f667ee4fcf6292c288c1eebf5027fb44fdd4ffb2cf40cc3c62f SHA512 f851dcceb4ab0388066a642395fbc3b19b7165ff7b69f4111454a6d56ae462b9671f29b036a2737bba392f08d6cb7fbb7c8bf46abfd45098e571075796f2336a
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.3.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.3.ebuild
new file mode 100644
index 000000000000..b4f5c318343b
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+# Tests currently only validating data files
+RESTRICT="test"
+
+DEPEND=">=app-text/poppler-21.12.0:=[cairo]
+	>=app-text/zathura-0.5.3:=
+	dev-libs/girara:=
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index cb0233ebcd83..4ea060b77f8c 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -7,10 +7,9 @@ inherit meson xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
-	EGIT_BRANCH="develop"
+	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-poppler.git"
 else
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 	SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -20,10 +19,14 @@ HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
 LICENSE="ZLIB"
 SLOT="0"
 
+# Tests currently only validating data files
+RESTRICT="test"
+
 DEPEND=">=app-text/poppler-21.12.0:=[cairo]
 	>=app-text/zathura-0.5.3:=
-	dev-libs/girara
-	dev-libs/glib:2"
+	dev-libs/girara:=
+	dev-libs/glib:2
+	x11-libs/cairo"
 
 RDEPEND="${DEPEND}"
 
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index 67ceee5bdcae..d23eaab1f037 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-ps-0.2.7.tar.xz 4488 BLAKE2B 4513173a2f9ca725abf8444516a78fd789286b082a1146ab5d0dee504cdda92962f3e6cef46f24e0307bc5ea6bb6595577fac2dfbd2d4ef0cf8e69d34337baf5 SHA512 86cf4cea8f32e446960c7727745711d6bb6723bb41127ccba335fbdaeb78e9f681ce4104b2be8718a2f19e06aef30d49ae7c90091fa0774b5ffe22303cf37d5f
+DIST zathura-ps-0.2.8.tar.xz 4716 BLAKE2B d9377a00fcc9e45fae413676947ff2067c80362bd9f9f1573f9962459d9a636ed0743decbe437bf90ab9e65dcdb8b5d0b19ad1794085c313fa473f0241a101bf SHA512 29ed9d5585df1151af50835daa75a11befbd0fe10e95b4a37c7b548e1442edd3f52a7d0afce8cca93ce70ced6381cdf23311cea004e3e38a6cb323ba13eb7039
 EBUILD zathura-ps-0.2.7.ebuild 780 BLAKE2B c132179888fb1cdd532af15cd6cd4270de3d7e87bc1ea0e755fa9f28620a2ec27c99327d982584aed42b7a31b693fce53c0165ca146f50fc2a76f82b16fe24ec SHA512 c89a12f7d29d834f461eadc0823bbfa365b4afeef18c412424ab62c4a0a9c7b963a9a0ef2fce596affd96552ba0cba4289396fc803ec4e95622c5730e0e30b89
-EBUILD zathura-ps-9999.ebuild 783 BLAKE2B fd0580968eda5cab5aea8a4d073d0891db52ce8f25b431ef037f8f8d3e7904adf12605e8f129ebdf530c99f8199d8596aca6f0a51eae1eabf1a05cc1ad2d6aa4 SHA512 27e382034e7c50c6465390a6e10a80858b07d484e1c243f214eae1757a75382949c9bd5ceba206882f4d6caf48fdd6894a87b902799b98d4b18a14bbfc2ffdc8
-MISC metadata.xml 583 BLAKE2B ca246e0a76aa83c55397bb48f58b196e816b11fa1c873a49b21ebee38512566d377b23ea926377ae8a08325d8494e49a12aad7caa2b8a3a19a1342ab2f8178ce SHA512 81c6f5d849fd80dd4b226db01e97f34ce8ae6affafd6b680ae31130484859983f1f1c7eaa5abaec9ca9c225fe7a7b3ecd0481f44fc9861b8c488e3c0aba24166
+EBUILD zathura-ps-0.2.8.ebuild 847 BLAKE2B b52a5c682efb592f9fd6092c48129a7b1e4635c7621d1cff2f68329919c3a8df394d8cbe8f3ef0f5e18f0ffc1f961f7dcb94f131b25dac9d8204b1b5a10ca4b8 SHA512 566b7a6ef111b2e3deaccfcc4e6503bfbc7fba3177231ec39356632ebb298bd1ebd351a446c036db2f2781cd46f8e233e69d6d3ccd4cec1191fb5f18c17024e0
+EBUILD zathura-ps-9999.ebuild 822 BLAKE2B 63d6e3d820e3e521321e5b67b6c30ede0101aaab5af6bb8a5bc6104c2b6f292db836326818a80622e0cffd58cd7c5c550f8547ee82ce16b13d53af50e45c7ff1 SHA512 39e78a36a13ab577edaa7baf39ec83180266f139804759f866383a98e78d663b12253813f8688549e34c8f3b1bcc66e6abece6685101d3aa4cb25c7060dae5ce
+MISC metadata.xml 648 BLAKE2B ce7146e48249d2b4f3873e23dc5d8b74e374f7de27528a6ab6bb7c424169ebf93751b6077b074fc0aa174e9e089da5539ea31f5a67556569d7a8ed17c2344c81 SHA512 2401f470d4c6b200aefac6d7bd62229e2795aed3ce96051e6c3515a9ce9f86716fa4ea523e77a1a956b40f53f52b24e39dff60d4eda4e42fd7f0708db2fa5969
diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml
index e0e23d23393f..f86e5bc49e5d 100644
--- a/app-text/zathura-ps/metadata.xml
+++ b/app-text/zathura-ps/metadata.xml
@@ -4,15 +4,16 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
-		<email>mlq@pwmt.org</email>
-		<name>Moritz Lipp</name>
-	</maintainer>
-	<maintainer status="active">
-		<email>sebastian+dev@ramacher.at</email>
-		<name>Sebastian Ramacher</name>
-	</maintainer>
-	<changelog>http://pwmt.org/projects/zathura/download/</changelog>
-	<doc lang="en">http://pwmt.org/projects/zathura/</doc>
-	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+			<email>mlq@pwmt.org</email>
+			<name>Moritz Lipp</name>
+		</maintainer>
+		<maintainer status="active">
+			<email>sebastian+dev@ramacher.at</email>
+			<name>Sebastian Ramacher</name>
+		</maintainer>
+		<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+		<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+		<bugs-to>http://bugs.pwmt.org/</bugs-to>
+		<remote-id type="github">pwmt/zathura-ps</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-ps/zathura-ps-0.2.8.ebuild b/app-text/zathura-ps/zathura-ps-0.2.8.ebuild
new file mode 100644
index 000000000000..e5fed454182c
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-0.2.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+# Tests currently only validating data files
+RESTRICT="test"
+
+DEPEND="app-text/libspectre
+	>=app-text/zathura-0.3.9
+	dev-libs/girara:=
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 52b16b0f9b8d..9d5281752c26 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,8 +7,7 @@ inherit meson xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
-	EGIT_BRANCH="develop"
+	EGIT_REPO_URI="https://github.com/pwmt/zathura-ps.git"
 else
 	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
@@ -20,9 +19,12 @@ HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
 LICENSE="ZLIB"
 SLOT="0"
 
+# Tests currently only validating data files
+RESTRICT="test"
+
 DEPEND="app-text/libspectre
 	>=app-text/zathura-0.3.9
-	dev-libs/girara
+	dev-libs/girara:=
 	dev-libs/glib:2
 	x11-libs/cairo"
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index f0f277aada17..e432be11dfda 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,14 +1,12 @@
 AUX zathura-0.5.4-disable-seccomp-tests.patch 736 BLAKE2B 20a1ad3dbf0f74853ac2deecf5273eb339e5c1a3386abcd11ec8abbe75b16ee8d1c49b06ce6f0d61e4bc3712f5cf0f45ed61bd63a2e6be89821db53f7deace5d SHA512 87924178c4a173e0db343cc7e9d087555a3be412d24ae808cfbe53ce6f53b7a2e23abd5354f77327e01d0afc7e74c8218884ba96998cc3d3667ab5f43fc6079e
 AUX zathura-9999-disable-seccomp-tests.patch 614 BLAKE2B 4191ff3dc542ec5d80876d7d1848abd4d99a1d5a161882a2985dfa09727ca50840d3a1dd237096beba621c5869c96a597eb9cc0fb577228b3049d7a90e379c49 SHA512 8c7765a88a511195ebf8799eabbba460fc4bcb45f987e4c67d6f9df9ec7adbebe73b0d201d8af8744c38619a6952dbb741e9801cec03df28a7c54e48f5c9b741
 AUX zathura-disable-seccomp-tests.patch 676 BLAKE2B a0fb24ad08247cb14e8017abf952b019aa8f8e0de3382fe5a9dfa20ab5ec9da9e8bdd3f8680c83c82520412f22f4fc1b328e73d9f58a04be34f0474aaba7ba05 SHA512 e68eacf092be083af7bb3b8ff350192544bbe60c8f40fa08cd756f9459f259b35805b44ec13c5b7ce92c58446b026272bf5b11ffaec75906fe70f5697f93319b
-DIST zathura-0.5.2-manpages.tar.xz 9696 BLAKE2B 23c6e94d5b44c1e20338ea04afb7644e4c76618cdc4902d2edd436734498c6b17e1522b37269d67a62801632595f535724d8f5d4c9817e017e6341c5365c5842 SHA512 3bb431f0564ddc1f67bcd21f019a43f6af95c3e3b42b264b7e1f01f10cebd7c05115e452a868dd176e5a0d65a9085ac3d554d69e553aa53569593ea494036f7c
-DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
 DIST zathura-0.5.4-manpages.tar.xz 10060 BLAKE2B 103d2b5ed4ab71bc096305e70addbf94f11539cc989fc867766a1366ec18ca30379ce8f5b9f2b4a4a67507f79bbf6c6136c46f47161d1b74457c04488aa3dcea SHA512 a8251740a8e24e1c37093bec58b0169f04bd318878d743c72f07505a722c58da4f84a2dad5d46ded7789e1b4c5f2a7bab9cc6d023cd0935e49fe4388c9c28bd9
 DIST zathura-0.5.4.tar.gz 216719 BLAKE2B 94219e1feb22dc5cf3c072ed7d53b984c58e1f5c2d86b7e2b9e67c2d1cde92e9972aa18583930d3af3bc7d9c2afe367221ed3c2141fee682cc7ea54aae603ec4 SHA512 16f7291c3742cffe9ba5c6a3137781b2dd0b0bfcd61747e45a3c4b14df97781b49d526a298d2be9f564c84e616f1adef2ff4f5442d539fd42ab5e862baa00922
 DIST zathura-0.5.6.tar.gz 215311 BLAKE2B 4609fbd38b92aeee55e2f89f0abc15d90a3086ff2e19d497f51fb708016d51d714d3c8a31e6d0574fa01a7f3b4b7b9f758a3296784fc1fa66e6730bac21a0f3b SHA512 df518865bc559b97d7abebde2dae17cbd7bde6b9f8219338bd3a455a5d71b42f62299591b9c12c75a9a6f007b1179cb163722eaaf43ee86e6a6d9e2e25f63465
-EBUILD zathura-0.5.2-r4.ebuild 1472 BLAKE2B 5e5c891b8b524b0415727ddc0ad64b1ef4aa58cf77078d7370b06e325608304f6ffe12ca982b0162d109cad4f583b15f465c17e400ef35134d213c5c4061235e SHA512 11a7f3c5a1a6cac9ed648d41a24e09d44b79cd37433aec90898f91615da18862e575c04a8b57bc9a06f7edd4233abc20585074ca758b2b13d1a18f476a4c7f9f
-EBUILD zathura-0.5.2-r5.ebuild 1550 BLAKE2B 2a07787e80374649f3e9ae523242062f7e036a76e3b64f63e14ce5724ecf0b5fdee294fac8a806227ac3d08be592439e3cb5190ad7533b9fa87f15d917cd0acf SHA512 f9eac669bf2944cfc9f2ab6e669e3dfe044ecbb2383cf7db9e6068a51c989774b4540e7d7e3ff1386a3ae77877961ad1e095913d89d1bc4da8fd26ce31381487
+DIST zathura-0.5.8.tar.gz 219371 BLAKE2B c7c163e0c1cd5e344ae566ab71ad66d51b89cacd11ef9b335589c0fa705e7a300adab680b7c13a197da3c10b5161656fbb9c8449667eb05e64f0506bf254e675 SHA512 6954f8bf8c76526e86a4e335c18c3c68f509fbbe1081f7c74d333f8a9ba83bc5da971ad744f91408f8b0fb8f0b647ae07f02601b5efa97961155ba193c8777f6
 EBUILD zathura-0.5.4.ebuild 1521 BLAKE2B edcf9de67cbc63e82febcf9ea6330065c6dc6cbe8da5664063340b61a49d6f6770520c7bcf24f2eec5ab983f01cd3cb39a23ffbcbdb399191d19eade8b8a893c SHA512 308e196daea2def30595aa66e1d5a06eebd40f75a69284cf004b5cc5714ce52cc1cd69686d0a29102a373ee3193e4c36d086a4656a11f0fd75185f7c5f81e9a5
 EBUILD zathura-0.5.6.ebuild 1326 BLAKE2B a476438b4d26bb06abd2eb30ff51b9cd5861a99b70318897f433da27653688dcac39fce67af1c9b53818e99b4afc9e66f8386bee08351b04550aec749505d108 SHA512 9386e149da5be754803865ab227f7516ccca5d85eaf6dda313c93896c1a348ff898be729f079e13e059f4d8da5f8c59a95cf029e514e97a17ae9cde96ea98388
-EBUILD zathura-9999.ebuild 1472 BLAKE2B 56edebaa8fa63f1692e10d5d12d8631f075b6b48c7ed241415d75f73e0c333bd8b374f14a06973745c1ab4a8dee539e2ab44455676a576432f57d71712b4cf94 SHA512 e9bc750fe6f3fa917d067822c24b2dd153b492aa3d76bf2eecb8376d0c9f3dff2f2c40d0ed2c1196f91dc744c9a5d459535df7078d5075d87977024902589510
+EBUILD zathura-0.5.8.ebuild 1398 BLAKE2B 2bb0d0662430286a0bc9c7441663451b697e0ba45150d99ce956692193ead594355e6de83d6b566117eab087bd0127617641b6a9c18a9d4026ba0693a3aa6f60 SHA512 b04c21f53a5824435f01100f87a953dfc5912bafd4f6ab3f80eedfc956c145bad49d1910a5e47c8ba78a538a52c7f438ba2aa062c12acba9606cc974498ebd10
+EBUILD zathura-9999.ebuild 1374 BLAKE2B 67f97ae4eff8a5604a36d5f69b6fd910f7741529e99e59146233bcf2d5686d3bbe8b453dcdc626d3e640ca48dc3f638cc9ef3618e15ca1a3c84f071b893c9916 SHA512 554ea820cf05896e62dca5db48ec073f16b0b4016fb6a7128205fedb0bc5b5e92a3aa8c0f9f8ea1da2907144173c1b9ea66733e8ba4101e404d3d820f14a687c
 MISC metadata.xml 920 BLAKE2B ca0d49998fae1b1661154d99cc8017d4afe8e2fd76869ef5b7adb3320a64df091e38ac288b7b1d9704d46b4d2cb9a477f17a9baa71ab1cffed0b9cb45c59e0f1 SHA512 b5403a9336fe7f382ce8ba3c5744a36b437c3a6bc2c7793812085dcb4315585859c17aaf29b567be9d95925a4f5d71f4596eb114620ac2d69804d340728efce2
diff --git a/app-text/zathura/zathura-0.5.2-r4.ebuild b/app-text/zathura/zathura-0.5.2-r4.ebuild
deleted file mode 100644
index bf8c8261af3f..000000000000
--- a/app-text/zathura/zathura-0.5.2-r4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx xdg
-
-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
-		https://cdn.turret.cyou/~turret/distfiles/${PN}/${P}-manpages.tar.xz
-	"
-	KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.7
-	>=dev-libs/glib-2.50:2
-	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	sys-apps/file
-	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
-	synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	test? ( dev-libs/appstream-glib
-		dev-libs/check )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/zathura-disable-seccomp-tests.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dconvert-icon=disabled
-		-Dmanpages=disabled
-		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsynctex=$(usex synctex enabled disabled)
-		)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	doman "${WORKDIR}"/man/zathura*
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/app-text/zathura/zathura-0.5.2-r5.ebuild b/app-text/zathura/zathura-0.5.8.ebuild
index 1ad4fe4776d4..cec45e525bb4 100644
--- a/app-text/zathura/zathura-0.5.2-r5.ebuild
+++ b/app-text/zathura/zathura-0.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,48 +15,48 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="
 		https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://cdn.turret.cyou/354c6d33bfd3bbc67c0047af1328498978eef352/${P}-manpages.tar.xz
 	"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="seccomp sqlite synctex test"
+SLOT="0/6.7"
+IUSE="+man seccomp synctex test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	>=dev-libs/girara-0.3.7
-	>=dev-libs/glib-2.50:2
-	sys-apps/file
-	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
+RDEPEND="
+	dev-libs/json-glib
+	man? ( dev-python/sphinx )
 	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
 	synctex? ( app-text/texlive-core )
+	sys-apps/file
+	x11-libs/cairo
+	x11-libs/pango
+	>=dev-db/sqlite-3.6.23:3
+	>=dev-libs/girara-0.4.3:=
+	>=dev-libs/glib-2.72:2
+	>=x11-libs/gtk+-3.24:3
 "
-RDEPEND="${DEPEND}"
-BDEPEND="
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-5.13
 	test? (
-		dev-libs/appstream-glib
 		dev-libs/check
-		x11-base/xorg-server[xvfb]
+		>=x11-libs/gtk+-3.24:3[X]
 	)
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/zathura-disable-seccomp-tests.patch
-)
-
 src_configure() {
 	local emesonargs=(
 		-Dconvert-icon=disabled
-		-Dmanpages=disabled
+		-Dlandlock=enabled
+		-Dmanpages=$(usex man enabled disabled)
 		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
 		-Dsynctex=$(usex synctex enabled disabled)
 		)
 	meson_src_configure
@@ -68,5 +68,4 @@ src_test() {
 
 src_install() {
 	meson_src_install
-	[[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura*
 }
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 0a26c971eaf0..2e490b9840ca 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -10,53 +10,50 @@ 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"
+	EGIT_REPO_URI="https://github.com/pwmt/zathura.git"
 else
 	SRC_URI="
 		https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://cdn.turret.cyou/e28b2f940d1a19a74ecbfd80ea4477c5ea9ac627/${P}-manpages.tar.xz
 	"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
-SLOT="0/5.6"
-IUSE="seccomp synctex test"
+SLOT="0/6.7"
+IUSE="+man seccomp synctex test"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/girara-0.4.3
-	>=dev-libs/glib-2.50:2
 	dev-libs/json-glib
+	man? ( dev-python/sphinx )
+	seccomp? ( sys-libs/libseccomp )
+	synctex? ( app-text/texlive-core )
 	sys-apps/file
 	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
 	>=dev-db/sqlite-3.6.23:3
-	seccomp? ( sys-libs/libseccomp )
-	synctex? ( app-text/texlive-core )
+	>=dev-libs/girara-0.4.3:=
+	>=dev-libs/glib-2.72:2
+	>=x11-libs/gtk+-3.24:3
 "
 DEPEND="
 	${RDEPEND}
+	>=sys-kernel/linux-headers-5.13
 	test? (
 		dev-libs/check
-		>=x11-libs/gtk+-3.22:3[X]
+		>=x11-libs/gtk+-3.24:3[X]
 	)
 "
 BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
-
-PATCHES=(
-	"${FILESDIR}"/${P}-disable-seccomp-tests.patch
-)
-
 src_configure() {
 	local emesonargs=(
 		-Dconvert-icon=disabled
-		-Dmanpages=disabled
+		-Dlandlock=enabled
+		-Dmanpages=$(usex man enabled disabled)
 		-Dseccomp=$(usex seccomp enabled disabled)
 		-Dsynctex=$(usex synctex enabled disabled)
 		)
@@ -69,5 +66,4 @@ src_test() {
 
 src_install() {
 	meson_src_install
-	[[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura*
 }