[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/

[Ionen Wolkens]

commit:     f34bf41a36fa763ab5d3d818ff54c9a09044b8fe
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 18:45:01 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=f34bf41a

www-client/qutebrowser: fix VariableScope

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

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

 www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 10 +++++++++-
 www-client/qutebrowser/qutebrowser-9999.ebuild  | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild 
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 189d01f0bdf8..901679cc38fa 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -17,7 +17,6 @@ else
                
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
                verify-sig? ( 
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
 )
        "
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg"
        KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
@@ -85,6 +84,15 @@ PATCHES=(
        "${FILESDIR}"/${P}-tests-qt653.patch
 )
 
+src_unpack() {
+       if [[ ${PV} == 9999 ]]; then
+               git-r3_src_unpack
+       else
+               local 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg
+               verify-sig_src_unpack
+       fi
+}
+
 src_prepare() {
        distutils-r1_src_prepare
 

diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild 
b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 7b51f2231379..e6b161f1ee7b 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -17,7 +17,6 @@ else
                
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
                verify-sig? ( 
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
 )
        "
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg"
        KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
@@ -81,6 +80,15 @@ fi
 
 distutils_enable_tests pytest
 
+src_unpack() {
+       if [[ ${PV} == 9999 ]]; then
+               git-r3_src_unpack
+       else
+               local 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg
+               verify-sig_src_unpack
+       fi
+}
+
 src_prepare() {
        distutils-r1_src_prepare