[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/

[Ionen Wolkens]

commit:     e6c641dab775ddb23915dd3f20ca03c77a5a679c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 18:38:28 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 20:18:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6c641da

x11-terms/kitty: fix VariableScope

Would probably be simpler if the eclass could handle BROOT by itself.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-terms/kitty/kitty-0.29.2-r1.ebuild | 5 +++--
 x11-terms/kitty/kitty-0.30.0.ebuild    | 5 +++--
 x11-terms/kitty/kitty-0.30.1.ebuild    | 5 +++--
 x11-terms/kitty/kitty-9999.ebuild      | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/x11-terms/kitty/kitty-0.29.2-r1.ebuild 
b/x11-terms/kitty/kitty-0.29.2-r1.ebuild
index 4d460614b658..5399ebaefc11 100644
--- a/x11-terms/kitty/kitty-0.29.2-r1.ebuild
+++ b/x11-terms/kitty/kitty-0.29.2-r1.ebuild
@@ -15,7 +15,6 @@ else
                
https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
                https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
                verify-sig? ( 
https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
        KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
@@ -78,8 +77,10 @@ src_unpack() {
                cd "${S}" || die
                edo go mod vendor
        else
-               use verify-sig &&
+               if use verify-sig; then
+                       local 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg
                        verify-sig_verify_detached 
"${DISTDIR}"/${P}.tar.xz{,.sig}
+               fi
                default
        fi
 }

diff --git a/x11-terms/kitty/kitty-0.30.0.ebuild 
b/x11-terms/kitty/kitty-0.30.0.ebuild
index 99e44b505ebd..5b2f98cbfa9f 100644
--- a/x11-terms/kitty/kitty-0.30.0.ebuild
+++ b/x11-terms/kitty/kitty-0.30.0.ebuild
@@ -16,7 +16,6 @@ else
                https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
                verify-sig? ( 
https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
        "
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
        KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
@@ -83,8 +82,10 @@ src_unpack() {
                cd "${S}" || die
                edo go mod vendor
        else
-               use verify-sig &&
+               if use verify-sig; then
+                       local 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg
                        verify-sig_verify_detached 
"${DISTDIR}"/${P}.tar.xz{,.sig}
+               fi
                default
        fi
 }

diff --git a/x11-terms/kitty/kitty-0.30.1.ebuild 
b/x11-terms/kitty/kitty-0.30.1.ebuild
index 884afab7f454..b5fe9c792ba6 100644
--- a/x11-terms/kitty/kitty-0.30.1.ebuild
+++ b/x11-terms/kitty/kitty-0.30.1.ebuild
@@ -16,7 +16,6 @@ else
                https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
                verify-sig? ( 
https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
        "
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
        KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
@@ -87,8 +86,10 @@ src_unpack() {
                cd "${S}" || die
                edo go mod vendor
        else
-               use verify-sig &&
+               if use verify-sig; then
+                       local 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg
                        verify-sig_verify_detached 
"${DISTDIR}"/${P}.tar.xz{,.sig}
+               fi
                default
        fi
 }

diff --git a/x11-terms/kitty/kitty-9999.ebuild 
b/x11-terms/kitty/kitty-9999.ebuild
index 884afab7f454..b5fe9c792ba6 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -16,7 +16,6 @@ else
                https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
                verify-sig? ( 
https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
        "
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
        KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
@@ -87,8 +86,10 @@ src_unpack() {
                cd "${S}" || die
                edo go mod vendor
        else
-               use verify-sig &&
+               if use verify-sig; then
+                       local 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg
                        verify-sig_verify_detached 
"${DISTDIR}"/${P}.tar.xz{,.sig}
+               fi
                default
        fi
 }