commit: f68184bc4f732b7b32169dd0d6c6d17bb9bb0373 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 21 12:41:12 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 21 12:41:12 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f68184bc
dev-util/kdevelop: Port to KF6, add IUSE share, drop hex (not yet ported) Upstream commits: 04d821a74f98d7d1ee9e8d729afa01556d0f4892 c5c063f775281892b30e4da62868d847dfcf406b a658504763a3542a63238ea815348e2d4f836a57 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/kdevelop/kdevelop-9999.ebuild | 120 +++++++++++++++------------------ dev-util/kdevelop/metadata.xml | 2 +- eclass/gear.kde.org.eclass | 1 + 3 files changed, 58 insertions(+), 65 deletions(-) diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild index dc006f2790..5eff0b69e5 100644 --- a/dev-util/kdevelop/kdevelop-9999.ebuild +++ b/dev-util/kdevelop/kdevelop-9999.ebuild @@ -6,73 +6,70 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" KDE_ORG_CATEGORY="kdevelop" -KFMIN=5.115.0 +KFMIN=6.3.0 LLVM_COMPAT=( 15 16 17 18 ) -QTMIN=5.15.12 -VIRTUALDBUS_TEST="true" +QTMIN=6.6.2 inherit ecm gear.kde.org llvm-r1 optfeature -DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" -HOMEPAGE="https://www.kdevelop.org/"; +DESCRIPTION="Integrated Development Environment, supporting KF6/Qt, C/C++ and much more" +HOMEPAGE="https://kdevelop.org/"; LICENSE="GPL-2 LGPL-2" -SLOT="5/$(ver_cut 1-2)" +SLOT="6/$(ver_cut 1-2)" KEYWORDS="" -IUSE="gdbui hex plasma +qmake subversion" +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 ) COMMON_DEPEND=" - dev-libs/grantlee:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qthelp-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qttest-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qttools-${QTMIN}:6[assistant] + >=dev-qt/qtwebengine-${QTMIN}:6[widgets] >=dev-util/astyle-3.1:= - kde-apps/libkomparediff2:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-frameworks/threadweaver-${KFMIN}:5 + kde-apps/libkomparediff2:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ktexteditor-${KFMIN}:6 + >=kde-frameworks/ktexttemplate-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 + >=kde-frameworks/threadweaver-${KFMIN}:6 $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') - gdbui? ( kde-plasma/libksysguard:5= ) - hex? ( app-editors/okteta:5 ) + gdbui? ( kde-plasma/libksysguard:6= ) plasma? ( - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-plasma/libplasma-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-plasma/libplasma-${KFMIN}:6 ) - qmake? ( dev-util/kdevelop-pg-qt:5 ) + qmake? ( dev-util/kdevelop-pg-qt:* ) + share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 @@ -81,16 +78,14 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} dev-libs/boost - >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[concurrent] " RDEPEND="${COMMON_DEPEND} dev-build/ninja >=dev-debug/gdb-7.0[python] - >=dev-qt/qdbus-${QTMIN}:* - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qttools-${QTMIN}:6[qdbus] kde-apps/kapptemplate:* - kde-apps/kio-extras:5 + kde-apps/kio-extras:6 " pkg_setup() { @@ -100,25 +95,22 @@ pkg_setup() { src_configure() { local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5Purpose=ON -DLLVM_ROOT="$(get_llvm_prefix)" $(cmake_use_find_package gdbui KSysGuard) -DBUILD_executeplasmoid=$(usex plasma) - $(cmake_use_find_package plasma KF5Plasma) - $(cmake_use_find_package hex OktetaKastenControllers) + $(cmake_use_find_package plasma Plasma) $(cmake_use_find_package qmake KDevelop-PG-Qt) + $(cmake_use_find_package share KF6Purpose) $(cmake_use_find_package subversion SubversionLibrary) ) - - use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON ) +# $(cmake_use_find_package hex OktetaKastenControllers) ecm_src_configure } pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "konsole view" kde-apps/konsole + optfeature "konsole view" "kde-apps/konsole:6" optfeature "static C++ Qt code analysis" dev-util/clazy optfeature "static C/C++ code analysis" dev-util/cppcheck optfeature "heap memory profiling" "dev-util/heaptrack[gui]" diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml index 1e372bd1e6..464e26d054 100644 --- a/dev-util/kdevelop/metadata.xml +++ b/dev-util/kdevelop/metadata.xml @@ -10,7 +10,7 @@ </upstream> <use> <flag name="gdbui">Enable GUI for attaching GDB to a running process</flag> - <flag name="hex">Enable hex editor plugin via <pkg>app-editors/okteta</pkg></flag> <flag name="qmake">Enable support for QMake build system</flag> + <flag name="share">Enable support for patch sharing using <pkg>kde-frameworks/purpose</pkg></flag> </use> </pkgmetadata> diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 2cf65908ee..699c1bd8f1 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -268,6 +268,7 @@ fi if $(ver_test -gt 24.07.75); then case ${PN} in k3b | \ + kdevelop | \ kgraphviewer | \ kimagemapeditor | \ kmplot | \
