From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD35E15ACFC for ; Sat, 29 Apr 2023 14:21:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1C66E0805; Sat, 29 Apr 2023 14:21:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9CFDE0805 for ; Sat, 29 Apr 2023 14:21:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D01B7341126 for ; Sat, 29 Apr 2023 14:21:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39FA9A56 for ; Sat, 29 Apr 2023 14:21:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1682778077.5de02490fb974329506bbffd61e3830532a6347e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/kdevelop/Manifest dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild dev-util/kdevelop/kdevelop-22.12.3.ebuild X-VCS-Directories: dev-util/kdevelop/ dev-util/kdevelop/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5de02490fb974329506bbffd61e3830532a6347e X-VCS-Branch: master Date: Sat, 29 Apr 2023 14:21:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b56a09a3-26b2-44aa-8b14-e02ceedb8694 X-Archives-Hash: 6fd2b279d1533fa04a769f3840d9a17a commit: 5de02490fb974329506bbffd61e3830532a6347e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 29 12:48:02 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 29 14:21:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de02490 dev-util/kdevelop: drop 22.12.3, 22.12.3-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-util/kdevelop/Manifest | 1 - .../kdevelop/files/kdevelop-22.12.3-clang16.patch | 24 ---- dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild | 136 --------------------- dev-util/kdevelop/kdevelop-22.12.3.ebuild | 130 -------------------- 4 files changed, 291 deletions(-) diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest index a88049a8ea61..469e9c1321b0 100644 --- a/dev-util/kdevelop/Manifest +++ b/dev-util/kdevelop/Manifest @@ -1,2 +1 @@ -DIST kdevelop-22.12.3.tar.xz 8652864 BLAKE2B a60de8549ccc949811c6c755c729b51711b2a7b0dbd8cf4c8f853623f27f42328dc82f732dd45abf7bfbf248841c72a55f1799c19110d2dd497c96fe5e7ef9ed SHA512 465bf3639e3fd61058af1217904fe0904d7c380e1f073dcb3af28d5758bba1d477e2f1313c61c233cf2acef4362c5380b30bcae6a02eb704a8a3fdf80ddfd75a DIST kdevelop-23.04.0.tar.xz 8656872 BLAKE2B 10127854f56fc6d07e8ed974d5d9aacd33c74f6bc21c3ef77541ed446ae33562551708b8b46796bbd3cdc423642d3a6a07f719e81d56c7fd108fa30b671eae5c SHA512 1660f5e819302e3783358556c36d09197f5de4fc4acf25c597e86982ea0ff419f6fdabb718ed74e4a56d3cf9623758c32978f7a12afe0a619a97b626c8c04173 diff --git a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch deleted file mode 100644 index 38676cc16473..000000000000 --- a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/902101 ---- a/cmake/modules/FindClang.cmake -+++ b/cmake/modules/FindClang.cmake -@@ -97,6 +97,8 @@ - # dito for git - string(REPLACE "git" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}") - -+ string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_STRIPPED "${CLANG_VERSION}") -+ string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_CLEAN_STRIPPED "${CLANG_VERSION_CLEAN}") - find_path(CLANG_BUILTIN_DIR - # cpuid.h because it is defined in ClangSupport constructor as valid clang builtin dir indicator - NAMES "cpuid.h" -@@ -106,6 +108,10 @@ - "../../../clang/${CLANG_VERSION}/include" - "clang/${CLANG_VERSION_CLEAN}/include" - "../../../clang/${CLANG_VERSION_CLEAN}/include" -+ "clang/${CLANG_VERSION_STRIPPED}/include" -+ "../../../clang/${CLANG_VERSION_STRIPPED}/include" -+ "clang/${CLANG_VERSION_CLEAN_STRIPPED}/include" -+ "../../../clang/${CLANG_VERSION_CLEAN_STRIPPED}/include" - NO_DEFAULT_PATH - ) - - diff --git a/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild b/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild deleted file mode 100644 index 6788033f46fe..000000000000 --- a/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KDE_ORG_CATEGORY="kdevelop" -KFMIN=5.101.0 -LLVM_MAX_SLOT=16 -QTMIN=5.15.5 -VIRTUALDBUS_TEST="true" -VIRTUALX_REQUIRED="test" -inherit ecm gear.kde.org llvm optfeature - -DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" -HOMEPAGE="https://www.kdevelop.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="5/57" # look at KDEVELOP_SOVERSION inside CMakeLists.txt -IUSE="+gdbui hex +plasma +qmake reviewboard subversion" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - -# see bug 366471 -RESTRICT="test" - -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-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-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - ) - qmake? ( dev-util/kdevelop-pg-qt:5 ) - reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - subversion? ( - dev-libs/apr:1 - dev-libs/apr-util:1 - dev-vcs/subversion - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qdbus-${QTMIN}:* - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - dev-util/ninja - kde-apps/kapptemplate:5 - kde-apps/kio-extras:5 - >=sys-devel/gdb-7.0[python] - reviewboard? ( kde-apps/ktp-accounts-kcm:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-22.12.3-clang16.patch -) - -llvm_check_deps() { - has_version -d "sys-devel/clang:${LLVM_SLOT}" -} - -src_configure() { - local mycmakeargs=( - -DLLVM_ROOT="$(get_llvm_prefix ${LLVM_SLOT})" - $(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 qmake KDevelop-PG-Qt) - $(cmake_use_find_package reviewboard KF5Purpose) - $(cmake_use_find_package subversion SubversionLibrary) - ) - - use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON ) - use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "konsole view" kde-apps/konsole - 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]" - optfeature "meson project manager plugin" dev-util/meson - optfeature "formatting configurations via customscript plugin" dev-util/indent - optfeature "formatting configurations via customscript plugin" dev-util/uncrustify - fi - ecm_pkg_postinst -} diff --git a/dev-util/kdevelop/kdevelop-22.12.3.ebuild b/dev-util/kdevelop/kdevelop-22.12.3.ebuild deleted file mode 100644 index 4d314ca3def7..000000000000 --- a/dev-util/kdevelop/kdevelop-22.12.3.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KDE_ORG_CATEGORY="kdevelop" -KFMIN=5.101.0 -QTMIN=5.15.5 -VIRTUALDBUS_TEST="true" -VIRTUALX_REQUIRED="test" -inherit ecm gear.kde.org optfeature - -DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" -HOMEPAGE="https://www.kdevelop.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="5/57" # look at KDEVELOP_SOVERSION inside CMakeLists.txt -IUSE="+gdbui hex +plasma +qmake reviewboard subversion" -KEYWORDS="amd64 arm64 ~ppc64 ~x86" - -# see bug 366471 -RESTRICT="test" - -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-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 - >=sys-devel/clang-6.0:= - gdbui? ( kde-plasma/libksysguard:5= ) - hex? ( app-editors/okteta:5 ) - plasma? ( - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - ) - qmake? ( dev-util/kdevelop-pg-qt:5 ) - reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - subversion? ( - dev-libs/apr:1 - dev-libs/apr-util:1 - dev-vcs/subversion - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qdbus-${QTMIN}:* - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - dev-util/ninja - kde-apps/kapptemplate:5 - kde-apps/kio-extras:5 - >=sys-devel/gdb-7.0[python] - reviewboard? ( kde-apps/ktp-accounts-kcm:5 ) -" - -src_configure() { - local clang_version=$(best_version sys-devel/clang) - local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})" - - local mycmakeargs=( - -DLLVM_ROOT=${llvm_root} - $(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 qmake KDevelop-PG-Qt) - $(cmake_use_find_package reviewboard KF5Purpose) - $(cmake_use_find_package subversion SubversionLibrary) - ) - - use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON ) - use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "konsole view" kde-apps/konsole - 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]" - optfeature "meson project manager plugin" dev-util/meson - optfeature "formatting configurations via customscript plugin" dev-util/indent - optfeature "formatting configurations via customscript plugin" dev-util/uncrustify - fi - ecm_pkg_postinst -}