From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: virtual/imagemagick-tools/
Date: Sat, 8 Jun 2024 17:15:17 +0000 (UTC) [thread overview]
Message-ID: <1717866899.af22ddb2c61f30b103776b09f2ce7e1d5ecadb87.sam@gentoo> (raw)
commit: af22ddb2c61f30b103776b09f2ce7e1d5ecadb87
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 17:13:39 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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?]
+ )
+ )
+"
next reply other threads:[~2024-06-08 17:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-08 17:15 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-31 21:32 [gentoo-commits] repo/gentoo:master commit in: virtual/imagemagick-tools/ Sam James
2024-05-19 17:09 Sam James
2024-05-19 17:09 Sam James
2024-05-19 17:02 Sam James
2022-06-21 16:29 David Seifert
2022-05-26 3:52 WANG Xuerui
2022-01-30 16:24 James Le Cuirot
2021-07-26 23:48 Marek Szuba
2021-01-26 0:06 Sam James
2019-05-20 17:22 Aaron Bauman
2019-03-16 19:01 Mikle Kolyada
2018-02-18 16:01 Michał Górny
2017-06-19 14:13 Alexis Ballier
2017-06-17 20:27 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1717866899.af22ddb2c61f30b103776b09f2ce7e1d5ecadb87.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox