Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/
Date: Sat, 14 May 2022 00:47:32
Message-Id: 1652489213.f70ba3fd46547066d2f76d500d47441476cfa652.sam@gentoo
1 commit: f70ba3fd46547066d2f76d500d47441476cfa652
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 19 15:31:08 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 00:46:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70ba3fd
7
8 mail-client/thunderbird: [QA] inline ESYSROOT
9
10 ESYSROOT is SYSROOT/EPREFIX in >= EAPI 7
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 mail-client/thunderbird/thunderbird-91.7.0.ebuild | 6 +++---
15 mail-client/thunderbird/thunderbird-91.9.0.ebuild | 6 +++---
16 2 files changed, 6 insertions(+), 6 deletions(-)
17
18 diff --git a/mail-client/thunderbird/thunderbird-91.7.0.ebuild b/mail-client/thunderbird/thunderbird-91.7.0.ebuild
19 index 908703b76654..44b0ebd261b6 100644
20 --- a/mail-client/thunderbird/thunderbird-91.7.0.ebuild
21 +++ b/mail-client/thunderbird/thunderbird-91.7.0.ebuild
22 @@ -655,8 +655,8 @@ src_configure() {
23 --with-system-zlib \
24 --with-toolchain-prefix="${CHOST}-" \
25 --with-unsigned-addon-scopes=app,system \
26 - --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
27 - --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
28 + --x-includes="${ESYSROOT}/usr/include" \
29 + --x-libraries="${ESYSROOT}/usr/$(get_libdir)"
30
31 # Set update channel
32 local update_channel=release
33 @@ -708,7 +708,7 @@ src_configure() {
34 mozconfig_use_with system-harfbuzz system-graphite2
35 mozconfig_use_with system-icu
36 mozconfig_use_with system-jpeg
37 - mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
38 + mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr"
39 mozconfig_use_with system-libvpx
40 mozconfig_use_with system-png
41 mozconfig_use_with system-webp
42
43 diff --git a/mail-client/thunderbird/thunderbird-91.9.0.ebuild b/mail-client/thunderbird/thunderbird-91.9.0.ebuild
44 index 745a9c7b1f55..08dcd4fecb8e 100644
45 --- a/mail-client/thunderbird/thunderbird-91.9.0.ebuild
46 +++ b/mail-client/thunderbird/thunderbird-91.9.0.ebuild
47 @@ -660,8 +660,8 @@ src_configure() {
48 --with-system-zlib \
49 --with-toolchain-prefix="${CHOST}-" \
50 --with-unsigned-addon-scopes=app,system \
51 - --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
52 - --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
53 + --x-includes="${ESYSROOT}/usr/include" \
54 + --x-libraries="${ESYSROOT}/usr/$(get_libdir)"
55
56 # Set update channel
57 local update_channel=release
58 @@ -713,7 +713,7 @@ src_configure() {
59 mozconfig_use_with system-harfbuzz system-graphite2
60 mozconfig_use_with system-icu
61 mozconfig_use_with system-jpeg
62 - mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
63 + mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr"
64 mozconfig_use_with system-libvpx
65 mozconfig_use_with system-png
66 mozconfig_use_with system-webp