Merge updates from master

14 files changed, 44 insertions, 26 deletions

diff --git a/dev-libs/kopeninghours/kopeninghours-25.08.49.9999.ebuild b/dev-libs/kopeninghours/kopeninghours-25.08.49.9999.ebuild
index 9dd359843bc..678a1d0c006 100644
--- a/dev-libs/kopeninghours/kopeninghours-25.08.49.9999.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-25.08.49.9999.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=6.16.0
 QTMIN=6.9.1
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 inherit ecm gear.kde.org python-single-r1
 
 DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
diff --git a/dev-libs/kopeninghours/kopeninghours-9999.ebuild b/dev-libs/kopeninghours/kopeninghours-9999.ebuild
index 9dd359843bc..678a1d0c006 100644
--- a/dev-libs/kopeninghours/kopeninghours-9999.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-9999.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=6.16.0
 QTMIN=6.9.1
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 inherit ecm gear.kde.org python-single-r1
 
 DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
diff --git a/dev-python/parse_cmake/parse_cmake-0.4.1-r2.ebuild b/dev-python/parse_cmake/parse_cmake-0.4.1-r2.ebuild
index eec9ee744d0..ebbdb2460a0 100644
--- a/dev-python/parse_cmake/parse_cmake-0.4.1-r2.ebuild
+++ b/dev-python/parse_cmake/parse_cmake-0.4.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Parser for CMakeLists.txt files"
diff --git a/dev-util/kdevelop-python/kdevelop-python-25.08.49.9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-25.08.49.9999.ebuild
index fe9c76f9a36..ed1b4dc45e4 100644
--- a/dev-util/kdevelop-python/kdevelop-python-25.08.49.9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-25.08.49.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_TEST="forceoptional"
 KDE_ORG_CATEGORY="kdevelop"
 KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 KFMIN=6.16.0
 QTMIN=6.9.1
 inherit ecm gear.kde.org python-single-r1
@@ -20,9 +20,8 @@ KEYWORDS=""
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
 
-DEPEND="${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-qt/qt5compat-${QTMIN}:6
 	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
 	dev-util/kdevelop:6=
@@ -36,7 +35,10 @@ DEPEND="${PYTHON_DEPS}
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	dev-util/kdevelop:6=[test?]
+"
+RDEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/pycodestyle[${PYTHON_USEDEP}]
 	')
diff --git a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
index fe9c76f9a36..ed1b4dc45e4 100644
--- a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_TEST="forceoptional"
 KDE_ORG_CATEGORY="kdevelop"
 KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 KFMIN=6.16.0
 QTMIN=6.9.1
 inherit ecm gear.kde.org python-single-r1
@@ -20,9 +20,8 @@ KEYWORDS=""
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
 
-DEPEND="${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-qt/qt5compat-${QTMIN}:6
 	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
 	dev-util/kdevelop:6=
@@ -36,7 +35,10 @@ DEPEND="${PYTHON_DEPS}
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	dev-util/kdevelop:6=[test?]
+"
+RDEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/pycodestyle[${PYTHON_USEDEP}]
 	')
diff --git a/dev-util/kdevelop/kdevelop-25.08.49.9999.ebuild b/dev-util/kdevelop/kdevelop-25.08.49.9999.ebuild
index 513881de873..738af92cfd2 100644
--- a/dev-util/kdevelop/kdevelop-25.08.49.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-25.08.49.9999.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="optional"
 ECM_TEST="true"
 KDE_ORG_CATEGORY="kdevelop"
 KFMIN=6.16.0
-LLVM_COMPAT=( 15 16 17 18 19 20 )
+LLVM_COMPAT=( 15 16 17 18 19 20 21 )
 QTMIN=6.9.1
 inherit ecm gear.kde.org llvm-r2 optfeature xdg
 
@@ -19,9 +19,6 @@ SLOT="6/$(ver_cut 1-2)"
 KEYWORDS=""
 IUSE="gdbui plasma +qmake +share subversion"
 
-# see bug 366471
-RESTRICT="test"
-
 # UPSTREAM: not ported yet, check plugins/CMakeLists.txt
 # IUSE="hex"
 # 	hex? ( app-editors/okteta:6 )
@@ -88,6 +85,16 @@ RDEPEND="${COMMON_DEPEND}
 	kde-apps/kio-extras:6
 "
 
+CMAKE_SKIP_TESTS=(
+	# D-Bus required
+	test_{{project,session}controller,midbus,definesandincludes,kdevgit}
+	test_{compilerprovider,cmakemanager,ctestfindsuites,cmakefileapi}
+	test_{custombuildsystemplugin,qmakeproject,projectload,craftruntime}
+	bench_codecompletion # segfaults
+	test_gdb # FIXME: fails to launch xterm (if found)
+	test_{path,generationtest} # FIXME: whatever that does, does not work
+)
+
 src_prepare() {
 	rm -r plugins/qmljs || die # bug 960669, unused upstream
 	ecm_src_prepare
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 513881de873..738af92cfd2 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="optional"
 ECM_TEST="true"
 KDE_ORG_CATEGORY="kdevelop"
 KFMIN=6.16.0
-LLVM_COMPAT=( 15 16 17 18 19 20 )
+LLVM_COMPAT=( 15 16 17 18 19 20 21 )
 QTMIN=6.9.1
 inherit ecm gear.kde.org llvm-r2 optfeature xdg
 
@@ -19,9 +19,6 @@ SLOT="6/$(ver_cut 1-2)"
 KEYWORDS=""
 IUSE="gdbui plasma +qmake +share subversion"
 
-# see bug 366471
-RESTRICT="test"
-
 # UPSTREAM: not ported yet, check plugins/CMakeLists.txt
 # IUSE="hex"
 # 	hex? ( app-editors/okteta:6 )
@@ -88,6 +85,16 @@ RDEPEND="${COMMON_DEPEND}
 	kde-apps/kio-extras:6
 "
 
+CMAKE_SKIP_TESTS=(
+	# D-Bus required
+	test_{{project,session}controller,midbus,definesandincludes,kdevgit}
+	test_{compilerprovider,cmakemanager,ctestfindsuites,cmakefileapi}
+	test_{custombuildsystemplugin,qmakeproject,projectload,craftruntime}
+	bench_codecompletion # segfaults
+	test_gdb # FIXME: fails to launch xterm (if found)
+	test_{path,generationtest} # FIXME: whatever that does, does not work
+)
+
 src_prepare() {
 	rm -r plugins/qmljs || die # bug 960669, unused upstream
 	ecm_src_prepare
diff --git a/kde-apps/kajongg/kajongg-25.08.49.9999.ebuild b/kde-apps/kajongg/kajongg-25.08.49.9999.ebuild
index 092d121be73..5048629127b 100644
--- a/kde-apps/kajongg/kajongg-25.08.49.9999.ebuild
+++ b/kde-apps/kajongg/kajongg-25.08.49.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=6.16.0
 QTMIN=6.9.1
diff --git a/kde-apps/kajongg/kajongg-9999.ebuild b/kde-apps/kajongg/kajongg-9999.ebuild
index 092d121be73..5048629127b 100644
--- a/kde-apps/kajongg/kajongg-9999.ebuild
+++ b/kde-apps/kajongg/kajongg-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=6.16.0
 QTMIN=6.9.1
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-6.5.49.9999.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-6.5.49.9999.ebuild
index 5ad44f2407c..c2a766a1a7f 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-6.5.49.9999.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-6.5.49.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 KFMIN=6.18.0
 QTMIN=6.9.1
 inherit ecm plasma.kde.org python-single-r1 xdg
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-9999.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-9999.ebuild
index 127ca820e60..9bf407f098b 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-9999.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 KFMIN=9999
 QTMIN=6.9.1
 inherit ecm plasma.kde.org python-single-r1 xdg
diff --git a/media-sound/kid3/kid3-9999.ebuild b/media-sound/kid3/kid3-9999.ebuild
index e98943898ba..8b043841eac 100644
--- a/media-sound/kid3/kid3-9999.ebuild
+++ b/media-sound/kid3/kid3-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit cmake kde.org python-any-r1 xdg
 
 DESCRIPTION="Simple tag editor based on Qt"
diff --git a/www-client/falkon/falkon-25.08.49.9999.ebuild b/www-client/falkon/falkon-25.08.49.9999.ebuild
index 8ab15303563..bc266f0d785 100644
--- a/www-client/falkon/falkon-25.08.49.9999.ebuild
+++ b/www-client/falkon/falkon-25.08.49.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_TEST="true"
 KFMIN=6.16.0
 QTMIN=6.9.1
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 inherit ecm gear.kde.org python-single-r1 xdg
 
 DESCRIPTION="Cross-platform web browser using QtWebEngine"
diff --git a/www-client/falkon/falkon-9999.ebuild b/www-client/falkon/falkon-9999.ebuild
index 8ab15303563..bc266f0d785 100644
--- a/www-client/falkon/falkon-9999.ebuild
+++ b/www-client/falkon/falkon-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_TEST="true"
 KFMIN=6.16.0
 QTMIN=6.9.1
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 inherit ecm gear.kde.org python-single-r1 xdg
 
 DESCRIPTION="Cross-platform web browser using QtWebEngine"