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 a043aa8cc7800..8fdea955e0bec 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 f92302d2fa9f7..a0f7ae9276b1a 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 850a132766387..9195654752016 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')
 	)