commit:     e1857def3989aa506b7bb7f08dca6ddaee1cd92e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 13:26:29 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 13:26:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1857def

sys-devel/clang-common: Fix S substitution

Variable reordering has caused the S substitution to be overwritten
by the eclass logic.  Rather than relying on a specific ordering,
just update LLVM_COMPONENTS so that the default value works just fine.

Closes: https://bugs.gentoo.org/841827
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-devel/clang-common/clang-common-14.0.3.ebuild      | 3 +--
 sys-devel/clang-common/clang-common-15.0.0.9999.ebuild | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys-devel/clang-common/clang-common-14.0.3.ebuild 
b/sys-devel/clang-common/clang-common-14.0.3.ebuild
index 5f09f0a442dc..798f9e9fb858 100644
--- a/sys-devel/clang-common/clang-common-14.0.3.ebuild
+++ b/sys-devel/clang-common/clang-common-14.0.3.ebuild
@@ -7,7 +7,6 @@ inherit bash-completion-r1 llvm.org
 
 DESCRIPTION="Common files shared between multiple slots of clang"
 HOMEPAGE="https://llvm.org/";
-S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -17,7 +16,7 @@ PDEPEND="
        sys-devel/clang:*
 "
 
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+LLVM_COMPONENTS=( clang/utils )
 llvm.org_set_globals
 
 src_install() {

diff --git a/sys-devel/clang-common/clang-common-15.0.0.9999.ebuild 
b/sys-devel/clang-common/clang-common-15.0.0.9999.ebuild
index 46b53588191e..1285500128bb 100644
--- a/sys-devel/clang-common/clang-common-15.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.0.9999.ebuild
@@ -7,7 +7,6 @@ inherit bash-completion-r1 llvm.org
 
 DESCRIPTION="Common files shared between multiple slots of clang"
 HOMEPAGE="https://llvm.org/";
-S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -17,7 +16,7 @@ PDEPEND="
        sys-devel/clang:*
 "
 
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+LLVM_COMPONENTS=( clang/utils )
 llvm.org_set_globals
 
 src_install() {

Reply via email to