[gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/

[Mikle Kolyada]

commit:     ef5b8a1079ea030204fd0807cf7b41a1696ffd21
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 20:22:52 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 20:25:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5b8a10

app-crypt/gnupg: fix wrong EROOT calls

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 .../gnupg/{gnupg-2.2.20-r1.ebuild => gnupg-2.2.20-r2.ebuild}   | 10 +++++-----
 app-crypt/gnupg/gnupg-2.2.23.ebuild                            | 10 +++++-----
 app-crypt/gnupg/gnupg-2.2.24.ebuild                            | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild 
b/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
similarity index 94%
rename from app-crypt/gnupg/gnupg-2.2.20-r1.ebuild
rename to app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
index a043aa8cc78..8fdea955e0b 100644
--- a/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
@@ -116,11 +116,11 @@ src_configure() {
                --enable-gpgsm \
                --enable-large-secmem \
                CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-               GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-               KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
-               LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
-               LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
-               NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
+               
GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" \
+               KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config" \
+               LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" \
+               
LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+               NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config" \
                $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed 
-e 's/^ *\([^ ]*\) .*/\1/g')
 }
 

diff --git a/app-crypt/gnupg/gnupg-2.2.23.ebuild 
b/app-crypt/gnupg/gnupg-2.2.23.ebuild
index f92302d2fa9..a0f7ae9276b 100644
--- a/app-crypt/gnupg/gnupg-2.2.23.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.23.ebuild
@@ -83,11 +83,11 @@ src_configure() {
                --enable-gpgsm
                --enable-large-secmem
                CC_FOR_BUILD="$(tc-getBUILD_CC)"
-               GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
-               KSBA_CONFIG="${EROOT}/usr/bin/ksba-config"
-               LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config"
-               LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config"
-               NPTH_CONFIG="${EROOT}/usr/bin/npth-config"
+               GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+               KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+               LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+               LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+               NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
                $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
        )
 

diff --git a/app-crypt/gnupg/gnupg-2.2.24.ebuild 
b/app-crypt/gnupg/gnupg-2.2.24.ebuild
index 850a1327663..91956547520 100644
--- a/app-crypt/gnupg/gnupg-2.2.24.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.24.ebuild
@@ -91,11 +91,11 @@ src_configure() {
                --enable-gpgsm
                --enable-large-secmem
                CC_FOR_BUILD="$(tc-getBUILD_CC)"
-               GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
-               KSBA_CONFIG="${EROOT}/usr/bin/ksba-config"
-               LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config"
-               LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config"
-               NPTH_CONFIG="${EROOT}/usr/bin/npth-config"
+               GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+               KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+               LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+               LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+               NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
                $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
        )