diff options
| author |   Sam James <sam@gentoo.org> | 2024-06-08 18:13:39 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-06-08 18:14:59 +0100 |
| commit | af22ddb2c61f30b103776b09f2ce7e1d5ecadb87 (patch) | |
| tree | 6f01a2ebd7be8e3f4d0c860040d59accd6f97bc9 /virtual | |
| parent | dev-python/fonttools: Keyword 4.53.0 ppc, #932674 (diff) | |
| download | gentoo-af22ddb2c61f30b103776b09f2ce7e1d5ecadb87.tar.gz gentoo-af22ddb2c61f30b103776b09f2ce7e1d5ecadb87.tar.bz2 gentoo-af22ddb2c61f30b103776b09f2ce7e1d5ecadb87.zip | |
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 <sam@gentoo.org>
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/imagemagick-tools/imagemagick-tools-1.ebuild (renamed from virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild) | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild b/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?] + ) + ) +" |