3 files changed, 171 insertions, 10 deletions
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a5d8fe688a1b..07ddf3d03d80 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,9 +7,13 @@ DIST poppler-24.03.0.tar.xz 1902068 BLAKE2B 34cd3b64b1fbee53727d99bf73a896331c15
 DIST poppler-24.03.0.tar.xz.sig 833 BLAKE2B efdf579fec7d5aca5ec197220d46e4420f60946992e0c6f0a461f4ebc0b45c363eca269e93ffa36e840a7959c8ca2225da17b62b412a0eb37e4d4e74f98a22c6 SHA512 7276311721a7c6ea35773e38147c816b79359422add5f9b954a1e95fd399f16161ff8791a82db56707b143e207e6cf8264d353b3a6da298c9f65f2e9cb2533d0
 DIST poppler-24.04.0.tar.xz 1904936 BLAKE2B c4a9350b990981b0018229923160ded621f4035b19ec3d87c328ef67b22b9e36cc15ef4912da625a55a5befacc95aef6a8ef5dc48aa46cd79943b03985333b47 SHA512 49a9bef20ebdca3b56e53fa610d5ff76a7fba378dd7d8bb64a11bea909bf103ec7fd385e95ca971feab84aaebb523d4c7515a3a42ac0c7eb728e376a1239cfd9
 DIST poppler-24.04.0.tar.xz.sig 833 BLAKE2B 842f500b45396a3a0a6e5789a6f0957ea5f3d66536dfb6e32420201bdfc4a867a0262d0dc97302cc0d530e68ca163fda10f143516a472394bcb085f746d891d1 SHA512 4419a2a94c34621ffde1f1e0d1d26929171f81b6809a5380af30434c2220a7bf694ff2f8e7ba7a611b1ebd265e91424060238f51d2cccd9acecd92f66e0e1e28
+DIST poppler-24.05.0.tar.xz 1909164 BLAKE2B 65d5d1509078012a26d0bd97985516a39c49594a3c83016f1b7c7745caf1d13faaa82bbaea62c16466f4b1c159c765fa88f97e20f10a87b08514b00e5bdb1113 SHA512 caa3d31b8f22186a7218831039c2ff7384b07863de04f166980dfe534a7a5f047e7c21e1114b9ed0ef323beb60983b45a36bb906c4189c0828f4119e3e2dbaa1
+DIST poppler-24.05.0.tar.xz.sig 833 BLAKE2B f1125a8b81089a4b8beb9385fa4a9b170b97f08e2bc732fd1cc2671ed43a81bb7b58b9ced61691e55188af94ee6b2c701be0ea1e12feecebbc7c4062a97b76fb SHA512 3010eeda09ff58d9705465bffe4861d9af1f294597b8eec1e1cc90f59008ab146000fcc694b2fad8bb675d89d68b2b78d54236ae6d42411058b9444b87514db3
 DIST poppler-test-400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1.tar.bz2 5199265 BLAKE2B d58f6ee7b44ca45291c205f9619db3833871f5789dd6a4e3ccc9acce2b6d7967a6b8596e3f32b7b35ba3d185976e8b9c8a998071c4451bb5ce674825a4005d6d SHA512 5bf5d99956fa0a6a93e0b0dc4713ecd8810811eca35514cc5765ffaafb9485f64f94b21487afa46c16eaf66326fcb999e792b8121eeb188e7e33a32a4798fb76
+DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.02.0.ebuild 4417 BLAKE2B b40e98b84d176b81769316c3a9ec3ee7094beb3a9dc126095d77bc37a35a2baa5d92a7261ca4ae41bd09b9a159b519bdfabd3d34bf3b957bbc3eb07ccf5c8b9a SHA512 40c8572bcc3740b96ab5d79f503c6004b629d6975db25fa5b6191ad19ba1dd5cec35e9a3cbf56a815d7e1abe70026d4939f89533dafd174754b3f21d65dad9b6
 EBUILD poppler-24.03.0.ebuild 4425 BLAKE2B 59bde449ff26fac6215ee6b6aa0545eb13db02a70bbf1e77812aa59db4130d6496e5677ff1449d001785d87a5be58d284aa0d182b76f7552498e94e2cb99f751 SHA512 1c7f0defa59e073053d97d3e3a6ce26522742e5e394236ed55b9c1a25f197fd153fcfc08d5ee02f5aa5342775578354e1569ce13b4c7f3926f09a3494d3b1284
 EBUILD poppler-24.04.0.ebuild 4425 BLAKE2B 949c40d63491e2e77610b879178e58ebe3e14851759d7653bfa4c825987431979fb9be5bc60e6cdc605287b86a442ef489ed639457814bc05b60eff9898bba8a SHA512 f6b145756adf5652dd93c0662cfcb8960e8a17549f718954194aa4fb8961248cdee775a1db099a505fc8e3abb02a515ec3a5879ed808b16d2f244779d066b8b5
-EBUILD poppler-9999.ebuild 4425 BLAKE2B 949c40d63491e2e77610b879178e58ebe3e14851759d7653bfa4c825987431979fb9be5bc60e6cdc605287b86a442ef489ed639457814bc05b60eff9898bba8a SHA512 f6b145756adf5652dd93c0662cfcb8960e8a17549f718954194aa4fb8961248cdee775a1db099a505fc8e3abb02a515ec3a5879ed808b16d2f244779d066b8b5
+EBUILD poppler-24.05.0.ebuild 4470 BLAKE2B 47bfdd4c11718af3603491d0863ca24d44b45177c34dde290fe00faa438c8897ca9899ded3db480131f70dce5813d02b82911a98ae7393a7b7718766f7c44876 SHA512 bbf33cd833105cbca2eddbf5b41136047c7232f7e333e98f7b790afc982c0e588f687cc204b0702f3e3b330422e886a99ae2811588b53ee589f25edbf41bf889
+EBUILD poppler-9999.ebuild 4470 BLAKE2B 47bfdd4c11718af3603491d0863ca24d44b45177c34dde290fe00faa438c8897ca9899ded3db480131f70dce5813d02b82911a98ae7393a7b7718766f7c44876 SHA512 bbf33cd833105cbca2eddbf5b41136047c7232f7e333e98f7b790afc982c0e588f687cc204b0702f3e3b330422e886a99ae2811588b53ee589f25edbf41bf889
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-24.05.0.ebuild b/app-text/poppler/poppler-24.05.0.ebuild
new file mode 100644
index 000000000000..fe2ff39083f0
--- /dev/null
+++ b/app-text/poppler/poppler-24.05.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2005-2024 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://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
+	inherit verify-sig
+
+	TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
+	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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	SLOT="0/137"   # 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 83006151fd51..fe2ff39083f0 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="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
+	TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
 	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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/136"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/137"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	cairo? (
 		>=dev-libs/glib-2.64:2
 		>=x11-libs/cairo-1.16
-		introspection? ( >=dev-libs/gobject-introspection-1.64:= )
+		introspection? ( >=dev-libs/gobject-introspection-1.72:= )
 	)
 	curl? ( net-misc/curl )
 	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
@@ -45,9 +45,9 @@ COMMON_DEPEND="
 	nss? ( >=dev-libs/nss-3.49 )
 	png? ( media-libs/libpng:0= )
 	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
+		>=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:= )
@@ -56,11 +56,11 @@ RDEPEND="${COMMON_DEPEND}
 	cjk? ( app-text/poppler-data )
 "
 DEPEND="${COMMON_DEPEND}
-	boost? ( >=dev-libs/boost-1.71 )
+	boost? ( >=dev-libs/boost-1.74 )
 	test? (
 		qt5? (
-			dev-qt/qttest:5
-			dev-qt/qtwidgets:5
+			>=dev-qt/qttest-5.15.2:5
+			>=dev-qt/qtwidgets-5.15.2:5
 		)
 		qt6? ( dev-qt/qtbase:6[widgets] )
 	)