gentoo auto-resync : 22:10:2024 - 04:04:46

3 files changed, 162 insertions, 2 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 064c846ae90f..51b036b4086b 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,9 +7,12 @@ DIST poppler-24.08.0.tar.xz 1912592 BLAKE2B f76ccb8d596909d671df34f6c028e6161ad7
 DIST poppler-24.08.0.tar.xz.sig 833 BLAKE2B d257fc092c8541daf2e88a852655827470fb4890316f0a9b334b18c736ea33500e52c3b6b238047e8e3ded6a155b4466dcfa3afabfede11ed89b3fa17553577e SHA512 5e5c0185db2f3c1e1639e1eead93cf9e282db403edb91750d8ec325ca69f4bfb026345f2e9a8a18ed23a5a02b308163f9b4a8d6a75f9e760414cd709681a25a7
 DIST poppler-24.09.0.tar.xz 1914488 BLAKE2B be6a388b9ca80aa6d86f05a69e712f5db8764653464ac0b511ed6d4b6090e796df041749f7c39519d3e6606e8c5692deadda9a60d5e8fc67931862676eda1b28 SHA512 1e8aea61d6bc1ce0d94bbcd0bb3b329a128b546082b2d74a005f6e36457c8c4632695ddddff6fe6e1e98cd40e5080e6b54eeb816846cb5e891d68b7051641151
 DIST poppler-24.09.0.tar.xz.sig 833 BLAKE2B 01c532ac962133ab85de72520a558b5f67ab27e8c260097b40a633f0f51978562c0ded7230828424712dbb931032d02d18179090fbc80dc926c1d58e8c32c2c2 SHA512 612b7b8a69ef4feb05c029cf925e5e876697abef4ee01575c3cfe68f20f7acd10103e18705c56f7c199707df648523553a6c87b8f39287ace03e444abf8750f2
+DIST poppler-24.10.0.tar.xz 1920580 BLAKE2B 5eee232c64f18083fa189b1839a7757c34f31a8711c4f173bfe0ded7c08d96618c9276fade85b3802cc79e31ca4b22f425904102f52a42985c9506f9cefbcf9f SHA512 5515b4c439cd2e92119aedcb8960dd82e6f78a1ffd82543d3649bedb3e0e8e97689ea592f4df347cc3c97d5d90c8518c13859f80be25f157b9aea78e62a31502
+DIST poppler-24.10.0.tar.xz.sig 833 BLAKE2B 241d939ab41687f3a5133418630624cc50f0de4cd00d45b3c7d2ea7afa083ac33b7dbb40a3493743bc6c5ba04f1c82c4bb0acae64f2f8658190fb7587a0097c3 SHA512 1c3668c8092bafe4169c2945b0bb2eeb1ab20097e1a45496837f2ce4edb4651272920583606b1746998a9313da6227814ffbbd22eb06195b21219673a9957a6e
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.06.1.ebuild 4447 BLAKE2B 9dd8e5dbd6e5985a5d9e21c0d3dc1c6da6a240d63db338ea06f2b1b4dfa1b175fccca4257d9da79e0deff5db1dec65c599a799a453f6962c39cad9f5073b1af2 SHA512 ef395755a8d3b41834dc0d91640aa527e3bee2a116510916c5e119b87085c401ffb7de73bc4eb1916d671b1bd493091226a4a54609c169e4e55b345975d7c4a2
 EBUILD poppler-24.08.0.ebuild 4449 BLAKE2B 325428375d2bca1fcaaaf15b0b23ed972f507127bddcca0ec5ff87bd4ef84e5195df23d225edd7397ab9d4ab983e6b079c4a2254b4c2497c01fc342641e9aca9 SHA512 d0f62169fbb6c99ac1dd0f352a57602b2590354836923b18eb6c24b395e1f9b6f60c0986196b4029f277095bac912457a0259c1fc643262263aafc44c80bc2f9
 EBUILD poppler-24.09.0.ebuild 4455 BLAKE2B c9a8dff1f1a8931a15aa835c135ad1c86650c73b2dabdab2b034ad0ea21f9ec5dc629ca8ec59ff2ff240604975a001895138e7c91447308b9b38d1cebceba060 SHA512 5574e1b7c7a6e7ca4f6275c63ceb4be233ea6af8d6bce0d16bfa78748956a23ee65a4674ebe45f58d63de7c6f564af34b31fd2e28b2a65b8a70e4a7bdaf33a48
-EBUILD poppler-9999.ebuild 4455 BLAKE2B c9a8dff1f1a8931a15aa835c135ad1c86650c73b2dabdab2b034ad0ea21f9ec5dc629ca8ec59ff2ff240604975a001895138e7c91447308b9b38d1cebceba060 SHA512 5574e1b7c7a6e7ca4f6275c63ceb4be233ea6af8d6bce0d16bfa78748956a23ee65a4674ebe45f58d63de7c6f564af34b31fd2e28b2a65b8a70e4a7bdaf33a48
+EBUILD poppler-24.10.0.ebuild 4456 BLAKE2B 35d08374784135e87c73ecb88727946c78acd3762dc87f68f6796608501aab22780929e665436cf07172da4c34295a709dc06083edc88fa47bf4b94471fbfcee SHA512 c55da2f0319e5d98e42a0bdb4eee86e8f802114ed2ccee61718718fca6f92c0c0afb1ae5515286d04b8fd545aea13e9ef72437822106937f7fd38652c4544310
+EBUILD poppler-9999.ebuild 4455 BLAKE2B e80ab3bcf12fe79a4d6ed9bd4b4876245c9ca5a7a4cfbb94facad8f10c07599afd0b363aaf1a9a7ec030a13e89d73e4bd5e64f511cedce3e93bdebf71b4b3eae SHA512 935a8e4f1e2b0f376ab8145381469da1c00792bd550005ecee2897ac132cbd770908b6f170bf67172b69bd6e67aff019e8195456a09b9c9a8f5c0439e4fb7438
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-24.10.0.ebuild b/app-text/poppler/poppler-24.10.0.ebuild
new file mode 100644
index 000000000000..0d9fac4f92c1
--- /dev/null
+++ b/app-text/poppler/poppler-24.10.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://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="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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	SLOT="0/142"   # 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 dda3fe1c9b3e..30f9b48467a0 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -18,7 +18,7 @@ else
 	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/141"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/142"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"