gentoo auto-resync : 11:02:2025 - 00:12:37

4 files changed, 156 insertions, 1 deletions

diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 59595b2c4d39..5638ff25eab1 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,4 +1,8 @@
+AUX qpdf-11.10.0-zopfli-inc.patch 1208 BLAKE2B 3313a25a13a0aa178c180ad49fd9234d56c25a4f50fe52523c24d975c216ccb81d6e2d46ff5b595287c5e81ce62084e3d513875f57b9b9bd7dec9128ae107df6 SHA512 a4ab3d0423013fc887517893f54477fa4e07350643b8f0e3c53e9d4dc8355f09c5fee14c7d8a38de44c15b1f78d568d6bd8d324b5d4e4fcee0f4dc830bad1c75
 AUX qpdf-11.9.1-include-cstdint.patch 1167 BLAKE2B b393358804b57ba2da81b5f8bb3588acfbf3f85e0f5047e74dd1d6c970e796c0ac356bf3b44d9c3cc383248d74f1c5763a58712eb8772c98715ee8bde3f2b8e1 SHA512 2a7228fd525750c43af3a5ca496ebe256cf33e827b75899b2b4bca114536e15b207a993492d7ba30162907fe07814600f33f78a5241e9b3165225446fc0028a0
+DIST qpdf-11.10.0-doc.zip 16605842 BLAKE2B 17dcad5daa6490666e04fff94152683b75b5e3579f4c1c46340cd6f6b847a4d4251d08c353bdcf5e34ea2043ad3ddbd13e4965db993103f9500206543c2a3d5d SHA512 afa095957fbd98ddf645021dd24addafb140f5ed07d048117999f0cb7e5a1a713b3cce8530d43f4ea3f1e83996479b1d052ef74e21bfd31bf214a1b2e77e5e3f
+DIST qpdf-11.10.0.tar.gz 19487550 BLAKE2B ea104ebedece94e6c6736add58e4139c5b8aa56e7679362cd15692be6ec54f47c95b9b3c654c53d7625fba6d4eec71ba3596896843f316b69e1976f87a7d7283 SHA512 7dfaba277fc3b3ccc0087b005c0a9f0184bde9618c73d6044604669d3d2bd0bbdf44eb4573474819bdb743e38a61e86fdcfd4512ccde07fa510461fb3738a1bd
+DIST qpdf-11.10.0.tar.gz.asc 833 BLAKE2B 63c278550807af8fe304cd2961881f32ea9a4db793f37b7ede0ebe47358c1ef5a468213c947354ec79ff90f2eed488e3a7e550d27f90928a790c03b2b8a64988 SHA512 92b86c642ab7c7d129474f57897d7694f3e0f4c28b1f8575572130a5d87fc9da272b753083fa53986c1b853a8a2f3f1e7c82043febb9bb2832279d74edacb7a4
 DIST qpdf-11.7.0-doc.zip 6874893 BLAKE2B b14b0f68f4599bd4f396cccbc35b13b0f52b72856de1afd3fdb0c70b33e1702c4afd7c954011df72905c06ff262b08dc9519e44dcef9b7633423d38208542795 SHA512 7ceeff62788defe3649a8d242220c7c8208ebe92dbd9d67b4b53d5036afb1cdbcfe46b4140b064b0542cba2d8eaaad6eedec1ed7b7bd0ccafe2dd7aa20efaa69
 DIST qpdf-11.7.0.tar.gz 18124824 BLAKE2B aa10e154899a7fd53d696b9521cc8a44d4a336094711ddc2a506dac8841ae12ce5bcd604555725d2b6bae3c63a6a3f6ef0e9ab6baf38dd3d7fa71507234378a3 SHA512 6ee302671fd4513c5b22f101feb773b4101de6cc5ff6b0e25d1daa03df82420f87ce7db49a6c47758d7e8bbc3beeb997d4671d52e4cf0ac0d4f817f10677d1f9
 DIST qpdf-11.7.0.tar.gz.asc 833 BLAKE2B e0b15e6ed6b67fc222f7b4d9f863e8630af814bede3605ca56b83b287d7e02c700092e59f3805565884b55af96c4ddd407331cae26273287b546c32a7975c331 SHA512 ef5aa1661944fd56c3f929ee1ffc78229667ed1d1c639aab82a0ff3a3891455e4dcf3dffbb17e9d22862d6426a263182360b19dd58435a2413c19761abc9b966
@@ -11,8 +15,9 @@ DIST qpdf-11.9.0.tar.gz.asc 833 BLAKE2B 6f00b52643b76828f65ce45ac031a72369753495
 DIST qpdf-11.9.1-doc.zip 6895053 BLAKE2B 6f23676b54cc1e913ec131cd2121e9ef35dd74cc2d85949e28374ca8fc449a8a93946c0ec7bd41c2cbabaef2eb00e54fb9cac7376658e835f9c2ab9e1e58bb7a SHA512 7cd4add8d43ab366feac34e98e7ce13338ed3e2282f5bbe5c59b96230acff3bdb259723ebf197f2e4aba6ed03ba20cab01df4cf583b9d80102e8f5ec0e06e18d
 DIST qpdf-11.9.1.tar.gz 18585065 BLAKE2B fa845e04d6044c70e1864a8eee9831774218a2fa6de74fed1efc22f0cc4982b7e41b2a7d6f0c794941eac08ba65d2196d72399514c376e2774c754f074560c43 SHA512 8c60c6639371e71a5229afb2e11c18aa660061e652eae4a8d9c8e9ceff913b0c7d866ed17375d1be9c439b0789ea03064ab98771f43fd03c7059aa136285a4b2
 DIST qpdf-11.9.1.tar.gz.asc 833 BLAKE2B 4b676ac2469971e0b4862d329d489ca4c37a11a753bee380668159f8e0c8bdeecefcfc51b6aa0fbafc379a732aacb89481b52138a38cb69fd8d8cfb804dcae9f SHA512 392cec40c7f7251f77ef3c7d27d9fc5c8d63ae6774192af59b3651c240fe652d67dee8ad80c94ee67362e27983124fecefc97df542b8e8d48843f2c305fa99b8
+EBUILD qpdf-11.10.0.ebuild 2417 BLAKE2B 5f34433e09665272fbc952836445b1dcf4d76118735654a8974e687093350f94b9b2544393195bb7c9f7c42bcd68ca8e44596ed36635c228022d5b49a6fd9077 SHA512 4691753b0eab683e4481f838a983be5f007927f4b7102c6657fc52e1877056d226bdec6a0f3ab6424fe94947906f365b3338b8e292115bc8d95aef8980386a4a
 EBUILD qpdf-11.7.0.ebuild 2253 BLAKE2B b2bc43884c75da8d3381d12b9f8f0d2d836ab03b8de884be792d308b0a564c623eccbab64ce694806cf7477f667e6754a177a9c94eab83ee75b551b05984cf51 SHA512 1956e77716fa8a25e5214e3463a5c51f8c2e20ad8d46a4ad43d0aa8068e858c054985cb2ca01ce682d90215fb80e10e019ce88f64c0252d46405c7a431a8f5ea
 EBUILD qpdf-11.8.0.ebuild 2261 BLAKE2B b3687a1e2b26990a2344e0e070aa3e7cb05cc9e802b727719900e42b69af8759bf936e3c707660174d009921ddf8d53c988558e05ef2a9be592744c5180ce32c SHA512 52525584740a3526daff4e097afaf743f3c5ca678ddec343b27fd41f068fda44fcf0087f11782bb90a7e3f8615101221aefac252078b4fa862de4e45738d34eb
 EBUILD qpdf-11.9.0.ebuild 2261 BLAKE2B b3687a1e2b26990a2344e0e070aa3e7cb05cc9e802b727719900e42b69af8759bf936e3c707660174d009921ddf8d53c988558e05ef2a9be592744c5180ce32c SHA512 52525584740a3526daff4e097afaf743f3c5ca678ddec343b27fd41f068fda44fcf0087f11782bb90a7e3f8615101221aefac252078b4fa862de4e45738d34eb
 EBUILD qpdf-11.9.1.ebuild 2324 BLAKE2B 5b92cbeb2ccc4c182c4d23eb187879b99e6b75a3ca5ee1cd44a71dc77157438a2ee1f29276dd1b0aa96c02b2dd229bcb9160ac7e57d5fe03acee11532ae65f08 SHA512 dd55fcc13955a3b78d7ff3a08d88fff36b98ddbc86ba451ee10cec91a248168d0af55e84bf677db0f70c0252feeaea9249f0bc7797b7e2c5f2bf4cd82cd9d861
-MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
+MISC metadata.xml 581 BLAKE2B 38c0e8385a46cae56b6f4556a70ad6eef3e2ed6d8f39b0c20e9304edf32a7eaeb20b5c231afcf1d802c9256df3e96358e4db279a96ee709ccafb958de8bac071 SHA512 af5205f77e4a4960dd3f12a78fd9c5927a48df443f7c8fd2779b7ff56225b174a53b36bb2f4ab02e306242827ce6cb7634251bbac565ac62543f46ccb668f5f3
diff --git a/app-text/qpdf/files/qpdf-11.10.0-zopfli-inc.patch b/app-text/qpdf/files/qpdf-11.10.0-zopfli-inc.patch
new file mode 100644
index 000000000000..2ab7c83b6a68
--- /dev/null
+++ b/app-text/qpdf/files/qpdf-11.10.0-zopfli-inc.patch
@@ -0,0 +1,38 @@
+From bbff557f8c63cd1b9405738f202b70e1067014ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 10 Feb 2025 06:26:45 +0100
+Subject: [PATCH] Fix build against a standard zopfli install
+
+Fix the logic to accept a top-level `zopfli.h` header, as that is
+the location used by upstream's build system.
+---
+ libqpdf/CMakeLists.txt | 2 +-
+ libqpdf/Pl_Flate.cc    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libqpdf/CMakeLists.txt b/libqpdf/CMakeLists.txt
+index 285afb86..91344a59 100644
+--- a/libqpdf/CMakeLists.txt
++++ b/libqpdf/CMakeLists.txt
+@@ -192,7 +192,7 @@ if(NOT EXTERNAL_LIBS)
+ endif()
+ 
+ if(ZOPFLI)
+-  find_path(ZOPFLI_H_PATH zopfli/zopfli.h)
++  find_path(ZOPFLI_H_PATH NAMES zopfli.h PATH_SUFFIXES zopfli)
+   find_library(ZOPFLI_LIB_PATH NAMES zopfli)
+   if(ZOPFLI_H_PATH AND ZOPFLI_LIB_PATH)
+     list(APPEND dep_include_directories ${ZOPFLI_H_PATH})
+diff --git a/libqpdf/Pl_Flate.cc b/libqpdf/Pl_Flate.cc
+index 97a337b4..724b4435 100644
+--- a/libqpdf/Pl_Flate.cc
++++ b/libqpdf/Pl_Flate.cc
+@@ -9,7 +9,7 @@
+ #include <qpdf/qpdf-config.h>
+ 
+ #ifdef ZOPFLI
+-# include <zopfli/zopfli.h>
++# include <zopfli.h>
+ #endif
+ 
+ namespace
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index 9248740ded39..c1d81ad48c72 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -10,4 +10,10 @@
 		<remote-id type="github">qpdf/qpdf</remote-id>
 		<remote-id type="sourceforge">qpdf</remote-id>
 	</upstream>
+	<use>
+		<flag name="zopfli">
+			Support using <pkg>app-arch/zopfli</pkg> for stronger
+			zlib-compatible compression.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/qpdf/qpdf-11.10.0.ebuild b/app-text/qpdf/qpdf-11.10.0.ebuild
new file mode 100644
index 000000000000..9e7dae0c4ace
--- /dev/null
+++ b/app-text/qpdf/qpdf-11.10.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 cmake verify-sig
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="
+	https://qpdf.sourceforge.io/
+	https://github.com/qpdf/qpdf/
+"
+SRC_URI="
+	https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz
+	doc? (
+		https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip
+	)
+	verify-sig? (
+		https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz.asc
+	)
+"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# Subslot for libqpdf soname version (just represent via major version)
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gnutls test zopfli"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? ( dev-libs/openssl:= )
+	zopfli? ( app-arch/zopfli:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+BDEPEND="
+	dev-lang/perl
+	doc? ( app-arch/unzip )
+	verify-sig? ( sec-keys/openpgp-keys-jberkenbilt )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# glibc only (bug #899052)
+	malloc_info
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jberkenbilt.asc
+
+PATCHES=(
+	# https://github.com/qpdf/qpdf/pull/1359
+	"${FILESDIR}/${P}-zopfli-inc.patch"
+)
+
+src_unpack() {
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_configure() {
+	local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
+	local crypto_provider_lowercase=${crypto_provider,,}
+
+	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+	local mycmakeargs=(
+		-DINSTALL_EXAMPLES=$(usex examples)
+		-DZOPFLI=$(usex zopfli)
+
+		# Avoid automagic crypto deps
+		-DUSE_IMPLICIT_CRYPTO=OFF
+		-DALLOW_CRYPTO_NATIVE=ON
+
+		# Breaks install with USE=-doc in 11.0.0?
+		#-DINSTALL_MANUAL=ON
+
+		-DDEFAULT_CRYPTO=${crypto_provider_lowercase}
+		-DREQUIRE_CRYPTO_${crypto_provider}=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use doc ; then
+		mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die
+	fi
+
+	cmake_src_install
+
+	# Completions
+	dobashcomp completions/bash/qpdf
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_qpdf
+}