[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/

[Sam James]

commit:     f70ba3fd46547066d2f76d500d47441476cfa652
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 15:31:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 00:46:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70ba3fd

mail-client/thunderbird: [QA] inline ESYSROOT

ESYSROOT is SYSROOT/EPREFIX in >= EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/thunderbird/thunderbird-91.7.0.ebuild | 6 +++---
 mail-client/thunderbird/thunderbird-91.9.0.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mail-client/thunderbird/thunderbird-91.7.0.ebuild 
b/mail-client/thunderbird/thunderbird-91.7.0.ebuild
index 908703b76654..44b0ebd261b6 100644
--- a/mail-client/thunderbird/thunderbird-91.7.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-91.7.0.ebuild
@@ -655,8 +655,8 @@ src_configure() {
                --with-system-zlib \
                --with-toolchain-prefix="${CHOST}-" \
                --with-unsigned-addon-scopes=app,system \
-               --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-               --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+               --x-includes="${ESYSROOT}/usr/include" \
+               --x-libraries="${ESYSROOT}/usr/$(get_libdir)"
 
        # Set update channel
        local update_channel=release
@@ -708,7 +708,7 @@ src_configure() {
        mozconfig_use_with system-harfbuzz system-graphite2
        mozconfig_use_with system-icu
        mozconfig_use_with system-jpeg
-       mozconfig_use_with system-libevent system-libevent 
"${SYSROOT}${EPREFIX}/usr"
+       mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr"
        mozconfig_use_with system-libvpx
        mozconfig_use_with system-png
        mozconfig_use_with system-webp

diff --git a/mail-client/thunderbird/thunderbird-91.9.0.ebuild 
b/mail-client/thunderbird/thunderbird-91.9.0.ebuild
index 745a9c7b1f55..08dcd4fecb8e 100644
--- a/mail-client/thunderbird/thunderbird-91.9.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-91.9.0.ebuild
@@ -660,8 +660,8 @@ src_configure() {
                --with-system-zlib \
                --with-toolchain-prefix="${CHOST}-" \
                --with-unsigned-addon-scopes=app,system \
-               --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-               --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+               --x-includes="${ESYSROOT}/usr/include" \
+               --x-libraries="${ESYSROOT}/usr/$(get_libdir)"
 
        # Set update channel
        local update_channel=release
@@ -713,7 +713,7 @@ src_configure() {
        mozconfig_use_with system-harfbuzz system-graphite2
        mozconfig_use_with system-icu
        mozconfig_use_with system-jpeg
-       mozconfig_use_with system-libevent system-libevent 
"${SYSROOT}${EPREFIX}/usr"
+       mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr"
        mozconfig_use_with system-libvpx
        mozconfig_use_with system-png
        mozconfig_use_with system-webp