From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1355717-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9B22F158003
for <garchives@archives.gentoo.org>; Thu, 6 Jan 2022 19:59:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D0CB6E0788;
Thu, 6 Jan 2022 19:59:56 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id ACB33E0788
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Jan 2022 19:59:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9556C342E3A
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Jan 2022 19:59:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D488A5
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Jan 2022 19:59:54 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1641499183.2b2510ae5cffece67dc8b03cd463d23eaaa3bebe.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
X-VCS-Directories: dev-qt/qtwebengine/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 2b2510ae5cffece67dc8b03cd463d23eaaa3bebe
X-VCS-Branch: master
Date: Thu, 6 Jan 2022 19:59:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ab6af5ac-378e-4406-b68b-87dc2c96a7ad
X-Archives-Hash: c9f21a3ae13866ba02f8bfc842a00b21
commit: 2b2510ae5cffece67dc8b03cd463d23eaaa3bebe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 6 19:53:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 6 19:59:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2510ae
dev-qt/qtwebengine: disable CHECKREQS_MEMORY for distcc
It's harder to calculate properly for this case.
Bug: https://bugs.gentoo.org/830661
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
index 3baacbff39c9..55f8f5631a65 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -136,7 +136,11 @@ qtwebengine_check-reqs() {
local CHECKREQS_DISK_BUILD="7G"
local CHECKREQS_DISK_USR="150M"
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ if ! has "distcc" ${FEATURES} ; then
+ # bug #830661
+ # Not super realistic to come up with good estimates for distcc right now
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ fi
check-reqs_${EBUILD_PHASE_FUNC}
}