gentoo resync : 22.12.2021

4 files changed, 53 insertions, 10 deletions

diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 7eeffdb203e6..1394dcb070c2 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-pdf-mupdf-0.3.6.tar.gz 8925 BLAKE2B ee74a1655da7d16070b8909dd0f44239eb21055a40a525b766dc3d9e81f84377abe0623ba33925a25739bccf885f8967496be30c27e421d30b1a78dd64b84aee SHA512 f6783c3fc08849d7dc6fd527b7fcdb51d4ef9214379ca6b4dc6d29e75b10f37e3ada2046e205449a7d0465f07e65a6cf3f2f44fba98360cba16676e705390a97
+DIST zathura-pdf-mupdf-0.3.7.tar.gz 8957 BLAKE2B e25412423ba8ec7c9c96d320129f9a3e71a974a118476f2720a356a0c51476f7c827d16b4fbb00d4cebcd803e75ff34b5e7d5c024db57fae17861c137487e021 SHA512 1e27bcf0fc2eb730e77d3dab7c25575e0ae830ca251f380d740a4b8bef588122d279b2c97a7b75fb749daaf24bb458cd54ec7a11321d75bfb5c1b4b0dc0fccac
 EBUILD zathura-pdf-mupdf-0.3.6.ebuild 820 BLAKE2B 8b7e4971575be372a30c98a8fbd348e3df257adcc1e4e2a02a0c09d8c3967e3e7c6c352fb98c239aff269eddbd765f6fce0e0995ef07f8b6fc56bcd4851a8cb8 SHA512 866df18c6496c891994782243fcea2fbd3301042e12f1cdb1358fe7195e30fa23e469ec462c604ad27250f235ff4833ec65664cfc571f0751b507b790d6ef4b6
-EBUILD zathura-pdf-mupdf-9999.ebuild 823 BLAKE2B ed4be465381eb7313c35873f9d479b3119c49b9175744511349b5345d6f6fba1ec2f341f05b0e5679eca91bed6f2b2a6d146706e25cfdc45caa894a312b07ba3 SHA512 2314179fdeac75c52412d950e449a5edaed5d3846d56e35c775086d17aa572fa53c25032b6251664422351618f920f909846ae4ef705fa06c06b5469ecfa8d30
-MISC metadata.xml 593 BLAKE2B eae144f33be25a2df391b571e1e10131b6a3ffedd8d9a5601557b514e5cc4f3fa55d8eca9a7eb4403e64a9786b0c8d6a5da1a551c6fa129bc617172407955d72 SHA512 0dca4273a6058d7650376a15023fa1df80213aa60a6159858428a35ace693be853b463c74d12f8135a02b22069e8014a1e61c474b8c388ea3e69b199aec0f585
+EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 791 BLAKE2B 1c404c508b0dc647056799051ca1eebee5e340f8031f306fe9bbfe08dd5d9719532eb4dc5e22ab5659001d90860488f1b14ceceb35175c5c44056314a6f94032 SHA512 376fd36b73f1fcaeec6e72cabef9f2b7afb646a6b27262b6b2ab360502e55ac195ee9d4d8a8461ea24953304ab458093e49522ec48ae76b55343a9b7b09d82da
+EBUILD zathura-pdf-mupdf-9999.ebuild 791 BLAKE2B 1c404c508b0dc647056799051ca1eebee5e340f8031f306fe9bbfe08dd5d9719532eb4dc5e22ab5659001d90860488f1b14ceceb35175c5c44056314a6f94032 SHA512 376fd36b73f1fcaeec6e72cabef9f2b7afb646a6b27262b6b2ab360502e55ac195ee9d4d8a8461ea24953304ab458093e49522ec48ae76b55343a9b7b09d82da
+MISC metadata.xml 830 BLAKE2B fbae9ee1ad786f6defe68a52311be5334c0699a67aaddb17ee4e1d09df395f01ab7484dfe370e269ed0c52f0af94e7493d6a535eda1ed6696f50aba81ec55337 SHA512 5692ec06aef6fbff3cb481c2b3706601c0dfea1c61e570cb9077548a9b48627a3c2fd85a2a6993ef10046adca3edcbabf67fec524dcbd29a10ca09d09a4e9150
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index 18a11cea9c40..90a532bc0a5f 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>mlq@pwmt.org</email>
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
new file mode 100644
index 000000000000..35451c79f998
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 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/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${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 f3f90d3b0870..35451c79f998 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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-pdf-mupdf.git"
+	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
@@ -24,9 +24,6 @@ DEPEND=">=app-text/mupdf-1.17:=
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
-	media-libs/jbig2dec:=
-	media-libs/openjpeg:2=
-	virtual/jpeg:0
 	x11-libs/cairo"
 
 RDEPEND="${DEPEND}"
@@ -34,7 +31,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
+	sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
 
 	default
 }