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 581F61382C5 for ; Wed, 9 Jun 2021 14:25:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31C17E07F9; Wed, 9 Jun 2021 14:25:23 +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 1A177E07F9 for ; Wed, 9 Jun 2021 14:25:23 +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 B1727340BD3 for ; Wed, 9 Jun 2021 14:25:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E200727E for ; Wed, 9 Jun 2021 14:25:19 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1623248716.17f2d67ce495f5dc5a7c904e3a2ace655fb6e117.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/gappa/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/gappa/gappa-1.3.5.ebuild X-VCS-Directories: sci-mathematics/gappa/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 17f2d67ce495f5dc5a7c904e3a2ace655fb6e117 X-VCS-Branch: master Date: Wed, 9 Jun 2021 14:25:19 +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: b72f9ec8-d10e-4a6a-9c1f-00bd417c6800 X-Archives-Hash: 9c5f9dbfcdc79c1ca2a8090e86f3e0ac commit: 17f2d67ce495f5dc5a7c904e3a2ace655fb6e117 Author: Lucas Mitrak lucasmitrak com> AuthorDate: Tue Jun 8 11:45:57 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Jun 9 14:25:16 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=17f2d67c sci-mathematics/gappa: Remove -l or --load-average from ${MAKEOPTS} * Remove -l or --load-average from ${MAKEOPTS} in src_compile() Currently, sci-mathematics/gappa will fail to compile if either -l or --load-average is set in ${MAKEOPTS} because remake does not accept them. This commit will remove either -l or --load-average from ${MAKEOPTS} during the src_compile() stage in the same method found in a suggested patch [1] written by developer Lars Wendler in bug 653554 [2]. This will allow the package to compile and install correctly. This commit was tested in a docker image with dev-util/ebuildtester. This commit was written, tested, and submitted by Lucas Mitrak. [1] https://653554.bugs.gentoo.org/attachment.cgi?id=528056 [2] https://bugs.gentoo.org/653554 Closes: https://bugs.gentoo.org/568368 Signed-off-by: Lucas Mitrak lucasmitrak.com> Signed-off-by: Andrew Ammerlaan gentoo.org> sci-mathematics/gappa/gappa-1.3.5.ebuild | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sci-mathematics/gappa/gappa-1.3.5.ebuild b/sci-mathematics/gappa/gappa-1.3.5.ebuild index 26461a439..d7907989d 100644 --- a/sci-mathematics/gappa/gappa-1.3.5.ebuild +++ b/sci-mathematics/gappa/gappa-1.3.5.ebuild @@ -28,6 +28,11 @@ src_prepare() { } src_compile() { + # Remove --load-average or -l because remake does not accept these + echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load\-average)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null + if [ $? -eq 0 ]; then + MAKEOPTS="${MAKEOPTS/$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load\-average)(=?|[[:space:]]*)[[:digit:]]+')/}" + fi ./remake -d ${MAKEOPTS} || die "emake failed" if use doc; then ./remake doc/html/index.html