gentoo auto-resync : 18:07:2024 - 12:29:01

6 files changed, 64 insertions, 20 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 76200a3bad59..4142d252b3a0 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 1e39e27eb9cd..09a599234416 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,7 +1,8 @@
 AUX zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch 1015 BLAKE2B b2ba561909eafed3f1aef2efdf5596a2d0f1a933c1e60106eef9ce52f86c9182492b4e4959f274312332089863e4209204c098d4baa1885de28eeaafd04d803d SHA512 264d6b4eb035424a54eccdc8b5103142f6c822de1e4831303413b778769b520268f02139213d391294d1c407289e075148c227e6a0d8fe02ba03d401f9c0f067
-DIST zathura-pdf-mupdf-0.4.0.tar.gz 9323 BLAKE2B e633e2d52080dc017cd59be184fc52f52b21f9bfa1cecb48c83b4383366226f8e65fcd92503493e8df568847f84a39f2f7d8e4a87df44c66ec121c246557e10a SHA512 44a8d72f54adf29cc853c636f2387edb52e253522c82175533a2f80a6afc45ca88a785785bb840bf81e368ef8f35e31f5e9bf7648ee6a13d394eb4133585c060
+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
-EBUILD zathura-pdf-mupdf-0.4.0.ebuild 847 BLAKE2B e76b4863334eee0543e35938ca4d00eed77fcacfe0ba5a8e3e7167fa480530d6c8375b854557d6508f944f28be23193623a4672c79210c07c06bb93ff444e765 SHA512 c43ee375c0e9fefefd22b9676cec0b916b421c3d1762c4bc11ced376d7c261b270771367401d0e411a6df21e70a5091217d333f64792802c3b706ce0e3c012a4
+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
-EBUILD zathura-pdf-mupdf-9999.ebuild 857 BLAKE2B fc48aa72ddb8caa36c3e32c51307d6779feb954e9607211dec5944c6c200c42fd180f0f5dc63c55eceb07401b3f08213fe24d1024f678bdf46b4491d2f6cfa12 SHA512 8867464a50199c1c523b587d2cec37d64ac17478a74002596a85bfa81bf66e9b83d09b95bf9802d29513001c07558f182bc5a7a63dac46daceb907bff113475d
-MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
+EBUILD zathura-pdf-mupdf-0.4.3.ebuild 893 BLAKE2B f48b7ace321b69bebda6dafb90396cdd8d3a5ff2f898ba734fc46818f12daa1783ff7713394b7e5886f3354dfe06b0aa099012d097033b76e861b595382ff378 SHA512 598c364179cc735d25a002b3a629414e0e53143d42797fa2264f8479de6e820e1d71ccf195229d3f8debdf042e85989e4c8f6ab54f786791c78be101b040c413
+EBUILD zathura-pdf-mupdf-9999.ebuild 900 BLAKE2B 4448a6191e58ce573c005681719abbd9fd42db7d0d700ef13a21bd478f2b43410a618a4ad402d627691e7db2dce9ec178ca8afebed150617e0ca4fe84f4349fb SHA512 903cc40c480e1b8b42d1e8e9cfcf23e9a26b690546dffaf33a02a81e639e503aa411b69e5f29b7f3b85843e66638d499ec6dee3e158ac492765d35296d937e4a
+MISC metadata.xml 882 BLAKE2B 7942e40c627610201c9fac32b873a457af91e1643df2d77edb7b16e8d16b190b03232515268b5f00127a385ec0ae195993830dce2c128fc982f330663b44bf4a SHA512 9509293871df3131a4502669c6b1e5bf875a821f56d00d37a9d0fefb426e572be456908c9767884b625f5bac966ca4c83b433926d8b2118f28cffa06a6719788
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.3-meson-mupdfthird.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.3-meson-mupdfthird.patch
new file mode 100644
index 000000000000..707e7b89cdf6
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.3-meson-mupdfthird.patch
@@ -0,0 +1,42 @@
+# The dependencies mupdfthird, leptonica and tesseract seem to not be actually used
+# anymore, hence exclude them.
+# Upstream issue: https://github.com/pwmt/zathura-pdf-mupdf/issues/73
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,6 @@ girara = dependency('girara-gtk3')
+ glib = dependency('glib-2.0')
+ cairo = dependency('cairo')
+ mupdf = dependency('mupdf', required: false, version: '>=@0@.@1@'.format(mupdf_required_version_major, mupdf_required_version_minor))
+-mupdfthird = cc.find_library('mupdf-third')
+ 
+ build_dependencies = [
+   zathura,
+@@ -46,17 +45,15 @@ if not mupdf.found()
+     error('mupdf @0@.@1@ or newer is required'.format(mupdf_required_version_major, mupdf_required_version_minor))
+   endif
+ 
+-  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 += [
+@@ -64,8 +61,6 @@ else
+     libjbig2dec,
+     libopenjp2,
+     gumbo,
+-    tesseract,
+-    leptonica,
+     mujs
+   ]
+ endif
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index 348798600314..c6a49fde50cb 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -18,7 +18,8 @@
 			<email>sebastian+dev@ramacher.at</email>
 		<name>Sebastian Ramacher</name>
 		</maintainer>
-		<doc lang="en">https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/blob/master/README.md</doc>
-		<bugs-to>https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/issues</bugs-to>
+		<doc lang="en">https://github.com/pwmt/zathura-pdf-mupdf/blob/develop/README.md</doc>
+		<bugs-to>https://github.com/pwmt/zathura-pdf-mupdf/issues</bugs-to>
+		<remote-id type="github">pwmt/zathura-pdf-mupdf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.3.ebuild
index 80d004c0aeca..a939c6c183b8 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.3.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,23 +7,23 @@ 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"
-	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://github.com/pwmt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
+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"
 
 DEPEND="
-	>=app-text/mupdf-1.20.0:=[javascript?]
-	>=app-text/zathura-0.5.2:=
+	>=app-text/mupdf-1.24.0:=[javascript?]
+	>=app-text/zathura-0.2.0:=
 	dev-libs/girara
 	dev-libs/glib:2
 	x11-libs/cairo
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 53bd172f9007..8942ebaca741 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-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,15 +7,15 @@ 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"
-	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/pwmt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
+DESCRIPTION="PDF support for zathura using the mupdf PDF rendering library"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
 
 LICENSE="ZLIB"
 SLOT="0"
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-meson-mupdfthird.patch"
+	"${FILESDIR}/${PN}-0.4.3-meson-mupdfthird.patch"
 )
 
 src_prepare() (