gentoo auto-resync : 09:04:2025 - 08:43:18

5 files changed, 157 insertions, 4 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ea7a92402dc9..9c4425176a3b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 7ad59495a776..d71adea5f98d 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,9 +5,12 @@ DIST poppler-25.02.0.tar.xz 1943728 BLAKE2B 4d58a6b4dbef0f45119ce9c18ebc9838cf65
 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-25.04.0.tar.xz 1957260 BLAKE2B 118d0bbe3936eb5be63f707d136e4b713dfbdf577a98c83f9ae9243ff304b18c4c891da255b28709ac0a5fbca67e681d4c9312ac83ffdcc70339f63412c44f59 SHA512 2f05cd757405ee08ace2a73abe122dd95cb225ea90c1891403bf12ca07f6c0d1dccdf504e0183ed6fa1c208228231aa892f71b573dccbe5e26489e51c6825390
+DIST poppler-25.04.0.tar.xz.sig 833 BLAKE2B b0b29b3b0caeb86de8bd904a2458eca470bb5ecb31366851b1c465c21d5990fcc474741d4057a90c928ccb0a088acd0a121de6fb6c127869919943fc09ef56c6 SHA512 444c15004d9187989c25a50b851b196843c6ebead2ef446ac438e6806f0a7a9d64028c08f6e45974526975a23212122ca53cb58ed603ae3792c016297ed04002
 DIST poppler-test-91ee031c882634c36f2f0f2f14eb6646dd542fb9.tar.bz2 5281593 BLAKE2B 84f7be67073bf485ace8e81ffcb6cb402fb288a4bb8c1793bbdbb79f74ef47b4264dd3a0a37635a59ce493d3224628ecd836180c7a5542ac8aed3af158d280f3 SHA512 e1672b5b1d80187fdcbf063b02bebe9f3a38aea989694940c2fd899da489f373ade8e370a3096e9803ba40c488a8dfcca56bfba3140b8c77cdceb9f9d3217b4a
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-25.02.0.ebuild 4447 BLAKE2B 81cbe55ee5f0302ba9a5b59cbb9918947b8dfbc52eb37da501b8f43bae4b29526549b9f9cb6d0f998adeca92b4724922052d8b70c16e90a79a42f882b20c045c SHA512 217230d29b4aa957fb06863cc32dfbfe42522ede9378cc4d58707f846f6739c726e11e1d3cb68ee0532e9bf9f74b0178ca2a6ba43b1d371a200a0dcc476b421b
-EBUILD poppler-25.03.0.ebuild 4216 BLAKE2B 1bde0563311400f163a40cee3c0452b7ef22a6a93b3c85787463c6bfb16ef54ae4979a17ebe71d1ebef7ab33054f630da517c931c33a6bdab6dc6a410e537901 SHA512 25efbb7d463cf579df828d1c30a5702fa551c5f1c0e4448111725f4bf6e45e90afe4c0ea7030abb21313f14683b1e87cd73bbaa3d6f8d624cb5a2eece5b25260
-EBUILD poppler-9999.ebuild 4216 BLAKE2B 1bde0563311400f163a40cee3c0452b7ef22a6a93b3c85787463c6bfb16ef54ae4979a17ebe71d1ebef7ab33054f630da517c931c33a6bdab6dc6a410e537901 SHA512 25efbb7d463cf579df828d1c30a5702fa551c5f1c0e4448111725f4bf6e45e90afe4c0ea7030abb21313f14683b1e87cd73bbaa3d6f8d624cb5a2eece5b25260
+EBUILD poppler-25.03.0.ebuild 4209 BLAKE2B c45be4ed36ad4ae56a9e89869be9eaf2080f676cc052734611b379e4193bd372cee7ad171c019f61011e480203d28756d286160341d695a344cd965a07682993 SHA512 58ce6ac319daee61969f51e74c6dbd4121347f326fa00ded07edf3d09c972a12340a926bb0c8a1f1801f5e452811177d8dd8dc4f0dec782718032fdf98a54ea4
+EBUILD poppler-25.04.0.ebuild 4216 BLAKE2B 57e8c2ff6341e6e6d683a0f95ea39efa097ec8a97ab1a7a5876033a3bb8167516c4c540cb76ff50affb7a99bd0495ebf336439bcf70cc7bf492390b0b50ffd0b SHA512 ddc30dd2b46be35d328db8ac92e27e62e484957bb9dc1c2948dd8e8a519da346fc267965f5fdf1596ba31f5974f813bcd7ec085c652d4914a594207f97ab5ac6
+EBUILD poppler-9999.ebuild 4216 BLAKE2B 57e8c2ff6341e6e6d683a0f95ea39efa097ec8a97ab1a7a5876033a3bb8167516c4c540cb76ff50affb7a99bd0495ebf336439bcf70cc7bf492390b0b50ffd0b SHA512 ddc30dd2b46be35d328db8ac92e27e62e484957bb9dc1c2948dd8e8a519da346fc267965f5fdf1596ba31f5974f813bcd7ec085c652d4914a594207f97ab5ac6
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-25.03.0.ebuild b/app-text/poppler/poppler-25.03.0.ebuild
index d11ce8b43778..bdcc212513f9 100644
--- a/app-text/poppler/poppler-25.03.0.ebuild
+++ b/app-text/poppler/poppler-25.03.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/147"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-25.04.0.ebuild b/app-text/poppler/poppler-25.04.0.ebuild
new file mode 100644
index 000000000000..45ec1a3227a0
--- /dev/null
+++ b/app-text/poppler/poppler-25.04.0.ebuild
@@ -0,0 +1,150 @@
+# 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/148"   # 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
+}
+
+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 d11ce8b43778..45ec1a3227a0 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/147"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/148"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"