gentoo auto-resync : 11:08:2024 - 11:06:01

5 files changed, 163 insertions, 3 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5572fa9e076d..b68848bc78d6 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 4976f849f926..f0ca60cbe007 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,7 +1,7 @@
 AUX mpe5 105 BLAKE2B 011a381d5edd222d08560e501814cbb5f66ab61294f18f87851a04dc00ad0b67b91c660a9b5d31c2fdaeeb42ab81f6dc8abfc51e4ed4b8a75d8dd7a6ac5e1f22 SHA512 704a06e58f250bc1e7ae2722d9875fe86248045f01906eb37e553c6379d9606fe5322876685bcd8bc1548a4b687b5e1153d9c7fdf96421a203ca5a7a47b3e787
 DIST master-pdf-editor-5.9.82-qt5.x86_64.tar.gz 80442378 BLAKE2B bd6357097451595388be3471b291ceb23b6815ed9ce68956223860c089265ae3693cee1c90f94e567e26b3a0f11b8dee8c2cf40e0184141e2539b44303d6a4c4 SHA512 d4613b5d5353e3bd39bcf953adff2d086e20de6a627e5e6dade62cb7887254b949659174ee3ba86ac525d2373fcedbdb286dc83ffca910c577cbf9ccc14ced39
 DIST master-pdf-editor-5.9.84.x86_64-qt5_include.tar.gz 82574581 BLAKE2B 53f21f11043f97c177010712b375101e29e2078a434e5791691e566b30d6a7b910ba735039b1ffd05c284e21fa478a3c1977b9bef6fe28c563bf5616f6379433 SHA512 9eca9f6504a919c1d8c00f51795c603b955cd69b02b05ad72943eb4561226ec5045f61f28f39e5a97b9c46ec9a6f49f64e92d2f6ee76b69ca09d84135b67f020
-DIST master-pdf-editor-5.9.85-qt5.x86_64-qt_include.tar.gz 61727253 BLAKE2B baf438bcbd250aec1df3a471ae146c5410a5511473cc6e2d0d07e1d9752fbdde6caf3ddd2eab19f0afff3f9d5cc083ffea9f8464c743dc7b603bec191703f1b0 SHA512 a66f905f7afa7ec40d076b1544d5cf18bfd547212123c297e79bf2403b69ec91c39f3ef6fb298b53bc2df4d580db5025c6af64e3031fe286fb9b9d59f2483139
+DIST master-pdf-editor-5.9.85-qt5.x86_64-qt_include.tar.gz 63065080 BLAKE2B 8d1231d6778ac321fad511878865869005e3b5fe6c0eaa8cf87b17fc0f4de279739d9b15bf12c77d9abf39a911b08125bf94a5a1b5927b328be6646dda31c314 SHA512 4f301a396fcb3654c40bb9ee2b072ee1fdaaba1ac5c22e4e3d035cd95f968062ea3662d0e8f0ffef5d59438ac07c5452bddac69f734237dcd6388b74f7ecb570
 EBUILD master-pdf-editor-5.9.82.ebuild 1157 BLAKE2B 2c83452b284f8c5fc23a8d0978087c2119294c7e176cb796c702ee50aba6948c5cd47c90ceb2975a7fffb83325e8fe3183e6bdfcd06ac19020ed62ac560405c9 SHA512 fc2833fe6b625381d7d5a62df3ed5e980fd442aba3eb058eedc6367d01303478b72ca41fbed1ec8d04176802d519f512ab6104a0160e5375275153fe59c37d80
 EBUILD master-pdf-editor-5.9.84.ebuild 1212 BLAKE2B b3fa97e8aa878080f594fd4d393b18257b92449b0f9136ad9609c95f4520e77a969095f8cba24acac26f80696e0c0220e780201300b2c6e2bd780105aa382221 SHA512 a57d1095bde8d3fe291c27c93989f05c87de73a8be35903e6294df4c540e344aff57408df07e0c6e04eeee4142041b667ef6db26864ed475f52ef1e190b365d7
 EBUILD master-pdf-editor-5.9.85.ebuild 1215 BLAKE2B 812e0a08a6d8f6d7760c3dde0a8effaddaca811184b6fcaa3c6d6d82e41d9a7eb5a44d57d1e644f717da9da0012e0035e797a8be29f0294505f2149d45970c13 SHA512 848e5a4835c989b157b421958cf0072392db453372dadf9b022713aa7b36490934dd341b3d1d385ca6d7e9446f74a05974e885dedc69e102e6d7ae068f4573bd
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a31d9530d884..17687c54ef84 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,10 +7,13 @@ DIST poppler-24.06.1.tar.xz 1910252 BLAKE2B 7eb2543dce1da0a04ce872d4af30eb25304d
 DIST poppler-24.06.1.tar.xz.sig 833 BLAKE2B f2fa137d12e9143691d1a640a39c40fe8d923b017e60e2a125026082adce8e0863c501167a170d60aa38044d9c799f9e31a8eacfee68847554ac86f7eea84d26 SHA512 f6343d3b7c8889a5b8e8a14a14e60fd11990393608639b0f41bb35451c2ac5ec28bba01af79578c0cb224726886b28a491a769cba5347df67680d18812258b9f
 DIST poppler-24.07.0.tar.xz 1913256 BLAKE2B fe4c227e72b215faea3942d9bab20b495da68cded7fbf082148362eae7ff35004e982fccb80fd05d3774cbf42d510b2784bbb6e71eb8b9fe7ac7f77a52d980ad SHA512 c11877c9977341c75166991118d9cbd0b4167708ead06bc464f0c13ef1e8ff30733f6521d9c8f8608fb6c59db2a3a046eac36a635f90e7aa7124f9be21df422d
 DIST poppler-24.07.0.tar.xz.sig 833 BLAKE2B c903a8f84c65c187f2f976eb83059722ef524331e0bae8aef21f0cc8af0d144528bc8c0b29e821eced49e318565e1c8fff4a674f9d74cf63e645e93caebd976d SHA512 5a80f27ce09ca2864e870a6d1cd9b8ac3d727c7c7522ff865517cb804344c797067ecb0763c58b486a5e371286ca2e0afa93c260cb864b11815972c03207ad5d
+DIST poppler-24.08.0.tar.xz 1912592 BLAKE2B f76ccb8d596909d671df34f6c028e6161ad734d31b460bc7b3578d08a75ad146d6d2c1e4108acb33d08fd518fee014cc84e23d2e04ea92ad152702af614c5ca2 SHA512 47309b75746d5bc309ae98da9280e5178c81505c8873e849ece6923eb0ae0df6f271dab1e38b3aac1dbd5d05518284ad237ea78ba40d90420c6fc53ae1c3b400
+DIST poppler-24.08.0.tar.xz.sig 833 BLAKE2B d257fc092c8541daf2e88a852655827470fb4890316f0a9b334b18c736ea33500e52c3b6b238047e8e3ded6a155b4466dcfa3afabfede11ed89b3fa17553577e SHA512 5e5c0185db2f3c1e1639e1eead93cf9e282db403edb91750d8ec325ca69f4bfb026345f2e9a8a18ed23a5a02b308163f9b4a8d6a75f9e760414cd709681a25a7
 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.04.0.ebuild 4417 BLAKE2B 407d85bd4d2865ace153236758eecad6ae6d5fc149f719c89edb4aad0ec59da434479cf490da90db7f5c1324ade5a1f106a48f861ee482d38ce237d11a650dfd SHA512 f01c512d9ff207bfa6b27095f36530d76aa992422de7b7c65056ec4b8f43e0f9d51b7c245731810cb9cc963bbed2751d435159261bbaccdf08e6bbc21651fe2f
 EBUILD poppler-24.06.1.ebuild 4463 BLAKE2B d9e2f1a71d72218aef0914c9537520ff447e8abcc235120735fcd9a299a5e71380b1c9599990d4cebbb7859397f1c1f99841850a0f9f98b9e8be24dced7faf52 SHA512 298c7c3a05882bf5aaf8231d922a520b3c1baf1e14ebb54049d96ac22a9d64417a4cafc40566dbfa8935bc57d687852077cbd439bddf6928c40fa3dac1f5edf8
 EBUILD poppler-24.07.0.ebuild 4470 BLAKE2B 23deceacbece8bfe874ebb9bd22e4c44e7b32309bf58f387af23dfa32e6c2d2040e5639822ac122d9b11f35c07fc4e40fbed08883c6cc7545ba57f6e2c55e9e6 SHA512 fd79c65d1b99e0f159e719355749d73821eec2cc7029ee0802edac6381f3405c89cea4bbee02ec5a2d8a1deaeaad226d148affb4a6690e3e403ed3a19da67bb8
-EBUILD poppler-9999.ebuild 4470 BLAKE2B 23deceacbece8bfe874ebb9bd22e4c44e7b32309bf58f387af23dfa32e6c2d2040e5639822ac122d9b11f35c07fc4e40fbed08883c6cc7545ba57f6e2c55e9e6 SHA512 fd79c65d1b99e0f159e719355749d73821eec2cc7029ee0802edac6381f3405c89cea4bbee02ec5a2d8a1deaeaad226d148affb4a6690e3e403ed3a19da67bb8
+EBUILD poppler-24.08.0.ebuild 4470 BLAKE2B 16fe6d27117e3741032506a11e31d61c404c1a0da08f5feb81fb2ef941cf45346edfbb0ac8ada9c8542bee1f8eca8bc070c27d2485fae2f7664a726f1439ec75 SHA512 951e53f9c1f0210993fe2554b35291d4f1a4d1670d87985ec2db633d33f2d3b90bee840da6feb49d0a16c12724db1f6ce1f407c6885e4699c7a10fdb09f7fe51
+EBUILD poppler-9999.ebuild 4470 BLAKE2B 16fe6d27117e3741032506a11e31d61c404c1a0da08f5feb81fb2ef941cf45346edfbb0ac8ada9c8542bee1f8eca8bc070c27d2485fae2f7664a726f1439ec75 SHA512 951e53f9c1f0210993fe2554b35291d4f1a4d1670d87985ec2db633d33f2d3b90bee840da6feb49d0a16c12724db1f6ce1f407c6885e4699c7a10fdb09f7fe51
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-24.08.0.ebuild b/app-text/poppler/poppler-24.08.0.ebuild
new file mode 100644
index 000000000000..06e7220bfbba
--- /dev/null
+++ b/app-text/poppler/poppler-24.08.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/140"   # 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 7b4beeb49ab3..06e7220bfbba 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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/139"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/140"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"