Merge updates from master

70 files changed, 102 insertions, 145 deletions

diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass
index fae6b5a4feb..ec69a2b508c 100644
--- a/eclass/frameworks.kde.org.eclass
+++ b/eclass/frameworks.kde.org.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: frameworks.kde.org.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @SUPPORTED_EAPIS: 8
+# @SUPPORTED_EAPIS: 8 9
 # @PROVIDES: kde.org
 # @BLURB: Support eclass for KDE Frameworks packages.
 # @DESCRIPTION:
@@ -17,14 +17,14 @@
 # variables and helper functions (not phase functions) may be considered as
 # part of this eclass's API.
 
+if [[ -z ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then
+_FRAMEWORKS_KDE_ORG_ECLASS=1
+
 case ${EAPI} in
-	8) ;;
+	8|9) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then
-_FRAMEWORKS_KDE_ORG_ECLASS=1
-
 # @ECLASS_VARIABLE: KDE_CATV
 # @DESCRIPTION:
 # Holds main Frameworks release number (major.minor) for use on same-category
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index a9654557bed..26e2cd0dfa0 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: gear.kde.org.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @SUPPORTED_EAPIS: 8
+# @SUPPORTED_EAPIS: 8 9
 # @PROVIDES: kde.org
 # @BLURB: Support eclass for KDE Gear packages.
 # @DESCRIPTION:
@@ -17,14 +17,14 @@
 # variables and helper functions (not phase functions) may be considered as
 # part of this eclass's API.
 
+if [[ -z ${_GEAR_KDE_ORG_ECLASS} ]]; then
+_GEAR_KDE_ORG_ECLASS=1
+
 case ${EAPI} in
-	8) ;;
+	8|9) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_GEAR_KDE_ORG_ECLASS} ]]; then
-_GEAR_KDE_ORG_ECLASS=1
-
 # @ECLASS_VARIABLE: KDE_PV_UNRELEASED
 # @INTERNAL
 # @DESCRIPTION:
@@ -71,7 +71,6 @@ if $(ver_test -gt 24.01.75); then
 		akonadi-contacts | \
 		akonadi-import-wizard | \
 		akonadi-mime | \
-		akonadi-notes | \
 		akonadi-search | \
 		akonadiconsole | \
 		akregator | \
@@ -173,7 +172,6 @@ if $(ver_test -gt 24.01.75); then
 		knavalbattle | \
 		knetwalk | \
 		knights | \
-		knotes | \
 		kolf | \
 		kollision | \
 		konqueror | \
@@ -255,7 +253,6 @@ if $(ver_test -gt 24.04.75); then
 		itinerary | \
 		kio-perldoc | \
 		kolourpaint | \
-		libkcompactdisc | \
 		signon-kwallet-extension)
 			RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
 		*) ;;
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 31dc727485e..d8c867085b5 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: kde.org.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @SUPPORTED_EAPIS: 8
+# @SUPPORTED_EAPIS: 8 9
 # @BLURB: Support eclass for packages that are hosted on kde.org infrastructure.
 # @DESCRIPTION:
 # This eclass is mainly providing facilities for the three upstream release
@@ -15,14 +15,14 @@
 # It also contains default meta variables for settings not specific to any
 # particular build system.
 
+if [[ -z ${_KDE_ORG_ECLASS} ]]; then
+_KDE_ORG_ECLASS=1
+
 case ${EAPI} in
-	8) ;;
+	8|9) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_KDE_ORG_ECLASS} ]]; then
-_KDE_ORG_ECLASS=1
-
 # @ECLASS_VARIABLE: KDE_BUILD_TYPE
 # @DESCRIPTION:
 # If PV matches "*9999*", this is automatically set to "live".
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index 4b21d4f60bd..0a9c5a746ac 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: plasma.kde.org.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @SUPPORTED_EAPIS: 8
+# @SUPPORTED_EAPIS: 8 9
 # @PROVIDES: kde.org
 # @BLURB: Support eclass for KDE Plasma packages.
 # @DESCRIPTION:
@@ -17,14 +17,14 @@
 # variables and helper functions (not phase functions) may be considered as
 # part of this eclass's API.
 
+if [[ -z ${_PLASMA_KDE_ORG_ECLASS} ]]; then
+_PLASMA_KDE_ORG_ECLASS=1
+
 case ${EAPI} in
-	8) ;;
+	8|9) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_PLASMA_KDE_ORG_ECLASS} ]]; then
-_PLASMA_KDE_ORG_ECLASS=1
-
 # @ECLASS_VARIABLE: KDE_CATV
 # @DESCRIPTION:
 # Holds main Plasma release number (major.minor.micro) for use on same-category
@@ -38,16 +38,6 @@ readonly KDE_CATV
 # For proper description see kde.org.eclass manpage.
 KDE_PV_UNRELEASED=( )
 
-# @ECLASS_VARIABLE: _PSLOT
-# @INTERNAL
-# @DESCRIPTION:
-# KDE Plasma major version mapping, implied by package version. This is being
-# used throughout the eclass as a switch between Plasma 5 and 6 packages.
-_PSLOT=6
-if $(ver_test -lt 5.27.50); then
-	_PSLOT=5
-fi
-
 inherit kde.org
 
 HOMEPAGE="https://kde.org/plasma-desktop"
@@ -56,7 +46,7 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 # @INTERNAL
 # @DESCRIPTION:
 # For proper description see kde.org.eclass manpage.
-KDE_ORG_SCHEDULE_URI+="/Plasma_${_PSLOT}"
+KDE_ORG_SCHEDULE_URI+="/Plasma_6"
 
 # @ECLASS_VARIABLE: _KDE_SRC_URI
 # @INTERNAL
@@ -80,22 +70,20 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then
 	SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz"
 fi
 
-if [[ ${_PSLOT} == 6 ]]; then
-	case ${PN} in
-		breeze | \
-		kglobalacceld | \
-		kwayland | \
-		kwayland-integration | \
-		libplasma | \
-		ocean-sound-theme | \
-		oxygen | \
-		plasma-activities | \
-		plasma-activities-stats | \
-		plasma-integration | \
-		plasma5support | \
-		print-manager) ;;
-		*) RDEPEND+=" !kde-plasma/${PN}:5" ;;
-	esac
-fi
+case ${PN} in
+	breeze | \
+	kglobalacceld | \
+	kwayland | \
+	kwayland-integration | \
+	libplasma | \
+	ocean-sound-theme | \
+	oxygen | \
+	plasma-activities | \
+	plasma-activities-stats | \
+	plasma-integration | \
+	plasma5support | \
+	print-manager) ;;
+	*) RDEPEND+=" !kde-plasma/${PN}:5" ;;
+esac
 
 fi
diff --git a/kde-plasma/aurorae/aurorae-9999.ebuild b/kde-plasma/aurorae/aurorae-9999.ebuild
index 7194182ec1d..4e7950d3ee8 100644
--- a/kde-plasma/aurorae/aurorae-9999.ebuild
+++ b/kde-plasma/aurorae/aurorae-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org
 
 DESCRIPTION="Themeable window decoration for KWin"
diff --git a/kde-plasma/bluedevil/bluedevil-9999.ebuild b/kde-plasma/bluedevil/bluedevil-9999.ebuild
index 8101b9c6baa..2a7569f6260 100644
--- a/kde-plasma/bluedevil/bluedevil-9999.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org xdg
 
 DESCRIPTION="Bluetooth stack for KDE Plasma"
diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild
index ff66ae26073..5bde73c4b4b 100644
--- a/kde-plasma/breeze/breeze-9999.ebuild
+++ b/kde-plasma/breeze/breeze-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org xdg
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index e5d8053ccac..c5a876caba6 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_TEST="true"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org xdg
 
 DESCRIPTION="KDE Plasma resources management GUI"
diff --git a/kde-plasma/drkonqi/drkonqi-9999.ebuild b/kde-plasma/drkonqi/drkonqi-9999.ebuild
index 6391cd867c3..b1428e2d919 100644
--- a/kde-plasma/drkonqi/drkonqi-9999.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_TEST="true"
 PYTHON_COMPAT=( python3_{11..13} )
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org python-single-r1 systemd xdg
 
 DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
diff --git a/kde-plasma/flatpak-kcm/flatpak-kcm-9999.ebuild b/kde-plasma/flatpak-kcm/flatpak-kcm-9999.ebuild
index 12cea8bcc7e..4a602656bd2 100644
--- a/kde-plasma/flatpak-kcm/flatpak-kcm-9999.ebuild
+++ b/kde-plasma/flatpak-kcm/flatpak-kcm-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org xdg
 
 DESCRIPTION="Flatpak Permissions Management KCM"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
index 7403b353fd2..9633f361b25 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org xdg
 
 DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
index 048424cb6c8..e3f51e0fbcb 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_HANDBOOK="forceoff"
 ECM_TEST="false"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org xdg
 
 DESCRIPTION="Tools based on KDE Frameworks 6 to better interact with the system"
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
index e425f35b197..563c10a790b 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org xdg
 
 DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications"
diff --git a/kde-plasma/kdecoration/kdecoration-9999.ebuild b/kde-plasma/kdecoration/kdecoration-9999.ebuild
index e966b2d7a05..a3e7d4aa22d 100644
--- a/kde-plasma/kdecoration/kdecoration-9999.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_TEST="forceoptional"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org
 
 DESCRIPTION="Plugin based library to create window decorations"
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index cf0d52653e5..695ec0ce055 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org optfeature xdg
 
 DESCRIPTION="Extra Plasma applets and engines"
diff --git a/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild
index 4c35c1b374f..72f0ad9eace 100644
--- a/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild
+++ b/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="forceoff"
 ECM_TEST="false"
 KDE_ORG_NAME="kde-cli-tools"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org
 
 DESCRIPTION="Graphical frontend for KDE Frameworks' kdesu"
diff --git a/kde-plasma/keditfiletype/keditfiletype-9999.ebuild b/kde-plasma/keditfiletype/keditfiletype-9999.ebuild
index 29078fc0973..3194bebed12 100644
--- a/kde-plasma/keditfiletype/keditfiletype-9999.ebuild
+++ b/kde-plasma/keditfiletype/keditfiletype-9999.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="forceoff"
 ECM_TEST="true"
 KDE_ORG_NAME="kde-cli-tools"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org xdg
 
 DESCRIPTION="File Type Editor"
diff --git a/kde-plasma/kgamma/kgamma-9999.ebuild b/kde-plasma/kgamma/kgamma-9999.ebuild
index 9926054c44d..e57f4ff9c85 100644
--- a/kde-plasma/kgamma/kgamma-9999.ebuild
+++ b/kde-plasma/kgamma/kgamma-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org xdg
 
 DESCRIPTION="Screen gamma values kcontrol module"
diff --git a/kde-plasma/kglobalacceld/kglobalacceld-9999.ebuild b/kde-plasma/kglobalacceld/kglobalacceld-9999.ebuild
index 2e1fe58db82..6c701114949 100644
--- a/kde-plasma/kglobalacceld/kglobalacceld-9999.ebuild
+++ b/kde-plasma/kglobalacceld/kglobalacceld-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_TEST="true"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org
 
 DESCRIPTION="Daemon providing Global Keyboard Shortcut (Accelerator) functionality"
diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
index 4048802491d..07a9d30825f 100644
--- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org optfeature xdg
 
 DESCRIPTION="Utility providing information about the computer hardware"
diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
index dc11e53433d..e97fc624562 100644
--- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 KFMIN=9999
-QTMIN=6.9.1
+QTMIN=6.10.1
 inherit ecm plasma.kde.org xdg
 
 DESCRIPTION="KDE Plasma menu editor"
diff --git a/kde-plasma/knighttime/knighttime-9999.ebuild b/kde-plasma/knighttime/knighttime-9999.ebuild
index e000e1f2633..59ad33fd4ed 100644
--- a/kde-plasma/knighttime/knighttime-9999.ebuild
+++ b/