13 files changed, 182 insertions, 18 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 30dd9fbff144..1d66c19fd954 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index c580284fdd65..55c623dd6b38 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -3,5 +3,5 @@ DIST libpaper-2.0.4.tar.gz 1286975 BLAKE2B 2751422ca3176d1f47d98c74d948d986e6dcf
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
 EBUILD libpaper-1.1.28.ebuild 1148 BLAKE2B b5556a5ae27415083aa89ca18a6f9dc232026a37fae823b9f96ef0325d28f2c1e37e3f34ecee1f4773793fb0b31b7f607ea955c9fa96a88d18a4b90eca8f54be SHA512 07e36537c2278711c602c667e50e72091aef0bbbb79de8a99ed915c7c1f600be4c7d53f7446578b3b1734375a07ab8464e5ab0b342ef50516d1e2b0e7c325d07
 EBUILD libpaper-2.0.3.ebuild 871 BLAKE2B 0b2162965d40cf4f9799f3dc18de0f00d443a88049a582bd16c596e61f8a56bb50f4efe2d33b34d7b98e5b928033c314990a39a17002e219f89e225771e954c7 SHA512 5bc6a660603619922f5210ad0f477d98742aa2351f1f2d74f9b2301ba8fe9f785f68a529cc5403c3eb0c5bf83caa64bde394478093ca389211630129bd841152
-EBUILD libpaper-2.0.4.ebuild 871 BLAKE2B 0b2162965d40cf4f9799f3dc18de0f00d443a88049a582bd16c596e61f8a56bb50f4efe2d33b34d7b98e5b928033c314990a39a17002e219f89e225771e954c7 SHA512 5bc6a660603619922f5210ad0f477d98742aa2351f1f2d74f9b2301ba8fe9f785f68a529cc5403c3eb0c5bf83caa64bde394478093ca389211630129bd841152
+EBUILD libpaper-2.0.4.ebuild 864 BLAKE2B 4b20c4a2ce4c35cdf611050f7420140263e8056e59a6e5f0244970b645b1ee1fe05bfa3cccbe3998d4bbd6cf25adbd10ca8dd014e2d67fdf89a85bbd7058bfc7 SHA512 632fe156df584720edcbf49dbeb43bdbbec4064c2d15424d289ff230a9a5d79a49afb00d773012d68be68936f5f327891424f9c7a85801796257d67e3528acb2
 MISC metadata.xml 342 BLAKE2B 28767bfca8e43186de0792106c408d3a8e0ef8c9c59836789b045c23f12163e43b9eb547c93f1751f031b8f61bd7940f50ccaa95f2ecc14cdf5a9267be721d0e SHA512 0d16a636e3cce2ee9051bd694f34a072ff13d4ca6f4c9f3e81443cea386f48f5863db03ca9cb050f43a6a1fa483d401969617597d68024fee10058a0c72b3585
diff --git a/app-text/libpaper/libpaper-2.0.4.ebuild b/app-text/libpaper/libpaper-2.0.4.ebuild
index dcf04a114100..7b2b029b49ce 100644
--- a/app-text/libpaper/libpaper-2.0.4.ebuild
+++ b/app-text/libpaper/libpaper-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.
 # paperspecs is public-domain
 LICENSE="LGPL-2.1+ GPL-3+ public-domain"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="sys-apps/help2man"
 
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 38ebd3c3188f..e7861a645a3c 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,5 +1,6 @@
+AUX recode-3.7.13-no-help2man.patch 1945 BLAKE2B 62f5af8333b360ff7519edaa7af3ebef8c602c811aa8575c18910929c1f2776e44a234bff2abb2c5403cb94d803f3a2601aee00fd259497c6eaeb07b882b4112 SHA512 bd808c741e58dd7fd56c0960188d49237016e3a66996b8ef286d1305a8ca32d5b9a8f30fa08120ddae1901eb5d3fa019044b63fda32dc78d71c91babacc84ded
 DIST recode-3.7.12.tar.gz 2399126 BLAKE2B 420ba6f96d532da4ae0e1861b512c39ad59f1f63b0e0ef061dcff95c15ff4ed82a3b7bb72f6abb29f85588476a76cb5d50151ca9e3f857c2c1c09727ccdd2890 SHA512 365602bf7b20e5362d13d1ab5269419f7f0838fb81dc01c466ea99c38eb1b979f8d707d24ca3dabbd3a0c65cde97704b570007ac60689d88bbafd33351d37d95
 DIST recode-3.7.13.tar.gz 2400432 BLAKE2B 457ba7855aeb5ae8b0cc32ee82b5b61b1b46ba2908406c0c10a76ae242343f421e81038b9bb6784089e8e3e687ecc0f61a6263c24f6b234962f94853e9359734 SHA512 af86754ed2ed1dc414f1dd7ab3564d606abb309766fb02bf085e56241527a74ac7141617956d01b0797e8e426cfb39ec597bd221d8ad58d9246e96b228e65b00
 EBUILD recode-3.7.12-r1.ebuild 1521 BLAKE2B 3445d43122f73fbc1a5c85e78f2433043f5b5f3627482ced67d733c016beeefd115ff5eca79b06ec3b659196557d8a64899449c2ea63a8fd0529c62924f12334 SHA512 1eb3427f0e2607c182dd165bc12e3688af8c9430584c0f66c8a67d8dca5f44d540a9cefb30622486de059c15c3093c1682b614991dbcaefcf8aee0994cbefccf
-EBUILD recode-3.7.13.ebuild 1612 BLAKE2B 50340a139b4905c7f531d9bd3467d8ca582f6244a5ed09e171e58adc7896eabf98cff134f1c6ff8caee0bad34b9e8f652b945bc00ac98f8fe4538a07e906a1d2 SHA512 03b2050efd7318e2c83ae6fc6dbf423e4ebc7a75ec2ddff69d146ada2e065c3a55052da7ec110d8d0984ad16d8d3aa9daa55cded0bcb98bc4fc6c8e2e44892fa
+EBUILD recode-3.7.13.ebuild 1580 BLAKE2B 6fd77f09d824fe222c02fbec0d6b5b6ce1e10b4be22bfc69b6ad696b135cda9f8cf03d858e63798c51e11761147e44213d51625b7fcc6777f4485d768de67dcb SHA512 4a93c11468c4c9336bcc8d05489b7c998e858fcd486b2950c72af9c0708a791b203a8f21c28b380315e58dec292ff75e780c8418eb786eb7a09c915c016d4bd1
 MISC metadata.xml 431 BLAKE2B a2f1b90590a30ec6d561845193e29d2fde7254ece1cc31b777bc5d3ed85aae53a6abb23cd9a00f9fd07ac4e13ccabd35e2fc71816106e46c89ff0607e869419c SHA512 388038f9e95b0491e8061def1c405facb327e8feefeca08d7b425b143db03d4f7745c6b7515cc000f42992b97cc9e82aac7660e313a2159d324883792d6d85fb
diff --git a/app-text/recode/files/recode-3.7.13-no-help2man.patch b/app-text/recode/files/recode-3.7.13-no-help2man.patch
new file mode 100644
index 000000000000..bc493d429e28
--- /dev/null
+++ b/app-text/recode/files/recode-3.7.13-no-help2man.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/890256
+https://github.com/rrthomas/recode/commit/dcdd5d26c0c2c49f8113b63186449d6a1e3a509e
+
+From dcdd5d26c0c2c49f8113b63186449d6a1e3a509e Mon Sep 17 00:00:00 2001
+From: Reuben Thomas <rrt@sc3d.org>
+Date: Fri, 6 Jan 2023 20:11:03 +0100
+Subject: [PATCH] src/Makefile.am: allow build without help2man
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnits
+ bin_PROGRAMS = recode
+ lib_LTLIBRARIES = librecode.la
+ noinst_LTLIBRARIES = libmerged.la
+-man_MANS = recode.1
++dist_man_MANS = recode.1
+ include_HEADERS = recode.h recodext.h
+ 
+ H_STEPS = common.h decsteps.h inisteps.h tersteps.h \
+@@ -100,12 +100,12 @@ merged.c: mergelex.py $(L_STEPS)
+ # Depend on recode$(EXEEXT) rather than explicitly make-ing it, as otherwise
+ # we break parallel builds, as libmerged.la can be built twice in parallel,
+ # which can fail.
+-recode.1: main.c $(top_srcdir)/configure.ac recode$(EXEEXT)
++recode.1: main.c $(top_srcdir)/configure.ac
+ ## Exit gracefully if recode.1 is not writeable, such as during distcheck!
+ 	$(AM_V_GEN)if ( touch $@.w && rm -f $@.w; ) >/dev/null 2>&1; then \
+ 	  $(top_srcdir)/build-aux/missing --run $(HELP2MAN) --locale=en_US.UTF-8 \
+ 		--name="converts files between character sets" \
+-		--output=$@ ./recode; \
++		--output=$@ ./recode$(EXEEXT); \
+ 	fi
+ 
+ main.o: main.c ../config.status
+@@ -169,5 +169,3 @@ strip-pool.c strip-data.c: stamp-strip
+ stamp-strip: ../tables.py $(MNEMONICS_DS) $(CHARSETS_DEF)
+ 	$(TABLES_PY) -C $(srcdir) -p $(MNEMONICS_DS) $(CHARSETS_DEF)
+ 	@echo timestamp > $(srcdir)/$@
+-
+-DISTCLEANFILES = recode.1
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,5 +1,5 @@
+ # Makefile for Recode regression tests.
+-# Copyright © 1996-2022 Free Software Foundation, Inc.
++# Copyright © 1996-2023 Free Software Foundation, Inc.
+ # François Pinard <pinard@iro.umontreal.ca>, 1988.
+ 
+ # This program is free software; you can redistribute it and/or modify
+
diff --git a/app-text/recode/recode-3.7.13.ebuild b/app-text/recode/recode-3.7.13.ebuild
index b903f2d850fd..fa935e6151e6 100644
--- a/app-text/recode/recode-3.7.13.ebuild
+++ b/app-text/recode/recode-3.7.13.ebuild
@@ -33,8 +33,9 @@ BDEPEND="
 	)
 "
 
-# False positive (runs within a conditional)
-QA_AM_MAINTAINER_MODE=".*help2man.*"
+PATCHES=(
+	"${FILESDIR}"/${P}-no-help2man.patch
+)
 
 python_check_deps() {
 	python_has_version "dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index b2123630b316..020f94661cd6 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,3 +1,4 @@
+AUX xpdf-4.04-libpaper-2.patch 484 BLAKE2B 4d749a21909e6fa6eaf64a0d9c337bc6cb6bdfe086ea93230696c0775e079434c45aa7bcd186d80fc1d79cddcc981b7d1261990fd94293a0252f90a79b0d3804 SHA512 d9f5f5b6c0de979ada6488af6ab7e74f01bfb5b54ce7d5aff2d0e279779c4a7948988492c42f5fb7aaf3d989b5f78062c36f681842a7b7758428f2ef2bb429d7
 AUX xpdf-automagic.patch 924 BLAKE2B df4d7a245d8f710568d455660b29a81fd4d4dcfb21fccf60d5f2db959a7a2e2e64eb36cc7cbc0aea7e1cd21bdc6a11cb0ae7ae43e9293164ba5ef88685aa1653 SHA512 8bdeafe1553fea67b6d30afd1eb6e6abbd57f470a79b982b2b545fc91f12bc00c34a1639a05e8ef589ce1518886cc8de45c54303c4528c7e3d721ff624a0d27e
 AUX xpdf-shared-libs.patch 2286 BLAKE2B 63d668f5ab910ede26c85ec8fb379baa39112c0056ab61d3d8192447d76a5d455a3d3eb43ac1f0f3e275ed38d8cfaa56ed45432cf2f0d22a5eeaa63fa8e794e6 SHA512 560bf773fea8aed81678710aebb5733c8134ea7c088a761e20726c8758a98219c977a32437bd6f425271ed7c76a2742705074e11db108cb4bf71c0530b10276c
 AUX xpdf-visibility.patch 414 BLAKE2B 835bdfdbb39297859d1886a5ebd76bec23a8b8df744f627a475d8c00ae3cdcfe219ec039f00b7b6a7305e6c451399c422fafdea0599bf22d2ef34bd4912eae4c SHA512 a1f87523aeb657484181005b3e40a90eaaee2d00452bfc50bc23913d6e1e5a9117600959b3800e789be50f6d12d726f875caf02b73ec41dc9d98e1215b2e964e
@@ -15,5 +16,5 @@ DIST xpdf-korean-20201222.tar.gz 809664 BLAKE2B 3c3a4397f25ae74ed8bd68d0736144b9
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
-EBUILD xpdf-4.04-r1.ebuild 3941 BLAKE2B fd4df457733bd94e6adfc1bea526ef150c8e4c79210e1e2067ba64e9b784ce575f347bededdf76e334e38bb0c2f251cb356fe63798fa4b10d22ada1354a3932c SHA512 961763092eb62805cfbeb893b0b9ecbebbeb3c4289dda6da4e4fe74f797c2ad9bda69e859f241841c0d5d97238ce1d75bae190f12d7c2da759a5a3f9d698dd57
+EBUILD xpdf-4.04-r1.ebuild 3984 BLAKE2B a23c4053d6217d907810e07edf328c1c13bc7e3c418c0ca597ea7351303234ced478db4b1ab6cbf19121f1492fc87fcb55572925573e6ed1b71beb8376ac10cd SHA512 ff16379233b5598b890bc5d53ea332b44f76bdbce596832d336d0dc992dbfbfd2b9052a154f8151cf8a29067e542653c69ec4773c1975fb61fadef77d900a423
 MISC metadata.xml 993 BLAKE2B 14996cd8a901c0cee2ff357b6d7e0ba523cef08d39997b4e3266b9f07e75e31fcbbee940d25eb318bcfc7144781d490a8604a9c57d8dd883ce08f51323139099 SHA512 b0245e750f66aeb07c9a35ad8bcc2d6fa01debf62870104b87ba824c79350dc4dbb620d8d4a535c774709f49b47d2808baeb9ddb88d209e48e3cfd6309fd8628
diff --git a/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch b/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch
new file mode 100644
index 000000000000..d6f3df150baf
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/870217
+https://forum.xpdfreader.com/viewtopic.php?t=42367
+https://github.com/rrthomas/libpaper/issues/29
+--- a/xpdf/GlobalParams.cc
++++ b/xpdf/GlobalParams.cc
+@@ -655,7 +655,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) {
+   base14SysFonts = new GHash(gTrue);
+   sysFonts = new SysFontList();
+ #if HAVE_PAPER_H
+-  char *paperName;
++  const char *paperName;
+   const struct paper *paperType;
+   paperinit();
+   if ((paperName = systempapername())) {
diff --git a/app-text/xpdf/xpdf-4.04-r1.ebuild b/app-text/xpdf/xpdf-4.04-r1.ebuild
index 9d39323e7d04..41d271c193ad 100644
--- a/app-text/xpdf/xpdf-4.04-r1.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -55,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-automagic.patch
 	"${FILESDIR}"/${PN}-visibility.patch
 	"${FILESDIR}"/${PN}-shared-libs.patch
+	"${FILESDIR}"/${PN}-4.04-libpaper-2.patch
 )
 
 DOCS=( ANNOUNCE CHANGES README )
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index ae125a4942ae..f1d22eaae4c4 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,7 +1,10 @@
 AUX zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch 719 BLAKE2B e8fee9b67dd4e3156eb48a69505bb81533751e29c9f05a46c5f93ea069eda042f72a24c4af1f804c28d2058ffe0d6ed646ba8f97610b113069cbadf05c841664 SHA512 a4b4a5b2d207ecd37a05d38f18f1f6a2df2acfaacf7a03fc97b14c3bf04441b3e0caa9aca30551fb4e12e0d41d1c4760d8033fb1c7a6b13dd8475453b59b529e
+AUX zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch 1015 BLAKE2B b2ba561909eafed3f1aef2efdf5596a2d0f1a933c1e60106eef9ce52f86c9182492b4e4959f274312332089863e4209204c098d4baa1885de28eeaafd04d803d SHA512 264d6b4eb035424a54eccdc8b5103142f6c822de1e4831303413b778769b520268f02139213d391294d1c407289e075148c227e6a0d8fe02ba03d401f9c0f067
 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
+DIST zathura-pdf-mupdf-0.4.0.tar.gz 9323 BLAKE2B e633e2d52080dc017cd59be184fc52f52b21f9bfa1cecb48c83b4383366226f8e65fcd92503493e8df568847f84a39f2f7d8e4a87df44c66ec121c246557e10a SHA512 44a8d72f54adf29cc853c636f2387edb52e253522c82175533a2f80a6afc45ca88a785785bb840bf81e368ef8f35e31f5e9bf7648ee6a13d394eb4133585c060
 EBUILD zathura-pdf-mupdf-0.3.8-r2.ebuild 783 BLAKE2B 87ad7d1eadc88026806ec9999bfc3486257362db0b3e0a6546c98f00b32dd89c8a699362c3085e822110fdd4b0645b3b968538917bbafd852eb69bcd49b01e2f SHA512 677fb3b5ced87f54d9d69367cba816f781bc08800f32219dea880e1cb767252401410b67c211908e815e3d54a2d3e7754d16d818439e9291bacbff9a182267a9
 EBUILD zathura-pdf-mupdf-0.3.9.ebuild 784 BLAKE2B cc9ff02db43aa1f51fff3ce73d51cb84e5070fae3fe130cf124da98191ca840c985b0b5ffd6fb48bfa7512b5fa9032043cef28fa0cc1470cb3c55e5945645cd4 SHA512 1877ff3986f1c4a507d6c8a68b6f31b159b42789bcb3bbdd65be56b287c8ad7cdfa344ef2a68652d72153255b5f4987b87e58aac1e5068e5d39b2675bcde1ff8
-EBUILD zathura-pdf-mupdf-9999.ebuild 787 BLAKE2B 942b51d2a72ed0a3b26eb4f88deb4f1fc510c0a8551e563c6799cbcd653bca158fc1467f1bda0a768d78aa5464714ee15bfc308bbf70f95fa2cd0424118a1195 SHA512 253121b5df0ec0322f7393c748470d062f834df39560a14755a14ba79fe28ad60523717a117b6f4d774e62fde71b1712b813cdc059b61d2fa774544de60009c8
+EBUILD zathura-pdf-mupdf-0.4.0.ebuild 850 BLAKE2B 5a22d731aaaf6b7cd2d1306eb3b68050e87bbaf5442ec6334137973dccefc6b037acf49645712c3fd0d93a538636c78c348ece5aa5eab956bdf0916c3b71d7d4 SHA512 7334ceb8d5a68317b28eb6ccc4580a7c464f01b69911b3591372f502be1257dc378d76fffee4efe3fb315505e65d4c49d03c6f9fb605e1bbf66577f8a979d1f3
+EBUILD zathura-pdf-mupdf-9999.ebuild 857 BLAKE2B fc48aa72ddb8caa36c3e32c51307d6779feb954e9607211dec5944c6c200c42fd180f0f5dc63c55eceb07401b3f08213fe24d1024f678bdf46b4491d2f6cfa12 SHA512 8867464a50199c1c523b587d2cec37d64ac17478a74002596a85bfa81bf66e9b83d09b95bf9802d29513001c07558f182bc5a7a63dac46daceb907bff113475d
 MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
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
new file mode 100644
index 000000000000..caa0da05e37c
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch
@@ -0,0 +1,39 @@
+--- 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.0.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild
new file mode 100644
index 000000000000..9e7a5e2f892b
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 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}/${P}-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 5ca8fe3fc822..53bd172f9007 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-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,20 +19,28 @@ HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
 
 LICENSE="ZLIB"
 SLOT="0"
+IUSE="+javascript"
 
-DEPEND=">=app-text/mupdf-1.20.0:=
-	>=app-text/zathura-0.3.9
+DEPEND="
+	>=app-text/mupdf-1.20.0:=[javascript?]
+	>=app-text/zathura-0.5.2:=
 	dev-libs/girara
 	dev-libs/glib:2
-	x11-libs/cairo"
+	x11-libs/cairo
+"
 
 RDEPEND="${DEPEND}"
 
-BDEPEND="app-text/tesseract
-	dev-lang/mujs
-	media-libs/leptonica
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch"
+	"${FILESDIR}/${PN}-0.4.0-meson-mupdfthird.patch"
+)
+
+src_prepare() (
+	default
+
+	if ! use javascript ; then
+		sed -i -e '/mujs/d' meson.build || die
+	fi
 )