gentoo auto-resync : 22:08:2024 - 12:26:19

43 files changed, 502 insertions, 57 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index fb83b2836887..0e99a2e01a3a 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index eff0c7e45c64..e6135845d213 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,6 @@
+AUX calendarjanitor-24.05.2-loggingcategory.patch 1510 BLAKE2B 468a353b10ec3803109fd2afe6d858f89835158e759bd8dcb6534540ae90acc31141b96023d592d00d9d9bb4dcbc593ca64070fe84218a28687a02ee6d0889d4 SHA512 3f3ca0ee0361619f2051e211ccf4c4c68d9d4c132fce3a7ef3eb5ba46bb74751e23d43be1aafc4709b1aae0aafbd00cb2120ef236cdd25862c7372b2db0450ea
 DIST akonadi-calendar-tools-23.08.5.tar.xz 255924 BLAKE2B 9270cc942f35b06bcc7f16d28f6c426a35683cf344d1837a5e51542cbd6502256f7ba58f3768b16356e445982e287fada396fd36dba6e9d45fb822fb2947d5a5 SHA512 9dccd51cf1004d639c0f02fc7e5ebed71093ca375a2895a301723762a073644b565930f9ee4cf663195db87370497b976ecf216dcf8c1d67bd00481f9e7a2082
 DIST akonadi-calendar-tools-24.05.2.tar.xz 264420 BLAKE2B a1c50f709ef1faec77b7b7e10e822d794aaff7de41f2c941e87f2cfd760da9be1c7d7048dc6aa305e356016baff55afdd63547962cdad5dfac503a60ec852311 SHA512 1bc632cd7787d5d45f4a0b350e20dd4e36b0a659954c3098ea050cf827ab814f67cf0441e2e4818d225b22fcd2b7c3e51eb08fee823f4333d107d4366e4caed3
 EBUILD calendarjanitor-23.08.5.ebuild 1035 BLAKE2B 41718a449ef00812110173ffe458fefb9f42fafa94efb6ab9759346e6beafcb62e448b08a14245ded01b2d79c6948b45c21d663313fc5f708460353b2248ff4e SHA512 d40838dc60e4b71c4d653c93dc6f0d540577c479b76acb585ac13aa61c55f3cc2871fe4152d7690b63a87d2b0e923649afe301788075d0f8a02a3713ef832ed6
-EBUILD calendarjanitor-24.05.2.ebuild 1035 BLAKE2B 1b8a7232427a69cbfd01b347493e2b27da60b13394fbbf68118114d8fc65be03fc19c301271ee0e6683165d4ca722a6a23d3eea743c3fd3240708b134d6c4cf8 SHA512 f7825aba42155136968bf6b98a8df87f1d39968b478f12cdc09873aa1a9d386708091df678be607e4b74994372b01d8103b44cc077fdad5f6d8a7dde72ffa882
+EBUILD calendarjanitor-24.05.2-r1.ebuild 953 BLAKE2B ae57ab68b96956683b130f17d5c9b960ad0ce860982861f7a894dc804fd20dc0925b576c845483df9275394e4e7dcd015aad26b1fdc19cead36f0a9282b43127 SHA512 9dd2599216d879f42df37f37a73f75afbaf63f2d447c790ccb7cc21e03f85dba08ae338db15311b3184320832e3e7a2d66a7473d7d15904f27a7556dd76b3c5b
 MISC metadata.xml 388 BLAKE2B 9e6ad08af2697daa84bd94a34450986acaf0f46c2715fc93de6049794b430786e88cc01a861bedb36fa4a6769f6868dfcd991e5c92a70d0ea5287b2d410be87d SHA512 795b6fc9030c09254d057ab70962daf231a41c9f9f0316d95dedf0a9dc7ec606b829863b931aa025e4245a4632ff48998ec26c8bffaf2aab42ee189e4d4a464b
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.05.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.05.2-r1.ebuild
index eee1001db359..cc8cce8da0e1 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-24.05.2.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-24.05.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_HANDBOOK="forceoff"
 ECM_TEST="false"
 KDE_ORG_NAME="akonadi-calendar-tools"
 PVCUT=$(ver_cut 1-3)
@@ -13,7 +13,7 @@ inherit ecm gear.kde.org
 
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS="~amd64 ~arm64"
 IUSE=""
@@ -29,11 +29,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-loggingcategory.patch" )
+
 src_prepare() {
 	ecm_src_prepare
-
 	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
 
 	# delete colliding konsolekalendar translations
 	rm -f po/*/konsolekalendar.po || die
diff --git a/kde-apps/calendarjanitor/files/calendarjanitor-24.05.2-loggingcategory.patch b/kde-apps/calendarjanitor/files/calendarjanitor-24.05.2-loggingcategory.patch
new file mode 100644
index 000000000000..e9796c334280
--- /dev/null
+++ b/kde-apps/calendarjanitor/files/calendarjanitor-24.05.2-loggingcategory.patch
@@ -0,0 +1,50 @@
+From 1c10a1418a063d625dce2fc1a5714b82f9cee728 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Aug 2024 16:02:27 +0200
+Subject: [PATCH] Move ecm_qt_install_logging_categories to konsolekalendar
+ subdir
+
+None is declared in calendarjanitor.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                 | 6 ------
+ konsolekalendar/CMakeLists.txt | 5 +++++
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d887d81..f79b923 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,12 +79,6 @@ endif()
+ add_subdirectory(calendarjanitor)
+ add_subdirectory(konsolekalendar)
+ 
+-ecm_qt_install_logging_categories(
+-        EXPORT AKONADICALENDARTOOLS
+-        FILE console.categories
+-        DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+-        )
+-
+ add_subdirectory(doc)
+ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+ ki18n_install(po)
+diff --git a/konsolekalendar/CMakeLists.txt b/konsolekalendar/CMakeLists.txt
+index c0b0eab..7e90f6c 100644
+--- a/konsolekalendar/CMakeLists.txt
++++ b/konsolekalendar/CMakeLists.txt
+@@ -44,6 +44,11 @@ target_link_libraries(konsolekalendar
+ 
+ install(TARGETS konsolekalendar  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ 
++ecm_qt_install_logging_categories(
++        EXPORT AKONADICALENDARTOOLS
++        FILE console.categories
++        DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
++        )
+ 
+ ########### install files ###############
+ 
+-- 
+2.45.2
+
diff --git a/kde-apps/ffmpegthumbs-common/Manifest b/kde-apps/ffmpegthumbs-common/Manifest
new file mode 100644
index 000000000000..afcd4cbc0c96
--- /dev/null
+++ b/kde-apps/ffmpegthumbs-common/Manifest
@@ -0,0 +1,3 @@
+DIST ffmpegthumbs-24.05.2.tar.xz 32996 BLAKE2B 85229891ee2d2edcd2fca73d89511358e4f8f2b92e143081652f00344fc526773bd16cb778a136e002ba4ed0640969ddf8987cc6e32a4c225c32298c58d01d4c SHA512 335db6a332f23261cb88f5a9ccd1feeb14132cd0b81b69ea34494b008951e60f7372e82b2ea3c3e8cfca8d3f3aa75ba47969bb531a531b2d0557e9b32e1e6cc8
+EBUILD ffmpegthumbs-common-24.05.2.ebuild 515 BLAKE2B 4baf07a2ebd20157a061235d7787ed2bc121890e203c0b47662a925899e95597501586a8f6942d96d1fc988f4ead835dfa21523b60ef80cc2881ad3224da92f6 SHA512 d713c62daef2620087ea12e5f72fdcdbc0ef657d6194475e3f0e9fcb16a94b244c3b0ee6fd35e384edea9f5d6ac869950f901b1ebb20bc2e40c82deacf6d901d
+MISC metadata.xml 385 BLAKE2B af12b78d497f17a5e9298d642546c5a7197f001d0790320b86934e5ebb33d9e8c8dded0edc4d5e4a30536322e573d16fded10f3834cf6288d77d8f26592c1154 SHA512 cb8abc764ec00fd5b557689135defb009874fde8b89c8e700bf8cf7a4009843c76e069901ed4aab55a94b8ca1b1c1e8213c85732c766d9a7d6d118229c5b7713
diff --git a/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.05.2.ebuild b/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.05.2.ebuild
new file mode 100644
index 000000000000..928d370615bc
--- /dev/null
+++ b/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.05.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_I18N="false"
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!<kde-apps/ffmpegthumbs-23.08.5-r1:5
+	!<kde-apps/ffmpegthumbs-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+	ffmpegthumbnailersettings5.kcfg:\${KDE_INSTALL_KCFGDIR}
+	org.kde.ffmpegthumbs.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
diff --git a/kde-apps/ffmpegthumbs-common/metadata.xml b/kde-apps/ffmpegthumbs-common/metadata.xml
new file mode 100644
index 000000000000..8f8e4359197f
--- /dev/null
+++ b/kde-apps/ffmpegthumbs-common/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">multimedia/ffmpegthumbs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 359568a4f394..deeb35987f79 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,6 @@
 DIST ffmpegthumbs-23.08.5.tar.xz 32984 BLAKE2B 445ee91c4f09394922a5a7a0f6d9e81c855cec9a19526ea9f84dc0d7b6dabca6430aa4ae3813b7b86566098088a2b62991367751d97fb3edaf55a621955deafe SHA512 d4dfb37acacc362e7d98a0fda81efd2630988192e6f02bb8adde815585ad976db0a960806694a10d20ad7256ca2aed97df962ae4a1f4aa00e66aae480baab8f9
 DIST ffmpegthumbs-24.05.2.tar.xz 32996 BLAKE2B 85229891ee2d2edcd2fca73d89511358e4f8f2b92e143081652f00344fc526773bd16cb778a136e002ba4ed0640969ddf8987cc6e32a4c225c32298c58d01d4c SHA512 335db6a332f23261cb88f5a9ccd1feeb14132cd0b81b69ea34494b008951e60f7372e82b2ea3c3e8cfca8d3f3aa75ba47969bb531a531b2d0557e9b32e1e6cc8
+EBUILD ffmpegthumbs-23.08.5-r1.ebuild 781 BLAKE2B 08c5b5747792ccd5ce15164ff29811e25bbc8fde22fa3d1bd511dbd544874b08bd436bc107606e65f95089adb38e71f95ec7520da674afcb21e27e53d78d46e0 SHA512 3dbe11335b347bdb155453d611a4ae47e385aad079f7c03b9d66f347380ec85448c0252acc1d72eabe55b8f015aa012a761a0f047d785836a645680a9f6d1282
 EBUILD ffmpegthumbs-23.08.5.ebuild 536 BLAKE2B d4d064dd99249f1cc0be98e57d7d2e829d277a2fe152a890c38940f87a58ab8f45d15da69b6218227aa574b29b06e6a961a58b9dc2358358f592b5eeb7450c08 SHA512 442ccb6010a18051899b4987672a5f41678d6d5c8fc8386f0170f05a732a9e8eba7e664669563c485ec4f0f305a94c4b88cce28acc532ae1a2ffcdd0c6057a26
-EBUILD ffmpegthumbs-24.05.2.ebuild 535 BLAKE2B 6a68e3e23090a2023a2c1eb2cee2e8102cc43586b86a7f241a212908f8b05dd9b4c4d527373d73f9e43d7f2a22c165f3357ac71ee7b4d7f86e838372bdb03f61 SHA512 2af55e302055791a6ab9a9f053a135df66932380d308ece3b2d2cc2203bfc4e6a98366229d2ac40efe8fd775b6b7a9816ef44484a1024d750af0352eef873430
+EBUILD ffmpegthumbs-24.05.2-r1.ebuild 782 BLAKE2B 3d7618b128876843cf8559578d51bced2d2de207aa81a134756adf8ef9119b9825868b3f8e37e776696ea4059dd740c15ebbfb4942bb682f3dc663b1224b1d4b SHA512 130b8d6ccc84073370fa43eeab1a8f07abc7718a12bb39fecd7dcdb7468ba62169ebf0b9fb5feb155d73f17faa28317391772245867629e7c80af771f87d13c1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.5-r1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.5-r1.ebuild
new file mode 100644
index 000000000000..959a631d1568
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.5-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="FFmpeg based thumbnail generator for video files"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	media-video/ffmpeg:0=
+"
+RDEPEND="${DEPEND}
+	${CATEGORY}/${PN}-common
+"
+BDEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	virtual/pkgconfig
+"
+
+# Shipped by kde-apps/ffmpegthumbs-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/config.kcfg/ffmpegthumbnailersettings5.kcfg
+	/usr/share/metainfo/org.kde.ffmpegthumbs.metainfo.xml
+)
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.05.2.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.05.2-r1.ebuild
index 790aa40c56c6..286af053b125 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.05.2.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.05.2-r1.ebuild
@@ -20,8 +20,16 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:6
 	media-video/ffmpeg:0=
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-apps/${PN}-common-${PV}
+"
 BDEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	virtual/pkgconfig
 "
+
+# Shipped by kde-apps/ffmpegthumbs-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/config.kcfg/ffmpegthumbnailersettings5.kcfg
+	/usr/share/metainfo/org.kde.ffmpegthumbs.metainfo.xml
+)
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index de99b2b3a864..fac0dfc76d12 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-23.08.5.tar.xz 5662960 BLAKE2B d1b5a2e54c3c196d366c1cf7f26b132b7d530f23128bedf8c729988349b18e6e056097642982853a3a9c18a1a8f0614083de010e8583ebfef981f8bcc7fd308c SHA512 3c21ad952f0a9cc01ede94861a38601debd737ab35ea7d1619952b4922f0d4896c0a034e67ef9dcb16552624a431e41fd5c62010e8ba667f0579531eb54cd4d0
 DIST kbruch-24.05.2.tar.xz 5148168 BLAKE2B c7b4b82e3329a19b6c40914d38d9665a6500d985c6872574c0b60875e90196a388aee19e856d97c6af8644d278dea55d6be68724b305797fac1c8c72a24eb2cd SHA512 333299e9d12dea151f1bf1b6b7676f28aaec5db133e63f1ba0ba767b811a9167ecb9f12c8e247fbfb8cb14794d9464c46854582f59b05eafe344f5adebaa2bca
-EBUILD kbruch-23.08.5.ebuild 747 BLAKE2B 1b690033d9ad38e04ba706bd64e6ef228516c4d81aa6d928a4083d584a20edc34d24899a34adc34b01bed8a2fedf161b649f7f0f9a477af033f24636d257e0ea SHA512 b988f4b0948129495e18753e34fb8f0426a1c35fbd0096ebbb8f4076e9463a8256185c43c346cdb2969b6d535b2fd48c857c2e669aea5802c951ab9afea25aeb
-EBUILD kbruch-24.05.2.ebuild 730 BLAKE2B fcb30b3cc334419004802ba0aa553580bf74cdf86d43c993d6c5dc4bd3f9392864a59ecee5e18e5a1bb14ba7a8c2e5060734c598a214380432f99ac49877c34b SHA512 5630b16c68f7a7b202ea2a3b7531545acd31832d405e2fd516cb0954176e8563d4a8f1cab9f024ba9afc5e8bda64d66b06ea2ae1973d8a43627513b304587be1
+EBUILD kbruch-23.08.5-r1.ebuild 783 BLAKE2B 91fec6e0140b71474f637f335ac0f31fd8dfc668cf6fde08a24efad6360a83bcd752577a58b3de447f67a04a52760c814997cd5db7b4126db0f1ef57f454f41a SHA512 10cafac3189cafd13da52dd02ccfe8475f40d4b7c98169310edeb2cfe27a406fd4fa60c91ee4525bf9c22bf28f622b81002ce455908fe41ab4ce8949bd4b90c4
+EBUILD kbruch-24.05.2-r1.ebuild 766 BLAKE2B 39afc7d250aad583f606b2b970777b215a7e4943a1ab395b8af45b7b4ed1f4f2a83f293b237b8b96b40b7723598a3a99111916cbc3fcaba2cfb465d52caaa265 SHA512 a96519d6cdbfbc2f89d23339b1fbfbe310c15c2194e38437c675847ee67b6d3017324775cb8ec8c0ea5ff32f5410b95c791928ecd4920284e6bd4854ccf71d8a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kbruch/kbruch-23.08.5.ebuild b/kde-apps/kbruch/kbruch-23.08.5-r1.ebuild
index d05adcc17610..df6681082f61 100644
--- a/kde-apps/kbruch/kbruch-23.08.5.ebuild
+++ b/kde-apps/kbruch/kbruch-23.08.5-r1.ebuild
@@ -22,6 +22,7 @@ DEPEND="
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
diff --git a/kde-apps/kbruch/kbruch-24.05.2.ebuild b/kde-apps/kbruch/kbruch-24.05.2-r1.ebuild
index c55850fa7bd0..15afbda7ccb3 100644
--- a/kde-apps/kbruch/kbruch-24.05.2.ebuild
+++ b/kde-apps/kbruch/kbruch-24.05.2-r1.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index 9526664e7d60..fdf78cff795c 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdecore-meta-23.08.5.ebuild 839 BLAKE2B 4dde9e7c62df5e4c4c974ad6ee09bdc0acc7030a9883a809a5028117cd0d78b733387cc125cf51e88c801507ed337acd814f43fb5f4074eba550b1adaaad55d2 SHA512 43e20af50565fa220627877a19571c629f8e19f36f0f8776f796305fbf7024a074316606211fadc8edb3e5b34ce0de2cffaa15eefaaf78cc76f2cb644cc065fb
-EBUILD kdecore-meta-24.05.2.ebuild 818 BLAKE2B 03458ad6ab6db5d21bf8fe4081f59d4b479ff0627a04a73533a4bed23d080c2668383e697706eb22f5f36741ff0f37e9f77b6363aa0a692dcf8129570bd3bc01 SHA512 3b2cce087e771a49164fe3c69cf2507349066c5a4d0c5b27714d20c81e4a6dbb102d0734039d8e455e22fd7fbc02768566b7ee9b4eff05ba2fee070f7aaf9e7e
-MISC metadata.xml 751 BLAKE2B 6550fcc8eef87eebefc064a082de31c27bc8f47acc010b0f79e3131b1fdfc6eedb628f547b44ad20ad8c6987ba35582b5f6751b71567c10eb27c46500e77a6fe SHA512 50801e5b9be74755db674a918499abd395db5d2e872f6080e4996c0ed6b96ad6a75a3a13c9c26b6f0f19724eb3fa1327e6e43fd7c9d4e672e635478ded8d2c17
+EBUILD kdecore-meta-23.08.5-r1.ebuild 743 BLAKE2B 67fb75b40a22c9191911d68ec6f125ee69dc7b20412f1602e92a7405283154ea53d2c5c576418e760b2a185bdeb7dda1f3152a0b791de9519b1c629aaee4426b SHA512 b8034bc89e4c26f52f13ea101dd6d99aad8bf8ceda12bc7713fdc804722a87db77601fd4c27bf8053eee66232601b635d4d9339f4070fc801ea94de48c694301
+EBUILD kdecore-meta-24.05.2-r1.ebuild 722 BLAKE2B f8cc8190f5445cb4a735087b5c50a21f17eec9f10756ea8e046728bdb1d649cfefde1a40b802e407900dd8b5d63a44f07df919ec48eeb682bf542f6a35d16dd6 SHA512 312f9c54d475de69c74c7ee84dc22a1a7761292907953f9087f003fbbfe0cea7bd980ff352b4a861a273f7ae2d061cd3e2e1f5767ee0a0889274ff6379d4a8be
+MISC metadata.xml 585 BLAKE2B a3e6b1c8bfd2ffc99b83ab1a1bfdfc7964431e2c4ea99d1299f1dab3e81c38a40fc972b16bb3896ae931f58682cb476fc3b67a67188517651f104ea4fd5fd686 SHA512 ad53ee0bcd3f67d431cf8ad0a491b095fd07bcdc9ceec4220198bcc25b5adad23c3f901ba655c81b740cf166a80567c299fd14ea553b32a91e4070f219628902
diff --git a/kde-apps/kdecore-meta/kdecore-meta-23.08.5.ebuild b/kde-apps/kdecore-meta/kdecore-meta-23.08.5-r1.ebuild
index 2079181d1642..de10b7eb2b15 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-23.08.5.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-23.08.5-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://apps.kde.org/"
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~loong ~ppc64 x86"
-IUSE="+handbook +share +thumbnail +webengine"
+IUSE="+handbook +share +webengine"
 
 RDEPEND="
 	>=kde-apps/dolphin-${PV}:5
@@ -27,8 +27,4 @@ RDEPEND="
 # Optional runtime deps: kde-apps/dolphin
 RDEPEND="${RDEPEND}
 	share? ( kde-frameworks/purpose:5 )
-	thumbnail? (
-		>=kde-apps/ffmpegthumbs-${PV}:5
-		>=kde-apps/thumbnailers-${PV}:5
-	)
 "
diff --git a/kde-apps/kdecore-meta/kdecore-meta-24.05.2.ebuild b/kde-apps/kdecore-meta/kdecore-meta-24.05.2-r1.ebuild
index 62fdc11c12d1..21765cbcdc58 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-24.05.2.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-24.05.2-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://apps.kde.org/"
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+share +thumbnail +webengine"
+IUSE="+share +webengine"
 
 RDEPEND="
 	>=kde-apps/dolphin-${PV}:*
@@ -29,8 +29,4 @@ RDEPEND="
 # Optional runtime deps: kde-apps/dolphin
 RDEPEND="${RDEPEND}
 	share? ( kde-frameworks/purpose:6 )
-	thumbnail? (
-		>=kde-apps/ffmpegthumbs-${PV}:*
-		>=kde-apps/thumbnailers-${PV}:*
-	)
 "
diff --git a/kde-apps/kdecore-meta/metadata.xml b/kde-apps/kdecore-meta/metadata.xml
index 0d9e85803212..7ea8697f712f 100644
--- a/kde-apps/kdecore-meta/metadata.xml
+++ b/kde-apps/kdecore-meta/metadata.xml
@@ -10,7 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="share">Install <pkg>kde-frameworks/purpose</pkg> for share file context menu actions in <pkg>kde-apps/dolphin</pkg></flag>
-		<flag name="thumbnail">Install <pkg>kde-apps/ffmpegthumbs</pkg> and <pkg>kde-apps/thumbnailers</pkg> for thumbnail generation in <pkg>kde-apps/dolphin</pkg></flag>
 		<flag name="webengine">Enable <pkg>www-client/falkon</pkg> which depends on <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdesdk-thumbnailers-common/Manifest b/kde-apps/kdesdk-thumbnailers-common/Manifest
new file mode 100644
index 000000000000..a0716aaf4a9d
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers-common/Manifest
@@ -0,0 +1,3 @@
+DIST kdesdk-thumbnailers-24.05.2.tar.xz 27248 BLAKE2B 24547264f852dc4e69382ce2648056f22c17fc7f6063868957adabe20382db30f6acf9820e42a98ccd914a68f4713192dcf0c66ca23ddf38954b2553bcec519c SHA512 e253acf6720cd2fcb3750c9452303c03d9df5c87d693831e279a748b7a350358a36457373d35f087e0b00431b4e38a09346d726a280f90ee66e0cca6799db12d
+EBUILD kdesdk-thumbnailers-common-24.05.2.ebuild 442 BLAKE2B 05d69404d9f80a585f2d5879c483113acbf5ec4c2972c00b938570867644f18df1120374286d9e72f706e1d1b9a34c732845438c72d4905a7818c3abc4c9083c SHA512 da29a7ffa807bc018c20c42b1acaeca1b7bc3ecb351a6d94e76b46c5f087e3417be0a5fca23571bee05f18604bfb398d3709762273767185f3fe511db302c8e6
+MISC metadata.xml 385 BLAKE2B a7297a79e621fb6110cb317bdc6c69be643e475cc5f957b8ca169bee135b93c6e2ceed194a2678665a9801313cfe06acd355c68786e2c50718d30184e2e69ae9 SHA512 cb46899bcb387735da77a01f3804fd79671be27cb0666e4ab9d2d8a5f587a52ee6da2eae320fcdff2e4b2b6bd5fc248c297cf123d533609c36dc999d7841994f
diff --git a/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.05.2.ebuild b/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.05.2.ebuild
new file mode 100644
index 000000000000..c8b4aad49995
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.05.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	!<kde-apps/kdesdk-thumbnailers-24.05.2-r1:5
+	!<kde-apps/kdesdk-thumbnailers-24.05.2-r10:6
+"
+
+ECM_INSTALL_FILES=(
+	po_thumbnailer/pocreatorsettings.kcfg:\${KDE_INSTALL_KCFGDIR}
+)
diff --git a/kde-apps/kdesdk-thumbnailers-common/metadata.xml b/kde-apps/kdesdk-thumbnailers-common/metadata.xml
new file mode 100644
index 000000000000..19fa07dcef36
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers-common/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">sdk/kdesdk-thumbnailers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 458547fb42ea..d4116377c25b 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,3 +1,5 @@
 DIST kdesdk-thumbnailers-24.05.2.tar.xz 27248 BLAKE2B 24547264f852dc4e69382ce2648056f22c17fc7f6063868957adabe20382db30f6acf9820e42a98ccd914a68f4713192dcf0c66ca23ddf38954b2553bcec519c SHA512 e253acf6720cd2fcb3750c9452303c03d9df5c87d693831e279a748b7a350358a36457373d35f087e0b00431b4e38a09346d726a280f90ee66e0cca6799db12d
+EBUILD kdesdk-thumbnailers-24.05.2-r1.ebuild 717 BLAKE2B 5f3b97abc3a73639fea1515eb261b472c75ba9f91660a73a9eb2186af2d6d34842dc6d225a0df5e56048085c38c80248494cb2c70ea089fff36d0fe22e44724b SHA512 eda668a510a4b11c4bf289ce010807244ca10c3cbbd615efd5ef613a31d62c3baa75b3ebfb90276a9c7e1ba6e22e7d47e0b2c9f582ec7025c9c3764a0445e6c3
+EBUILD kdesdk-thumbnailers-24.05.2-r10.ebuild 701 BLAKE2B dd0e8f9f97868505ac0061ba1ef5b9f5484ddd463c476eed80ea356a2790018f52676c5af4fd6b8af6c77621d37e10c8d7841e674ebc9afa55909fef819ca562 SHA512 3a50d41a771bb6ccd523abe5a2bc9ad6a7148d2da690c0025a758592b623730e96082939d6755e68bad24b9faef0d8df662efeccf3a48eead4af1cc5ddd2defe
 EBUILD kdesdk-thumbnailers-24.05.2.ebuild 554 BLAKE2B 4bdb7c944a8071794711831510b0a09b33313639ab2f953529a5f3c5ef52c57868f32a046abd4386693a71eaad1ccd703fc878e59fd046c7c0c151d5b4be826f SHA512 72597b7a697bb08d662416c12b14638c3fc0595f834b1b6a0b2543dfa3703d01ab82eebddd4c731719956d5a8562681e6151e32a74ddd38675b94c07a3bcbae9
 MISC metadata.xml 385 BLAKE2B a7297a79e621fb6110cb317bdc6c69be643e475cc5f957b8ca169bee135b93c6e2ceed194a2678665a9801313cfe06acd355c68786e2c50718d30184e2e69ae9 SHA512 cb46899bcb387735da77a01f3804fd79671be27cb0666e4ab9d2d8a5f587a52ee6da2eae320fcdff2e4b2b6bd5fc248c297cf123d533609c36dc999d7841994f
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..9792926cb301
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="Thumbnail generator for PO files"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}
+	${CATEGORY}/${PN}-common
+"
+
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/config.kcfg/pocreatorsettings.kcfg
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r10.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r10.ebuild
new file mode 100644
index 000000000000..4b02a3eb7dc5
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r10.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Thumbnail generator for PO files"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/${PN}-common-${PV}
+"
+
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/config.kcfg/pocreatorsettings.kcfg
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/kde-apps/libkcddb-common/Manifest b/kde-apps/libkcddb-common/Manifest
new file mode 100644
index 000000000000..7f60f1d7a17f
--- /dev/null
+++ b/kde-apps/libkcddb-common/Manifest
@@ -0,0 +1,3 @@
+DIST libkcddb-24.05.2.tar.xz 449172 BLAKE2B afd8371d9c05ebfffc173bdfa1ccf64dacc0caec1cae4c20c7ea9aca74795cc0567fc022589ecd8c54740a22e0d632a0ab3e5209258dde0bcb5e6aa10407281e SHA512 f6797a56c0362b0979b329a27a913bf36334587e86b1c50ab5dd5373b1cff0b69577e9ebff22bea93683c9c3c9da68339dc5e57d2926e6865f5b19ef5cfb51cf
+EBUILD libkcddb-common-24.05.2.ebuild 526 BLAKE2B 8a33a4671104df31ba0bf4e50084c01e9610bdfd1b846109e08c5d26ec542d664c05c59f8a17fcdfcbcbd739a2235e69d721e635dcb75584361e2412c7bfd9b7 SHA512 5626a3c080bfa70e87f7b380e7f1dacaaec3c2fe8899e28ffe39b6a25e3c062d15ae6231307d8fd54c2d5ef1b670666f5a248ce1dd1c599507b74e51255a1beb
+MISC metadata.xml 411 BLAKE2B 54278265c85e4325b1db4faf26a6e1fcd195ed55702b3c0eb7ec2b82775e6ba7e7ee4c19b18318ac41b91d3500fe6481966b9f615fa34b20115a6389433fcf25 SHA512 b05a0ff6b011e5d8327aae24beaebdb016dfad88615e095b16275d0db740a3e0778dc3f9c798783883d82f88ec27346473c608469afe4d9fa866f3f9d01721c7
diff --git a/kde-apps/libkcddb-common/libkcddb-common-24.05.2.ebuild b/kde-apps/libkcddb-common/libkcddb-common-24.05.2.ebuild
new file mode 100644
index 000000000000..422b5adcdc5c
--- /dev/null
+++ b/kde-apps/libkcddb-common/libkcddb-common-24.05.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+ECM_HANDBOOK_DIR=( kcmcddb/doc )
+ECM_KCM_TARGETS=( kcm_cddb:kcmcddb/ )
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!<kde-apps/libkcddb-23.08.5-r1:5
+	!<kde-apps/libkcddb-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+	libkcddb/libkcddb5.kcfg:\${KDE_INSTALL_KCFGDIR}
+)
diff --git a/kde-apps/libkcddb-common/metadata.xml b/kde-apps/libkcddb-common/metadata.xml
new file mode 100644
index 000000000000..b3bfb0b912f6
--- /dev/null
+++ b/kde-apps/libkcddb-common/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=libkcddb</bugs-to>
+		<remote-id type="kde-invent">multimedia/libkcddb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 771c96de76ab..3da92945b9ed 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,6 @@
 DIST libkcddb-23.08.5.tar.xz 451388 BLAKE2B 2c6118d0f9f263d45226005340d66c99b32171459ad2f744b788b3d88f714546b99421251422fae6296b97fbcb3523ee12436974bed67ad9683a26124cd69e53 SHA512 fbc08f6a7d701df179a0b59e6b9d242faefc1801b2cda5f15d821ca5de019ac2ab37464f6cd186cd7be39a0fa5545cf89f074a094f437807e16024459a144d82
 DIST libkcddb-24.05.2.tar.xz 449172 BLAKE2B afd8371d9c05ebfffc173bdfa1ccf64dacc0caec1cae4c20c7ea9aca74795cc0567fc022589ecd8c54740a22e0d632a0ab3e5209258dde0bcb5e6aa10407281e SHA512 f6797a56c0362b0979b329a27a913bf36334587e86b1c50ab5dd5373b1cff0b69577e9ebff22bea93683c9c3c9da68339dc5e57d2926e6865f5b19ef5cfb51cf
+EBUILD libkcddb-23.08.5-r1.ebuild 1325 BLAKE2B b6992fa070c1cdf05b0c205699355d934cde9af463acd4af13661a6496a02185000fe932fef02a483ccfd5a52c86b4d23431d40ae2b363dbdc44eecbd51808dc SHA512 f6c2f907f204784ceb4d119e6242e8bb103e38441fe956d2dd47ab31a0986b23fcef710f6be2855e59a11409a8c1de32bf202bfcbf3e8389338e972410bc5928
 EBUILD libkcddb-23.08.5.ebuild 1455 BLAKE2B 869401ab939c0ae3232e37944b4ab1ce984bf294a7ec10b3073d9b0a85b951ad6d6d22910b56042e67d2cd22cd129136dda691e13b6f63905599b9ee9c4ca1ad SHA512 45b90a1ce525b481f56c1176e02c3705d2015da80a63ede0bd1ab1539914a01907033c20c67506b57927464cf6d77e649c2e4212906c86e5ff6443ce736f85c4
-EBUILD libkcddb-24.05.2.ebuild 1127 BLAKE2B 347a498882645437b67b172c4411cd4e84dcaa1d4865a2245158c1dfb599b7b21f920bd1910ca2396590956522630a3d80df7f3f3590811263d560072a80590d SHA512 d90736af053938a5ccd72968c46e15430c510eb61a48cd11e1104f546ebb970c027923e6a7708a92c8f36949586f406a39f78946c9fd91ae0b2710095ff3434a
+EBUILD libkcddb-24.05.2-r1.ebuild 1282 BLAKE2B 4931f2ccb954a4bd1a1eaf3ca74878496d5e39c84574542835d714c7a11d4abf21c38237062c6343d8395a9805145e4b7be1715f3bc44be36f685141cfc1a0fc SHA512 2007b228e4cf18212b20ccfe7d6d496de7904a0b93b82cbb6c624beefd832f42fb8c12961db07f90327c0fbd51f2108cc0c25334ef157f546c06029194b6cd69
 MISC metadata.xml 530 BLAKE2B e7b2030572e79d1a5e8270f6994256939741e6d807b3b86feb6507f15a5bed4d742eb50469e2e37d238f5339427298ac89d17c507a2779bfeab521ee30f2f958 SHA512 b4ea42cdcf007b1a051eced437cfb95066b3abdc08e71702756291434d2b88a9f2fdc15e87e3ad103fb12db9597fd8ef181b2f01977eb2f4486b39573c89d3ca
diff --git a/kde-apps/libkcddb/libkcddb-23.08.5-r1.ebuild b/kde-apps/libkcddb/libkcddb-23.08.5-r1.ebuild
new file mode 100644
index 000000000000..d1d02a33c320
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-23.08.5-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="true"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE library for CDDB"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="musicbrainz"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	musicbrainz? ( media-libs/musicbrainz:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/libkcddb-common-${PV}
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
+
+# Shipped by kde-apps/libkcddb-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/applications/kcm_cddb.desktop
+	/usr/share/config.kcfg/libkcddb5.kcfg
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package musicbrainz MusicBrainz5)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/libkcddb/libkcddb-24.05.2.ebuild b/kde-apps/libkcddb/libkcddb-24.05.2-r1.ebuild
index d6756e1ffd4e..eb7a69c834c0 100644
--- a/kde-apps/libkcddb/libkcddb-24.05.2.ebuild
+++ b/kde-apps/libkcddb/libkcddb-24.05.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 ECM_TEST="true"
 KFMIN=6.3.0
 QTMIN=6.6.2
@@ -11,7 +11,7 @@ inherit ecm gear.kde.org
 
 DESCRIPTION="KDE library for CDDB"
 
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="musicbrainz"
@@ -31,19 +31,25 @@ DEPEND="
 	musicbrainz? ( media-libs/musicbrainz:5 )
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	>=kde-apps/libkcddb-common-${PV}
 "
 BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
 
+# Shipped by kde-apps/libkcddb-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/applications/kcm_cddb.desktop
+	/usr/share/config.kcfg/libkcddb5.kcfg
+)
+
 src_prepare() {
 	ecm_src_prepare
-	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
+	ecm_punt_po_install
+	cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
 }
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package musicbrainz MusicBrainz5)
 	)
-
 	ecm_src_configure
 }
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 958b36ffaf63..432fd4f432d7 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
 DIST libkcompactdisc-23.08.5.tar.xz 99360 BLAKE2B 087435f61ebe793b15c4b4f73bee6841409ee17467567ba861d85bb1af1b843fe541c2d20347ca2d9e83c1670b9649303d99f06de1771533e649cb15322955cb SHA512 cf6e10c04e6664ed2db16131de34e6c23ddd744887dbd94c7bc64913be9f797fd439731f03151e216c1055b759566521d7be502776b5be327613bf49fca69871
 DIST libkcompactdisc-24.05.2.tar.xz 99740 BLAKE2B 94320b85a1ad3e218eab232427f4d9c3e60c8faf4ffdca847abb43f509a6d9b8e83246f668c52ed3bc2c99bb3c7baa7dee094b5ac187913258f341a7dff1e58b SHA512 cdbe04c4ea0a9851e518651a1d5134d7dc2afc0b38361a54fc119885dddcbda896dedfe357b5df2e8701dda8a3f7f5e77347bbcc02c1268f75fb15f11a20e4dc
-EBUILD libkcompactdisc-23.08.5.ebuild 775 BLAKE2B 1daacedb3f3450d907a4076fc0905405b63bab6bb0318d0957927bee3d995f0ad7b2aa2333527a62d30aaf64d2153cd73551f4bf2852e128336351768ce361aa SHA512 9f2aeb57d96c72af0e1ad73903e946020512a287c9dcece401dec961d5da7acb7dac92a54ccbfd676c0bed50e88fb677b7934704a29e6aea30ca5f9e3584dbd9
-EBUILD libkcompactdisc-24.05.2.ebuild 658 BLAKE2B d50ac9c0c967f117ca73c2a3f2f88265be7e900ae0ce5fe73bf86fbe383062065a6fb618869c9c3e239e8f3930d7533bdddc0e4a32b02d6fbefee3d8fed0c21b SHA512 ca67b5e72de5a25ab7161197816dcc2ca42b858497dab8489360626a0f95e35661751b0818b31e70dab1ef91e1971b7cb38717e6835c14dfc76dbfcba0ab8b52
-MISC metadata.xml 507 BLAKE2B d92c383fb94dab5cff568cf2e4c90d380cba653800573b80ac17d774ad313a03cb3f4db9e6fc9174fe51a4239185c76007583f193adad1ac29ac9fe90ced4dcb SHA512 ad7e332aab792b7479faab45da847c25328f86bd00f9c376b67bb10f2b1e9f2c90c793a82ab02ad54d076d286468bcdac1187dcba19b096b1e2c85427efc61d1
+EBUILD libkcompactdisc-23.08.5-r1.ebuild 617 BLAKE2B 9f76b64741d419e814957b670be4e29955b2091f23158242e1c83dfad4e14592617dd8703ece2c2ab693b527cd4cd1d867d618cd0a6cec3ce0f7b80da8ebe30d SHA512 2a4133abe3bf27c968df43c17a6f98fa1c54dd526ee6a3ce5e0f6d6d1405241a7d531524447a71ab2633d51d01cea931130a54e7bd77a15d0bc95a21e35c9a61
+EBUILD libkcompactdisc-24.05.2-r1.ebuild 620 BLAKE2B 3fd00a62532853345cca36c408d068c948236ed6bcd10bc593c338b0babc83a36bbe31ef72b8d09276cfed0975ee21d9058a159a86f0511fa77e0e3be0df75ba SHA512 f44c1d156ed55e4c8e2498a15438a54c906a01f8aeeaca3875a0eee047a4cd558a3a6dc8be477e183a9a74027552b4fe84aa62b42c1ab4296fa12c841f2c180f
+MISC metadata.xml 388 BLAKE2B 622395c2c72b4b67338be67473395f46681ff70f4e2da53f8cd97a7e3a1e69e8eb3b712b84fa992cb59a1d20e157490fcb34cd96acde1f14a9c6f7b019d8325a SHA512 02a7ca441445e86400640d18fceb96358196b8a662c9c2f1868e27e5cc5bfb88042e03a2a1ce053d72270c0e341f18e81f905b3e99c24eac4eb592eb5f2cb611
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-23.08.5.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-23.08.5-r1.ebuild
index aee305dc090d..7455c21917de 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-23.08.5.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-23.08.5-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for playing & ripping CDs"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="alsa kf6compat"
+IUSE="alsa"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -22,9 +22,7 @@ DEPEND="
 	>=media-libs/phonon-4.11.0[qt5(+)]
 	alsa? ( media-libs/alsa-lib )
 "
-RDEPEND="${DEPEND}
-	kf6compat? ( kde-apps/libkcompactdisc:6 )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
@@ -32,11 +30,3 @@ src_configure() {
 	)
 	ecm_src_configure
 }
-
-src_install() {
-	ecm_src_install
-
-	if use kf6compat; then
-		rm -r "${D}"/usr/share/locale || die
-	fi
-}
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-24.05.2.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-24.05.2-r1.ebuild
index 60aeeb79421c..497d11693753 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-24.05.2.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-24.05.2-r1.ebuild
@@ -22,9 +22,7 @@ DEPEND="
 	>=media-libs/phonon-4.12.0[qt6]
 	alsa? ( media-libs/alsa-lib )
 "
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/libkcompactdisc/metadata.xml b/kde-apps/libkcompactdisc/metadata.xml
index 18d53b343a94..c1132e23fef5 100644
--- a/kde-apps/libkcompactdisc/metadata.xml
+++ b/kde-apps/libkcompactdisc/metadata.xml
@@ -9,7 +9,4 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 		<remote-id type="kde-invent">multimedia/libkcompactdisc</remote-id>
 	</upstream>
-	<use>
-		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-apps/libksane-common/Manifest b/kde-apps/libksane-common/Manifest
new file mode 100644
index 000000000000..8e8999dadc36
--- /dev/null
+++ b/kde-apps/libksane-common/Manifest
@@ -0,0 +1,3 @@
+DIST libksane-24.05.2.tar.xz 153572 BLAKE2B fe15e8359b9975b68f98370e502b6115169a94f153ccea6927c1492a68028edc22e3f062b23ed1e063b3349deb08f045f44e4fce0ce945fc4dec60ce27bd341a SHA512 ba5537fdb690e33ffdf841981ddfd9767a588f40277c39aa4fa6e2ad56cf42afe4a231282bbf4c410df600750a95b459a11e36d03a671fbad5369d141febd691
+EBUILD libksane-common-24.05.2.ebuild 524 BLAKE2B d1f888c63882a0b2d0c6b4f68f03b760f820f455f7c82bcc9c9ddc3532facbe5a51f315f535cb5344295c94edf72dc2693b5a7bbe492bf045de92921c843c07b SHA512 7dba320220f33bb005924869c9f775f443d943443238110192c2a300ce03ae8f5dd69befc08b94184fb18321dabeaaeb426ce99cab1fc6cb2f4573de22b2ea86
+MISC metadata.xml 409 BLAKE2B 0673e71d7865fa8db72e9dad57eed93dec1dfac747cff1d5ef61beeaa8d96874390b8ecbce6b8c1cfb3aeed7079dcdd1cb97087ed961499f2120fad69ebba6c9 SHA512 3a24348d7972a00230da35272986820762ba1b775a10c737b829a583217343595f3a69dac523d44817a0ba4ccf7f4033cadb27f5fd64f8f25d258c9615b9596b
diff --git a/kde-apps/libksane-common/libksane-common-24.05.2.ebuild b/kde-apps/libksane-common/libksane-common-24.05.2.ebuild
new file mode 100644
index 000000000000..582564bb6b69
--- /dev/null
+++ b/kde-apps/libksane-common/libksane-common-24.05.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!<kde-apps/libksane-24.02.2-r2:5
+	!<kde-apps/libksane-24.05.2-r1:6
+"
+
+ECM_INSTALL_ICONS=(
+	src/16-actions-black-white.png:\${KDE_INSTALL_ICONDIR}
+	src/16-actions-color.png:\${KDE_INSTALL_ICONDIR}
+	src/16-actions-gray-scale.png:\${KDE_INSTALL_ICONDIR}
+)
diff --git a/kde-apps/libksane-common/metadata.xml b/kde-apps/libksane-common/metadata.xml
new file mode 100644
index 000000000000..7f5e4344af19
--- /dev/null
+++ b/kde-apps/libksane-common/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=libksane</bugs-to>
+		<remote-id type="kde-invent">graphics/libksane</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 18899ef7fea1..18e0c9eee775 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -2,5 +2,6 @@ AUX libksane-24.02.0-ksanecore-23.08.patch 400 BLAKE2B 6d5ab87fc34609a42c86bb5a3
 DIST libksane-24.02.2.tar.xz 153524 BLAKE2B 71559382fef484c3d08c7022eacd0a6d3f7be1c3cc9b85e50c1f8b627c5e497173263fd7de2429cbe99b6f4b5185be40d8be1d3bbf8c1c3e3391205d7974d6ea SHA512 e5ad9152760384be4f1aa2b7cf54161caceb3fa68e9745606398cadd6e2e44c9b4b0d7d4cbf51c44667697221d6c7ab8ee3dcb9e210bd341d33bd7cee006909a
 DIST libksane-24.05.2.tar.xz 153572 BLAKE2B fe15e8359b9975b68f98370e502b6115169a94f153ccea6927c1492a68028edc22e3f062b23ed1e063b3349deb08f045f44e4fce0ce945fc4dec60ce27bd341a SHA512 ba5537fdb690e33ffdf841981ddfd9767a588f40277c39aa4fa6e2ad56cf42afe4a231282bbf4c410df600750a95b459a11e36d03a671fbad5369d141febd691
 EBUILD libksane-24.02.2-r1.ebuild 1001 BLAKE2B 66eeae8c7fa3df4d9a470424ccca64f31c2ff08446d69694477425af500afc2a9a69f873faa518c2416023fca99d1a9f32d1eec15db75c0260c43498bd84e36d SHA512 e950fae8cfc06f286f1cb9e78aa8eea72efaec0c0104e4e1964a9a3430ceb67d047c88ad4ba3d9b0d286ea031cb363f53eadba4d83d1d69e0dd342378cb1559a
-EBUILD libksane-24.05.2.ebuild 774 BLAKE2B e990a8e6914a8370197e1551fbb48ff902dd87de2276c9079fcb6d0b11ac33fd4560666003570aa15bf637f5a3fabbdf84cfb3243b63b3ce8782a879743e4560 SHA512 0d9be0fa006c0edf76f20b24134ee4b2851217ca4e2c5101aa28b8413e36a9e73d266e5cea16aa147a10fa7d4efaa8c12fd25938d308116952621615dc50f048
+EBUILD libksane-24.02.2-r2.ebuild 1030 BLAKE2B 01ed9b2bfb6ebc340483fde4eb09bdde36d7b5c46e85ee0d3b981dc49f89d7a991fcb1e527af20e33d0f19d56a22973dd18fc65b0e88401315355e1b3ea30ea0 SHA512 dc8cb3ab0bd11681c0acefa41418c279801dd8b60e4561530f50446f5ae78b140d499d5ab0af0044f93ed9b2d7199430c02f4022c564c826c819c04264701128
+EBUILD libksane-24.05.2-r1.ebuild 968 BLAKE2B ff9604ae4d0bf3477bd62a54465b6fa2627e191794e25bc2567e29bcd2f3bcc6d40d6831e3608c323034b918c29773a2ea5f321144841cd1aa53f2f58dd34bd0 SHA512 8cf355f8c206a43fa641c35751582081702f5425f7b55adcf7d8a89d0d05a1c93088854cbd3e1831ec3f4d4f0a761eaf0d5f3054e05ae4e59016c4f1d7ba91c8
 MISC metadata.xml 635 BLAKE2B 8baefe8995a941d16f619d7e8efdef1d762f1d9adccfa75617c771f094ba2b155a0ec300a078296aac0bda7cf78f608d01938054daabb377f491eafcd5bb6b54 SHA512 b591e896e277d28cae4c1cb7304c06a3eb09114e9e98b6529a42eff1dcacacc75b1a0a11f47d944b2edf5bb4847350a254ac1decc5ba8a0e352ab57e209b45dc
diff --git a/kde-apps/libksane/libksane-24.02.2-r2.ebuild b/kde-apps/libksane/libksane-24.02.2-r2.ebuild
new file mode 100644
index 000000000000..7c527b593833
--- /dev/null
+++ b/kde-apps/libksane/libksane-24.02.2-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="SANE Library interface based on KDE Frameworks"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="kwallet"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=media-libs/ksanecore-23.08.5:5
+	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/libksane-common-${PV}
+"
+
+# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/icons/hicolor/16x16/actions
+)
+
+PATCHES=( "${FILESDIR}/${PN}-24.02.0-ksanecore-23.08.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kwallet KF5Wallet)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/libksane/libksane-24.05.2.ebuild b/kde-apps/libksane/libksane-24.05.2-r1.ebuild
index fcad20ed1e87..3a4bb555ee11 100644
--- a/kde-apps/libksane/libksane-24.05.2.ebuild
+++ b/kde-apps/libksane/libksane-24.05.2-r1.ebuild
@@ -24,9 +24,19 @@ DEPEND="
 	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	>=kde-apps/libksane-common-${PV}
 "
 
+# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/icons/hicolor/16x16/actions
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package kwallet KF6Wallet)
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index 92ea6eb38dac..4d021fa5e612 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,6 @@
 DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f
 EBUILD thumbnailers-23.08.5-r1.ebuild 557 BLAKE2B 83654c0fd9ff30006dc4a666d350611725e01085104650c2d8ce4d48cfd9434a906c34f149475330497430d27fc7ef3ee1a828c0198ec3b2c47c0f5c21667d1a SHA512 3de81ed8e0c664b0d044db23e9c1f4ce0fc8ee463205b3327434093e43848ab00146347589e82ae4943df2d071217d1af64a0f43941849c9d5b71978c35d110e
+EBUILD thumbnailers-23.08.5-r2.ebuild 670 BLAKE2B 977ee16b2f09b47a186e409b035676fbde4e77c5ebe5d54bd02e41c2792d926030e27fcd5b41cc1c8405a8d2b04a69a409b83b6a30b6faddb8dd97ef2d3993a9 SHA512 9a5afcf8ae99182f672c3cc78dd4caf0bacfca4cbb8969ee62080014074980e8db5dd2c25361305c747c4b8ccce763fca487a73135944efcc55a51ccc03a9aa9
 EBUILD thumbnailers-23.08.5.ebuild 909 BLAKE2B 63f913e4c61e29ed6f197b110a94be884dfb0ebedc45f1ac212523daf2eb4d3b32aaf443d4245740ae2c78530a511023cf7d7b642769e2406c556b0cbe3a0e8c SHA512 559c046ec3109fb4b01000876711bafd18b39822a74a62ba2dbcdf22eef313d2163d367a34160575367f1702e195d4e62386398f429c879a6fa0aa6fec87eb2b
-EBUILD thumbnailers-24.05.2-r1.ebuild 605 BLAKE2B 2f9785272ee3f6024dec0a1cf80717f67b9a59e26b940e14d474e65f433eeb3705c0329a8600ecee6708d9188dec335348f21b168c67c705e21bbd79aa3dc79a SHA512 91d542217f3dec99ce416b10bd3ece8943c3885ef1f2e949ff0568dcc3847440e07f2594e06c5b74141dc23fa746b06468330fcce77ca60358c280f16adde721
-MISC metadata.xml 664 BLAKE2B 4f2358a5a6de104e9192d7bde39657ad1dafc7dd4a4b876441cbc81462e4a03b86d0887f0177d681e4682c840ad84991568948619ef396d6c62a0e22bf481939 SHA512 0c1a9a0604ecd74aa03c2aea0bd9749f1963be3fe6f68ee8b06e68f9052c3f9b32529f7127c57f3c2a438906fb999c6cbb5aa3d7a19c8e0744821d69ec0c7349
+EBUILD thumbnailers-24.05.2-r2.ebuild 663 BLAKE2B 6c57de82cbe48bfcef109655c4f7a473f7027491ee2bcb06657a66e8e4f4eecda8a2209c285a05501a11fbb502efe46e62ac29a97a1daf50224d0d5558c9d5d5 SHA512 a752cc6119da2af055b56105993108a1efb7c5ffdfb999b9a63fccb12a8f446eebb28f16311a09b7e867d9ff30e3ec939b9a81a2d9e148ed179741bd08b1d7b0
+MISC metadata.xml 768 BLAKE2B d8a59c070cacb9cfea21e7d5ebf78840f1b4760b59635ff4124d337688fd76c6b982f4c65d2081cc93896ee3d4a2bede72d6fb9c19c8f134531b89f83299c906 SHA512 38b067cb72b794e67e19ae6034960a3ba03258a61e88051f681fa5fd8a70b35340494700d65b4c89cde7d883504cf9449e151159ff55990de86ebab99052038b
diff --git a/kde-apps/thumbnailers/metadata.xml b/kde-apps/thumbnailers/metadata.xml
index 419b2d426170..ca27dcc0ab13 100644
--- a/kde-apps/thumbnailers/metadata.xml
+++ b/kde-apps/thumbnailers/metadata.xml
@@ -10,7 +10,8 @@
 	</upstream>
 	<use>
 		<flag name="blender">Enable blender thumbnail generation using <pkg>kde-frameworks/karchive</pkg></flag>
+		<flag name="gettext">Enable PO file thumbnail generation using <pkg>kde-apps/kdesdk-thumbnailers</pkg></flag>
 		<flag name="mobi">Enable mobipocket thumbnail generation using <pkg>kde-apps/kdegraphics-mobipocket</pkg></flag>
-<!--		<flag name="video">Enable video thumbnail generation using <pkg>kde-apps/ffmpegthumbs</pkg></flag> -->
+		<flag name="video">Enable video thumbnail generation using <pkg>kde-apps/ffmpegthumbs</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/thumbnailers/thumbnailers-23.08.5-r2.ebuild b/kde-apps/thumbnailers/thumbnailers-23.08.5-r2.ebuild
new file mode 100644
index 000000000000..204751576c40
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-23.08.5-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Metapackage for KIO thumbnail generators"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="blender gettext mobi pdf raw video"
+
+RDEPEND="
+	blender? ( >=media-gfx/kio-blender-thumbnailer-${PV}:5 )
+	gettext? ( >=kde-apps/kdesdk-thumbnailers-${PV}:5 )
+	mobi? ( >=media-gfx/kio-mobi-thumbnailer-${PV}:5 )
+	pdf? ( >=media-gfx/kio-ps-thumbnailer-${PV}:5 )
+	raw? ( >=media-gfx/kio-raw-thumbnailer-${PV}:5 )
+	video? ( >=kde-apps/ffmpegthumbs-${PV}:5 )
+"
diff --git a/kde-apps/thumbnailers/thumbnailers-24.05.2-r1.ebuild b/kde-apps/thumbnailers/thumbnailers-24.05.2-r2.ebuild
index 9e352574cd7d..e2b2f769fc3b 100644
--- a/kde-apps/thumbnailers/thumbnailers-24.05.2-r1.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-24.05.2-r2.ebuild
@@ -9,12 +9,13 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
 LICENSE="metapackage"
 SLOT="6"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="blender mobi pdf raw" # video
+IUSE="blender gettext mobi pdf raw video"
 
 RDEPEND="
 	blender? ( >=media-gfx/kio-blender-thumbnailer-${PV}:6 )
+	gettext? ( >=kde-apps/kdesdk-thumbnailers-${PV}:6 )
 	mobi? ( >=media-gfx/kio-mobi-thumbnailer-${PV}:6 )
 	pdf? ( >=media-gfx/kio-ps-thumbnailer-${PV}:6 )
 	raw? ( >=media-gfx/kio-raw-thumbnailer-${PV}:6 )
+	video? ( >=kde-apps/ffmpegthumbs-${PV}:6 )
 "
-#	video? ( >=kde-apps/ffmpegthumbs-${PV}:6 )