Merge updates from master

59 files changed, 1318 insertions, 83 deletions

diff --git a/eclass/ecm-common.eclass b/eclass/ecm-common.eclass
new file mode 100644
index 000000000000..460d702dea1f
--- /dev/null
+++ b/eclass/ecm-common.eclass
@@ -0,0 +1,376 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: ecm-common.eclass
+# @MAINTAINER:
+# kde@gentoo.org
+# @SUPPORTED_EAPIS: 8
+# @PROVIDES: cmake
+# @BLURB: Standalone CMake calling std. ECM macros to install common files only.
+# @DESCRIPTION:
+# This eclass is used for installing common files of packages using ECM macros,
+# most of the time translations, but optionally also icons and kcfg files. This
+# is mainly useful for packages split from a single upstream tarball, or for
+# collision handling of slotted package versions, which need to share a common
+# files package.
+# Conventionally we will use ${PN}-common for these split packages.
+
+case ${EAPI} in
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ -z ${_ECM_COMMON_ECLASS} ]]; then
+_ECM_COMMON_ECLASS=1
+
+inherit cmake
+
+# @ECLASS_VARIABLE: KFMIN
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Minimum version of Frameworks to require.  Default value for kde-frameworks
+# is ${PV} and 6.0.0 baseline for everything else.
+# If set to <5.240, it is assumed dependencies are fulfilled by KF5/Qt5
+# alternatively, thus a block of SLOT=5 shadow dependencies added.
+if [[ ${CATEGORY} = kde-frameworks ]]; then
+	: "${KFMIN:=$(ver_cut 1-2)}"
+fi
+: "${KFMIN:=6.0.0}"
+
+# @ECLASS_VARIABLE: _KFSLOT
+# @INTERNAL
+# @DESCRIPTION:
+# KDE Frameworks main slot dependency for consistently finding all KF5 or KF6
+# in CMakeLists.txt.  Consistency over installed KF packages is established via
+# BDEPEND, then detected in pkg_setup().
+# Is passed as -DQT_MAJOR_VERSION=${_KFSLOT} in src_configure() too.
+_KFSLOT=6
+
+# @ECLASS_VARIABLE: KF5_BDEPEND
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Dynamic KF5 dependency list.
+if [[ ${KF5_BDEPEND} ]]; then
+	[[ ${KF5_BDEPEND@a} == *a* ]] ||
+		die "KF5_BDEPEND must be an array"
+else
+	KF5_BDEPEND=( )
+fi
+
+# @ECLASS_VARIABLE: KF6_BDEPEND
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Dynamic KF6 dependency list.
+if [[ ${KF6_BDEPEND} ]]; then
+	[[ ${KF6_BDEPEND@a} == *a* ]] ||
+		die "KF6_BDEPEND must be an array"
+else
+	KF6_BDEPEND=( )
+fi
+
+# @ECLASS_VARIABLE: ECM_I18N
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Will accept "true" (default) or "false".  If set to "false", do nothing.
+# Otherwise, add kde-frameworks/ki18n:* to BDEPEND, find KF[56]I18n and let
+# ki18n_install(po) generate and install translations.
+: "${ECM_I18N:=true}"
+
+# @ECLASS_VARIABLE: ECM_HANDBOOK
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Will accept "true" or "false" (default).  If set to "false", do nothing.
+# Otherwise, add "+handbook" to IUSE, add kde-frameworks/kdoctools:* to BDEPEND
+# find KF[56]DocTools in CMake, call add_subdirectory(ECM_HANDBOOK_DIRS)
+# and let let kdoctools_install(po) generate and install translated docbook
+# files.
+: "${ECM_HANDBOOK:=false}"
+
+# @ECLASS_VARIABLE: ECM_HANDBOOK_DIRS
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Default is "doc" which is correct for the vast majority of packages. Specifies
+# one or more directories containing untranslated docbook file(s) relative to
+# ${S} to be added via add_subdirectory.
+if [[ ${ECM_HANDBOOK_DIRS} ]]; then
+	[[ ${ECM_HANDBOOK_DIRS@a} == *a* ]] ||
+		die "ECM_HANDBOOK_DIRS must be an array"
+else
+	ECM_HANDBOOK_DIRS=( doc )
+fi
+
+# @ECLASS_VARIABLE: ECM_INSTALL_FILES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of <file>:<destination_path> tuples to install by CMake via
+# install(FILES <file> DESTINATION <destination_path>)
+if [[ ${ECM_INSTALL_FILES} ]]; then
+	[[ ${ECM_INSTALL_FILES@a} == *a* ]] ||
+		die "ECM_INSTALL_FILES must be an array"
+fi
+
+# @ECLASS_VARIABLE: ECM_INSTALL_ICONS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of <icon>:<icon_install_dir> tuples to feed to ECMInstallIcons
+# via ecm_install_icons(ICONS <icon> DESTINATION <icon_install_dir)
+if [[ ${ECM_INSTALL_ICONS} ]]; then
+	[[ ${ECM_INSTALL_ICONS@a} == *a* ]] ||
+		die "ECM_INSTALL_ICONS must be an array"
+fi
+
+# @ECLASS_VARIABLE: ECM_KCM_TARGETS
+# @DEFAULT_UNSET
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Array of <target>:<subdir> tuples to feed to ECMInstallIcons via
+# ecmcommon_generate_desktop_file(<target> <subdir>), which is this
+# eclass adaptation of kcmutils_generate_desktop_file.
+if [[ ${ECM_KCM_TARGETS} ]]; then
+	[[ ${ECM_KCM_TARGETS@a} == *a* ]] ||
+		die "ECM_KCM_TARGETS must be an array"
+fi
+
+DESCRIPTION="Common files for ${PN/-common/}"
+
+BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:*"
+
+case ${ECM_I18N} in
+	true)
+		KF5_BDEPEND+=( "kde-frameworks/ki18n:5" )
+		KF6_BDEPEND+=( "kde-frameworks/ki18n:6" )
+		;;
+	false) ;;
+	*)
+		eerror "Unknown value for \${ECM_I18N}"
+		die "Value ${ECM_I18N} is not supported"
+		;;
+esac
+
+case ${ECM_HANDBOOK} in
+	true)
+		IUSE+=" +handbook"
+		KF5_BDEPEND+=( "handbook? ( kde-frameworks/kdoctools:5 )" )
+		KF6_BDEPEND+=( "handbook? ( kde-frameworks/kdoctools:6 )" )
+		;;
+	false) ;;
+	*)
+		eerror "Unknown value for \${ECM_HANDBOOK}"
+		die "Value ${ECM_HANDBOOK} is not supported"
+		;;
+esac
+
+if [[ ${ECM_KCM_TARGETS} ]]; then
+	KF5_BDEPEND+=( "kde-frameworks/kcmutils:5" )
+	KF6_BDEPEND+=( "kde-frameworks/kcmutils:6" )
+fi
+
+if $(ver_test ${KFMIN} -lt 5.240) && [[ ${KF6_BDEPEND} && ${KF5_BDEPEND} ]]; then
+	BDEPEND+=" || ( ( ${KF6_BDEPEND[*]} ) ( ${KF5_BDEPEND[*]} ) )"
+else
+	BDEPEND+=" ${KF6_BDEPEND[*]}"
+fi
+
+# @FUNCTION: _ecm-common_preamble
+# @INTERNAL
+# @DESCRIPTION:
+# Create a CMakeLists.txt file with minimum ECM setup.
+_ecm-common_preamble() {
+	cat > CMakeLists.txt <<- _EOF_ || die
+		cmake_minimum_required(VERSION 3.16)
+		project(${PN} VERSION ${PV})
+
+		find_package(ECM "${KFMIN}" REQUIRED NO_MODULE)
+		set(CMAKE_MODULE_PATH \${ECM_MODULE_PATH})
+
+		# Set by pkg_setup(); Use this if need to differ between KF5 or KF6
+		set(KFSLOT ${_KFSLOT})
+		set(KDE_INSTALL_DOCBUNDLEDIR "${EPREFIX}/usr/share/help" CACHE PATH "")
+
+		include(KDEInstallDirs)
+		include(ECMOptionalAddSubdirectory) # commonly used
+		include(FeatureSummary)
+	_EOF_
+
+	if [[ ${ECM_INSTALL_ICONS} ]]; then
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			include(ECMInstallIcons)
+		_EOF_
+	fi
+}
+
+# @FUNCTION: _ecm-common_i18n
+# @INTERNAL
+# @DESCRIPTION:
+# Find KF[56]I18n and call ki18n_install(po).
+_ecm-common_i18n() {
+	[[ ${ECM_I18N} == true ]] || return
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		find_package(KF\${KFSLOT}I18n REQUIRED)
+		ki18n_install(po)
+	_EOF_
+}
+
+# @FUNCTION: _ecm-common_docs
+# @INTERNAL
+# @DESCRIPTION:
+# Find KF[56]DocTools, call kdoctools_install(po) and
+# add_subdirectory(${ECM_HANDBOOK_DIRS})
+_ecm-common_docs() {
+	{ in_iuse handbook && use handbook; } || return
+
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		find_package(KF\${KFSLOT}DocTools REQUIRED)
+		kdoctools_install(po)
+	_EOF_
+
+	local i
+	for i in "${ECM_HANDBOOK_DIRS[@]}"; do
+		if [[ -d ${i} ]]; then
+			cat >> CMakeLists.txt <<- _EOF_ || die
+				add_subdirectory(${i})
+			_EOF_
+		fi
+	done
+}
+
+# @FUNCTION: _ecm-common_generate_desktop_file
+# @INTERNAL
+# @DESCRIPTION:
+# Find KF[56]KCMUtils and iterate through ECM_KCM_TARGETS to generate
+# desktop files out of json.
+_ecm-common_generate_desktop_file() {
+	[[ ${ECM_KCM_TARGETS} ]] || return
+
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		find_package(KF\${KFSLOT}KCMUtils REQUIRED)
+		# extracted from kcmutils_generate_desktop_file(kcm_target)
+		function(ecmcommon_generate_desktop_file kcm_target subdir)
+			set(IN_FILE \${CMAKE_CURRENT_SOURCE_DIR}/\${subdir}\${kcm_target}.json)
+			set(OUT_FILE \${CMAKE_CURRENT_BINARY_DIR}/\${kcm_target}.desktop)
+			add_custom_target(\${kcm_target}-kcm-desktop-gen ALL
+				COMMAND KF\${KFSLOT}::kcmdesktopfilegenerator \${IN_FILE} \${OUT_FILE}
+				DEPENDS \${IN_FILE})
+			install(FILES \${OUT_FILE} DESTINATION \${KDE_INSTALL_APPDIR})
+		endfunction()
+	_EOF_
+
+	local i
+	for i in "${ECM_KCM_TARGETS[@]}"; do
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			ecmcommon_generate_desktop_file(${i%:*} ${i#*:})
+		_EOF_
+	done
+}
+
+# @FUNCTION: _ecm-common_ecm_install_icons
+# @INTERNAL
+# @DESCRIPTION:
+# Installs icons listed in ECM_INSTALL_ICONS using ecm_install_icons
+_ecm-common_ecm_install_icons() {
+	[[ ${ECM_INSTALL_ICONS} ]] || return
+	local i
+	for i in "${ECM_INSTALL_ICONS[@]}"; do
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			ecm_install_icons(ICONS ${i%:*} DESTINATION ${i#*:})
+		_EOF_
+	done
+}
+
+# @FUNCTION: _ecm-common_ecm_install_files
+# @INTERNAL
+# @DESCRIPTION:
+# Installs files listed in ECM_INSTALL_FILES using install(FILES ...)
+_ecm-common_ecm_install_files() {
+	[[ ${ECM_INSTALL_FILES} ]] || return
+	local i
+	for i in "${ECM_INSTALL_FILES[@]}"; do
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			install(FILES ${i%:*} DESTINATION ${i#*:})
+		_EOF_
+	done
+}
+
+# @FUNCTION: ecm-common_inject_heredoc
+# @DESCRIPTION:
+# Override this to inject custom Heredoc into the root CMakeLists.txt
+ecm-common_inject_heredoc() {
+	debug-print-function ${FUNCNAME} "$@"
+}
+
+# @FUNCTION: _ecm-common_summary
+# @INTERNAL
+# @DESCRIPTION:
+# Just calls feature_summary
+_ecm-common_summary() {
+	cat >> CMakeLists.txt <<- _EOF_ || die
+
+		feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+	_EOF_
+}
+
+# @FUNCTION: ecm-common-check_deps
+# @DESCRIPTION:
+# Override this to add more KF6 has_version checks to pkg_setup(),
+# corresponding with any additional KF6_BDEPEND defined pre-inherit.
+# If false, we'll assume KF5 dependencies are fulfilled via BDEPEND.
+ecm-common-check_deps() {
+	return 0
+}
+
+# @FUNCTION: ecm-common_pkg_setup
+# @DESCRIPTION:
+# If KFMIN is not lower than 5.240 (default is 6.0.0), do nothing.
+# Otherwise, dDetermine which of KF5 or KF6-based depgraph is complete,
+# preferring KF6.  The result is stored in _KFSLOT, which is then handed
+# to CMakeLists.txt as KFSLOT var for further use.
+ecm-common_pkg_setup() {
+	$(ver_test ${KFMIN} -lt 5.240) && return
+
+	if has_version -b "kde-frameworks/ki18n:6" && {
+		! in_iuse handbook || {
+			in_iuse handbook && use handbook &&
+				has_version -b "kde-frameworks/kdoctools:6"
+			}
+		} && {
+			! [[ ${ECM_KCM_TARGETS} ]] ||
+				has_version -b "kde-frameworks/kcmutils:6"
+		} && ecm-common-check_deps
+	then
+		_KFSLOT=6
+	else
+		_KFSLOT=5
+	fi
+}
+
+# @FUNCTION: ecm-common_src_prepare
+# @DESCRIPTION:
+# Wrapper for cmake_src_prepare with a Heredoc replacing the standard
+# root CMakeLists.txt file to only generate and install translations.
+ecm-common_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_ecm-common_preamble
+	_ecm-common_i18n
+	_ecm-common_docs
+	_ecm-common_generate_desktop_file
+	_ecm-common_ecm_install_icons
+	_ecm-common_ecm_install_files
+	ecm-common_inject_heredoc
+	_ecm-common_summary
+
+	cmake_src_prepare
+}
+
+# @FUNCTION: ecm-common_src_configure
+# @DESCRIPTION:
+# Passes -DQT_MAJOR_VERSION=${_KFSLOT} only.
+ecm-common_src_configure() {
+	# necessary for at least KF6KCMUtils
+	local mycmakeargs=( -DQT_MAJOR_VERSION=${_KFSLOT} )
+	cmake_src_configure
+}
+
+fi
+
+EXPORT_FUNCTIONS pkg_setup src_prepare src_configure
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index c8731b8c0cff..fbe1a23cf205 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -84,8 +84,8 @@ fi
 
 # @ECLASS_VARIABLE: ECM_HANDBOOK
 # @DESCRIPTION:
-# Will accept "true", "false", "optional", "forceoptional". If set to "false",
-# do nothing.
+# Will accept "true", "false", "optional", "forceoptional", "forceoff".
+# If set to "false" (default), do nothing.
 # Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and let
 # KF${_KFSLOT}DocTools generate and install the handbook from docbook file(s)
 # found in ECM_HANDBOOK_DIR. However if !handbook, disable build of
@@ -122,6 +122,15 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : "${ECM_QTHELP:=false}"
 
+# @ECLASS_VARIABLE: ECM_REMOVE_FROM_INSTALL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of <paths> to remove from install image.
+if [[ ${ECM_REMOVE_FROM_INSTALL} ]]; then
+	[[ ${ECM_REMOVE_FROM_INSTALL@a} == *a* ]] ||
+		die "ECM_REMOVE_FROM_INSTALL must be an array"
+fi
+
 # @ECLASS_VARIABLE: ECM_TEST
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -233,7 +242,7 @@ case ${ECM_HANDBOOK} in
 		IUSE+=" +handbook"
 		BDEPEND+=" handbook? ( >=kde-frameworks/kdoctools-${KFMIN}:${_KFSLOT} )"
 		;;
-	false) ;;
+	false|forceoff) ;;
 	*)
 		eerror "Unknown value for \${ECM_HANDBOOK}"
 		die "Value ${ECM_HANDBOOK} is not supported"
@@ -446,6 +455,25 @@ ecm_punt_bogus_dep() {
 	fi
 }
 
+# @FUNCTION: _ecm_punt_kdoctools_install
+# @INTERNAL
+# @DESCRIPTION:
+# Disables kdoctools_install(po) call.
+_ecm_punt_kdoctools_install() {
+	sed -e "s/^ *kdoctools_install.*(po.*)/#& # disabled by ecm.eclass/" \
+		-i CMakeLists.txt || die
+}
+
+# @FUNCTION: ecm_punt_po_install
+# @DESCRIPTION:
+# Disables handling of po subdirectories, typically when the package
+# is outsourcing common files to a ${PN}-common split package.
+ecm_punt_po_install() {
+	_ecm_punt_kdoctools_install
+	sed -e "s/^ *ki18n_install.*(po.*)/#& # disabled by ecm.eclass/" \
+		-i CMakeLists.txt || die
+}
+
 # @FUNCTION: ecm_pkg_pretend
 # @DESCRIPTION:
 # Checks if the active compiler meets the minimum version requirements.
@@ -478,13 +506,16 @@ ecm_src_prepare() {
 	fi
 
 	# only enable handbook when required
-	if in_iuse handbook && ! use handbook ; then
+	if [[ ${ECM_HANDBOOK} == forceoff ]] ||
+		{ [[ ${ECM_HANDBOOK} = forceoptional ]] && in_iuse handbook && ! use handbook; }
+	then
+		ecm_punt_kf_module DocTools
+		_ecm_punt_kdoctools_install
+	fi
+	if [[ ${ECM_HANDBOOK} == forceoff ]] ||
+		{ in_iuse handbook && ! use handbook; }
+	then
 		cmake_comment_add_subdirectory ${ECM_HANDBOOK_DIR}
-
-		if [[ ${ECM_HANDBOOK} = forceoptional ]] ; then
-			ecm_punt_kf_module DocTools
-			sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die
-		fi
 	fi
 
 	# drop translations when nls is not wanted
@@ -657,9 +688,9 @@ ecm_src_install() {
 
 	cmake_src_install
 
+	local f
 	# bug 621970
 	if [[ -d "${ED}"/usr/share/applications ]]; then
-		local f
 		for f in "${ED}"/usr/share/applications/*.desktop; do
 			if [[ -x ${f} ]]; then
 				einfo "Removing executable bit from ${f#${ED}}"
@@ -694,6 +725,10 @@ ecm_src_install() {
 			popd > /dev/null || die
 		fi
 	fi
+
+	for f in "${ECM_REMOVE_FROM_INSTALL[@]}"; do
+		rm -r "${ED}"${f} || die
+	done
 }
 
 # @FUNCTION: ecm_pkg_preinst
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 3f8126dd1c01..8089cbb53bf7 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -94,7 +94,6 @@ if $(ver_test -gt 24.01.75); then
 		dragon | \
 		elisa | \
 		eventviews | \
-		ffmpegthumbs | \
 		filelight | \
 		granatier | \
 		grantlee-editor | \
@@ -256,6 +255,7 @@ if $(ver_test -gt 24.04.75); then
 		itinerary | \
 		kio-perldoc | \
 		kolourpaint | \
+		libkcompactdisc | \
 		signon-kwallet-extension)
 			RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
 		*) ;;
@@ -267,7 +267,6 @@ if $(ver_test -gt 24.07.75); then
 	case ${PN} in
 		k3b | \
 		kde-dev-scripts | \
-		kdesdk-thumbnailers | \
 		kdevelop | \
 		kdevelop-php | \
 		kdevelop-python | \
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..68e6e0de263f
--- /dev/null
+++ b/kde-apps/ffmpegthumbs-common/Manifest
@@ -0,0 +1 @@
+DIST ffmpegthumbs-24.05.2.tar.xz 32996 BLAKE2B 85229891ee2d2edcd2fca73d89511358e4f8f2b92e143081652f00344fc526773bd16cb778a136e002ba4ed0640969ddf8987cc6e32a4c225c32298c58d01d4c SHA512 335db6a332f23261cb88f5a9ccd1feeb14132cd0b81b69ea34494b008951e60f7372e82b2ea3c3e8cfca8d3f3aa75ba47969bb531a531b2d0557e9b32e1e6cc8
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/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/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..9cbb4722d706
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers-common/Manifest
@@ -0,0 +1 @@
+DIST kdesdk-thumbnailers-24.05.2.tar.xz 27248 BLAKE2B 24547264f852dc4e69382ce2648056f22c17fc7f6063868957adabe20382db30f6acf9820e42a98ccd914a68f4713192dcf0c66ca23ddf38954b2553bcec519c SHA512 e253acf6720cd2fcb3750c9452303c03d9df5c87d693831e279a748b7a350358a36457373d35f087e0b00431b4e38a09346d726a280f90ee66e0cca6799db12d
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/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..fc7a90683236
--- /dev/null
+++ b/kde-apps/libkcddb-common/Manifest
@@ -0,0 +1 @@
+DIST libkcddb-24.05.2.tar.xz 449172 BLAKE2B afd8371d9c05ebfffc173bdfa1ccf64dacc0caec1cae4c20c7ea9aca74795cc0567fc022589ecd8c54740a22e0d632a0ab3e5209258dde0bcb5e6aa10407281e SHA512 f6797a56c0362b0979b329a27a913bf36334587e86b1c50ab5dd5373b1cff0b69577e9ebff22bea93683c9c3c9da68339dc5e57d2926e6865f5b19ef5cfb51cf
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/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/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..6e490a213e8d
--- /dev/null
+++ b/kde-apps/libksane-common/Manifest
@@ -0,0 +1 @@
+DIST libksane-24.05.2.tar.xz 153572 BLAKE2B fe15e8359b9975b68f98370e502b6115169a94f153ccea6927c1492a68028edc22e3f062b23ed1e063b3349deb08f045f44e4fce0ce945fc4dec60ce27bd341a SHA512 ba5537fdb690e33ffdf841981ddfd9767a588f40277c39aa4fa6e2ad56cf42afe4a231282bbf4c410df600750a95b459a11e36d03a671fbad5369d141febd691
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/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/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 )
diff --git a/kde-frameworks/purpose-kaccounts-services/Manifest b/kde-frameworks/purpose-kaccounts-services/Manifest
new file mode 100644
index 000000000000..e9a50ad9eb07
--- /dev/null
+++ b/kde-frameworks/purpose-kaccounts-services/Manifest
@@ -0,0 +1 @@
+DIST purpose-6.5.0.tar.xz 174700 BLAKE2B 780682a8308023e40723616f3f69704fc168d4a3391194948a7345246cf0014572d0100fccb2575c11251b067c26a21f40997418bb98e35287e7c88b3454c9e2 SHA512 8f0947545c125b08ed34a36321d73ff99725e6e537ec7675f8cff0673c11b7a4570bf194da409b43c997927a844f2236ebaf07fd193f887d57e768485f41ca0b
diff --git a/kde-frameworks/purpose-kaccounts-services/metadata.xml b/kde-frameworks/purpose-kaccounts-services/metadata.xml
new file mode 100644
index 000000000000..ec7aae97d041
--- /dev/null
+++ b/kde-frameworks/purpose-kaccounts-services/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=frameworks-purpose</bugs-to>
+		<remote-id type="kde-invent">frameworks/purpose</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.5.0.ebuild b/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.5.0.ebuild
new file mode 100644
index 000000000000..11d7765f9513
--- /dev/null
+++ b/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# this is purely for service file creation
+ECM_I18N="false"
+ECM_HANDBOOK="false"
+KDE_ORG_NAME="${PN/-kaccounts-services/}"
+KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+inherit ecm-common frameworks.kde.org
+
+DESCRIPTION="KAccounts generated service files for nextcloud and google services"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	!<kde-frameworks/purpose-5.116.0-r2:5
+	!<kde-frameworks/purpose-6.5.0-r1:6
+"
+
+ecm-common-check_deps() {
+	return $(has_version -b "kde-apps/kaccounts-integration:6")
+}
+
+ecm-common_inject_heredoc() {
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		if(KFSLOT STREQUAL "6")
+			find_package(KAccounts6 REQUIRED)
+		else()
+			find_package(KAccounts REQUIRED)
+		endif()
+
+		kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/nextcloud/nextcloud-upload.service.in)
+		kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/youtube/google-youtube.service.in)
+	_EOF_
+}
+
+src_prepare() {
+	ecm-common_src_prepare
+
+	# Safety measure in case new services are added in the future
+	local known_num_of_services=2
+	local found_num_of_services=$(find . -iname "*service.in" | wc -l)
+	if [[ ${found_num_of_services} != ${known_num_of_services} ]]; then
+		eerror "Number of service files mismatch!"
+		eerror "Expected: ${known_num_of_services}"
+		eerror "Found: ${found_num_of_services}"
+		die
+	fi
+}
diff --git a/kde-frameworks/purpose/purpose-5.116.0-r2.ebuild b/kde-frameworks/purpose/purpose-5.116.0-r2.ebuild
new file mode 100644
index 000000000000..e399592c8dd3
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.116.0-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org optfeature xdg-utils
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="bluetooth kaccounts"
+
+# requires running environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/prison-${PVCUT}*:5
+	kaccounts? (
+		|| (
+			kde-apps/kaccounts-integration:6[qt5]
+			kde-apps/kaccounts-integration:5
+		)
+		>=net-libs/accounts-qt-1.16_p20220803[qt5(-)]
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kdeclarative-${PVCUT}:5
+	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
+	kaccounts? (
+		kde-frameworks/purpose-kaccounts-services
+		>=net-libs/accounts-qml-0.7_p20231028[qt5(-)]
+	)
+"
+BDEPEND="kaccounts? ( dev-util/intltool )"
+
+src_prepare() {
+	ecm_src_prepare
+
+	use bluetooth ||
+		cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kaccounts KAccounts)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	# Shipped by kde-frameworks/purpose-kaccounts-services package for shared use w/ SLOT 5
+	use kaccounts && ECM_REMOVE_FROM_INSTALL=(
+		/usr/share/accounts/services/kde/{google-youtube,nextcloud-upload}.service
+	)
+	ecm_src_install
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Send through KDE Connect" kde-misc/kdeconnect
+	fi
+	ecm_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/purpose/purpose-6.5.0.ebuild b/kde-frameworks/purpose/purpose-6.5.0-r1.ebuild
index 601eaf910a3c..3addb28b15b1 100644
--- a/kde-frameworks/purpose/purpose-6.5.0.ebuild
+++ b/kde-frameworks/purpose/purpose-6.5.0-r1.ebuild
@@ -35,10 +35,12 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
 	>=kde-frameworks/kdeclarative-${PVCUT}:6
 	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:6 )
-	webengine? ( >=net-libs/accounts-qml-0.7_p20231028[qt6] )
+	webengine? (
+		>=kde-frameworks/purpose-kaccounts-services-${PVCUT}
+		>=net-libs/accounts-qml-0.7_p20231028[qt6]
+	)
 "
 BDEPEND="webengine? ( dev-util/intltool )"
 
@@ -57,6 +59,14 @@ src_configure() {
 	ecm_src_configure
 }
 
+src_install() {
+	# Shipped by kde-frameworks/purpose-kaccounts-services package for shared use w/ SLOT 5
+	use webengine && ECM_REMOVE_FROM_INSTALL=(
+		/usr/share/accounts/services/kde/{google-youtube,nextcloud-upload}.service
+	)
+	ecm_src_install
+}
+
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "Send through KDE Connect" kde-misc/kdeconnect
diff --git a/kde-misc/kio-gdrive-common/Manifest b/kde-misc/kio-gdrive-common/Manifest
new file mode 100644
index 000000000000..6444e8b80d2c
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/Manifest
@@ -0,0 +1 @@
+DIST kio-gdrive-24.05.2.tar.xz 80828 BLAKE2B 2e5bd00895028969663ded3fe54ba077c4ec714e9dabda86d6b10ed7ab6407bac7e23438b137ad8a8dda88de00187904555a825e7bb5414d62232ced5d081ae8 SHA512 c6da9037e58e679d03bcf7a2899448ed05e81ae7337ede43f76ba2589800731a80aa0bef21468790308cd36428d43f1cb0ef17221a875f5b25065f5b9e732a2b
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
new file mode 100644
index 000000000000..732c572a03e6
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_CATEGORY="network"
+KDE_ORG_NAME="${PN/-common/}"
+KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	!<kde-misc/kio-gdrive-23.08.5-r2:5
+	!<kde-misc/kio-gdrive-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+	desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+	desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
+
+ecm-common-check_deps() {
+	return $(has_version -b "kde-apps/kaccounts-integration:6")
+}
+
+ecm-common_inject_heredoc() {
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		if(KFSLOT STREQUAL "6")
+			find_package(KAccounts6 REQUIRED)
+		else()
+			find_package(KAccounts REQUIRED)
+		endif()
+
+		kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in)
+	_EOF_
+}
+
+src_prepare() {
+	ecm-common_src_prepare
+
+	# Safety measure in case new services are added in the future
+	local known_num_of_services=1
+	local found_num_of_services=$(find . -iname "*service.in" | wc -l)
+	if [[ ${found_num_of_services} != ${known_num_of_services} ]]; then
+		eerror "Number of service files mismatch!"
+		eerror "Expected: ${known_num_of_services}"
+		eerror "Found: ${found_num_of_services}"
+		die
+	fi
+}
diff --git a/kde-misc/kio-gdrive-common/metadata.xml b/kde-misc/kio-gdrive-common/metadata.xml
new file mode 100644
index 000000000000..676893a6308e
--- /dev/null
+++ b/kde-misc/kio-gdrive-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=kio-gdrive</bugs-to>
+		<remote-id type="kde-invent">network/kio-gdrive</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild
index f0e25f566bb1..c91c6d257c47 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 ECM_TEST="optional"
 KDE_ORG_CATEGORY="network"
 KFMIN=5.106.0
@@ -34,14 +34,25 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	kde-apps/kaccounts-providers:*
-	kf6compat? ( kde-misc/kio-gdrive:6 )
+	${CATEGORY}/${PN}-common
 "
 BDEPEND="dev-util/intltool"
 
 DOCS=( README.md )
 
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/accounts/services/kde/google-drive.service
+	/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml
+	/usr/share/remoteview/gdrive-network.desktop
+)
+
 PATCHES=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" )
 
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package share KF5Purpose)
@@ -52,16 +63,7 @@ src_configure() {
 src_install() {
 	ecm_src_install
 
-	if use kf6compat; then
-		rm "${D}"/usr/share/accounts/services/kde/google-drive.service \
-			"${D}"/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml \
-			"${D}"/usr/share/remoteview/gdrive-network.desktop || die
-		if use handbook; then
-			rm -r "${D}"/usr/share/help || die
-		fi
-		if use share; then
-			rm -r "${D}"/usr/share/purpose/purpose_gdrive_config.qml || die
-		fi
-		rm -r "${D}"/usr/share/locale || die
+	if use kf6compat && use share; then
+		rm -r "${D}"/usr/share/purpose/purpose_gdrive_config.qml || die
 	fi
 }
diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.05.2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.05.2-r1.ebuild
index 6afd296e86de..d34f7c76abe7 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-24.05.2.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-24.05.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 ECM_TEST="true"
 KDE_ORG_CATEGORY="network"
 KFMIN=6.3.0
@@ -32,13 +32,25 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtbase-${QTMIN}:6[network]
 "
 RDEPEND="${COMMON_DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
 	kde-apps/kaccounts-providers:6
+	>=kde-misc/${PN}-common-${PV}
+	share? ( !${CATEGORY}/${PN}:5[share,-kf6compat(-)] )
 "
 BDEPEND="dev-util/intltool"
 
 DOCS=( README.md )
 
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/accounts/services/kde/google-drive.service
+	/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml
+	/usr/share/remoteview/gdrive-network.desktop
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package share KF6Purpose)
diff --git a/media-libs/ksanecore-common/Manifest b/media-libs/ksanecore-common/Manifest
new file mode 100644
index 000000000000..42b4179fe88f
--- /dev/null
+++ b/media-libs/ksanecore-common/Manifest
@@ -0,0 +1 @@
+DIST ksanecore-24.05.2.tar.xz 51080 BLAKE2B c57152bbff1c3eb4c6de3f20809d9e3a7ec5c81c981823e3750142006f1c6ac0f7bfc5913042edfcaa6a8e2f2210c8dc8963097d60dffc153ffb9078e3ca13bd SHA512 862c5997f0e10e6b3382127fe1d5efee37621212f2ec70a5346bf914cbe6ff9d1476cd05b119e0784222c8a195787f30b4454aaeeeb9535d0d52362a7ba0a718
diff --git a/media-libs/ksanecore-common/ksanecore-common-24.05.2.ebuild b/media-libs/ksanecore-common/ksanecore-common-24.05.2.ebuild
new file mode 100644
index 000000000000..3fd16d901523
--- /dev/null
+++ b/media-libs/ksanecore-common/ksanecore-common-24.05.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="false"
+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="
+	!<media-libs/ksanecore-23.08.5-r2:5
+	!<media-libs/ksanecore-24.05.2-r1:6
+"
diff --git a/media-libs/ksanecore-common/metadata.xml b/media-libs/ksanecore-common/metadata.xml
new file mode 100644
index 000000000000..e2881717c482
--- /dev/null
+++ b/media-libs/ksanecore-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">libraries/ksanecore</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/ksanecore/ksanecore-23.08.5-r2.ebuild b/media-libs/ksanecore/ksanecore-23.08.5-r2.ebuild
new file mode 100644
index 000000000000..11d390bdd974
--- /dev/null
+++ b/media-libs/ksanecore/ksanecore-23.08.5-r2.ebuild
@@ -0,0 +1,31 @@
+# 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="Qt-based interface for SANE library to control scanner hardware"
+HOMEPAGE="https://invent.kde.org/libraries/ksanecore
+https://api.kde.org/ksanecore/html/index.html"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	media-gfx/sane-backends
+"
+RDEPEND="${DEPEND}
+	${CATEGORY}/${PN}-common
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/media-libs/ksanecore/ksanecore-24.05.2.ebuild b/media-libs/ksanecore/ksanecore-24.05.2-r1.ebuild
index ddbaeecf5c0e..730b73c10232 100644
--- a/media-libs/ksanecore/ksanecore-24.05.2.ebuild
+++ b/media-libs/ksanecore/ksanecore-24.05.2-r1.ebuild
@@ -21,5 +21,10 @@ DEPEND="
 	media-gfx/sane-backends
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	>=media-libs/${PN}-common-${PV}
 "
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/net-misc/kio-zeroconf-common/Manifest b/net-misc/kio-zeroconf-common/Manifest
new file mode 100644
index 000000000000..8100d3378773
--- /dev/null
+++ b/net-misc/kio-zeroconf-common/Manifest
@@ -0,0 +1 @@
+DIST kio-zeroconf-24.05.2.tar.xz 44392 BLAKE2B 6ef8fc100cae8256b8a77ea0d11715df420bfa41fd09ebcb9f72b898981c1a0cd6067e14f4f01977f3d0314a5e0c0bac9a8864183a509652c37e8e3a2bfdb304 SHA512 ce85f0ef9ea1cf1efb58ea63f25ea50d141fe7756c06eaea55d44fa64b66831c80b54cec2d2d61d748807eb8c04cdb8dbd531ca69efa1874f58b0057c45c5f9f
diff --git a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2.ebuild
new file mode 100644
index 000000000000..b07e670c3c15
--- /dev/null
+++ b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="false"
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!<net-misc/kio-zeroconf-23.08.5-r1:5
+	!<net-misc/kio-zeroconf-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+	kdedmodule/org.kde.kdnssd.xml:\${KDE_INSTALL_DBUSINTERFACEDIR}
+)
diff --git a/net-misc/kio-zeroconf-common/metadata.xml b/net-misc/kio-zeroconf-common/metadata.xml
new file mode 100644
index 000000000000..cb61f990580f
--- /dev/null
+++ b/net-misc/kio-zeroconf-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">network/kio-zeroconf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r1.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r1.ebuild
new file mode 100644
index 000000000000..112ea166d0e6
--- /dev/null
+++ b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-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.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	${CATEGORY}/${PN}-common
+"
+
+# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.05.2.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2-r1.ebuild
index eaa51e81642c..d3debd68feae 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.05.2.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2-r1.ebuild
@@ -23,5 +23,15 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:6
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	>=net-misc/${PN}-common-${PV}
 "
+
+# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 475887b6dd32..3a33eb2aa867 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-19)
+# kde-apps/kdesdk-thumbnailers is not yet keyworded
+kde-apps/thumbnailers gettext
+
 # Hans de Graaff <graaff@gentoo.org> (2024-08-18)
 # Requires large parts of dev-ruby/rails to be keyworded
 dev-ruby/minitest-hooks test
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 1a4bd8be7bd6..be5d34583d63 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-19)
+# kde-apps/kdesdk-thumbnailers is not yet keyworded
+kde-apps/thumbnailers gettext
+
 # Ulrich Müller <ulm@gentoo.org> (2024-08-03)
 # Needs dev-libs/openspecfun which is not yet keyworded
 sci-visualization/gnuplot amos
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index d0ccb4411891..01db7ccd205f 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -70,10 +70,6 @@ lxqt-base/lxqt-meta desktop-portal
 # impl there anyway. Please keep this in sync with use.stable.mask.
 dev-lang/python-exec -python_targets_pypy3
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-12)
-# telepathy stack is not keyworded
-dev-util/kdevelop reviewboard
-
 # Sam James <sam@gentoo.org> (2021-10-17)
 # Go doesn't support pie on ppc64, bug #818529
 net-dns/dnscrypt-proxy pie
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 1947aa4df1ce..754bad076213 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -20,7 +20,6 @@
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-07-21)
 # Need not as yet stable KF6-based counterparts (bug #934361)
 kde-apps/libkcddb kf6compat
-kde-apps/libkcompactdisc kf6compat
 kde-apps/libksane kf6compat
 net-misc/kio-zeroconf kf6compat
 
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 6c9bef5a32a7..71cf794e08b0 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -55,10 +55,6 @@ app-admin/testdisk ewf
 # Wayland client is broken/deprecated by upstream. Bug 930197.
 >=net-misc/freerdp-3 wayland
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-04-06)
-# Depends on last-rited kde-apps/ktp-accounts-kcm
-dev-util/kdevelop reviewboard
-
 # Michał Górny <mgorny@gentoo.org> (2024-03-26)
 # sys-auth/pam_ssh is being last rited, bug #892031.
 sys-auth/pambase pam_ssh