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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A6D415817D for ; Sat, 8 Jun 2024 17:15:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94123E2B10; Sat, 8 Jun 2024 17:15:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 7D888E2B10 for ; Sat, 8 Jun 2024 17:15:20 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5594D335D6A for ; Sat, 8 Jun 2024 17:15:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2EF31610 for ; Sat, 8 Jun 2024 17:15:17 +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: <1717866899.af22ddb2c61f30b103776b09f2ce7e1d5ecadb87.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: virtual/imagemagick-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild virtual/imagemagick-tools/imagemagick-tools-1.ebuild X-VCS-Directories: virtual/imagemagick-tools/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: af22ddb2c61f30b103776b09f2ce7e1d5ecadb87 X-VCS-Branch: master Date: Sat, 8 Jun 2024 17:15:17 +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: 4bd0ac9b-2085-4996-8c2e-57cbd8dd0056 X-Archives-Hash: f163349e29e66cd4f1e27379d1f9d6c2 commit: af22ddb2c61f30b103776b09f2ce7e1d5ecadb87 Author: Sam James gentoo org> AuthorDate: Sat Jun 8 17:13:39 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jun 8 17:14:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af22ddb2 virtual/imagemagick-tools: add 1, drop 0-r3 I gave Holger bad advice when we were discussing af40c92d01c669f2574bcfe40e326ba13c5e1454. mjo rightly points out on the bug that svg(-) will make Portage cling to older graphicsmagick which had a (noop) USE=svg. Let's drop it entirely and do the ugly branching in RDEPEND with "svg? ( ... ) !svg? ( ...)". Bug: https://bugs.gentoo.org/921532 Fixes: af40c92d01c669f2574bcfe40e326ba13c5e1454 Signed-off-by: Sam James gentoo.org> ...ick-tools-0-r3.ebuild => imagemagick-tools-1.ebuild} | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild b/virtual/imagemagick-tools/imagemagick-tools-1.ebuild similarity index 76% rename from virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild rename to virtual/imagemagick-tools/imagemagick-tools-1.ebuild index 3a8944b42e10..a09ac3268580 100644 --- a/virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild +++ b/virtual/imagemagick-tools/imagemagick-tools-1.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Virtual for imagemagick command line tools" + SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="jpeg perl postscript png svg tiff" @@ -15,7 +16,13 @@ IUSE="jpeg perl postscript png svg tiff" # in all consuming ebuilds and use appropriate sub-slot operators. # See also: https://bugs.gentoo.org/314431 RDEPEND=" - || ( - media-gfx/imagemagick[jpeg?,perl?,postscript?,png?,svg?,tiff?] - media-gfx/graphicsmagick[imagemagick,jpeg?,perl?,postscript?,png?,svg(-),tiff?] - )" + svg? ( + media-gfx/imagemagick[jpeg?,perl?,postscript?,png?,svg,tiff?] + ) + !svg? ( + || ( + media-gfx/imagemagick[jpeg?,perl?,postscript?,png?,tiff?] + media-gfx/graphicsmagick[imagemagick,jpeg?,perl?,postscript?,png?,tiff?] + ) + ) +"