5 files changed, 168 insertions, 2 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 561bb250fe7c..99b4c08b6c9a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 174ffc7c4c56..1ff4a6cb5968 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -5,7 +5,7 @@ DIST libpaper-2.1.0.tar.gz 1306128 BLAKE2B 6e44e3d2fcf01faa551b1df401155a96b8612
 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.10.ebuild 751 BLAKE2B dff6949aeaaeabd4ba376751a664d5b3f480803527f372f8ca41ab1b8b87e607e621b10c949287d5481b109468303393e33671e95ba59c251efc258483f4f840 SHA512 56496703a0c56ee21a27f269df1f0702ad9387c1a851817f2f5a04ce7b7e9a15688d9b1893fd0d2b66071883b549c8b7d4859660b0cbbb1a78ab8afc4acf000e
-EBUILD libpaper-2.0.12.ebuild 759 BLAKE2B 3ab49f8c1b8d2bbe5672c6021e0b04ff4c10692bfe3cac95e212d2425e0b7a39f80982e07a7f08ab71cb6ba0da9e2855437ba184eb79762fa397e8b161073a44 SHA512 69bc2bee9595ae86e843b2413d9cee5458d2655cb6a20e478628817dd520cd3450f26b08589f9b13b2f5b6f73db5485df3d9653951a0f33888fc80ff2a3c2138
+EBUILD libpaper-2.0.12.ebuild 752 BLAKE2B 861e18a669162f03a0a6d2f4d75bec0acebe31341aa2b94d855a8fdbc9b9d34bf75e01cfae9d8348c7c509fa7e54242a5a4635318c765a6f2c3dbb84a6be513f SHA512 95441873176250a7fb357325e1c20a77cc42ae94693b0bfc1f65b8ac67c6410c0301c910686297b2d24d988650240df82a8d2bcb7dc5dc44c0e8bb56fdf87a43
 EBUILD libpaper-2.0.4.ebuild 863 BLAKE2B 3e0d9e2cbdf03710e90764064f0b1200028ad0ce9f850d243bcbfe76a674cd1e1c849d872d29cf895dad88bb0af568805f8b8b9fd725372b27128bb8bb181034 SHA512 d2b1345af00be4c2c723f08362f12a0e0570ab28bb401d68f533d8c866f61a95e662f089ec56fdb0fd85e17cf92252606d29fe2e84979bf06958cfa407244be1
 EBUILD libpaper-2.1.0.ebuild 759 BLAKE2B 3ab49f8c1b8d2bbe5672c6021e0b04ff4c10692bfe3cac95e212d2425e0b7a39f80982e07a7f08ab71cb6ba0da9e2855437ba184eb79762fa397e8b161073a44 SHA512 69bc2bee9595ae86e843b2413d9cee5458d2655cb6a20e478628817dd520cd3450f26b08589f9b13b2f5b6f73db5485df3d9653951a0f33888fc80ff2a3c2138
 MISC metadata.xml 342 BLAKE2B 28767bfca8e43186de0792106c408d3a8e0ef8c9c59836789b045c23f12163e43b9eb547c93f1751f031b8f61bd7940f50ccaa95f2ecc14cdf5a9267be721d0e SHA512 0d16a636e3cce2ee9051bd694f34a072ff13d4ca6f4c9f3e81443cea386f48f5863db03ca9cb050f43a6a1fa483d401969617597d68024fee10058a0c72b3585
diff --git a/app-text/libpaper/libpaper-2.0.12.ebuild b/app-text/libpaper/libpaper-2.0.12.ebuild
index d77438c2f590..7b6b8a756796 100644
--- a/app-text/libpaper/libpaper-2.0.12.ebuild
+++ b/app-text/libpaper/libpaper-2.0.12.ebuild
@@ -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"
 
 src_configure() {
 	econf --enable-relocatable
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index a8a45666765f..b7754495670d 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -11,7 +11,9 @@ AUX mupdf-1.21.1-no-drm.patch 586 BLAKE2B dad2f0544153830cd8fff32a667edc229e5f14
 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
 DIST mupdf-1.21.0-source.tar.gz 54753613 BLAKE2B bb531f165a9dd8af22aa6e1d65b57d7900bb5128d0c8ad235518ed0b1e446234b147fdd3937f3dd49f627ed2cfb49c4e325baf320f698adbbde68de466f61660 SHA512 a711489e236437e4e7c21373d8624118a5308941148be31cd57a0bbed708b44b1d4030aed71ccb82143159fc3a23e5524738e7fc6177058e6bdaf94a36beaf64
 DIST mupdf-1.21.1-source.tar.gz 57243762 BLAKE2B 9ec79e380af40020d37e4a2a6372175f19b63a47e9f6f55cff777a827f0fba89507d19d4f86394e13209ca8eb9d812c2fc4664f44ed012c91727c9c442bce97c SHA512 11eeea409e0b44d3f754a44b00b15522c2ae2d94171b8c7067efa7acbb1d597eefe1e27607fab90a56bf6c73579bbfb77b7599080fc2504a5881aaf7cc1957c7
+DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7 SHA512 ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59
 EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f254bf3c51aee44405ad2bab8bd3f5245f5d04fd4d713d8befd8a84b62632a757ae69396e5291ac6c8cb6b57b SHA512 b1ee92e6e10373980739bed7bffb1bd658d9b3830f82fcc2b3153c5296828a50b487164e686a69de31df6ea25aa6e0925b5ff5c997ec91a6cef1851a7bff76af
 EBUILD mupdf-1.21.0.ebuild 4744 BLAKE2B 1eedbb5b4aeecd9718c820e40ec40aa517d08b29d7cdca2c7a397824ecbf21a3dfe70cd6aff0afec2a1b5beb4baa7f4eb1703d1ab193be1430e3a226329ddbd6 SHA512 253804764cb8465bfa0b5f534d53e9e561e5ea5c2205cb5b05a1e401d412a05eb12ae0920de348677ad00c73194e372204e5b586d53c92ced42065477bc5e8bf
 EBUILD mupdf-1.21.1-r1.ebuild 4994 BLAKE2B b62512eb89dab520784f9308c839654f380bbf3a7448aca72e4705427d066f5343112a426d383877eaed2032d6e0d302b92f9ece4f67678322944a016da91537 SHA512 8fc7a1b14811f080e2ab63852f8788994f437746edaf499bbb3c5682b458899fd9e47d10f43ad6f1941403f829b970089da0fc9ad5bc3b3b31f34a9bb74328be
+EBUILD mupdf-1.22.0.ebuild 4918 BLAKE2B 6fc7a698895cf767374db98ff767e0312e3679d92a09b6f8691cba8f69d967807af0378c6d1122ce3ff358813e0f40df42e432a2a764b6c0c741b6fc51cbf78e SHA512 b57b98e4e380580faf417a8825223d3492e8983b7f26a1f55d85fffcd2436c21270dc21154064755724be651432a466038cd99069fab0125f3594a87c36d0bea
 MISC metadata.xml 497 BLAKE2B 35e16ef688aa8b046f3e8ceaa7399da31379ba50b2cbc36d842696d1589aeea5a55eede13d79188f08ae8ff411c16385128633a1fbdaba04ee115158ac7e529b SHA512 225727e22fe2756480f3d502f49a62abbd0fe09d6266c1e00c09b04c2b5da181fc46bb06b19020290fa857b1feb0d557e6a77084f6269b5e0fdfec593cd46709
diff --git a/app-text/mupdf/mupdf-1.22.0.ebuild b/app-text/mupdf/mupdf-1.22.0.ebuild
new file mode 100644
index 000000000000..0b55c2f4345b
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.22.0.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+drm +javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+	dev-libs/gumbo
+	media-libs/freetype:2
+	media-libs/harfbuzz:=[truetype]
+	media-libs/jbig2dec:=
+	media-libs/libpng:0=
+	>=media-libs/openjpeg-2.1:2=
+	>=media-libs/libjpeg-turbo-1.5.3-r2:0=
+	javascript? ( >=dev-lang/mujs-1.2.0:= )
+	opengl? ( >=media-libs/freeglut-3.0.0 )
+	ssl? ( >=dev-libs/openssl-1.1:0= )
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="X? ( x11-base/xorg-proto )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+	"${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
+	"${FILESDIR}"/${PN}-1.19.0-darwin.patch
+	# See bugs #662352
+	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+	# General cross fixes from Debian (refreshed)
+	"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+	"${FILESDIR}"/${PN}-1.21.1-no-drm.patch
+	"${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch
+)
+
+src_prepare() {
+	default
+
+	use hppa && append-cflags -ffunction-sections
+
+	use drm && append-cflags -DGENTOO_MUPDF_DRM
+
+	append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iCXX = $(tc-getCXX)" \
+		-e "1iLD = $(tc-getLD)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+
+	# Adjust MuPDF version in .pc file created by the
+	# mupdf-1.10a-add-desktop-pc-xpm-files.patch file
+	sed -e "s/Version: \(.*\)/Version: ${PV}/" \
+		-i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
+}
+
+_emake() {
+	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+	#
+	# Bundled libs
+	# * General
+	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+	# recommendations. It does not mean "always use system libs".
+	# See [0] below for what it means in a specific version.
+	#
+	# * freeglut
+	# We don't use system's freeglut because upstream has a special modified
+	# version of it that gives mupdf clipboard support. See bug #653298
+	#
+	# * mujs
+	# As of v1.15.0, mupdf started using symbols in mujs that were not part
+	# of any release. We then went back to using the bundled version of it.
+	# But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+	# when bumping and check!
+	# See bug #685244
+	#
+	# * lmms2
+	# mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+	# It is therefore not appropriate for us to unbundle it at this time.
+	#
+	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+	local myemakeargs=(
+		GENTOO_PV=${PV}
+		HAVE_GLUT=$(usex opengl)
+		HAVE_LIBCRYPTO=$(usex ssl)
+		HAVE_X11=$(usex X)
+		USE_SYSTEM_LIBS=yes
+		USE_SYSTEM_MUJS=$(usex javascript)
+		USE_SYSTEM_GLUT=no
+		HAVE_OBJCOPY=no
+		"$@"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	_emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+	if use opengl || use X ; then
+		domenu platform/debian/${PN}.desktop
+		doicon -s scalable docs/logo/new-${PN}-icon.svg
+	else
+		rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+	fi
+
+	sed -i \
+		-e "1iprefix = ${ED}/usr" \
+		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+		-i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+	_emake install
+
+	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+
+	# Respect libdir (bug #734898)
+	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc \
+		|| die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}