Merge updates from master

14 files changed, 34 insertions, 41 deletions

diff --git a/app-office/libalkimia/libalkimia-9999.ebuild b/app-office/libalkimia/libalkimia-9999.ebuild
index 22f791abfaf..62a380cf357 100644
--- a/app-office/libalkimia/libalkimia-9999.ebuild
+++ b/app-office/libalkimia/libalkimia-9999.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 ECM_TEST="forceoptional"
 KDE_ORG_NAME="alkimia"
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
-inherit ecm kde.org
+inherit ecm kde.org xdg
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz"
@@ -15,8 +15,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323
-https://community.kde.org/Alkimia"
+HOMEPAGE="https://community.kde.org/Alkimia/libalkimia https://community.kde.org/Alkimia"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8"
diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild
index a7a560e540e..91448fc16ac 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
-inherit ecm kde.org
+inherit ecm kde.org xdg
 
 DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
 HOMEPAGE="https://skrooge.org/"
@@ -24,8 +24,7 @@ IUSE="activities kde ofx"
 # hangs + installs files (also requires KF5DesignerPlugin)
 RESTRICT="test"
 
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.9:2[qt6(+)]
+DEPEND="
 	dev-db/sqlcipher
 	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
 	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
@@ -56,12 +55,7 @@ COMMON_DEPEND="
 	kde? ( >=kde-frameworks/krunner-${KFMIN}:6 )
 	ofx? ( dev-libs/libofx:= )
 "
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!${CATEGORY}/${PN}:5
 "
 BDEPEND="
diff --git a/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild b/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild
index 5eb5494562c..37f90c23deb 100644
--- a/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild
+++ b/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild
@@ -5,12 +5,12 @@ EAPI=8
 
 KDE_ORG_CATEGORY="kdevelop"
 KDE_ORG_NAME="kdev-valgrind"
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
 inherit ecm kde.org
 
 DESCRIPTION="Plugin offering full integration of the valgrind suite to KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
+HOMEPAGE="https://kdevelop.org/"
 
 LICENSE="GPL-2"
 SLOT="6"
diff --git a/games-kids/gcompris/gcompris-9999.ebuild b/games-kids/gcompris/gcompris-9999.ebuild
index b1a1cb28186..0a8791cfb46 100644
--- a/games-kids/gcompris/gcompris-9999.ebuild
+++ b/games-kids/gcompris/gcompris-9999.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm kde.org
+KFMIN=6.16.0
+QTMIN=6.9.1
+inherit ecm kde.org xdg
 
 DESCRIPTION="Full featured educational application for children from 2 to 10"
 HOMEPAGE="https://gcompris.net/"
@@ -23,10 +23,10 @@ SLOT="0"
 IUSE="kiosk"
 
 DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=dev-qt/qtcharts-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qtquick3d-${QTMIN}:6
 	>=dev-qt/qtsensors-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 "
diff --git a/games-mud/kmuddy/kmuddy-9999.ebuild b/games-mud/kmuddy/kmuddy-9999.ebuild
index 1dbd0da1aed..01539681d33 100644
--- a/games-mud/kmuddy/kmuddy-9999.ebuild
+++ b/games-mud/kmuddy/kmuddy-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
-inherit ecm kde.org
+inherit ecm kde.org xdg
 
 DESCRIPTION="MUD client by KDE"
 HOMEPAGE="https://invent.kde.org/games/kmuddy/"
diff --git a/gui-apps/liquidshell/liquidshell-9999.ebuild b/gui-apps/liquidshell/liquidshell-9999.ebuild
index 0396b4d36b6..8353ce70fe8 100644
--- a/gui-apps/liquidshell/liquidshell-9999.ebuild
+++ b/gui-apps/liquidshell/liquidshell-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
-inherit ecm kde.org
+inherit ecm kde.org xdg
 
 DESCRIPTION="Basic desktop shell using QtWidgets"
 HOMEPAGE="https://invent.kde.org/system/liquidshell"
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
index 30f81bd6b2e..9185249699b 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
 inherit cmake kde.org xdg-utils
 
diff --git a/kde-misc/akonadiclient/akonadiclient-9999.ebuild b/kde-misc/akonadiclient/akonadiclient-9999.ebuild
index e694ffbfa7c..bba16cdb612 100644
--- a/kde-misc/akonadiclient/akonadiclient-9999.ebuild
+++ b/kde-misc/akonadiclient/akonadiclient-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
 inherit ecm kde.org
 
diff --git a/kde-misc/kio-gopher/kio-gopher-9999.ebuild b/kde-misc/kio-gopher/kio-gopher-9999.ebuild
index 7d1ae92a52a..22704fd4c25 100644
--- a/kde-misc/kio-gopher/kio-gopher-9999.ebuild
+++ b/kde-misc/kio-gopher/kio-gopher-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 KDE_ORG_CATEGORY="network"
 ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
 inherit ecm kde.org
 
@@ -18,6 +18,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[network]
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kiconthemes-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
diff --git a/kde-misc/krusader/krusader-9999.ebuild b/kde-misc/krusader/krusader-9999.ebuild
index 3f840a02dbf..3f3c05b1eca 100644
--- a/kde-misc/krusader/krusader-9999.ebuild
+++ b/kde-misc/krusader/krusader-9999.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
-inherit ecm kde.org optfeature
+inherit ecm kde.org optfeature xdg
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
@@ -81,5 +81,5 @@ pkg_postinst() {
 		optfeature "Google Drive service" "kde-misc/kio-gdrive:6"
 		optfeature "bookmarks support" "kde-apps/keditbookmarks:6"
 	fi
-	ecm_pkg_postinst
+	xdg_pkg_postinst
 }
diff --git a/media-gfx/kgeotag/kgeotag-9999.ebuild b/media-gfx/kgeotag/kgeotag-9999.ebuild
index 0c07555ff99..ea3af9c07cd 100644
--- a/media-gfx/kgeotag/kgeotag-9999.ebuild
+++ b/media-gfx/kgeotag/kgeotag-9999.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
-inherit ecm kde.org
+inherit ecm kde.org xdg
 
 DESCRIPTION="Photo geotagging program"
 HOMEPAGE="https://kgeotag.kde.org/ https://apps.kde.org/kgeotag/"
diff --git a/media-gfx/kxstitch/kxstitch-9999.ebuild b/media-gfx/kxstitch/kxstitch-9999.ebuild
index e0b2e60ecce..e7714e5767d 100644
--- a/media-gfx/kxstitch/kxstitch-9999.ebuild
+++ b/media-gfx/kxstitch/kxstitch-9999.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
-inherit ecm kde.org
+inherit ecm kde.org xdg
 
 DESCRIPTION="Program to create cross stitch patterns"
 HOMEPAGE="https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch"
diff --git a/media-gfx/symboleditor/symboleditor-9999.ebuild b/media-gfx/symboleditor/symboleditor-9999.ebuild
index 7c0cf0d52f2..307815d62b9 100644
--- a/media-gfx/symboleditor/symboleditor-9999.ebuild
+++ b/media-gfx/symboleditor/symboleditor-9999.ebuild
@@ -4,13 +4,12 @@
 EAPI=8
 
 ECM_HANDBOOK="optional"
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
-inherit ecm kde.org
+inherit ecm kde.org xdg
 
 DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints"
-HOMEPAGE="https://apps.kde.org/symboleditor/
-https://userbase.kde.org/SymbolEditor"
+HOMEPAGE="https://apps.kde.org/symboleditor/ https://userbase.kde.org/SymbolEditor"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	MY_P=SymbolEditor-${PV}
diff --git a/media-video/kaffeine/kaffeine-9999.ebuild b/media-video/kaffeine/kaffeine-9999.ebuild
index 161cbf7f860..d2132ee8a00 100644
--- a/media-video/kaffeine/kaffeine-9999.ebuild
+++ b/media-video/kaffeine/kaffeine-9999.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 ECM_HANDBOOK="optional"
-KFMIN=6.5.0
+KFMIN=6.16.0
 QTMIN=6.7.2
-inherit ecm kde.org
+inherit ecm kde.org xdg
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"