[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/

["Sam James" <sam@gentoo.org>]

commit:     4452c53936e4eb6df13f7b28961b4b4857420c85
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 13:31:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 13:32:25 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4452c539

dev-util/kdevelop: drop obsolete clang 16 patch

Fixed upstream in 1a92bed73ae31e6f90c3bffe455f8e3c46ac4905 by using
the proper FindClang module.

Fixed on both the 23.03 branch & master.

Bug: https://bugs.gentoo.org/902101
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../kdevelop/files/kdevelop-22.12.3-clang16.patch  | 24 ----------------------
 dev-util/kdevelop/kdevelop-23.03.80.ebuild         |  4 ----
 dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild    |  4 ----
 dev-util/kdevelop/kdevelop-9999.ebuild             |  4 ----
 4 files changed, 36 deletions(-)

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 38676cc164..0000000000
--- 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-23.03.80.ebuild b/dev-util/kdevelop/kdevelop-23.03.80.ebuild
index 59cd6f2f22..d2848b6c73 100644
--- a/dev-util/kdevelop/kdevelop-23.03.80.ebuild
+++ b/dev-util/kdevelop/kdevelop-23.03.80.ebuild
@@ -96,10 +96,6 @@ RDEPEND="${COMMON_DEPEND}
 	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}"
 }

diff --git a/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild b/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild
index 9b93334c07..912f2c6e53 100644
--- a/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild
@@ -96,10 +96,6 @@ RDEPEND="${COMMON_DEPEND}
 	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}"
 }

diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 9b93334c07..912f2c6e53 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -96,10 +96,6 @@ RDEPEND="${COMMON_DEPEND}
 	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}"
 }