commit: 0498e6fbc8a5a9c53234d125fc36f3941635c7b5 Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de> AuthorDate: Tue Feb 18 22:33:50 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <mario.haustein <AT> hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/40644 Signed-off-by: Sam James <sam <AT> 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 }
