gentoo auto-resync : 18:10:2022 - 01:55:31

22 files changed, 30 insertions, 450 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5889cba68eed..a96c014ab6aa 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 9e86f4411474..95b07b49af8a 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,9 +1,5 @@
-DIST asciidoc-10.1.4.tar.gz 215656 BLAKE2B 461dd31ebc7067430e595935681ec6e0207a481ec183f0c29e08be444b40a26afabe84ac46dd8f7c563eb8d28ad8eed4b63a23fccd1105d817f7402f6afbfc5e SHA512 fba8c8efe215da0170fc46f1245af831c7b9e982705fbd9cbfe4cd2b979286b49f30570b116bc9f095f060099904a30671ab0498a58fc24b0069575ecf026a7d
 DIST asciidoc-10.2.0.tar.gz 216824 BLAKE2B 500038d655f820fe89048bbff683ae029c7044de839ae4f9ec4666b843585511c99bbc1991ec1764262f33c55b08845661fc1e62eb21bb3250d3168e369928ff SHA512 2f83c7f6d1d0a34948035347833ca59841de1271e8d008b4c4a43a7a8273b230148e6f51ee8f6e2dc702460e27c495037fbe2d6d43195b70bf3447ad86390d28
 DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6
-DIST asciidoc-9.1.1.new.tar.gz 1259206 BLAKE2B da274d3a9389ee2e42ad1be70467f11d0164df3e6f9102e6ef1be6a802dbeb12898786fa1fe37a95755d0db8c9df5d5dd3faf000dfb73b701a83af3cc0261606 SHA512 74b83e8c8904fd761783c2f572d353656fc0794c6cb427f61e9179c9f80b6fc3b3ee8d028baba4e25eafe5f8cf5318f9984a5828849a793a7520f83e6fe50d66
-EBUILD asciidoc-10.1.4.ebuild 1692 BLAKE2B 778cf7374ea0dc5082c48a3d4f037e064f3283f59a8d97f21fcbff606395f5318efd9cd5cc96c52d7890530fe056276f65145fb448e153f0fe95f4f7fa6634c4 SHA512 1fa77bb1e8095df7412a2d0896548bfe27dd949ea6c36383f877608c49ec156342b0973f8af7726ba98654481e2995b392c5271b30cfd8ec0daba60b405e76ca
 EBUILD asciidoc-10.2.0.ebuild 1692 BLAKE2B 778cf7374ea0dc5082c48a3d4f037e064f3283f59a8d97f21fcbff606395f5318efd9cd5cc96c52d7890530fe056276f65145fb448e153f0fe95f4f7fa6634c4 SHA512 1fa77bb1e8095df7412a2d0896548bfe27dd949ea6c36383f877608c49ec156342b0973f8af7726ba98654481e2995b392c5271b30cfd8ec0daba60b405e76ca
 EBUILD asciidoc-9.1.0.ebuild 2334 BLAKE2B 17cf7c01cdec7a9b24f82a82446e8dfb7033396efdd4941660a47fc9d87938a52e18b20ce739797ba0409c8a2f27fff3db131a56c6f45a93d36062a166ea0fef SHA512 e3fdf9af5fc2ddfbf935616ac49a13691952fc2f6fefb16b1bfd7b2c35428ad4730ea01a8eda7402a80982e5d4d98b15e71fb1aa172b74b758916939188b774b
-EBUILD asciidoc-9.1.1.ebuild 2342 BLAKE2B e5c950868bcb3d5e185540c588433deda3ad4d1197cc3062002d66fd8af18471552ad59bc4c6b48203bfc1d22e292bb83ae5e42001f300eb785b424e439e3837 SHA512 b4c7e2232546238a9a4b46b2a59036e64aa13eb46e39747d06f1b55d2a3345f0670a8039f68c463d395053945b14b7144f70e511d66fdabd579707501533dcd7
 MISC metadata.xml 389 BLAKE2B 3b83fe10e6041ef28e6c63e08ffd80a2762c5429f3b41ed2a324717b9d9fd8ffd0cbd88ebae46f3a0be47fbf8cd83d268d6b85179a628f6ac5ace8be3a5b4957 SHA512 56182f3887fd1097dbd62ee542318e18699261a303bb0246489b50e15c0a0ef9a23b207d0531e716b9cbe58a15d5232ba01a7fc2dbf7ce676a2389dbe4e3f136
diff --git a/app-text/asciidoc/asciidoc-10.1.4.ebuild b/app-text/asciidoc/asciidoc-10.1.4.ebuild
deleted file mode 100644
index 9f376b493bd3..000000000000
--- a/app-text/asciidoc/asciidoc-10.1.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1 optfeature readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-# Could use the github tarball but we need autotools then
-#SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2:2"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-src_install() {
-	distutils-r1_src_install
-
-	# TODO: Consider using Debian patch to allow /usr/share?
-	insinto /usr/share/asciidoc
-	doins -r asciidoc/resources/.
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "music filter support" "media-sound/lilypond virtual/imagemagick-tools"
-	optfeature "source filter support" "dev-util/source-highlight dev-python/pygments app-text/highlight"
-	optfeature "latex filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
-	optfeature "graphviz filter support" "media-gfx/graphviz"
-}
diff --git a/app-text/asciidoc/asciidoc-9.1.1.ebuild b/app-text/asciidoc/asciidoc-9.1.1.ebuild
deleted file mode 100644
index f3c86d982e94..000000000000
--- a/app-text/asciidoc/asciidoc-9.1.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit autotools optfeature python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2:2
-	"
-DEPEND="
-	test? (
-		${PYTHON_DEPS}
-		app-text/dvipng
-		app-text/dvisvgm
-		dev-texlive/texlive-latex
-		dev-util/source-highlight
-		media-gfx/graphviz
-		media-gfx/imagemagick[png]
-		media-sound/lilypond
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
-	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
-	   filters/code/code-filter-readme.txt )
-
-src_prepare() {
-	default
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		asciidoc.py || die
-
-	# enforce usage of the configured version of Python
-	sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		emake DESTDIR="${D}" docs
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
-	optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
-	optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
-	optfeature "\"graphviz\" filter support" media-gfx/graphviz
-}
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 9ed1cc6ac495..041bd17c8e10 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,6 +1,6 @@
 AUX podofo-0.9.6_p20190928-cmake_lua_version.patch 522 BLAKE2B b911b2ab2b35f5eccb58b32e575a775fe43cac1576831bb4e47d10c666a1e7040d8c01c865ee63ef1c3ff3c1a1feb2059dc25c71924b61995302dad21c32c868 SHA512 953f41b44468918aa96af42ecf3de8e3dd0d7721ed7c6283d8a6d44941caf70d9ef63d7d59ee1d94081fdc91a915ba8770bc335f8af5d60b24cd1f6c04698f6f
 DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
 DIST podofo-0.9.7.tar.gz 1005247 BLAKE2B d8f123008d272c1c39f60438d7cd6112cdd851488775e7e0fcb3fd9c4669fd64867fa293ef18b3189eac01f84a8a6b3c536171528f2b6097a5fe181c98501a71 SHA512 0e699739c2fb7d4d02ffca371504bb19f3a8a97ddcbfc06f8d9636db9e73064b4f633f7f09bce92140bb2174610ad68c1e5f8460d474d176ab803ed28295251b
-EBUILD podofo-0.9.6_p20190928-r100.ebuild 4622 BLAKE2B 087e231b372536232efa5fda6b5dde449e4243642e9485b21ebd3f4c5cb9d579e4ebc782d4081e878dda0e15179641f764ebecc7b524d9b9d227a6bdd7d11c5a SHA512 05e740499bd547f6a307927d52c6f83ccae8ce2d824b9f371a1025ab7561bf9ee0de37b1b63547bb85392efbc87c80211cd855423de1c053323b303b987152e0
-EBUILD podofo-0.9.7.ebuild 3062 BLAKE2B f6b8790121463002a291095278dd992ccb649285a282aaad91a499413fe51b66324c6668da5a3fe5516b045cc5b78a0c1b69d3b9046961cab7150c73850faeeb SHA512 d0d78ee49a71c3b3e13d64c6e8db11ca5a7e23fc9e328f604af2d573e6f5b0a207bb184d218429ad59f0db6d367cc52057289c08aeb336191be350d9e2d04a09
+EBUILD podofo-0.9.6_p20190928-r101.ebuild 4655 BLAKE2B c379c5cef61673671c9dfbda5e6b4123f9d66ff93a3064bc40bac56ba6e99e5672049f18710e31a4dfb0d1d56160ed10191ff1699836f77cb1b1811fcdc831e3 SHA512 bea8324cf06beb7d0b920c3659639656e439f0a224102391b66aab2aaf5148948117c4f79a0657596993eed0c8c7131e44683aaaa49c88916453fc6c76ec873e
+EBUILD podofo-0.9.7-r1.ebuild 3159 BLAKE2B faeeae5cbd4e445961db6eb50180fc82e7a50e6f63dc29d7569b6fd134562e806e59ae441e5a74be1448c4f89ccb7898dd1fd211eba2f97682088456f28ce2d3 SHA512 7ecb65bf995b5f8ad796fe67a25fee8cd797abd0d7dfc27d10f1ef0e8e39ec1ba0c5a66c775511aa9dd5d36e694edec5466a474bd1dec6f475442ad130b555e3
 MISC metadata.xml 510 BLAKE2B a8b777ebbbbadbb251c30aa0c662509559849d74c326e38d8ef965aa32f4cdd613a8d2251771d43fd217dbedd195dc11c8167e09bb2aa7ecf064a7dc2e13abe9 SHA512 d47dfa7ef44f0f0758662550afafd90e2566ad1ee418173aa27ead580ec0d328e0facd812e68b9701a2a6d7e6dcb9d62576c62c9a441c2c7f2fd664cd8f92bbc
diff --git a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild b/app-text/podofo/podofo-0.9.6_p20190928-r101.ebuild
index bd8bf05d1b85..b38d2983b91f 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928-r101.ebuild
@@ -21,12 +21,13 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
 
 RDEPEND="${LUA_DEPS}
 	idn? ( net-dns/libidn:= )
-	dev-libs/openssl:0=
+	dev-libs/openssl:=
+	dev-libs/libunistring:=
 	media-libs/fontconfig:=
 	media-libs/freetype:2=
-	virtual/jpeg:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
 	sys-libs/zlib:="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )"
diff --git a/app-text/podofo/podofo-0.9.7.ebuild b/app-text/podofo/podofo-0.9.7-r1.ebuild
index 97e2a987c7a1..e15f6767e6c5 100644
--- a/app-text/podofo/podofo-0.9.7.ebuild
+++ b/app-text/podofo/podofo-0.9.7-r1.ebuild
@@ -21,12 +21,12 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
 
 RDEPEND="${LUA_DEPS}
 	idn? ( net-dns/libidn:= )
-	dev-libs/openssl:0=
+	dev-libs/openssl:=
 	media-libs/fontconfig:=
 	media-libs/freetype:2=
-	virtual/jpeg:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
 	sys-libs/zlib:="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
@@ -100,9 +100,11 @@ src_configure() {
 		-DLUA_VERSION="$(lua_get_version)"
 		-DWANT_BOOST=$(usex boost ON OFF)
 		-DHAVE_LIBIDN=$(usex idn ON OFF)
+		# We use libidn for unicode support instead
+		-DCMAKE_DISABLE_FIND_PACKAGE_UNISTRING=ON
 		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
 		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
-		)
+	)
 
 	cmake_src_configure
 	mkdir -p "${S}/test/TokenizerTest/objects" || die
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 33061ddbdc3b..a00dceafdffa 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
 DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc
-EBUILD zathura-cb-0.1.8.ebuild 895 BLAKE2B 9b6a276bcbd0685f05aec8f492b25f168be8ff1d5a2395f91c336fd6ec33205a70084f2dbc7dc88c7322f47c9c65c072ae922650bfbb6f730cee25319215955f SHA512 a4d85eb270e731c207c8ac69646f35302f6ebcb5ba80711d77203d7cd8cece902808ac41f3a7b598d910fe3ff84daede5eabbe780572159142488a436f9c9232
 EBUILD zathura-cb-0.1.9.ebuild 890 BLAKE2B deb04a042f3a225e5dd84d88268b71eb3ea6d379371dfcec2a710613112d93db5008f1af033a5c921cf39b90c3eab0cad618507355fbe8d87e9c6500feb0d7ef SHA512 c05e31dadcdbf15021e44cd2d6cf03321679e9f91f0a74940d5b98ca5e0529201ab2004f26f2a7a6c0b1ea13a821a5f97b4dbc165437261ad5996d360a86da14
-EBUILD zathura-cb-9999.ebuild 898 BLAKE2B 591b8e8c047fe736b2271d6ee4f685b6443fc7919146ff8dfaae88bddaa3c70d3aea48f766f3bece87d3360e5437bc2ff55a85e8c8442bb0eef59e2e9be8dc56 SHA512 603db72b8c1e77da38575f97d6523dbd02a8c32823298ed2532e0871353854c2cf4280f35f085eb02968ff999db9f5630bcd7666d71f70c0f71413c27acb77c5
+EBUILD zathura-cb-9999.ebuild 893 BLAKE2B 10d8d81684467fc0676cec24e554fbd204b9d58ce6df85d2ce9873d193a8aa89bc349afea4457546c11e02207b6e4a2bf1dff76c1202bf7f2284fd25850223d0 SHA512 284c23d10550e71915600ab7a7d6f491d2e97334ee7c0d51fe1f690a5c992f427202c0eb0de443be45695b03a11dafa331bef59b5c7c79cddcadea560f7303b7
 MISC metadata.xml 583 BLAKE2B ca246e0a76aa83c55397bb48f58b196e816b11fa1c873a49b21ebee38512566d377b23ea926377ae8a08325d8494e49a12aad7caa2b8a3a19a1342ab2f8178ce SHA512 81c6f5d849fd80dd4b226db01e97f34ce8ae6affafd6b680ae31130484859983f1f1c7eaa5abaec9ca9c225fe7a7b3ecd0481f44fc9861b8c488e3c0aba24166
diff --git a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
deleted file mode 100644
index dbee873ba606..000000000000
--- a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils optfeature
-
-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"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-arch/libarchive:=
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3"
-
-RDEPEND="${DEPEND}"
-
-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 de2653af775d..3686e39e9456 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg-utils optfeature
 
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+	SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
 fi
 
 DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index b7544ac426f1..70101b0b6b60 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,9 +1,7 @@
 AUX zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch 719 BLAKE2B e8fee9b67dd4e3156eb48a69505bb81533751e29c9f05a46c5f93ea069eda042f72a24c4af1f804c28d2058ffe0d6ed646ba8f97610b113069cbadf05c841664 SHA512 a4b4a5b2d207ecd37a05d38f18f1f6a2df2acfaacf7a03fc97b14c3bf04441b3e0caa9aca30551fb4e12e0d41d1c4760d8033fb1c7a6b13dd8475453b59b529e
-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
 DIST zathura-pdf-mupdf-0.3.9.tar.gz 9201 BLAKE2B a74621e6330889363e25875e25984d8f9d9250a654ddb628849a8750fc4bbbb730cb6707d1959d0d28189d99af6bc041e1806036737b3daaa739373e632e304d SHA512 12537ca4c579be6dfa4c94195eafea09e45a08207eb131ed806ab868a71d781dbe6fef5e4442f77bcc0a70921d44654d97d48a6f4bfdbe28e0bdb9fec67f69b1
-EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 770 BLAKE2B b03dbb81d5570940d90c4f91c755a5c95ff9e09b9932a44e8a0edcad2811762f8ddf20d78fa17dafe91d3e7984c9bbe5f0c9b7cb89032f1d6fee4a1dbf42db9a SHA512 3284605db9a02201670e81ce465bd8c3005b4755114ba2e92dfe76fd60242d5cfaa5ce32bc1ed53f90be60213a5ed7e089db4ae98ae6f81380b5d06e4ec8b6d6
 EBUILD zathura-pdf-mupdf-0.3.8-r2.ebuild 783 BLAKE2B 87ad7d1eadc88026806ec9999bfc3486257362db0b3e0a6546c98f00b32dd89c8a699362c3085e822110fdd4b0645b3b968538917bbafd852eb69bcd49b01e2f SHA512 677fb3b5ced87f54d9d69367cba816f781bc08800f32219dea880e1cb767252401410b67c211908e815e3d54a2d3e7754d16d818439e9291bacbff9a182267a9
 EBUILD zathura-pdf-mupdf-0.3.9.ebuild 787 BLAKE2B 942b51d2a72ed0a3b26eb4f88deb4f1fc510c0a8551e563c6799cbcd653bca158fc1467f1bda0a768d78aa5464714ee15bfc308bbf70f95fa2cd0424118a1195 SHA512 253121b5df0ec0322f7393c748470d062f834df39560a14755a14ba79fe28ad60523717a117b6f4d774e62fde71b1712b813cdc059b61d2fa774544de60009c8
-EBUILD zathura-pdf-mupdf-9999.ebuild 800 BLAKE2B 6feb5d919001645d5a5502f81cf71758fdac6b0dd852ab2be17e1afe477bfe1d553a6b64c3d5ed03b0422f874134be8aa9ae961610035d3b7dd37bdd456c8da0 SHA512 d7a4f042e05cae1a2d5a40512b4cb0004c221c87e2d0e9a3e1779a55f1eb8c73b10ec7673a90908e8c64ea5bc3128cd8dcde948fec2c03a498de96e8e0e13813
+EBUILD zathura-pdf-mupdf-9999.ebuild 787 BLAKE2B 942b51d2a72ed0a3b26eb4f88deb4f1fc510c0a8551e563c6799cbcd653bca158fc1467f1bda0a768d78aa5464714ee15bfc308bbf70f95fa2cd0424118a1195 SHA512 253121b5df0ec0322f7393c748470d062f834df39560a14755a14ba79fe28ad60523717a117b6f4d774e62fde71b1712b813cdc059b61d2fa774544de60009c8
 MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
deleted file mode 100644
index 9c4eda569f63..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 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://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND=">=app-text/mupdf-1.17:=
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	x11-libs/cairo"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
-
-	default
-}
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 e1fbd119eba3..5ca8fe3fc822 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
@@ -20,7 +20,7 @@ HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
 LICENSE="ZLIB"
 SLOT="0"
 
-DEPEND=">=app-text/mupdf-1.20:=
+DEPEND=">=app-text/mupdf-1.20.0:=
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
@@ -29,9 +29,9 @@ DEPEND=">=app-text/mupdf-1.20:=
 RDEPEND="${DEPEND}"
 
 BDEPEND="app-text/tesseract
-	virtual/pkgconfig
+	dev-lang/mujs
 	media-libs/leptonica
-	dev-lang/mujs"
+	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch"
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index ffd27a5a4b0b..4747cf7a5beb 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-pdf-poppler-0.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde
 DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff74f91ada036f0cc9beca49b2ebac3e09dbc8334b150ac313d75c3f05f7be59d1f42873a67b77c58186a40c41f88d4772f15 SHA512 588c1d03fef2b0cbb44af6904ab078ae3686d79ce05b1448a41a62ac807226cade4b54725002f0c4bd9c428b192b607664da4bdc8d83c792fab250ef43622a85
-EBUILD zathura-pdf-poppler-0.2.9.ebuild 742 BLAKE2B e3a1fbaf7947512832385b3b8ffd47a56ca09cba148a5d80af28457a9d041563eb5dfdf7bb89a0cd590f990a9c4265349a8ceb832c77b6ac1b0dd185b730125c SHA512 a8504ef444e936e214b3621ea3111d82a0e86f89f087531f9f82b9ea05e2648c9aa11adc19c923e33b6bee85330bc8fd9bf782ae78801dc303fccf62b0438ed8
 EBUILD zathura-pdf-poppler-0.3.0.ebuild 767 BLAKE2B d4955dc86e748ab9710b15b17c83cb2cff34e11d845eb3261efc854ba7b132a8d6a90c05b5b3001fcbbc6c6d128a1442272012388ff2d48fcbeaa6724e84822d SHA512 e9e573f14940d53d9627b782aabe16e1903044b7490cd03047d05bba924ddac57493b98449602bce074611535fef9d4f7a031f90a1a9f3347670ce2ea20cda0a
-EBUILD zathura-pdf-poppler-9999.ebuild 752 BLAKE2B 1aa9d28b4eb5af1bbaa3b98351d744766a97e08e2395f2f180e2ff4b076865dbb58359cb1b616079e1bf0a6fd83f3e228eba0ac26631ff684a79018f371e7dfb SHA512 bd09f493abef296daba93fd43f3d68d2a1e2cf5015f189057cd676fd12707246eacb2ff7947fe9e3bb32f769720afd336d3a5d90e87aba6b88e2ecaf0f16e9a6
+EBUILD zathura-pdf-poppler-9999.ebuild 770 BLAKE2B 83a617fbab49073633f120c1d3974c17998b2d5b92d71e195434e7527d6fe4b1c1d9598bc82c8c84984e517ef2e27f884159899b1a4f30f0af647668298bb939 SHA512 d31e24d52bae236e369f46245ca852f0c7540adc22980f08a9a101fa10ce3084ffd443442d7086a93be2e1f04d302061f1d1125b0b2e94d4c230f58e1e7c6f33
 MISC metadata.xml 669 BLAKE2B 60a8af6a6f1ef902d941ebbfa7bc86fa10a773af260878d0bdc2d211d6792ae1eb28106e653247a03ffb3dfbc4bddf76d7332fd7b703a9e03dc37c90c69b1deb SHA512 c2afc877f4c46a55d662fd0ee6a66fd940f32e7b396a0124cf24209b1cf9d9fd2cc8dc05fccaa5a7a067f7760207a2f8b2ddc54964c6191f2a438d790b3a0d34
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
deleted file mode 100644
index ebbe11bcdbf3..000000000000
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-text/poppler[cairo]
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2"
-
-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 1d1d57e3ea67..448941a99c64 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+	SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index d8748f375e75..67ceee5bdcae 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
 DIST zathura-ps-0.2.7.tar.xz 4488 BLAKE2B 4513173a2f9ca725abf8444516a78fd789286b082a1146ab5d0dee504cdda92962f3e6cef46f24e0307bc5ea6bb6595577fac2dfbd2d4ef0cf8e69d34337baf5 SHA512 86cf4cea8f32e446960c7727745711d6bb6723bb41127ccba335fbdaeb78e9f681ce4104b2be8718a2f19e06aef30d49ae7c90091fa0774b5ffe22303cf37d5f
-EBUILD zathura-ps-0.2.6.ebuild 785 BLAKE2B ea456f3cee1a359e4176d2cceca60445224f0c0f2b63e19376ad1875ecc84f579a59f77c3626b11df22a416b41c60fbcbc08119c08d327e4591f151fa53b4166 SHA512 ded381a60d4e220c4f5a71bb89873daafa9a6135763727d41c30a8ae87b90f07a7b2ccd9e2c65bef06651c0d6a2c7705aa72bf9aad5f9b17f78f7d79efe2f618
 EBUILD zathura-ps-0.2.7.ebuild 780 BLAKE2B c132179888fb1cdd532af15cd6cd4270de3d7e87bc1ea0e755fa9f28620a2ec27c99327d982584aed42b7a31b693fce53c0165ca146f50fc2a76f82b16fe24ec SHA512 c89a12f7d29d834f461eadc0823bbfa365b4afeef18c412424ab62c4a0a9c7b963a9a0ef2fce596affd96552ba0cba4289396fc803ec4e95622c5730e0e30b89
-EBUILD zathura-ps-9999.ebuild 788 BLAKE2B 5cca1dd318b0b42d25d5256c8a8ac041982ec42aecbad33f74fb41ec1ee9304725913c93d29ff6fa7dce1a7c120eaa1bb546c7c84c1acf38153650738146197b SHA512 87db8d6a258a48923eed12296c924e253cec2201780c24f169b7a22118818b394e9c1ac674a748377a49de4b39f02257c469b0fd4ad0cb81d9287ab8d7fd0b47
+EBUILD zathura-ps-9999.ebuild 783 BLAKE2B fd0580968eda5cab5aea8a4d073d0891db52ce8f25b431ef037f8f8d3e7904adf12605e8f129ebdf530c99f8199d8596aca6f0a51eae1eabf1a05cc1ad2d6aa4 SHA512 27e382034e7c50c6465390a6e10a80858b07d484e1c243f214eae1757a75382949c9bd5ceba206882f4d6caf48fdd6894a87b902799b98d4b18a14bbfc2ffdc8
 MISC metadata.xml 583 BLAKE2B ca246e0a76aa83c55397bb48f58b196e816b11fa1c873a49b21ebee38512566d377b23ea926377ae8a08325d8494e49a12aad7caa2b8a3a19a1342ab2f8178ce SHA512 81c6f5d849fd80dd4b226db01e97f34ce8ae6affafd6b680ae31130484859983f1f1c7eaa5abaec9ca9c225fe7a7b3ecd0481f44fc9861b8c488e3c0aba24166
diff --git a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
deleted file mode 100644
index 023f84490bc9..000000000000
--- a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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"
-else
-	KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-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 01488806de7c..52b16b0f9b8d 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg-utils
 
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+	SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
 fi
 
 DESCRIPTION="PostScript plug-in for zathura"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 60a9804095a4..d291d8815ba9 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,9 +1,5 @@
 AUX zathura-0.4.8-meson-0.61-build.patch 814 BLAKE2B 692fa4e525d8ca5bad33e1e36a288832509da06399db895f53235709db2367e4011a58d6b6632ee8850677619e6cf8a8d419989737af4cbfc6b6ed04ed8ea83e SHA512 ebf7769d5775f60e57521bdbfbc5a749c584ed706dc0f28d63ec2b6de6e5324a1835ad6f66827301a8ccedb3f2e4b6d60822c0176d63a52173b37fbf36e8f5ce
-DIST zathura-0.4.7.tar.gz 199857 BLAKE2B c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f SHA512 adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60
-DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 70916ac23624b8e55b39bc2b9329fc5d992d3e2e3989b17bebf0f8b1bcb26ed943c15866c0b37e0a4a29fee7c264d6309bf1d036d770817e13a14a13af7499d7 SHA512 00d7b735154ff0e857f8a0a21c24b3fbbff8c166d93a34bee725072ee00f2870adecb956e9445334be2a84827778bd874cc1d4bda7f8b32e4468ea3784834b86
 DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10
-EBUILD zathura-0.4.7.ebuild 1355 BLAKE2B f5e59096beb3e8cc13dde9cb887a1ceea87c7ee22f28f1599e235240c4e065da858ffadb96c3c702602684b6c0f6c6ed9018cf039ad16077f6f6b041d1c4f3fa SHA512 a1996b203c933b5e6e3661151bdba217ef131cd1e895ad2328c6cc6207b7f841434671671f7cc49af97bc6554fa366c9cc16f8eb38eafbb6bbf584b41632c3c4
-EBUILD zathura-0.4.8.ebuild 1414 BLAKE2B c9e53786f10e0bcdd9057124a365b050881a640e7dd42e87a962b71aaa0702d7090a43b360dc92976456ccaaa1af84160bbae95a9a21a3fc315b116303a3aaf7 SHA512 fc53625f6057cc6433c61e30b8beb9e37c83772ee6eae7ad3177e4f00d8de56223ebcdd728a9773b9fadc93746295cb99e1331a1c6763c6fbb9108539987f95e
 EBUILD zathura-0.4.9.ebuild 1355 BLAKE2B 82e932b9fddd23316066c358a6aede8480532c970a992270f9f6fa2a3c7545b4286249d4ce9a96b9079500ede0e2371fe8682e2b234a93c4e351d1781507b7ea SHA512 7978966e9716677442b274af5792aa3e2a682f7e1963ed6c3ed094f322e8a12db1118525b06c600c407c362177584c543679de2583cfadfd5e4ad95e86d30734
 EBUILD zathura-9999.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
 MISC metadata.xml 769 BLAKE2B 417d92ddfcbc7c2352a79c4275022515fa0bf31b7c06058bb29452f7e15882b59ad3d2b92a2aa8063bb54120377e028449c0e253cd2aeab719a92e4853a3eea7 SHA512 9f7284f67e9bb6b454670393431546685ede815937bb06f7a73ebf25c9cbecca734a8e09753ffc803f8f44ce3a67002c59e31d98bce6185b4237e5d499e3165f
diff --git a/app-text/zathura/zathura-0.4.7.ebuild b/app-text/zathura/zathura-0.4.7.ebuild
deleted file mode 100644
index 90354da9273c..000000000000
--- a/app-text/zathura/zathura-0.4.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 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"
-	KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.3
-	>=dev-libs/glib-2.50:2
-	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	magic? ( sys-apps/file )
-	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
-	synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-libs/appstream-glib
-		dev-libs/check )
-	virtual/pkgconfig"
-
-src_configure() {
-	local emesonargs=(
-		-Dconvert-icon=disabled
-		-Dmagic=$(usex magic enabled disabled)
-		-Dmanpages=$(usex doc enabled disabled)
-		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsynctex=$(usex synctex enabled disabled)
-		)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/app-text/zathura/zathura-0.4.8.ebuild b/app-text/zathura/zathura-0.4.8.ebuild
deleted file mode 100644
index 83b02ddfd08f..000000000000
--- a/app-text/zathura/zathura-0.4.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 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"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.6
-	>=dev-libs/glib-2.50:2
-	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	magic? ( sys-apps/file )
-	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
-	synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-libs/appstream-glib
-		dev-libs/check )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-0.61-build.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dconvert-icon=disabled
-		-Dmagic=$(usex magic enabled disabled)
-		-Dmanpages=$(usex doc enabled disabled)
-		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsynctex=$(usex synctex enabled disabled)
-		)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}