From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 198AA138359 for ; Mon, 20 Jul 2020 13:46:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 114C2E0909; Mon, 20 Jul 2020 13:46:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7A57E08ED for ; Mon, 20 Jul 2020 13:46:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CADD034F410 for ; Mon, 20 Jul 2020 13:46:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A18512A4 for ; Mon, 20 Jul 2020 13:46:14 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1595252767.6a975aeadd63b85f685eb9f1cac1d03b88ffbcd7.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/thunderbird/thunderbird-68.10.0.ebuild X-VCS-Directories: mail-client/thunderbird/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 6a975aeadd63b85f685eb9f1cac1d03b88ffbcd7 X-VCS-Branch: master Date: Mon, 20 Jul 2020 13:46:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 88b2b394-be4e-4fe4-ba67-eb66e5361ac3 X-Archives-Hash: 886d6d293989f5c2da1c30913fad22e0 commit: 6a975aeadd63b85f685eb9f1cac1d03b88ffbcd7 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Jul 19 20:46:20 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Jul 20 13:46:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a975aea mail-client/thunderbird: check requirements only for non-binary merges Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann gentoo.org> mail-client/thunderbird/thunderbird-68.10.0.ebuild | 66 ++++++++++++---------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/mail-client/thunderbird/thunderbird-68.10.0.ebuild b/mail-client/thunderbird/thunderbird-68.10.0.ebuild index 5da743f127c..684386fa541 100644 --- a/mail-client/thunderbird/thunderbird-68.10.0.ebuild +++ b/mail-client/thunderbird/thunderbird-68.10.0.ebuild @@ -216,43 +216,51 @@ llvm_check_deps() { } pkg_pretend() { - if use pgo ; then - if ! has usersandbox $FEATURES ; then - die "You must enable usersandbox as X server can not run as root!" + if [[ ${MERGE_TYPE} != binary ]] ; then + if use pgo ; then + if ! has usersandbox $FEATURES ; then + die "You must enable usersandbox as X server can not run as root!" + fi fi - fi - # Ensure we have enough disk space to compile - if use pgo || use lto || use debug || use test ; then - CHECKREQS_DISK_BUILD="8G" - else - CHECKREQS_DISK_BUILD="4500M" - fi + # Ensure we have enough disk space to compile + if use pgo || use lto || use debug || use test ; then + CHECKREQS_DISK_BUILD="8G" + else + CHECKREQS_DISK_BUILD="4500M" + fi - check-reqs_pkg_pretend + check-reqs_pkg_pretend + fi } pkg_setup() { moz_pkgsetup - # Ensure we have enough disk space to compile - if use pgo || use lto || use debug || use test ; then - CHECKREQS_DISK_BUILD="8G" - else - CHECKREQS_DISK_BUILD="4500M" - fi + if [[ ${MERGE_TYPE} != binary ]] ; then + # Ensure we have enough disk space to compile + if use pgo || use lto || use debug || use test ; then + CHECKREQS_DISK_BUILD="8G" + else + CHECKREQS_DISK_BUILD="4500M" + fi + + check-reqs_pkg_setup - check-reqs_pkg_setup + # Avoid PGO profiling problems due to enviroment leakage + # These should *always* be cleaned up anyway + unset DBUS_SESSION_BUS_ADDRESS \ + DISPLAY \ + ORBIT_SOCKETDIR \ + SESSION_MANAGER \ + XDG_CACHE_HOME \ + XDG_SESSION_COOKIE \ + XAUTHORITY - # Avoid PGO profiling problems due to enviroment leakage - # These should *always* be cleaned up anyway - unset DBUS_SESSION_BUS_ADDRESS \ - DISPLAY \ - ORBIT_SOCKETDIR \ - SESSION_MANAGER \ - XDG_CACHE_HOME \ - XDG_SESSION_COOKIE \ - XAUTHORITY + addpredict /proc/self/oom_score_adj + + llvm_pkg_setup + fi if ! use bindist ; then einfo @@ -261,10 +269,6 @@ pkg_setup() { elog "a legal problem with Mozilla Foundation." elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag." fi - - addpredict /proc/self/oom_score_adj - - llvm_pkg_setup } src_unpack() {