gentoo auto-resync : 25:03:2025 - 00:31:49

6 files changed, 2 insertions, 244 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a8cc02b76e15..6787ed237dee 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,19 +1,13 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
 AUX poppler-23.10.0-qt-deps.patch 2020 BLAKE2B e9f022a7ddbc0e2533554c3263e0f22e62da8c28881a4f6a5bef18b1f85c5db9e6a4c3b312d5e1b0fbeec6f265716d376fe2036b9ae3d0e5396fc6cc1510d1ac SHA512 7ab6f92cc9f019b9f01b6f4cb4bfe7f8f269fd172ac46379b212ae623452265bbbb223e840897fb6c483c65919f3573a9bd79814b719b115cabd97950a202c7a
-AUX poppler-24.11.0-readd-SplashFont.patch 672 BLAKE2B 39d3d22cac3600ca71e803eb0fab6396d67bfd9a054c7a79480bfaadfbff3a5cfb10450f88025df9f1779903d3e16f94a0e614bdb5141a7bb33c8700e13bc533 SHA512 6774e05bae26819220ed207ac171ff422807bfc206c2a23a11ed6612b4c5e28c1bfda4b75c3bc827ecc37e92383ebed64d5cc6a60862e03feda69eaddca0aaae
-AUX poppler-24.11.0-readd-StructTreeRoot.patch 698 BLAKE2B 08171ca524a1005a923624f2d849295df8a06ed9872fd3e0b0bf961076290069803c34cadc3cab36e3199fdb615325ad6d365f31da85cfd9e711bb1efc962a67 SHA512 b0d786601770a9ea73bd7a8dfc3a91eff086090e599cb335cd9e7bc9719d9752256a1a487d446f8affb68d52f5cf13a71ab17f7c583c66809948e5ec26ba1bf2
-AUX poppler-24.11.0-readd-ViewerPreferences.patch 719 BLAKE2B bd3e34a65493b7b76e0cfef98f6ef91ef62bf98aed0250a0d1ca16c0d7ff4babe112513746368c8506d9c844491d1f3d8f1b2986f5c4b8d71bcc7d2102a85f32 SHA512 9b68c2b826b73523f94d5c2264b636ea2962d9d3574185ea913b8387b1ad584a2c42792f648a9093f25a5599b3c53228b9215c37eaf966ed7ad800c551ad5e79
-DIST poppler-24.11.0.tar.xz 1922804 BLAKE2B 2ee77ddfd49ab4b3f486fcd160be21fdf2d474e44b6cdfd40a7f927cbe253d407a6f75b66de83ab541288a54558445e409b283a81c7a8ff20f9a6d0d4f33adf7 SHA512 3823c024d9b1cab7c4ee8a99d5209722296cce8894e3f4ba8d5a84ab6bba430fa0c1078bfcddcdbc1c30bd98832e269df2aef1d5af20c1985b9f903cb70a24e7
-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 4448 BLAKE2B 2f376ae31e7d0bd595919d436866ef5155bcde5084437a569f2139ca804e216e6472a021d5ff9c97eead1fc593aedf3ff6935fa5a457835ce7a39345ba615072 SHA512 b2e44330012564767f22d7d420b73b3343b80585144d07e0ac4fac2c2921e34dd60a6485befea6b93e280b3dc7fc5cc060a7a751df3b73426921188e248c4158
+EBUILD poppler-25.02.0.ebuild 4447 BLAKE2B 81cbe55ee5f0302ba9a5b59cbb9918947b8dfbc52eb37da501b8f43bae4b29526549b9f9cb6d0f998adeca92b4724922052d8b70c16e90a79a42f882b20c045c SHA512 217230d29b4aa957fb06863cc32dfbfe42522ede9378cc4d58707f846f6739c726e11e1d3cb68ee0532e9bf9f74b0178ca2a6ba43b1d371a200a0dcc476b421b
 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/files/poppler-24.11.0-readd-SplashFont.patch b/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch
deleted file mode 100644
index 35daf33c7c6f..000000000000
--- a/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a87cf2157e6ce5b1f98288727e8fc2a2caf0220 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 13 Nov 2024 21:15:55 +0100
-Subject: [PATCH] Install SplashFont again
-
-I failed realizing it was usable
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a5c8b7610..ef0dc236a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -756,6 +756,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
-     splash/SplashBitmap.h
-     splash/SplashClip.h
-     splash/SplashErrorCodes.h
-+    splash/SplashFont.h
-     splash/SplashFontEngine.h
-     splash/SplashFontFile.h
-     splash/SplashFontFileID.h
--- 
-GitLab
-
diff --git a/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch b/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch
deleted file mode 100644
index 9b0a5211abd0..000000000000
--- a/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2d7188a3a3679a359e3eb49beb9657027a16b3bd Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 13 Nov 2024 22:06:46 +0100
-Subject: [PATCH] Install StructTreeRoot.h again
-
-I didn't realize it was usable without being exported
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef0dc236a..574b50deb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -713,6 +713,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
-     poppler/Stream-CCITT.h
-     poppler/Stream.h
-     poppler/StructElement.h
-+    poppler/StructTreeRoot.h
-     poppler/UnicodeMap.h
-     poppler/UnicodeMapFuncs.h
-     poppler/UnicodeMapTables.h
--- 
-GitLab
-
diff --git a/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch b/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch
deleted file mode 100644
index 9787e6f3a80d..000000000000
--- a/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b9620f70a41e878b7f4e615ced4bd7ecf9fe7233 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 10 Nov 2024 23:47:18 +0100
-Subject: [PATCH] Install ViewerPreferences again
-
-I failed realizing it was usable given it's all inline functions
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bb1c73a05..a5c8b7610 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -720,6 +720,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
-     poppler/UnicodeCClassTables.h
-     poppler/UnicodeCompTables.h
-     poppler/UnicodeDecompTables.h
-+    poppler/ViewerPreferences.h
-     poppler/XRef.h
-     poppler/CharTypes.h
-     poppler/ErrorCodes.h
--- 
-GitLab
-
diff --git a/app-text/poppler/poppler-24.11.0-r1.ebuild b/app-text/poppler/poppler-24.11.0-r1.ebuild
deleted file mode 100644
index a387463f5a98..000000000000
--- a/app-text/poppler/poppler-24.11.0-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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/143"   # 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"
-	# git master
-	"${FILESDIR}/${P}-readd-ViewerPreferences.patch"
-	"${FILESDIR}/${P}-readd-SplashFont.patch"
-	"${FILESDIR}/${P}-readd-StructTreeRoot.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-25.02.0.ebuild b/app-text/poppler/poppler-25.02.0.ebuild
index e813bd37faa0..e76604f05506 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