commit:     a237f7b8315f2768940c87d5f1aaaea05d7ad5c2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 15:09:42 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 15:12:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a237f7b8

dev-util/ccls: Switch to llvm-r1.eclass

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/ccls/ccls-9999.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-util/ccls/ccls-9999.ebuild b/dev-util/ccls/ccls-9999.ebuild
index 18afc3fd7cb3..fe5aaff02dd3 100644
--- a/dev-util/ccls/ccls-9999.ebuild
+++ b/dev-util/ccls/ccls-9999.ebuild
@@ -7,12 +7,12 @@ EGIT_REPO_URI="https://github.com/MaskRay/${PN}";
 
 if [[ ${PV} = 9999* ]]; then
        GIT_ECLASS="git-r3"
-       LLVM_MAX_SLOT=18
+       LLVM_COMPAT=( {18..19} )
 else
-       LLVM_MAX_SLOT=18
+       LLVM_COMPAT=( {18..19} )
 fi
 
-inherit cmake llvm ${GIT_ECLASS}
+inherit cmake llvm-r1 ${GIT_ECLASS}
 
 DESCRIPTION="C/C++/ObjC language server"
 HOMEPAGE="https://github.com/MaskRay/ccls";
@@ -25,11 +25,12 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 
-# We only depend on Clang because of a quirk in how dependencies work
-# See comment in llvm.eclass docs
 DEPEND="
        dev-libs/rapidjson
-       <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+       $(llvm_gen_dep '
+               sys-devel/clang:${LLVM_SLOT}=
+               sys-devel/llvm:${LLVM_SLOT}=
+       ')
 "
 RDEPEND="${DEPEND}"
 

Reply via email to