Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/
Date: Thu, 31 Oct 2019 15:56:49
Message-Id: 1572537388.01e22106072edf393d9d8f07611efc013be3035a.whissi@gentoo
1 commit: 01e22106072edf393d9d8f07611efc013be3035a
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 31 15:51:57 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 31 15:56:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e22106
7
8 mail-client/thunderbird: force stderr for ewarn in llvm_check_deps()
9
10 Closes: https://bugs.gentoo.org/695668
11 Package-Manager: Portage-2.3.78, Repoman-2.3.17
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 mail-client/thunderbird/thunderbird-68.2.1.ebuild | 19 +++++++++----------
15 1 file changed, 9 insertions(+), 10 deletions(-)
16
17 diff --git a/mail-client/thunderbird/thunderbird-68.2.1.ebuild b/mail-client/thunderbird/thunderbird-68.2.1.ebuild
18 index e96e0a6bf23..7d71069196c 100644
19 --- a/mail-client/thunderbird/thunderbird-68.2.1.ebuild
20 +++ b/mail-client/thunderbird/thunderbird-68.2.1.ebuild
21 @@ -182,37 +182,36 @@ fi
22
23 llvm_check_deps() {
24 if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
25 - ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
26 + ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
27 return 1
28 fi
29
30 - if use pgo ; then
31 - if ! has usersandbox $FEATURES ; then
32 - eerror "You must enable usersandbox as X server can not run as root!"
33 - fi
34 - fi
35 -
36 if use clang ; then
37 if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
38 - ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
39 + ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
40 return 1
41 fi
42
43 if use pgo ; then
44 if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
45 - ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
46 + ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
47 return 1
48 fi
49 fi
50 fi
51
52 - # <EAPI 7 workaround, #695668
53 einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
54 }
55
56 pkg_setup() {
57 moz_pkgsetup
58
59 + if use pgo ; then
60 + if ! has usersandbox $FEATURES ; then
61 + die "You must enable usersandbox as X server can not run as root!"
62 + fi
63 + fi
64 +
65 # Avoid PGO profiling problems due to enviroment leakage
66 # These should *always* be cleaned up anyway
67 unset DBUS_SESSION_BUS_ADDRESS \