diff options
| author | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-10-12 09:18:37 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-10-12 09:18:37 +0000 |
| commit | f3372ab41f61af563b193e3805a4c535a3ff294d (patch) | |
| tree | edc62caa20e25ef033cbd224ba79ea6fbab372ec /dev-util | |
| parent | 1a7c873a377bdebd1a2e19575bd19cbaf21d4d54 (diff) | |
| parent | d809cdea017b6fe14938fa9007891fc705765233 (diff) | |
| download | kde-f3372ab41f61af563b193e3805a4c535a3ff294d.tar.gz kde-f3372ab41f61af563b193e3805a4c535a3ff294d.tar.bz2 kde-f3372ab41f61af563b193e3805a4c535a3ff294d.zip | |
Merge updates from master
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/kdevelop-python/kdevelop-python-25.08.49.9999.ebuild | 10 | ||||
| -rw-r--r-- | dev-util/kdevelop-python/kdevelop-python-9999.ebuild | 10 | ||||
| -rw-r--r-- | dev-util/kdevelop/kdevelop-25.08.49.9999.ebuild | 15 | ||||
| -rw-r--r-- | dev-util/kdevelop/kdevelop-9999.ebuild | 15 |
4 files changed, 34 insertions, 16 deletions
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 |