From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id B10711582EF for ; Wed, 19 Feb 2025 11:05:34 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 9B84A3431DE for ; Wed, 19 Feb 2025 11:05:34 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 25327110474; Wed, 19 Feb 2025 11:05:26 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 1E620110474 for ; Wed, 19 Feb 2025 11:05:26 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB40234319D for ; Wed, 19 Feb 2025 11:05:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5F932735 for ; Wed, 19 Feb 2025 11:05:23 +0000 (UTC) From: "Sam James" 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" Message-ID: <1739963066.0498e6fbc8a5a9c53234d125fc36f3941635c7b5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/grass/grass-8.3.2-r1.ebuild sci-geosciences/grass/grass-8.4.0.ebuild sci-geosciences/grass/grass-8.4.1_rc1.ebuild sci-geosciences/grass/grass-9999.ebuild X-VCS-Directories: sci-geosciences/grass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0498e6fbc8a5a9c53234d125fc36f3941635c7b5 X-VCS-Branch: master Date: Wed, 19 Feb 2025 11:05:23 +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: 9020050c-8673-47f1-914f-80916849fe8b X-Archives-Hash: ee3b2fe13db2068f32230eec7070ceb3 commit: 0498e6fbc8a5a9c53234d125fc36f3941635c7b5 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Tue Feb 18 22:33:50 2025 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 19 11:04:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0498e6fb sci-geosciences/grass: fix addpredict use Newer Portage bans use of colons in addpredict calls. Closes: https://bugs.gentoo.org/948968 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/40644 Signed-off-by: Sam James gentoo.org> sci-geosciences/grass/grass-8.3.2-r1.ebuild | 26 +++++++++++++++++--------- sci-geosciences/grass/grass-8.4.0.ebuild | 26 +++++++++++++++++--------- sci-geosciences/grass/grass-8.4.1_rc1.ebuild | 26 +++++++++++++++++--------- sci-geosciences/grass/grass-9999.ebuild | 26 +++++++++++++++++--------- 4 files changed, 68 insertions(+), 36 deletions(-) diff --git a/sci-geosciences/grass/grass-8.3.2-r1.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild index 9e070e7012a6..0f5c4b57489c 100644 --- a/sci-geosciences/grass/grass-8.3.2-r1.ebuild +++ b/sci-geosciences/grass/grass-8.3.2-r1.ebuild @@ -156,16 +156,24 @@ src_prepare() { eend $? # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}"; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}"; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}"; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}"; do + addpredict "${card}" + done addpredict /dev/nvidiactl } diff --git a/sci-geosciences/grass/grass-8.4.0.ebuild b/sci-geosciences/grass/grass-8.4.0.ebuild index de06e287f11f..1d490f0bf7d4 100644 --- a/sci-geosciences/grass/grass-8.4.0.ebuild +++ b/sci-geosciences/grass/grass-8.4.0.ebuild @@ -156,16 +156,24 @@ src_prepare() { eend $? # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}"; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}"; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}"; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}"; do + addpredict "${card}" + done addpredict /dev/nvidiactl } diff --git a/sci-geosciences/grass/grass-8.4.1_rc1.ebuild b/sci-geosciences/grass/grass-8.4.1_rc1.ebuild index d1df30016725..462a01ac5c57 100644 --- a/sci-geosciences/grass/grass-8.4.1_rc1.ebuild +++ b/sci-geosciences/grass/grass-8.4.1_rc1.ebuild @@ -156,16 +156,24 @@ src_prepare() { eend $? # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}"; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}"; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}"; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}"; do + addpredict "${card}" + done addpredict /dev/nvidiactl } diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index b35f6c4b8ae1..10a22120331e 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -151,16 +151,24 @@ src_prepare() { eend $? # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob + ati_cards=$(echo -n /dev/ati/card*) + for card in "${ati_cards[@]}"; do + addpredict "${card}" + done + mesa_cards=$(echo -n /dev/dri/card*) + for card in "${mesa_cards[@]}"; do + addpredict "${card}" + done + nvidia_cards=$(echo -n /dev/nvidia*) + for card in "${nvidia_cards[@]}"; do + addpredict "${card}" + done + render_cards=$(echo -n /dev/dri/renderD128*) + for card in "${render_cards[@]}"; do + addpredict "${card}" + done addpredict /dev/nvidiactl }