gentoo auto-resync : 08:01:2023 - 18:16:34

15 files changed, 67 insertions, 145 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 267371bee4d5..01d91bbaecb3 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index ba6cc31ab69c..e048379e584d 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -1,11 +1,5 @@
-AUX apvlv-0.1.5-cflags.patch 702 BLAKE2B f6679326fdf3263e5a304f11bb1b6d047fd5604288912c9099a18b9a990574e1031c92c751c147319aa8c0f9e066e8a239562483b56f77e29fecf649fe7f89d5 SHA512 de7842c8cb402f045240aa50bdf05a13c6e9a4bea099fc8c41f07329b330fbb98f6edc229f0bb78eec65b14ecfffe9240441387717024939c11b9a69cb65919f
-AUX apvlv-0.1.5-gcc6.patch 403 BLAKE2B d593c72ef63ddc22a76fe8b93ad12078b1739f359832dee54f3ff4f5fbf7fa4249457ac74921b8fd9734eafdae2088321703df0b3bf56a89a1c33b96a15908b8 SHA512 f838fe6c601765e7d03ba83575aa5ffa2562d90e257832109ebe879b29d67228784c920ff7c9716010f10d2c36f4e873bc2425fc337857c437c6a19e6bd5e5f5
-AUX apvlv-0.1.5-gcc7.patch 685 BLAKE2B 3ece21cc1bfb5bbf66d10fb67abb140a357c6953655ca1b02b37cbc3d09503b5382694fb20337b2a7e50fc0a7ab51657f1a3091060bf03e8666b2bdbd0b8a8dc SHA512 53102dfea587fd946bdd7300fdb60b8395d6b2436aef6fe67be539e4ac88063f9d7934282227316f456951aa1e0748db7db02ddda06e17056d32ea6b91588afb
-AUX apvlv-0.1.5-poppler-0.73.patch 282 BLAKE2B 8bd7926afd2ce2364b82e7f9c8348b2905e1c3cdd6ba3565b4191ec5b6cfa5565179cc58706286f793b5b02cba2dc6eff04076b2fa61eb0be1638681632eedd5 SHA512 b832ee8e8e7290d2294ac326e84271570f560a5e7afc29446401ad1c05f1b03998c054bf3cd7ec80813899e49c256f86c871b400ce8e5a663fa9ab22015990cb
 AUX apvlv-0.4.0-cmake-cxxflags.patch 378 BLAKE2B 44063fd090374654067c6f1b43d9d392fb0a6739ae1e44271796c97a39962e229b6ba597b29ec7a0e5b30501af3c62f5a7c0fcc3ed093985e4b253ed33a39efc SHA512 d52d7b7f4500c3094de521e8eee368d6b50dd858d78fa830067ea2fe7cb446f66850d57ab70e6f51281d7a86ac531c0ed89425480d1c5e371631f1fbcff23fd3
 AUX apvlv-0.4.0-icon.patch 258 BLAKE2B 440dfe9904c4ac79408c90c5930e7b6ffc26fdd084ac4320fd945679f69c5333ffc4120991658d045d1e4525421f973d7dce020814b641397b54a0706f510475 SHA512 039204036fdf6b8a26451ca7d4b5d7d2e6b28bac8df5d97876a3b3dcb1e5b24e1f030864cac41b7a4776ea7999dffa9053bdd0632baf2d43054474c28e9a9b3d
-DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
 DIST apvlv-0.4.0.tar.gz 4361302 BLAKE2B 99d61df285ff3b910ace50bc4b1b62601fe7ca9037f835262a8eac179ddcccff5f772121b223e38050243d4bc2da9532e17d9b38fbceb786971d77fea006f91d SHA512 a25033e52acf34b486101953ffaa5de604e3321f9b4705e94fa157596ef560351c1712ed830b2a950f92c054b600a33f903be58f8a7d222c27e5125fedf4245b
-EBUILD apvlv-0.1.5-r2.ebuild 1074 BLAKE2B c372704ea0105086aec23cf4a5ca647440e1a9c3dd90fee4e94bc285e6b78475cf0c7f43edd3b91b4999fcc22f13cb6d978837d9ad2c9cbf3e7ae6b1327a9060 SHA512 7b78bf8e5805f95348e4ae1dd7a6c8027bfc147f2db31b78739b7f343557a918db53831891ed1d0b71430ba2a963f44483277913de5998c7829a70aa7d7e3c5a
 EBUILD apvlv-0.4.0-r1.ebuild 1125 BLAKE2B aec2471b52af93c8435d3e3949e85687ccc030f2af562a9eba78e488646eb25e0d743d72b0f3acadbd67298edb736b1c52c6da49d158d14b140cfdd5ba8f7439 SHA512 1a9edbe4ffecec6f68d6a574b14a5e09cfa694c5b5785debfbae4c60edd7408d7eaa03ee9bf2db7d7ac9fce9a3e89b1457fb78efb728d0c5b8fd4079079994c5
 MISC metadata.xml 543 BLAKE2B 6e61516bb251d76663ce79b5c55ba6b7ea8fc6c3b1f0bd9ba4524e7b61e9f79d271599395daaeafa90ff2a44ad6755bf1185aa29adc0462bf65d4bdc9129e502 SHA512 c8822ce8ddfec1223794ac415517f17e46b06eb19207a52457b5362076342364fb85cd1873c0b39642f65bc2640eb752fb793df1d26a66140dd8026f81b8ea90
diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
deleted file mode 100644
index 8bd32e2cccc9..000000000000
--- a/app-text/apvlv/apvlv-0.1.5-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake desktop
-
-DESCRIPTION="Alf's PDF Viewer Like Vim"
-HOMEPAGE="https://github.com/naihe2010/apvlv/"
-SRC_URI="https://github.com/naihe2010/apvlv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug djvu"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	djvu? ( app-text/djvu:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# preserve cflags
-	"${FILESDIR}/${P}-cflags.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-gcc7.patch"
-	"${FILESDIR}/${P}-poppler-0.73.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONFDIR=/etc/${PN}
-		-DDOCDIR=/usr/share/${PN}
-		-DMANDIR=/usr/share/man
-		-DAPVLV_WITH_HTML=OFF
-		-DAPVLV_WITH_UMD=OFF
-		-DAPVLV_WITH_TXT=ON
-		-DAPVLV_WITH_DJVU=$(usex djvu)
-		-DAPVLV_ENABLE_DEBUG=$(usex debug)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newicon -s 32 icons/pdf.png ${PN}.png
-}
diff --git a/app-text/apvlv/files/apvlv-0.1.5-cflags.patch b/app-text/apvlv/files/apvlv-0.1.5-cflags.patch
deleted file mode 100644
index d1859fa25701..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ae9ae09..5831e7a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,13 +1,11 @@
- IF (WIN32)
-   ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
- ELSE (WIN32)
--  SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
-+  SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
- 
-   OPTION (APVLV_ENABLE_DEBUG "If build binary with debug infomations." OFF)
-   IF (APVLV_ENABLE_DEBUG)
--    SET (CMAKE_CXX_FLAGS "-D_DEBUG -g ${CMAKE_CXX_FLAGS}")
--  ELSE (APVLV_ENABLE_DEBUG)
--    SET (CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
-+    SET (CMAKE_CXX_FLAGS "-D_DEBUG ${CMAKE_CXX_FLAGS}")
-   ENDIF (APVLV_ENABLE_DEBUG)
- ENDIF (WIN32)
- 
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
deleted file mode 100644
index 0ffe3659d6d7..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur apvlv-0.1.5.orig/src/ApvlvParams.cc apvlv-0.1.5/src/ApvlvParams.cc
---- apvlv-0.1.5.orig/src/ApvlvParams.cc	2015-01-10 15:04:24.000000000 +0100
-+++ apvlv-0.1.5/src/ApvlvParams.cc	2017-02-09 20:03:08.655402750 +0100
-@@ -90,7 +90,7 @@
- 	return false;
-       }
- 
--    while ((getline (os, str)) != NULL)
-+    while (getline (os, str))
-       {
- 	string argu, data, crap;
- 	stringstream is (str);
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch
deleted file mode 100644
index e55f2771395a..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- apvlv-0.1.5+dfsg.orig/src/ApvlvCmds.cc
-+++ apvlv-0.1.5+dfsg/src/ApvlvCmds.cc
-@@ -200,7 +200,7 @@ namespace apvlv
- 
-     if (len >= 4
- 	&& *s == '<'
--	&& (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-')
-+	&& (e = strchr ((char *) s, '>')) && *(s + 2) != '-')
-       {
- 	e++;
- 	StringKeyMap::iterator it;
---- apvlv-0.1.5+dfsg.orig/src/ApvlvCore.cc
-+++ apvlv-0.1.5+dfsg/src/ApvlvCore.cc
-@@ -90,7 +90,7 @@ namespace apvlv
-   {
-     mInuse = use;
- 
--    if (mInuse == false && gView->hasloaded (filename (), type ()) == false)
-+    if (mInuse == false && !gView->hasloaded (filename (), type ()))
-       {
- 	debug ("core :%p is not needed, delete it\n", this);
- 	delete this;
diff --git a/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch b/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch
deleted file mode 100644
index c3001d4b6196..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ApvlvPdf.cc	2015-01-10 15:04:24.000000000 +0100
-+++ b/src/ApvlvPdf.cc	2019-01-17 01:29:54.479256848 +0100
-@@ -29,7 +29,6 @@
- #include "ApvlvPdf.h"
- 
- #ifndef POPPLER_WITH_GDK
--#include <goo/gtypes.h>
- 
- static void
- copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 4747cf7a5beb..f0ad72e6767c 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff74f91ada036f0cc9beca49b2ebac3e09dbc8334b150ac313d75c3f05f7be59d1f42873a67b77c58186a40c41f88d4772f15 SHA512 588c1d03fef2b0cbb44af6904ab078ae3686d79ce05b1448a41a62ac807226cade4b54725002f0c4bd9c428b192b607664da4bdc8d83c792fab250ef43622a85
+DIST zathura-pdf-poppler-0.3.1.tar.gz 9259 BLAKE2B c1131d2acc0cf69bf9266969839f6fb4e043664a0a4648d033f9338b1219d75e34576a03380daf54bc8fe52cc8bd2244a93394e15f8ff0bbb980fb903749affc SHA512 a6ea7d61f05cfbc6229ec81580c539841916b44085aeb168668cfabd41aca2e5321e88605f092caaa3efc30bec25a2bb319c687920a22b1f7f53e4b1e470ec34
 EBUILD zathura-pdf-poppler-0.3.0.ebuild 767 BLAKE2B d4955dc86e748ab9710b15b17c83cb2cff34e11d845eb3261efc854ba7b132a8d6a90c05b5b3001fcbbc6c6d128a1442272012388ff2d48fcbeaa6724e84822d SHA512 e9e573f14940d53d9627b782aabe16e1903044b7490cd03047d05bba924ddac57493b98449602bce074611535fef9d4f7a031f90a1a9f3347670ce2ea20cda0a
-EBUILD zathura-pdf-poppler-9999.ebuild 770 BLAKE2B 83a617fbab49073633f120c1d3974c17998b2d5b92d71e195434e7527d6fe4b1c1d9598bc82c8c84984e517ef2e27f884159899b1a4f30f0af647668298bb939 SHA512 d31e24d52bae236e369f46245ca852f0c7540adc22980f08a9a101fa10ce3084ffd443442d7086a93be2e1f04d302061f1d1125b0b2e94d4c230f58e1e7c6f33
-MISC metadata.xml 669 BLAKE2B 60a8af6a6f1ef902d941ebbfa7bc86fa10a773af260878d0bdc2d211d6792ae1eb28106e653247a03ffb3dfbc4bddf76d7332fd7b703a9e03dc37c90c69b1deb SHA512 c2afc877f4c46a55d662fd0ee6a66fd940f32e7b396a0124cf24209b1cf9d9fd2cc8dc05fccaa5a7a067f7760207a2f8b2ddc54964c6191f2a438d790b3a0d34
+EBUILD zathura-pdf-poppler-0.3.1.ebuild 772 BLAKE2B 401c7396ff2e8a6803d67400065d104839437d734897454e73058abdfd603c515a21827cd9efe5ef3e3fceebb9c359e17173eb0fcc6fcb00c201d71fa892b464 SHA512 e08a7d327ee0ccbbab0f2881ab8ead87ed28309b9f6e27b32014b9631ab1f9f95afcb9f286293ebcedecd8bb7d6480ad8a748fd82be12e5f952b7c1180b22539
+EBUILD zathura-pdf-poppler-9999.ebuild 772 BLAKE2B 401c7396ff2e8a6803d67400065d104839437d734897454e73058abdfd603c515a21827cd9efe5ef3e3fceebb9c359e17173eb0fcc6fcb00c201d71fa892b464 SHA512 e08a7d327ee0ccbbab0f2881ab8ead87ed28309b9f6e27b32014b9631ab1f9f95afcb9f286293ebcedecd8bb7d6480ad8a748fd82be12e5f952b7c1180b22539
+MISC metadata.xml 742 BLAKE2B 25123046ea688616972cd2ef7347eaa72efe9136914abc7b54b2afbf3f85afdf487cc9e246cd1b2de45f2109998c34005b5f9041d6d15282389e9942b357beac SHA512 bddd3bf740e7ef9a6327ed9bd29e2224643fb7403486417b98d6e00b19af7405694d3d726de28090a00b0c469a238d721664240f6e524d3c9bfc816ff431eca8
diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml
index 9e8a429671ba..61d86c13239b 100644
--- a/app-text/zathura-pdf-poppler/metadata.xml
+++ b/app-text/zathura-pdf-poppler/metadata.xml
@@ -7,15 +7,16 @@
 	</maintainer>
 	<upstream>
 		<maintainer status="active">
-		<email>mlq@pwmt.org</email>
-		<name>Moritz Lipp</name>
+			<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>
+		<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-pdf-poppler</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild
new file mode 100644
index 000000000000..cda9cd6aa073
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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 ~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"
+
+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 448941a99c64..cda9cd6aa073 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 
 DEPEND="app-text/poppler[cairo]
-	>=app-text/zathura-0.3.9
+	>=app-text/zathura-0.3.9:=
 	dev-libs/girara
 	dev-libs/glib:2"
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 18cd334d0bb6..407472320840 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -2,6 +2,6 @@ AUX zathura-disable-seccomp-tests.patch 676 BLAKE2B a0fb24ad08247cb14e8017abf952
 DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10
 DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
 EBUILD zathura-0.4.9.ebuild 1355 BLAKE2B 82e932b9fddd23316066c358a6aede8480532c970a992270f9f6fa2a3c7545b4286249d4ce9a96b9079500ede0e2371fe8682e2b234a93c4e351d1781507b7ea SHA512 7978966e9716677442b274af5792aa3e2a682f7e1963ed6c3ed094f322e8a12db1118525b06c600c407c362177584c543679de2583cfadfd5e4ad95e86d30734
-EBUILD zathura-0.5.2.ebuild 1363 BLAKE2B 0837cff7f4afc27c1f95581325c0f554fa9fcb87e40082f5bddabb9e129c135d63596d883dd58be7471a36c13da84deeaf65a4d50c26d2aa9c8a5bbb4c752561 SHA512 ef35dbafdc4eb52a83bf8d667b79306f67df8dc47d4ba4c59717b711f1b158a134c73fa0b3b557210fe7ec12490bc231c33d137ce72abd9cd6fdeac5077e6aa3
-EBUILD zathura-9999.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
-MISC metadata.xml 769 BLAKE2B 417d92ddfcbc7c2352a79c4275022515fa0bf31b7c06058bb29452f7e15882b59ad3d2b92a2aa8063bb54120377e028449c0e253cd2aeab719a92e4853a3eea7 SHA512 9f7284f67e9bb6b454670393431546685ede815937bb06f7a73ebf25c9cbecca734a8e09753ffc803f8f44ce3a67002c59e31d98bce6185b4237e5d499e3165f
+EBUILD zathura-0.5.2-r1.ebuild 1378 BLAKE2B db094c73bd02339d3369f087208544f75dd745c226df070d109cd55bc1ef67ba7e6d3ee13e49fab2e50cd5ada0de1bdbecfc05eb1cafd70ce1437ef389f4445e SHA512 9612f653fcf23efe7204506bf66d2c43aa9137bc072fce26d1e6d182844ed65a0084a4ac46cb8a3cafbd514ab11ee7889cd3f06c6fa5129e53b870e2c3545888
+EBUILD zathura-9999.ebuild 1378 BLAKE2B db094c73bd02339d3369f087208544f75dd745c226df070d109cd55bc1ef67ba7e6d3ee13e49fab2e50cd5ada0de1bdbecfc05eb1cafd70ce1437ef389f4445e SHA512 9612f653fcf23efe7204506bf66d2c43aa9137bc072fce26d1e6d182844ed65a0084a4ac46cb8a3cafbd514ab11ee7889cd3f06c6fa5129e53b870e2c3545888
+MISC metadata.xml 821 BLAKE2B 1e00497e754b684be18ced6966f830350bb6c9529a3993c4a1c17b9f0f6d3512e864dafc10966be8e5f338a8f4484335f2debe239914ddf2d0bc0ed99895bf63 SHA512 ff0cacc5dd1ed909ddd5080fc949dc997ffcc1b5ed429b9cf9d5e3d1447bfffc89ddce79371ef387c5064fd0df65f15d85c665ee2125d4269093e536a7b80c6c
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index f7b9cf89b9e1..63a71a9577e8 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -20,5 +20,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</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura/zathura-0.5.2.ebuild b/app-text/zathura/zathura-0.5.2-r1.ebuild
index a348aaac0cce..88dfa8dc6291 100644
--- a/app-text/zathura/zathura-0.5.2.ebuild
+++ b/app-text/zathura/zathura-0.5.2-r1.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 LICENSE="ZLIB"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 IUSE="doc seccomp sqlite synctex test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 0de2aed7939f..88dfa8dc6291 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-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
@@ -18,17 +18,17 @@ else
 fi
 
 LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="doc seccomp sqlite synctex test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=dev-libs/girara-0.3.6
+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
-	magic? ( sys-apps/file )
+	sys-apps/file
 	seccomp? ( sys-libs/libseccomp )
 	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
 	synctex? ( app-text/texlive-core )"
@@ -40,10 +40,13 @@ BDEPEND="doc? ( dev-python/sphinx )
 		dev-libs/check )
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/zathura-disable-seccomp-tests.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)