[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     3148533a390f042036894216e70b9a0fe27673a9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  9 13:27:51 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug  9 17:36:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3148533a

llvm.org.eclass: Update for LLVM 15 prereleases

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/llvm.org.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 8f1f48414d1a..0d17b19c8abf 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -201,14 +201,14 @@ llvm.org_set_globals() {
        elif [[ ${_LLVM_SOURCE_TYPE} == tar ]]; then
                if ver_test -ge 14.0.5; then
                        SRC_URI+="
-                               
https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/llvm-project-${PV}.src.tar.xz
+                               
https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV/_/-}/llvm-project-${PV/_/}.src.tar.xz
                                verify-sig? (
-                                       
https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/llvm-project-${PV}.src.tar.xz.sig
+                                       
https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV/_/-}/llvm-project-${PV/_/}.src.tar.xz.sig
                                )
                        "
                        BDEPEND+="
                                verify-sig? (
-                                       sec-keys/openpgp-keys-llvm
+                                       >=sec-keys/openpgp-keys-llvm-15
                                )
                        "
                        
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/llvm.asc
@@ -302,7 +302,7 @@ llvm.org_src_unpack() {
        else
                local archive=llvmorg-${PV/_/-}.tar.gz
                if ver_test -ge 14.0.5; then
-                       archive=llvm-project-${PV/_/-}.src.tar.xz
+                       archive=llvm-project-${PV/_/}.src.tar.xz
                        if use verify-sig; then
                                verify-sig_verify_detached \
                                        "${DISTDIR}/${archive}" 
"${DISTDIR}/${archive}.sig"