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 AB5571382C5 for ; Thu, 24 Jun 2021 11:19:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6945E076B; Thu, 24 Jun 2021 11:19:40 +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 A7B6AE076B for ; Thu, 24 Jun 2021 11:19:40 +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 97B703426B7 for ; Thu, 24 Jun 2021 11:19:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 097DA797 for ; Thu, 24 Jun 2021 11:19:38 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1624533100.45d7908ab622bc74093f309340a1d637b84a0951.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: 45d7908ab622bc74093f309340a1d637b84a0951 X-VCS-Branch: master Date: Thu, 24 Jun 2021 11:19:38 +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: e83c60af-64d1-496c-b82d-fc2ab7f18a8a X-Archives-Hash: afe8fddc669e80dcbd9647c53659e325 commit: 45d7908ab622bc74093f309340a1d637b84a0951 Author: Jimi Huotari gentoo org> AuthorDate: Thu Jun 24 11:10:34 2021 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Thu Jun 24 11:11:40 2021 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=45d7908a dev-qt/qtwebengine: remove "pass appropriate options to ninja" The file 'bootstrap.py' has changed, and this 'sed' has been doing nothing since around 83-based. Quick testing suggests that NINJAFLAGS is being respected as it should be, even without our modifications. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild index 6b75547b..c5be9e25 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild @@ -115,10 +115,6 @@ src_prepare() { src/buildtools/config/common.pri || die fi - # bug 630834 - pass appropriate options to ninja when building GN - sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ - -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die - # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | \ xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die