gentoo auto-resync : 09:03:2025 - 01:48:35

4 files changed, 166 insertions, 5 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 44f235c16c7d..f91dbe2e75f6 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,8 +8,12 @@ DIST poppler-24.11.0.tar.xz 1922804 BLAKE2B 2ee77ddfd49ab4b3f486fcd160be21fdf2d4
 DIST poppler-24.11.0.tar.xz.sig 833 BLAKE2B 7ef6e5bd5659c91dc5924367b7875a3946116a71b0cc02d98a1cccd51d4a46b8d8b219681e576ba7ea27f736c8a5220ae98acb0f454ac4785c03d1c66d104046 SHA512 7b935eaa99c4c3e8706bfcb010245babf5a4f08f6809a340239a0c40eed0a79472c34e4722d4b480e20fa6618106cc5e9583e209e025689f1fae06c5c499f95f
 DIST poppler-25.02.0.tar.xz 1943728 BLAKE2B 4d58a6b4dbef0f45119ce9c18ebc9838cf65a18cb41fd08bbcbb9adb4d06adbb81c1fb50255cc6d96e5504a54e6756b6b6efb4bc7d34d19d47fb0089f8673d3f SHA512 5223dd2c6f4014b40da989d9a09cea7e8ae5441b4c511c89aab731abed6b72c817633addd591da34743f86cb81b0e147df05ac99ada2e3d2a13d287abef5c4a0
 DIST poppler-25.02.0.tar.xz.sig 833 BLAKE2B 93a2443590ed97e09bced44a0b3aeff4dbcf74358923527bef8effcb09c14a0ac14e45aef7c76d929bb7b966b8aaf7417c551911f789ecf888f9bb04d9405c10 SHA512 6d723138c87a753d8d65e28f803fa6a75dbeb4f7e0510155f910e7d76c87e2b70554010214e7d125c1b619a672b251428de81bdde49ab682c5117eb1ff4847d2
+DIST poppler-25.03.0.tar.xz 1954516 BLAKE2B 369d3f60ee50c3ca01df0ea9aab5b5081318b484ffc4862153c274a489afd14f6fc0c470712c1a6c25edf49952ecd07b3a490c5ea10e1b0116fba2e6d9b1788e SHA512 8b550774389688850ff0629de2fbd5b33193076075d5da116151be3340066b0bbf5cd9b86c79949c28b8e670998e30760d5126164b4681f89322cbe8eeeb2172
+DIST poppler-25.03.0.tar.xz.sig 833 BLAKE2B 0304c7b3a53b77463e82ed5118e21dea1d84a89ee81b42904ae400dbf7036fb2af187582ff8b6c0d61d09e611770dbabb91840b4a97f9d132617d347a1f264d3 SHA512 a4443b22006c12f19260a808b3d67988abe2fdf16e7bab129e3a725c60e28d36a4477a8b514a5bca040f81161a5a5ee2313fab7cbc055ada2ea4cf7d81f7d188
+DIST poppler-test-91ee031c882634c36f2f0f2f14eb6646dd542fb9.tar.bz2 5281593 BLAKE2B 84f7be67073bf485ace8e81ffcb6cb402fb288a4bb8c1793bbdbb79f74ef47b4264dd3a0a37635a59ce493d3224628ecd836180c7a5542ac8aed3af158d280f3 SHA512 e1672b5b1d80187fdcbf063b02bebe9f3a38aea989694940c2fd899da489f373ade8e370a3096e9803ba40c488a8dfcca56bfba3140b8c77cdceb9f9d3217b4a
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.11.0-r1.ebuild 4601 BLAKE2B 445cb55f547da3a3c4b0ddfadb7caebf54f82c5d50a5695e54b41443b4c1d362d424de98733a1c8fd9366dac6c254741a394e179dbcde927dbc1f437af283ee6 SHA512 0d05d9637903b61c9ed0095a3f9555cdb6609ef5ea15224f103976c08ad43996ca6261ff25976968f3007d619fdb44fabe145787fd4a30052fd0fc9be6230673
-EBUILD poppler-25.02.0.ebuild 4455 BLAKE2B b98668e6ae63ff035fb4525fc364266b6e6b25a3ff16a7dc3121fd465b92189bf6cd9a1ddf5bcb26171c43e0d192b3d3fd4660fa8632e9fd4232db725560adb2 SHA512 8efc7d62378982931c6d226f7cb6a71c0a4dc01a614d843c90ee9163ab375d8dabd8071b86ac4efc876f59de2aafed74478e65f82a2045bdc4977ed2ca63c051
-EBUILD poppler-9999.ebuild 4455 BLAKE2B b98668e6ae63ff035fb4525fc364266b6e6b25a3ff16a7dc3121fd465b92189bf6cd9a1ddf5bcb26171c43e0d192b3d3fd4660fa8632e9fd4232db725560adb2 SHA512 8efc7d62378982931c6d226f7cb6a71c0a4dc01a614d843c90ee9163ab375d8dabd8071b86ac4efc876f59de2aafed74478e65f82a2045bdc4977ed2ca63c051
+EBUILD poppler-25.02.0.ebuild 4453 BLAKE2B c718387154f83fa8a8bac940fb65e2a2823ad4c3aeff5854a74afdd9d8c997f0e56bd23d9e929750f8bac421d702164beb5fa55aa1b59498ee839f9abc65abd7 SHA512 8d7f4a549003d33c5f6ce5e3ac62656ac85a3e6f5a859f91ae9d1f710b93d44de722decf072744be21998ee8109082548124c9402230938140bed31d7341f277
+EBUILD poppler-25.03.0.ebuild 4455 BLAKE2B bd6e106f93cc49072a9a820f85a74f45d3a97e56640e43d624d50ff5d865150f2576ae8b1f73a8b3476848725599e436d11f76a11d4927245ca240600872d26e SHA512 6c60f2e115454cbe99f1c5021b4e3b7b626174bb1307b58482cb4ad0503eb292232ecd461603a467d313257507e4d7c40c81891369dd2d548d89b2fb925c97ef
+EBUILD poppler-9999.ebuild 4455 BLAKE2B bd6e106f93cc49072a9a820f85a74f45d3a97e56640e43d624d50ff5d865150f2576ae8b1f73a8b3476848725599e436d11f76a11d4927245ca240600872d26e SHA512 6c60f2e115454cbe99f1c5021b4e3b7b626174bb1307b58482cb4ad0503eb292232ecd461603a467d313257507e4d7c40c81891369dd2d548d89b2fb925c97ef
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-25.02.0.ebuild b/app-text/poppler/poppler-25.02.0.ebuild
index a4b54047b0b1..14b877a194c5 100644
--- a/app-text/poppler/poppler-25.02.0.ebuild
+++ b/app-text/poppler/poppler-25.02.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/146"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-25.03.0.ebuild b/app-text/poppler/poppler-25.03.0.ebuild
new file mode 100644
index 000000000000..0525bc07254b
--- /dev/null
+++ b/app-text/poppler/poppler-25.03.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2005-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/poppler/poppler"
+	SLOT="0/9999"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
+	inherit verify-sig
+
+	TEST_COMMIT="91ee031c882634c36f2f0f2f14eb6646dd542fb9"
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
+	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	SLOT="0/147"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.13
+	>=media-libs/freetype-2.10
+	sys-libs/zlib
+	cairo? (
+		>=dev-libs/glib-2.64:2
+		>=x11-libs/cairo-1.16
+		introspection? ( >=dev-libs/gobject-introspection-1.72:= )
+	)
+	curl? ( net-misc/curl )
+	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
+	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.49 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		>=dev-qt/qtcore-5.15.2:5
+		>=dev-qt/qtgui-5.15.2:5
+		>=dev-qt/qtxml-5.15.2:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,xml] )
+	tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+	boost? ( >=dev-libs/boost-1.74 )
+	test? (
+		qt5? (
+			>=dev-qt/qttest-5.15.2:5
+			>=dev-qt/qtwidgets-5.15.2:5
+		)
+		qt6? ( dev-qt/qtbase:6[widgets] )
+	)
+"
+BDEPEND="
+	>=dev-util/glib-utils-2.64
+	virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+	elif use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if tc-is-clang ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	append-lfs-flags # bug #898506
+
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=$(usex test $(usex qt5))
+		-DBUILD_QT6_TESTS=$(usex test $(usex qt6))
+		-DBUILD_CPP_TESTS=$(usex test)
+		-DBUILD_MANUAL_TESTS=$(usex test)
+		-DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DENABLE_GPGME=$(usex gpgme)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_LCMS=$(usex lcms)
+		-DENABLE_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		-DENABLE_QT5=$(usex qt5)
+		-DENABLE_QT6=$(usex qt6)
+		-DENABLE_LIBTIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index a4b54047b0b1..0525bc07254b 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -13,12 +13,12 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
 	inherit verify-sig
 
-	TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
+	TEST_COMMIT="91ee031c882634c36f2f0f2f14eb6646dd542fb9"
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/146"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/147"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"