commit: d8b3a440d5094cccf9be4f2f0df11dd79c869828
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 04:56:16 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 04:56:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b3a440
media-gfx/imagemagick: fix addpredict use
Newer Portage bans use of colons in addpredict calls.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../imagemagick/imagemagick-6.9.13.16-r1.ebuild | 34 ++++++++++----------
media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild | 34 ++++++++++----------
media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild | 34 ++++++++++----------
.../imagemagick/imagemagick-7.1.1.25-r1.ebuild | 36 +++++++++++-----------
.../imagemagick/imagemagick-7.1.1.38-r1.ebuild | 36 +++++++++++-----------
.../imagemagick/imagemagick-7.1.1.38-r2.ebuild | 36 +++++++++++-----------
media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild | 36 +++++++++++-----------
media-gfx/imagemagick/imagemagick-9999.ebuild | 36 +++++++++++-----------
8 files changed, 141 insertions(+), 141 deletions(-)
diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index 3a27a91f6b96..080fc19e0b33 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -103,22 +103,22 @@ src_prepare() {
# For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
+ 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
shopt -u nullglob
addpredict /dev/nvidiactl
}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
index d5470d00ae36..8e26cfb2d9a6 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -103,22 +103,22 @@ src_prepare() {
# For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
+ 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
shopt -u nullglob
addpredict /dev/nvidiactl
}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index 51feb1ba7e34..81adc8b3bf07 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -103,22 +103,22 @@ src_prepare() {
# For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
+ 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
shopt -u nullglob
addpredict /dev/nvidiactl
}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild
b/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild
index 52d6378e2f26..a9b0dde7fb7c 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -106,25 +106,25 @@ src_prepare() {
#elibtoolize # for Darwin modules
eautoreconf
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ # For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
+ 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
shopt -u nullglob
addpredict /dev/nvidiactl
}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
index 7a411d2e2d91..4cb8cbb1251a 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -108,25 +108,25 @@ src_prepare() {
#elibtoolize # for Darwin modules
eautoreconf
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ # For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
+ 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
shopt -u nullglob
addpredict /dev/nvidiactl
}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
index 63f2b61e4b69..16d4e4c94e35 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -108,25 +108,25 @@ src_prepare() {
#elibtoolize # for Darwin modules
eautoreconf
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ # For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
+ 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
shopt -u nullglob
addpredict /dev/nvidiactl
}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
index 45cfe4d2db47..c3af2faa2229 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -106,25 +106,25 @@ src_prepare() {
#elibtoolize # for Darwin modules
eautoreconf
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ # For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
+ 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
shopt -u nullglob
addpredict /dev/nvidiactl
}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild
b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 36da9357938f..dae61feb43e4 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -106,25 +106,25 @@ src_prepare() {
#elibtoolize # for Darwin modules
eautoreconf
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ # For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
+ 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
shopt -u nullglob
addpredict /dev/nvidiactl
}
