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

[Sam James]

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

www-client/firefox: [QA] inline ESYSROOT

ESYSROOT is SYSROOT/EPREFIX in >= EAPI 7

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

 www-client/firefox/firefox-91.8.0.ebuild | 6 +++---
 www-client/firefox/firefox-99.0.1.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/www-client/firefox/firefox-91.8.0.ebuild 
b/www-client/firefox/firefox-91.8.0.ebuild
index f9c38109c42c..1c0f236cbdb3 100644
--- a/www-client/firefox/firefox-91.8.0.ebuild
+++ b/www-client/firefox/firefox-91.8.0.ebuild
@@ -722,8 +722,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
@@ -775,7 +775,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/www-client/firefox/firefox-99.0.1.ebuild 
b/www-client/firefox/firefox-99.0.1.ebuild
index c9a7bcf776d1..6305adb8c35e 100644
--- a/www-client/firefox/firefox-99.0.1.ebuild
+++ b/www-client/firefox/firefox-99.0.1.ebuild
@@ -718,8 +718,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