10 files changed, 232 insertions, 167 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b38e9f5ae870..bd439845b804 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 38d36506b576..3ec69c1aa3fd 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,11 +1,7 @@
-DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B b7af2ba4fb4be5aaba66eca55436c889bfc80fad7f6bdbfcf7fbfd2ecb05b6a0143d1c8599836d4c1a8dde3bfa235335cbebc05164ac03bca1de13b613bcbca0 SHA512 e6fdc9ae0c5638944c1a9c7d6f9cbd902c59b0823422010815e78c93133504546142211ca34456b18cadf5a25c093385927fe7f24adceb7f5997f42a957e8666
-DIST cherrytree_0.99.54.tar.xz 3500772 BLAKE2B bec969f75629da0488774a4ca18abd32bf6db50d4ad66418726cdfd7894901401d7d5af21678fb0886863154aea68286e25d4bbfb21f16a616ab0aa89d44da4b SHA512 c4e8ff4440fc688ee6b24279857452e00f85614dcf094b311a768479fcc842712171e4dcd0b121b865aedd2d854ed5906e7fc615a69a76d50af71b91bb29835e
-DIST cherrytree_0.99.55.tar.xz 2449336 BLAKE2B 6e034b019a70849af99766085bc2c2e777e909a8d18f9b98943c6aeb1a0285573e3651cef1a2620f0eb9aad37d9f28cd871fbcff6f57e39bc89cd60ba4191028 SHA512 3c22df32fe0a4449607862c87aac46f52047a37a6404c848ce9a1e5308f87de7c5ca47c8e4abb21d1ecbe53bb7fc714fa7e0de0302caabd18e6eb2137c3438b6
 DIST cherrytree_1.0.0.tar.xz 3746968 BLAKE2B 0f13dc25f04bc04db7d1e35de8b2f0dce45f1edcbb32705171edd19f3f508c188182036313267fb0289e98fdd64ea7fbd673f33a494997d5a873dfbe63006b0c SHA512 aa1e32be1cb99b11e158bb4d6a079a967f1b01109df76bc416cb1a11bf3628279dbf5a8ac9d476a2a9f2446f8e77d83a453891df8ea6b94ec97c3ea9b4294508
 DIST cherrytree_1.0.1.tar.xz 3682988 BLAKE2B 59bb5fca46c090bfa219a0a90c4a2db6307d38844ecbe8e153159b8c39bc8e3d52b6d07b48fa10a481839666134fd74c195ad03c87c8b8698b7ebfbf83a405d5 SHA512 07d334b1af40b0195e600e676a45d9d72d1c13c8cedee6b7e576abecff0898ea248708a4f3795a9c3030e716ad814009013fd98cffe616c25a118b2b564528d1
-EBUILD cherrytree-0.99.53.ebuild 1543 BLAKE2B 1c64d83f880e7ba0070460ebf8da6a72c964369ba7f7edc627c59496be8a8e6ebdfc49697ef6f28be7c3bd51b7e8ab3252794ebacd90e5a792f21d8d856b86c4 SHA512 425280be6a4c18a46105c2a9dc6292ad5a5431facb5885b80615df7865b3b6e767dbeef63456b900295e943ff1a08f1fa7f426d891a75c60e0ce4a756b59aca6
-EBUILD cherrytree-0.99.54.ebuild 1547 BLAKE2B 8616ded1ee517f081100325b1439cf1b2b03e7e4a5a9fa58aa909b08171c6dda39d733d87bd7caf6b8f461b73b21744b7fdca93358f4502fd79f75dc3b64c660 SHA512 0a826fd8bb018f1ec00e3f53fa03f0006d43dbc75bb765181e14c72cd8724c02ccfd3d5ec567fb30a33630becb0c0abfe711876a10caa3b07a17f15144205082
-EBUILD cherrytree-0.99.55.ebuild 1547 BLAKE2B 8616ded1ee517f081100325b1439cf1b2b03e7e4a5a9fa58aa909b08171c6dda39d733d87bd7caf6b8f461b73b21744b7fdca93358f4502fd79f75dc3b64c660 SHA512 0a826fd8bb018f1ec00e3f53fa03f0006d43dbc75bb765181e14c72cd8724c02ccfd3d5ec567fb30a33630becb0c0abfe711876a10caa3b07a17f15144205082
+DIST cherrytree_1.0.2.tar.xz 3732232 BLAKE2B 07fd346909ff501b88dac939e73f1eb5d30559c7a00ea1bf55ee47a0d87178434f05324509e8d8f00cec9d2188d3089baf1ff6f069eecb9c9f8ac14bddbe0c2b SHA512 917ec9a0b4160328fe281139f95ac119f211a8d5f7bb4b7e6b3fb63d9fb0bc0eedbe6286ccf8627ce718dfeff8d9f9996ffda288ce16f8d8b18a0e64a98fd5bc
 EBUILD cherrytree-1.0.0.ebuild 1548 BLAKE2B a20f71c4c0a5445b93d6f1ce94a1be148b650628146ea6aaba2d5badd049732435de2c24bcfd3e84b88203eebdc37e7cb0f594cec85d43ca5cd9f06a98614611 SHA512 4099fb15a0db124e3672854fe611a23003d30384831f2480f892276cc28567c39736f79e6ed5040d7a91bbfb93dfa00bda3348263a9de098c5b5885016df819b
 EBUILD cherrytree-1.0.1.ebuild 1543 BLAKE2B 4a919743a3b5b532b0b451b1de255038763081287d19240c3891f331a33a28710b7d4f2cb950bb32c95cf4ce1a6d7a9801e7bbfc0b7d672ac1a40d7c4d3ea1be SHA512 db81821a1131365df2234dff2cedb0c22e194bd9f0130830bb0d2e28b46fe6d1b5645339b3be124190326d29c572ffa152290c7b1a226f140d37788577b7293f
+EBUILD cherrytree-1.0.2.ebuild 1537 BLAKE2B 664a7ead4707688c07cf0c6ce1bca699ae91306d7ccf45f351abff8cf7e25478a963fd245bac4b18781d378985655616ba90631fee9e789cfeb7a51f94b45cc2 SHA512 04b02708a37cb5750979644d28c9a47d0761b5508fb0dde97e4a5f0ff48a9bb8df29d27f6716b13833400c6c7c98420c1a138b032b3e1274d236c4afc6f52490
 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0
diff --git a/app-text/cherrytree/cherrytree-0.99.53.ebuild b/app-text/cherrytree/cherrytree-0.99.53.ebuild
deleted file mode 100644
index ae17b8db137a..000000000000
--- a/app-text/cherrytree/cherrytree-0.99.53.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1 xdg
-
-DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree/"
-
-SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
-S="${WORKDIR}"/${P/-/_}
-
-KEYWORDS="~amd64 ~x86"
-
-# GPL-3 — future/src/ct (CherryTree)
-# LGPL-2.1 — future/src/7za (7zip)
-# MIT — future/src/fmt (libfmt)
-LICENSE="GPL-3 LGPL-2.1 MIT"
-SLOT="0"
-IUSE="nls test"
-
-# Has deps that aren't available in ::gentoo repo
-RESTRICT="test"
-
-RDEPEND="app-i18n/uchardet
-	app-text/gspell:=
-	>=dev-cpp/glibmm-2.64.2:2
-	dev-cpp/gtkmm:3.0
-	dev-cpp/gtksourceviewmm:3.0
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-db/sqlite:3
-	dev-libs/fribidi
-	dev-libs/glib:2
-	dev-libs/libfmt:=
-	dev-libs/libxml2:2
-	dev-libs/spdlog:=
-	gui-libs/vte:2.91-gtk4
-	net-misc/curl
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/pango"
-
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-util/cpputest )"
-
-src_prepare() {
-	# disable compress man pages
-	sed -i -e \
-		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
-		CMakeLists.txt || die
-
-	# python_fix_shebang .
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_EXEC="${PYTHON}"
-		-DUSE_NLS=$(usex nls)
-		-DBUILD_TESTING=$(usex test)
-		-DUSE_SHARED_FMT_SPDLOG=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/app-text/cherrytree/cherrytree-0.99.55.ebuild b/app-text/cherrytree/cherrytree-0.99.55.ebuild
deleted file mode 100644
index 589376ce484d..000000000000
--- a/app-text/cherrytree/cherrytree-0.99.55.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1 xdg
-
-DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree/"
-
-SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
-S="${WORKDIR}"/${P/-/_}
-
-KEYWORDS="~amd64 ~x86"
-
-# GPL-3 — future/src/ct (CherryTree)
-# LGPL-2.1 — future/src/7za (7zip)
-# MIT — future/src/fmt (libfmt)
-LICENSE="GPL-3 LGPL-2.1 MIT"
-SLOT="0"
-IUSE="nls test"
-
-# Has deps that aren't available in ::gentoo repo
-RESTRICT="test"
-
-RDEPEND="app-i18n/uchardet
-	app-text/gspell:=
-	>=dev-cpp/glibmm-2.64.2:2
-	dev-cpp/gtkmm:3.0
-	dev-cpp/gtksourceviewmm:3.0
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-db/sqlite:3
-	dev-libs/fribidi
-	dev-libs/glib:2
-	dev-libs/libfmt:=
-	dev-libs/libxml2:2
-	dev-libs/spdlog:=
-	>=x11-libs/vte-0.70.2:2.91
-	net-misc/curl
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/pango"
-
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-util/cpputest )"
-
-src_prepare() {
-	# disable compress man pages
-	sed -i -e \
-		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
-		CMakeLists.txt || die
-
-	# python_fix_shebang .
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_EXEC="${PYTHON}"
-		-DUSE_NLS=$(usex nls)
-		-DBUILD_TESTING=$(usex test)
-		-DUSE_SHARED_FMT_SPDLOG=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/app-text/cherrytree/cherrytree-0.99.54.ebuild b/app-text/cherrytree/cherrytree-1.0.2.ebuild
index 589376ce484d..dd062ad78a2f 100644
--- a/app-text/cherrytree/cherrytree-0.99.54.ebuild
+++ b/app-text/cherrytree/cherrytree-1.0.2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake python-any-r1 xdg
 
 DESCRIPTION="A hierarchical note taking application (C++ version)"
 HOMEPAGE="https://www.giuspen.com/cherrytree/"
 
-SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
+SRC_URI="https://github.com/giuspen/${PN}/releases/download/v$PV/${P/-/_}.tar.xz"
 S="${WORKDIR}"/${P/-/_}
 
 KEYWORDS="~amd64 ~x86"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 3c89f1f78410..502175ecdfdd 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,12 +1,16 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
+AUX poppler-23.10.0-qt-deps.patch 2022 BLAKE2B 26aad6d82079db343339c80e5dbf01250de821e2850299a1604ec15a854f43a760858fe0bb0ce1070fdda4c899960bdaac80f814c7e628b783ab5a401c7ff237 SHA512 4f3903f610c9ed7fa24a084e23906d474be5169f1af6b44040943f09b3cc38df7730ca09168ed0d5d6c9411b3ecfbd35f5144893d1112ec19894cb330518d904
 DIST poppler-23.08.0.tar.xz 1883408 BLAKE2B a35e44cc590e34991b27e53caf650dedf4d4aa4f9f82ed5d8a57b0ca6bb863c96fe0e9b9c9021b9722db48896d236c9e057bcbf45e9609eb237bf00481e91428 SHA512 4f4e3fab9c7de5913496862ce7158a4d79e252c36e4c461980a2ac77689897d02ab292965ea12fb02ea7720e34f98331251b914c0ea8be66842fee0d76779ba6
 DIST poppler-23.08.0.tar.xz.sig 833 BLAKE2B afab91ff9f799cc6c5864275bebf580098449ca070fa5eca47ff54007e94eef4a33f3762390a509d21471af81f9d731951bdbc1ff4adc162763bf54e7dd84408 SHA512 896905f056265388872de552aac94c64abc29f82062ecb2a5137288e4594ca87cb7372807bfe4c30fbc08a3d3922ce84bbbe7260a35e19d438f6bc88d230429f
 DIST poppler-23.09.0.tar.xz 1888836 BLAKE2B 910bd83a94268673c348f554114cbefd02186ed70f8cf9bbe83e4754758f585e74ed418e711b883f8bc39fb680372583229f7196c847a4b749c04018c1ab7407 SHA512 8657845ec02fca6fe9791823ebeed6c44971c524edc56cb945501dfefb3dc72a6d86fff751bfb708a862a7862cfdcc57bf7b3f825e2bafe25a1e6679c7171a4c
 DIST poppler-23.09.0.tar.xz.sig 833 BLAKE2B 3d8277e8e9779b655003bb73637f2e763f82388f58a25010ed5af0078199a75e1c0872f00ee8b0893660a6912b558a5c69bd11309204493d9dbb6e2cbefd41ba SHA512 2b091e2f96d6ed1737e2c208228c969196e3d6f927664759f259a04f0e35b79d2b00ee0da5882f622d0269eea7ab470014f30e6d55659fd1e8fb9cdc23db68a6
+DIST poppler-23.10.0.tar.xz 1892152 BLAKE2B ce1b42d316e1d55567384fc5374af1a177f95cc045490bc3040b454106681f10959e192d961603443d3df2efe30350f70ab0bd2755ed099c70ab50019c2abdf3 SHA512 b945662746c5fc58df6ec05c637cfa0792702f49f589f1eef69a3aa06823274babd0d604cb8671cabc1341c3bfede1814b5d400fb2a9efe711bf04bd177cea03
+DIST poppler-23.10.0.tar.xz.sig 833 BLAKE2B 74bdf5548afae23cf17037f3810765afd82a8d7f2a908e49144733adaae5f2eff0adce97aaa0945a40a324b293cb5f7f88b996e783390b26f7c360886c6bb41c SHA512 3c02270febea589d72d60e3fd0ffff2cb0be84ffcf5c8c66fd4461e64827614e08d9351176a6880d64558247cd722adc42343a7a5774eb331e55141bfb8f661c
 DIST poppler-test-e3cdc82782941a8d7b8112f83b4a81b3d334601a.tar.bz2 5199251 BLAKE2B 6431b2aa4c60dec6202c737b4cfbbd4bf03808772c0adc6568454a04e713a2e869702f5c318e7799e7b1374252b5a956471b7cf6c9e2d6c8da5236e31a110f35 SHA512 bf5442601f453e601e0b368cc576bf0d5ca5509e9eecd8c7f0476802346834e9a9d3e0f32130c18d21807cd69a55e8168bca1cdb0292ad0215590a881a923c04
 EBUILD poppler-23.08.0.ebuild 4310 BLAKE2B 3432859fb7c477736f0aa6b3309620a0802e8ff720bed72968c5a8c1e57b72e0e8bc80ebd350398944b730610a30aa22a1f5c25992a2ef21f314768b07ee4581 SHA512 fd3829b708941707afac4d610e708c0aae2f2adb5694a222d6c9fac7e45708d612795d6ee7b3645e6327baad30b2939faabd0bf65d712a47db405b8c6df879de
-EBUILD poppler-23.09.0.ebuild 4317 BLAKE2B 5872e73cebc79fedaa91521a56e9865570296c798f15241bd986578a5453d0327879268c2a9c92897a86b05827bd8786e1f8b9f9cd517ff8b02735b0e8311c8c SHA512 f36f2f468365021afc1a7ec5d482c9fb99b05712cc2ca4a3d83fece247e9a8ceae5b6fccfcede581e4416265763f06792fd5ff523f45588320a973512453897b
-EBUILD poppler-9999.ebuild 4318 BLAKE2B 5014c23b8ed02d8bf59ac2ad531af32d6b7451429bf835e617166f88fb20b113bbfe936589996392bcbf67ed9e53d80e52a420b6f580969172ce42f03bfacb17 SHA512 da4709afb59c97bdf5f08a8e576486fb36aefc6ccff2f250eab1552467cb6cd87e7102c9a682ad0242683300d8410de98cf23459354d7d37d3755b056afebeae
+EBUILD poppler-23.09.0.ebuild 4316 BLAKE2B ba14535980b56510d53c95183efecd1d1a658669453cbcd45a2950090ab02a5f3f2adaa4e71fb5f87b2253bcf533d98f57ceed7d7d9be19b65adc35e046ca981 SHA512 bee7cdf4516a94f70f667a89e998dbae740003191589fa78195ec54e9dcf5ace582fe8b672d74a9276a4c20aa2095ca75d8d4a4687268445bd1f833ce978c8d5
+EBUILD poppler-23.10.0.ebuild 4292 BLAKE2B a996ca0442db441f3dac99b3d6ac2126a29943c6131916690e9a31aa4e47735eb7fab7fef85c70666eaa0030366acffed3c025511d4bcbe5694c48c8b0c75ff7 SHA512 af0a887c3d15cc359a04b1d7e6e506d44018c93dda19770735b9a17ccb51b746bf69137651e59e546f0f7f708f17cbdab9b75834bbff717d4116b70bc289a4a4
+EBUILD poppler-9999.ebuild 4301 BLAKE2B 0f2b8e03d6e48e20f9ef967f670657c52398524bd3d2a8284313954a706e58a67d3d0491ae0a1936cfdeb5f84d53007180622a60b774e09a81a0993e7cecc1e3 SHA512 5369a91c4b8a5031228a96ce975e4a1a35f4420ce83cd177fd36ecc43335e0690588fd35b36a58ff01541a54166f756aa0c78d1504ad8a25158b08801ba4c3ac
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/files/poppler-23.10.0-qt-deps.patch b/app-text/poppler/files/poppler-23.10.0-qt-deps.patch
new file mode 100644
index 000000000000..348f56d5e0b4
--- /dev/null
+++ b/app-text/poppler/files/poppler-23.10.0-qt-deps.patch
@@ -0,0 +1,61 @@
+From e5927c7250afd6b715a9de520851b26e41b7f422 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 9 Dec 2020 01:28:25 +0100
+Subject: [PATCH] Move Qt test dependencies into test dir
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt     |  8 ++++----
+ qt5/CMakeLists.txt |  7 +++++--
+ qt6/CMakeLists.txt |  6 ++++--
+ 3 files changed, 13 insertions(+), 8 deletions(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -212,15 +212,15 @@
+ find_soft_mandatory_package(ENABLE_QT5 Qt5Core ${QT5_VERSION})
+ find_soft_mandatory_package(ENABLE_QT5 Qt5Gui ${QT5_VERSION})
+ find_soft_mandatory_package(ENABLE_QT5 Qt5Xml ${QT5_VERSION})
+-find_soft_mandatory_package(ENABLE_QT5 Qt5Widgets ${QT5_VERSION})
+-find_soft_mandatory_package(ENABLE_QT5 Qt5Test ${QT5_VERSION})
++find_soft_mandatory_package(BUILD_QT5_TESTS Qt5Widgets ${QT5_VERSION})
++find_soft_mandatory_package(BUILD_QT5_TESTS Qt5Test ${QT5_VERSION})
+ 
+ set(QT6_VERSION "6.2")
+ SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
+ find_soft_mandatory_package(ENABLE_QT6 Qt6Core ${QT6_VERSION})
+ find_soft_mandatory_package(ENABLE_QT6 Qt6Gui ${QT6_VERSION})
+-find_soft_mandatory_package(ENABLE_QT6 Qt6Widgets ${QT6_VERSION})
+-find_soft_mandatory_package(ENABLE_QT6 Qt6Test ${QT6_VERSION})
++find_soft_mandatory_package(ENABLE_QT6_TESTS Qt6Widgets ${QT6_VERSION})
++find_soft_mandatory_package(ENABLE_QT6_TESTS Qt6Test ${QT6_VERSION})
+ 
+ # Check for Cairo rendering backend
+ macro_optional_find_package(Cairo ${CAIRO_VERSION})
+--- a/qt5/CMakeLists.txt
++++ b/qt5/CMakeLists.txt
+@@ -9,5 +9,8 @@
+ add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
+ 
+ add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(demos)
++
++if(BUILD_QT5_TESTS)
++  add_subdirectory(tests)
++  add_subdirectory(demos)
++endif()
+--- a/qt6/CMakeLists.txt
++++ b/qt6/CMakeLists.txt
+@@ -7,5 +7,7 @@
+ 
+ add_subdirectory(src)
+ 
+-add_subdirectory(tests)
+-add_subdirectory(demos)
++if(BUILD_QT5_TESTS)
++  add_subdirectory(tests)
++  add_subdirectory(demos)
++endif()
+-- 
+2.29.2
diff --git a/app-text/poppler/poppler-23.09.0.ebuild b/app-text/poppler/poppler-23.09.0.ebuild
index 9283794bb682..bb940d455f4b 100644
--- a/app-text/poppler/poppler-23.09.0.ebuild
+++ b/app-text/poppler/poppler-23.09.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 ~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/131"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-23.10.0.ebuild b/app-text/poppler/poppler-23.10.0.ebuild
new file mode 100644
index 000000000000..eb8379739663
--- /dev/null
+++ b/app-text/poppler/poppler-23.10.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2005-2023 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="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+	inherit verify-sig
+
+	TEST_COMMIT="e3cdc82782941a8d7b8112f83b4a81b3d334601a"
+	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/132"   # 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 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
+	)
+	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
+	) )
+"
+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}/${P}-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_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_LIBTIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	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 d33daa61e4b9..d9408aba46c1 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/131"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/132"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -73,7 +73,7 @@ fi
 DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${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"
 )
@@ -123,15 +123,15 @@ src_configure() {
 		-DWITH_Cairo=$(usex cairo)
 		-DENABLE_LIBCURL=$(usex curl)
 		-DENABLE_CPP=$(usex cxx)
-		-DWITH_Gpgmepp=$(usex gpgme)
+		-DENABLE_GPGME=$(usex gpgme)
 		-DWITH_JPEG=$(usex jpeg)
 		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
 		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
+		-DENABLE_LCMS=$(usex lcms)
+		-DENABLE_NSS3=$(usex nss)
 		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_QT5=$(usex qt5)
+		-DENABLE_LIBTIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 		-DENABLE_QT6=OFF
 	)