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 693281581F0 for ; Fri, 24 Jan 2025 04:57:05 +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) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 4CE1E34349B for ; Fri, 24 Jan 2025 04:57:05 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 48C1A11042D; Fri, 24 Jan 2025 04:57:04 +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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 39D4611042D for ; Fri, 24 Jan 2025 04:57:04 +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 D050134349A for ; Fri, 24 Jan 2025 04:57:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35C2EE65 for ; Fri, 24 Jan 2025 04:57:02 +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: <1737694596.d8b3a440d5094cccf9be4f2f0df11dd79c869828.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild media-gfx/imagemagick/imagemagick-9999.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d8b3a440d5094cccf9be4f2f0df11dd79c869828 X-VCS-Branch: master Date: Fri, 24 Jan 2025 04:57:02 +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: 7004a3dd-3820-49b6-a5cc-e0dd43aeeaa6 X-Archives-Hash: 2e349b639f018d218684887e28dbfbbd commit: d8b3a440d5094cccf9be4f2f0df11dd79c869828 Author: Sam James gentoo org> AuthorDate: Fri Jan 24 04:56:16 2025 +0000 Commit: Sam James gentoo 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 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 }