3 files changed, 2 insertions, 163 deletions
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index dee69c7e2749..82fc16cf00b6 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,16 +1,12 @@
 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
-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.06.1.tar.xz 1910252 BLAKE2B 7eb2543dce1da0a04ce872d4af30eb25304db72fb6dc6f3ed309d478844af0fdd66e886a6e8c3a48df2096a8aa834f6b14e65689466de3283b54bc50289cd8b3 SHA512 4add06c9cb7741a66cd11e169b6cc332e80151b6e3450295400e948f30c340d018f67fcf2b923f4f65a11f20e2ce1c2740008e823d9b97f966eded7ae51e4167
 DIST poppler-24.06.1.tar.xz.sig 833 BLAKE2B f2fa137d12e9143691d1a640a39c40fe8d923b017e60e2a125026082adce8e0863c501167a170d60aa38044d9c799f9e31a8eacfee68847554ac86f7eea84d26 SHA512 f6343d3b7c8889a5b8e8a14a14e60fd11990393608639b0f41bb35451c2ac5ec28bba01af79578c0cb224726886b28a491a769cba5347df67680d18812258b9f
 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.06.1.ebuild 4462 BLAKE2B 3140159843c7f88d80405c60f3127ac5a5132c06738ba6035c177b202a3a21d6f1630b1ed9a29d9a5e3f0e7429c865889bb309b9a7a7e9b61b5d347d9b499dd0 SHA512 62a677fb497f87d155222974e0c4c1923f98f714914702858c2861212eb5c8375de6cdae15ef1b9406b07d236a84fd02b032b12883f6d0befccc4dcc751b0b04
 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.04.0.ebuild b/app-text/poppler/poppler-24.04.0.ebuild
deleted file mode 100644
index 47fea88caf87..000000000000
--- a/app-text/poppler/poppler-24.04.0.ebuild
+++ /dev/null
@@ -1,157 +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://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="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
-	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
-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.64:= )
-	)
-	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
-		dev-qt/qtgui:5
-		dev-qt/qtxml: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.71 )
-	test? (
-		qt5? (
-			dev-qt/qttest:5
-			dev-qt/qtwidgets: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-24.06.1.ebuild b/app-text/poppler/poppler-24.06.1.ebuild
index bb7ab3e3a6d6..7550f85e6200 100644
--- a/app-text/poppler/poppler-24.06.1.ebuild
+++ b/app-text/poppler/poppler-24.06.1.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 ~ia64 ~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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/138"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi