gentoo auto-resync : 04:11:2024 - 03:03:54

11 files changed, 166 insertions, 119 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0c407eca17fe..44e4f58aa1b9 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index e2d9f26e6a53..8ccbfb73fff1 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -1,10 +1,7 @@
-DIST pandoc-3.3-linux-amd64.tar.gz 32140122 BLAKE2B eda93f6a127e40d3ef064604385558fdd4e98c497bd65a845062e6daa988f5bf4cda952a0025835a918b5d7c693d299e4ef7a4244ebce065e48571442f199494 SHA512 4dbf051707fe6d2a6e4d46e32ef000a684edd724059059578950d808114f234bef009725f77b5c9ce44b6feb21bdaf9ac16196bb272b9a79456dd5f67b84cbb9
-DIST pandoc-3.3-linux-arm64.tar.gz 34838805 BLAKE2B a81e590d862aa3c7832425cba67d3622805373dbee5c1a36e52e80326d28251d2076ec95392b0bea62c5154c6f59e2f60d2195b64d0fe6688313437f76f678c4 SHA512 e2c42c2af49dffd05506dc268d929214b85559560140da163145b72dce4dd8fd2f22b8e3278dfdaf0d90f7caba8a8d5a56443362054d508437326b7fc1dfcb93
 DIST pandoc-3.4-linux-amd64.tar.gz 32415360 BLAKE2B f1daec8a527b5a58c55ed060f6dc38db36011ffc4825d11710e82301f984511e9584dba8bc52823c3e1acc6acdd58d5cfc60714263b5e8eafa210c383316e944 SHA512 b38ca8b7c51117051de235a937bf50382ca831e68f190503c3526261920c4568f963400c1953247495d18782f5b0d864085621965a11750255b508ba7779ccaa
 DIST pandoc-3.4-linux-arm64.tar.gz 35126564 BLAKE2B 4dba5ce0e85b3189d1af814bf4a27198004c391b4e27aabe7b71bbb122a310af6b83cf032e495ccab2004226687b5f830fa26554d12d1be49c250d28fc792958 SHA512 954c7b267d67566da8c613f866c82b3a2e6d65e42f261f07ffa486a0e2c4095b3320cee637aecfa297e7abd81e118fcfe0e05d04870bc23219c0a3154c96e15a
 DIST pandoc-3.5-linux-amd64.tar.gz 32371117 BLAKE2B c6c2e08760fe2172bcd0acda3e54c650e48b2a7e9eef519807ec70c5b17cd34f2bc46c11965cfda5d1a072f73ca0cc88d7067c30a3c193192b0e3de7feec0bb8 SHA512 5c83cc80a559912862eb4b89a0ff67101f3e201210812a9e255930037e411de236d41a7c961adc1caff94f50e41de4308f1ed1d76e41a0024c4f96240e252ce7
 DIST pandoc-3.5-linux-arm64.tar.gz 35098101 BLAKE2B 3bfefaed9d5a972aa2a94f1ab1a52e85408c020cc3460fcbe02113103c8038f8290b0f3918d30c4b73f74be7978694021a4cc07e8fd64a00fdc7f8066f46453f SHA512 b15aea4cebffec3dc9645af306d017584fe707b643816a98c794b7fb5157643d6a06f0062dc89327458ce2009ded120bac88f3f0bbed8027740a0d47f9f9d958
-EBUILD pandoc-bin-3.3.ebuild 1450 BLAKE2B b846905663c51f8aa082e7cb261e69a91f1cb55c6d09c92b1b3fbe9f9fedf2777550f1ca46b965717ae97ff50b0a928e86eb7ca8d2cc4808fd160ede4895cfba SHA512 b00d55d61794115f6b923a6d0ce7aa13dd828bf355ca1d7219b858c947b73b1df02e45d346a747bbe2ca0b74ea1e529aea89d13e31a7df4ff4cd5e25fda58495
 EBUILD pandoc-bin-3.4.ebuild 1450 BLAKE2B b846905663c51f8aa082e7cb261e69a91f1cb55c6d09c92b1b3fbe9f9fedf2777550f1ca46b965717ae97ff50b0a928e86eb7ca8d2cc4808fd160ede4895cfba SHA512 b00d55d61794115f6b923a6d0ce7aa13dd828bf355ca1d7219b858c947b73b1df02e45d346a747bbe2ca0b74ea1e529aea89d13e31a7df4ff4cd5e25fda58495
 EBUILD pandoc-bin-3.5.ebuild 1452 BLAKE2B b395d96764270ec8a80dc554570200efe107fd2c204370c3331593a2d2a28d766c76773a29986dbeae2a0c74e214129ee3275e46c0da0c136792b0a680e6b634 SHA512 8d31de85f20cd3fb581f5948bdd7a92b8f2c103dbbcaa09241de5d9ba87011ad819decbc8717f824aa789f39449f0e1e791c502ef8f41aaa048825fbbacc32c9
 MISC metadata.xml 986 BLAKE2B 10ab442c2f7892545054ba2747c0cde115d9d875673c077d2cefcd035e2ecd6d04f2aef05ef9ca58a2150a983079ad8fbdc6910ca93fc14977409041e5f20201 SHA512 c8e241d4d7bba0a6f36320517d18fbb99922e32970d7771d5bbc80a8ecf5086f8f7d1eadd0188d457412a66db898d044074b4d4f0301aab1e19cd1213e562375
diff --git a/app-text/pandoc-bin/pandoc-bin-3.3.ebuild b/app-text/pandoc-bin/pandoc-bin-3.3.ebuild
deleted file mode 100644
index 1a9e4cefd9f7..000000000000
--- a/app-text/pandoc-bin/pandoc-bin-3.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN//-bin/}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Conversion between markup formats (binary package)"
-HOMEPAGE="https://pandoc.org/
-	https://github.com/jgm/pandoc/"
-
-BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
-SRC_URI="
-	amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
-	arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 arm64"
-IUSE="+pandoc-symlink"
-
-RDEPEND="
-	pandoc-symlink? (
-		!${CATEGORY}/${MY_PN}
-		!app-text/pandoc-cli
-		!dev-haskell/pandoc
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-	default
-
-	# Manpages are gzipped.
-	unpack "${S}"/share/man/man1/*.1.gz
-}
-
-src_install() {
-	exeinto /usr/bin
-	newexe bin/${MY_PN} ${PN}
-	dosym ${PN} /usr/bin/pandoc-lua-bin
-	dosym ${PN} /usr/bin/pandoc-server-bin
-
-	newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
-	newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
-	newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
-
-	if use pandoc-symlink ; then
-		dosym ${PN} /usr/bin/${MY_PN}
-		dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
-		dosym pandoc-server-bin /usr/bin/${MY_PN}-server
-
-		dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
-		dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
-		dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
-	fi
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 56deaa49cab5..19a1fc2f27ad 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -9,10 +9,13 @@ DIST poppler-24.09.0.tar.xz 1914488 BLAKE2B be6a388b9ca80aa6d86f05a69e712f5db876
 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-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-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 4448 BLAKE2B e6474a52582ea630652448ff3e9b47b5f7fadab1560d1070ca556090c81256cfc711e4f52f431f0209d6ca49f7d10ee3f36a1c82b3a6bbef6804ba97e88b66fe SHA512 2689fb03bca8a7805baabf524310c5ea74ee0f0b9ec5e92d3272a41cac4feb1b752b21f7188f1f3d5f5af5daf3df560cfc64fca846e4b18e14cadfda2ecc064f
+EBUILD poppler-24.08.0.ebuild 4447 BLAKE2B f88e585dd3992006527baac658f55d778cda382ee76fe3fea904ce890625d3d0c03453b5c8c4d7e3b1df204039b8f2563349ad4ffa386161cdf6c1cd288c949c SHA512 9f35693e28a92d3e5f8cf3f710a67f028571b38814ea2126713b19ab8b229738d89cd7808117323563ad779053ce375b68fc1ed03d62cbec53770be3f06f29d2
 EBUILD poppler-24.09.0.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
+EBUILD poppler-24.10.0.ebuild 4455 BLAKE2B e80ab3bcf12fe79a4d6ed9bd4b4876245c9ca5a7a4cfbb94facad8f10c07599afd0b363aaf1a9a7ec030a13e89d73e4bd5e64f511cedce3e93bdebf71b4b3eae SHA512 935a8e4f1e2b0f376ab8145381469da1c00792bd550005ecee2897ac132cbd770908b6f170bf67172b69bd6e67aff019e8195456a09b9c9a8f5c0439e4fb7438
+EBUILD poppler-24.11.0.ebuild 4456 BLAKE2B 28ff323c722d7da896e04236859966e2bd5ee148baf0cc69383e256de35588a5a3db52444f8c52c4df24639b712c501bed038a79dec21eb86e3969c06044662b SHA512 20de416f33870bd70015018696ee8155348815f6f902b099a8751edcd8fb4cd743f9224ef36fc915b758ca6528e314f6d2d1216dd2ad24e5da4b713ac7bb9267
+EBUILD poppler-9999.ebuild 4455 BLAKE2B e03e1ba798e681c3426cefe2c5da396e3884060ddcbbc6bb109a38e16b715fb0f2e6c02c05848fa25c1f3166112145c51698fba36db1d834b7fb9baf8c79e572 SHA512 e9bef5746dd9fa1a77a2f4ce7adcea4034aba009cd2a309a906f5a96b8cf2d7b9db55359dc0b0229771f434cd3bc7ccad3adbcafd4d405c55a9abdc8ab501987
 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
index 653108e066a1..f2676aa3adc2 100644
--- a/app-text/poppler/poppler-24.08.0.ebuild
+++ b/app-text/poppler/poppler-24.08.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/140"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-24.10.0.ebuild b/app-text/poppler/poppler-24.10.0.ebuild
index 0d9fac4f92c1..30f9b48467a0 100644
--- a/app-text/poppler/poppler-24.10.0.ebuild
+++ b/app-text/poppler/poppler-24.10.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/142"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-24.11.0.ebuild b/app-text/poppler/poppler-24.11.0.ebuild
new file mode 100644
index 000000000000..054f0ab434e4
--- /dev/null
+++ b/app-text/poppler/poppler-24.11.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/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"
+)
+
+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 30f9b48467a0..a721ae5cb97a 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/142"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	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"
diff --git a/app-text/spellutils/Manifest b/app-text/spellutils/Manifest
index ea1cea40e725..01931bf5e993 100644
--- a/app-text/spellutils/Manifest
+++ b/app-text/spellutils/Manifest
@@ -1,6 +1,4 @@
 AUX 0001-allow-running-modern-autoreconf.patch 1268 BLAKE2B 3c8ecdca0f3df3ff5b199eb910532b2f57a09281a212202d1c602be8994812c7a92c1e2a12c140f7c35a6b410446f928fa17571d828a258a592466a016bec35b SHA512 554f2156ac3b30016538b9d5ebb75cc643a219a0b9bd4dcab8c51fb00d7439bd22aba0a81fb9f5272c629605a9d4485c5009836b90707a98cc7d6fca161d6779
-AUX spellutils-0.7-nls.patch 433 BLAKE2B aa85963ace2272facd52b6e8478c1522d363ca81011f53d8971802b74835065cddae904fb3bf873886ae90f9efee3d4362fba13141cf28e1a2d27422c1f5d44b SHA512 94ab6bba55800559ad2621001df828ff67d40df045a63737a112545d558a5436a85cd3220993daf91c23591cc6b94ef692dad9811e08ca0066d602ece07b5b8e
 DIST spellutils-0.7.tar.bz2 110421 BLAKE2B b415a8be96962b88c4ba64270b43e90e42a3ebe23d765ef970cf55a22ada842f269878c4b3a72e6284864d1d1c3e4ade1e84aaf28d4fa39f86f0280db4f27e4d SHA512 030b06038c587e668fcbef95afc64e28db48a25f2b247b829155c1a5b66d3b3012650cb4c13e5de41a70a1665b05fbfb44a4cd0b1295868e611a21d855f02f9e
 EBUILD spellutils-0.7-r1.ebuild 2394 BLAKE2B f8aa043a5256d73cde21322465cdda19c2903c25364f4f1d6f15bff3c840df244ce81e20beb1556df75b80be9d3a909e9952109a6825b65716dbd9acbdb5f15a SHA512 55e9badc41fcd077096164299bca3b16b3bba85412fa8f08d9fa028215729b8b96da7ecf955c50be9cffbd4bdbc77dfb652bbf890f8a3ef96008ab36bc79e374
-EBUILD spellutils-0.7.ebuild 684 BLAKE2B 8756b375935826882174d604cfd15078048cd1acc5fe54f967109a96e410590371df840d77bdbf462a8e097c17b73cedf69671c44237232289e5e657ca269727 SHA512 5009c6e89fef86e8030664026d88a58000bc015e38c0225d85f360e8dec5860f93d4078c6782a491be775a65cd5794e74bfd01fec4c43fbae6eac3df427acd60
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/spellutils/files/spellutils-0.7-nls.patch b/app-text/spellutils/files/spellutils-0.7-nls.patch
deleted file mode 100644
index eed9d8dd9d5a..000000000000
--- a/app-text/spellutils/files/spellutils-0.7-nls.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
-@@ -119,8 +119,8 @@
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  case "$$cat" in \
--	    *.gmo) destdir=$(gnulocaledir);; \
--	    *)     destdir=$(localedir);; \
-+	    *.gmo) destdir=$(DESTDIR)/$(gnulocaledir);; \
-+	    *)     destdir=$(DESTDIR)/$(localedir);; \
- 	  esac; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/app-text/spellutils/spellutils-0.7.ebuild b/app-text/spellutils/spellutils-0.7.ebuild
deleted file mode 100644
index 36331975124e..000000000000
--- a/app-text/spellutils/spellutils-0.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="spellutils includes 'newsbody' (useful for spellchecking in mails, etc.)"
-HOMEPAGE="http://home.worldonline.dk/byrial/spellutils/"
-SRC_URI="http://home.worldonline.dk/byrial/spellutils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
-IUSE="nls"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-nls.patch
-)
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}