From af22ddb2c61f30b103776b09f2ce7e1d5ecadb87 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 8 Jun 2024 18:13:39 +0100 Subject: 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 --- .../imagemagick-tools-0-r3.ebuild | 21 ---------------- .../imagemagick-tools/imagemagick-tools-1.ebuild | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 21 deletions(-) delete mode 100644 virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild create mode 100644 virtual/imagemagick-tools/imagemagick-tools-1.ebuild (limited to 'virtual/imagemagick-tools') diff --git a/virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild b/virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild deleted file mode 100644 index 3a8944b42e10..000000000000 --- a/virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -# This virtual is to be used **ONLY** for depending on the runtime -# tools of imagemagick/graphicsmagick. It should and cannot be used -# for linking against, as subslots are not transitively passed on. -# For linking, you will need to depend on the respective libraries -# 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?] - )" diff --git a/virtual/imagemagick-tools/imagemagick-tools-1.ebuild b/virtual/imagemagick-tools/imagemagick-tools-1.ebuild new file mode 100644 index 000000000000..a09ac3268580 --- /dev/null +++ b/virtual/imagemagick-tools/imagemagick-tools-1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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" + +# This virtual is to be used **ONLY** for depending on the runtime +# tools of imagemagick/graphicsmagick. It should and cannot be used +# for linking against, as subslots are not transitively passed on. +# For linking, you will need to depend on the respective libraries +# in all consuming ebuilds and use appropriate sub-slot operators. +# See also: https://bugs.gentoo.org/314431 +RDEPEND=" + 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?] + ) + ) +" -- cgit v1.2.3-65-gdbad