gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

virtual/imagemagick-tools: add 1, drop 0-r3

Browse Source 
I gave Holger bad advice when we were discussing af40c92d01.

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: af40c92d01
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2024-06-08 18:13:39 +01:00
parent 57b66ec82b
commit af22ddb2c6
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
virtual/imagemagick-tools/imagemagick-tools-0-r3.ebuild → virtual/imagemagick-tools/imagemagick-tools-1.ebuild
View File

@@ -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?]
)
)
"