[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-07-12 Thread Sam James
commit: 21586e8a075a56ddd2b3b332f12b4d9703f4d706
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 12 14:57:36 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 12 14:57:36 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21586e8a

media-gfx/imagemagick: Stabilize 6.9.13.25 ppc64, #959935

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
index 525b1e2490ed..d82471f58028 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-07-12 Thread Sam James
commit: b53219a4d45d5d6296241a3bfc3fc4d9758ed2b0
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 12 14:57:35 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 12 14:57:35 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53219a4

media-gfx/imagemagick: Stabilize 7.1.1.47 ppc64, #959934

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
index 69e7a03fef2f..34bdb98a9423 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-07-11 Thread Sam James
commit: b0cefcecf4c087bfac0bd3164fa536761c0aa956
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 12 05:10:00 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 12 05:10:00 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0cefcec

media-gfx/imagemagick: Stabilize 6.9.13.25 amd64, #959935

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
index 6af07410ad81..525b1e2490ed 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-07-11 Thread Sam James
commit: 26808f59e4dfcf2729b5a5b4df962bba82679bde
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 12 04:49:12 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 12 04:59:59 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26808f59

media-gfx/imagemagick: Stabilize 7.1.1.47 amd64, #959934

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
index a66ed0e15429..f36ea15ae7e2 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-07-11 Thread Sam James
commit: e444080d61b769774be2ffa3bea551d60ed5caa5
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 12 04:49:18 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 12 05:00:02 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e444080d

media-gfx/imagemagick: Stabilize 6.9.13.25 arm64, #959935

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
index b3e2e303a6db..6af07410ad81 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-07-11 Thread Sam James
commit: 570fe54879c8c8e5cfe30011260d3b61839c5695
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 12 04:49:13 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 12 05:00:00 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570fe548

media-gfx/imagemagick: Stabilize 7.1.1.47 arm64, #959934

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
index f36ea15ae7e2..69e7a03fef2f 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-07-11 Thread Sam James
commit: ae22f34d7c18f3e95e5669083986fdd0647d54be
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 12 04:49:15 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 12 05:00:00 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae22f34d

media-gfx/imagemagick: Stabilize 6.9.13.25 ppc, #959935

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
index 3f4305abdcd5..007a1a5f4ce8 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-07-11 Thread Sam James
commit: 1635e8a54aa94b740b5ac536d96dc051c557938d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 12 04:49:17 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 12 05:00:01 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1635e8a5

media-gfx/imagemagick: Stabilize 6.9.13.25 x86, #959935

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
index 007a1a5f4ce8..b3e2e303a6db 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-07-11 Thread Sam James
commit: ab35ff6b5ccbe615abef1c38ce50f236ad49eed9
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 12 04:49:10 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 12 04:59:58 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab35ff6b

media-gfx/imagemagick: Stabilize 7.1.1.47 x86, #959934

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
index c00e5fd43015..a66ed0e15429 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-07-11 Thread Sam James
commit: 20d88fee5c2acd20e8b2b83c06bc17e24e21a9e4
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 12 04:49:09 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 12 04:59:57 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d88fee

media-gfx/imagemagick: Stabilize 7.1.1.47 ppc, #959934

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
index c3543f04fc13..c00e5fd43015 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-06-10 Thread Sam James
commit: 38d50afac41347d326e4480ac7b9b5af802e55d8
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 10 17:31:03 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 10 17:31:38 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d50afa

media-gfx/imagemagick: add 7.1.1.47

Closes: https://bugs.gentoo.org/956500
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest|   1 +
 media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild | 255 ++
 2 files changed, 256 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index fb754a182a9d..22377872cbe4 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,3 +3,4 @@ DIST ImageMagick-6.9.13-25.tar.xz 9616976 BLAKE2B 
d54d907893fd0901530c989fdf8edc
 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 
9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080
 SHA512 
3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 
833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04
 SHA512 
0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e
 DIST ImageMagick-7.1.1-38.tar.xz 10778140 BLAKE2B 
f8abf53fefbebb9f6d6a28396aae1898ca52be22f56e60273ca68c1f40d5bbd1ac026542422f37ba489a9e46734fe36c5dd11fc0d819ed518b2371328f1bcf0b
 SHA512 
636e2061c11c012e2607a53a893eb227569f3a4e04e331499722f2c84dc0db3eedae63525bd530972a639e3a262ab4f61383a21ca8603f8f81e5629a29f54b89
+DIST ImageMagick-7.1.1-47.tar.xz 10773968 BLAKE2B 
0bd2287d9e7247f3b5422649c8235b89be552ef17565ab06e0ac77f00c589b2b87e89733d8fd19185b4438f27c5fa64d293bde118a8b67d7a8352221e1312798
 SHA512 
35fb786677fc0095cd999a9246c8ebd2af2a3a84fcba9c490c88cc33b1227b02ea9bf5b57b45d253b90d4292ae541bc521eb331f839f5aeeb11802d8e6e0ed35

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
new file mode 100644
index ..c3543f04fc13
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.47.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://imagemagick.org/index.php";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-18"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl 
+png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml 
zip zlib"
+
+REQUIRED_USE="
+   corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   jpegxl? ( >=media-libs/libjxl-0.6:= )
+   lcms? ( media-libs/lcms:2= )
+   lqr? ( media-libs/liblqr )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   pango? ( x11-libs/pango )
+   perl? ( >=dev-lang/perl-5.8.8:= )
+   png? ( media-libs/libpng:= )
+   postscript? ( app-text/ghostscript-gpl:= )
+   raw? ( media-libs/libraw:= )
+   svg? (
+   gnome-base/librsvg
+   media-gfx/potrace
+   )
+   tiff? ( media-libs/tiff:= )
+   truetype? (
+   media-fonts/urw-fonts
+   >=media-libs/freetype-2
+   )
+   webp?

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-06-10 Thread Sam James
commit: ee889441b607e9a44a8166f519c41e8a29db1e8a
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 10 17:31:29 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 10 17:31:39 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee889441

media-gfx/imagemagick: fix whitespace

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16-r2.ebuild | 2 +-
 media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r2.ebuild
index 2ed3fc571eda..2480907919f3 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r2.ebuild
@@ -109,7 +109,7 @@ src_prepare() {
done
mesa_cards=$(echo -n /dev/dri/card*)
for card in ${mesa_cards[@]} ; do
-addpredict "${card}"
+   addpredict "${card}"
done
nvidia_cards=$(echo -n /dev/nvidia*)
for card in ${nvidia_cards[@]} ; do

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
index 99fafe473ebc..3f4305abdcd5 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
@@ -109,7 +109,7 @@ src_prepare() {
done
mesa_cards=$(echo -n /dev/dri/card*)
for card in ${mesa_cards[@]} ; do
-addpredict "${card}"
+   addpredict "${card}"
done
nvidia_cards=$(echo -n /dev/nvidia*)
for card in ${nvidia_cards[@]} ; do



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-06-10 Thread Sam James
commit: 9fbe2f42b593ac63fad95af5f50ba0973fce83f8
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 10 17:23:58 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 10 17:31:38 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbe2f42

media-gfx/imagemagick: add 6.9.13.25

Bug: https://bugs.gentoo.org/956500
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest |   1 +
 media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild | 245 +
 2 files changed, 246 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 189f0531..fb754a182a9d 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,5 @@
 DIST ImageMagick-6.9.13-16.tar.xz 9613864 BLAKE2B 
ba6aa3cfd283e234c91e4e79a5410ba4b920cac59f1e1b23da7e899bd7b05a520bfcebd60cf3032c50da2c65bd70592a10de6a41382f9dc65eb37b1fac0f6b39
 SHA512 
11f3cd6a278d2af21a2bfdd5e88fe1302278b8d8a49c2b42affc5f1138f62db334fb53afc93883309904f1e6198fa4b577a5b28361e84a0c8f278873251b4e30
+DIST ImageMagick-6.9.13-25.tar.xz 9616976 BLAKE2B 
d54d907893fd0901530c989fdf8edc55f5a6513ae39bac9020292d865549839af4651c57aca0e24818feeb82fef5a45fb1b28009d632f5261101761037e111c6
 SHA512 
57e026f96ffb5022cf1a195fa32acf64b767d739e5cc3f4adc1a3315fb5c9b1146c8ec885eee30e0b4d381b8f6727aa3c57cd758d47b4e6d78e9c2837b8e5250
 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 
9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080
 SHA512 
3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 
833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04
 SHA512 
0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e
 DIST ImageMagick-7.1.1-38.tar.xz 10778140 BLAKE2B 
f8abf53fefbebb9f6d6a28396aae1898ca52be22f56e60273ca68c1f40d5bbd1ac026542422f37ba489a9e46734fe36c5dd11fc0d819ed518b2371328f1bcf0b
 SHA512 
636e2061c11c012e2607a53a893eb227569f3a4e04e331499722f2c84dc0db3eedae63525bd530972a639e3a262ab4f61383a21ca8603f8f81e5629a29f54b89

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
new file mode 100644
index ..99fafe473ebc
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.25.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://imagemagick.org/index.php";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="
+   corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   lcms? ( media-libs/lcms:2= )
+   lqr? ( media-libs/liblqr )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   pango? ( x11-libs/pango )
+   perl? ( >=dev-lang/perl-5.8.8:= )
+   png? ( media-libs/libpng:= )
+   postscript? ( app-text/ghostscript-gpl:= )
+   raw? ( media-libs/libraw:= )
+   svg? (
+   gnome-base/librsvg
+   media-gfx/potrace
+   )
+   tiff

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-05-05 Thread Sam James
commit: f6f6ce9c66a4775f18cde0e2fc0db2c437e4896d
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sat May  3 15:44:53 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  5 08:13:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f6ce9c

media-gfx/imagemagick: add dev-libs/libxml2 subslot op for incoming ABI break

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41919
Signed-off-by: Sam James  gentoo.org>

 ...{imagemagick-6.9.13.16-r1.ebuild => imagemagick-6.9.13.16-r2.ebuild} | 2 +-
 .../{imagemagick-6.9.13.3.ebuild => imagemagick-6.9.13.3-r1.ebuild} | 2 +-
 .../{imagemagick-7.1.1.25-r1.ebuild => imagemagick-7.1.1.25-r2.ebuild}  | 2 +-
 .../{imagemagick-7.1.1.38-r2.ebuild => imagemagick-7.1.1.38-r3.ebuild}  | 2 +-
 media-gfx/imagemagick/imagemagick-.ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r2.ebuild
similarity index 99%
rename from media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
rename to media-gfx/imagemagick/imagemagick-6.9.13.16-r2.ebuild
index 8a40a76d0cc8..2ed3fc571eda 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r2.ebuild
@@ -76,7 +76,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
)
-   xml? ( dev-libs/libxml2 )
+   xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib:= )
 "

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3-r1.ebuild
similarity index 99%
rename from media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
rename to media-gfx/imagemagick/imagemagick-6.9.13.3-r1.ebuild
index c2dd63adc7ea..59b127d04cb0 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3-r1.ebuild
@@ -76,7 +76,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
)
-   xml? ( dev-libs/libxml2 )
+   xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib:= )
 "

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25-r2.ebuild
similarity index 99%
rename from media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild
rename to media-gfx/imagemagick/imagemagick-7.1.1.25-r2.ebuild
index f1ba7a921c29..4b7990ee5929 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25-r2.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
)
-   xml? ( dev-libs/libxml2 )
+   xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
zip? ( dev-libs/libzip:= )
zlib? ( sys-libs/zlib:= )

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r3.ebuild
similarity index 99%
rename from media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
rename to media-gfx/imagemagick/imagemagick-7.1.1.38-r3.ebuild
index 8fa329f476c5..50172f62901c 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r3.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
)
-   xml? ( dev-libs/libxml2 )
+   xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
zip? ( dev-libs/libzip:= )
zlib? ( sys-libs/zlib:= )

diff --git a/media-gfx/imagemagick/imagemagick-.ebuild 
b/media-gfx/imagemagick/imagemagick-.ebuild
index c53f5f1ef202..c3543f04fc13 100644
--- a/media-gfx/imagemagick/imagemagick-.ebuild
+++ b/media-gfx/imagemagick/imagemagick-.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
)
-   xml? ( dev-libs/libxml2 )
+   xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
zip? ( dev-libs/libzip:= )
zlib? ( sys-libs/zlib:= )



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-03-09 Thread Sam James
commit: daeee4faff3eeb8bfb7839735d6cccb38a19ea43
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 10 06:04:34 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 10 06:07:35 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daeee4fa

media-gfx/imagemagick: fix nullglob vs quoting

Closes: https://bugs.gentoo.org/951100
Fixes: d8b3a440d5094cccf9be4f2f0df11dd79c869828
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild | 8 
 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild | 8 
 media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild  | 8 
 media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild  | 8 
 media-gfx/imagemagick/imagemagick-.ebuild | 8 
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index 080fc19e0b33..5fb8aee6da47 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -104,19 +104,19 @@ src_prepare() {
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card*)
-   for card in "${ati_cards[@]}" ; do
+   for card in ${ati_cards[@]} ; do
addpredict "${card}"
done
mesa_cards=$(echo -n /dev/dri/card*)
-   for card in "${mesa_cards[@]}" ; do
+   for card in ${mesa_cards[@]} ; do
 addpredict "${card}"
done
nvidia_cards=$(echo -n /dev/nvidia*)
-   for card in "${nvidia_cards[@]}" ; do
+   for card in ${nvidia_cards[@]} ; do
addpredict "${card}"
done
render_cards=$(echo -n /dev/dri/renderD128*)
-   for card in "${render_cards[@]}" ; do
+   for card in ${render_cards[@]} ; do
addpredict "${card}"
done
shopt -u nullglob

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index 81adc8b3bf07..c2dd63adc7ea 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -104,19 +104,19 @@ src_prepare() {
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card*)
-   for card in "${ati_cards[@]}" ; do
+   for card in ${ati_cards[@]} ; do
addpredict "${card}"
done
mesa_cards=$(echo -n /dev/dri/card*)
-   for card in "${mesa_cards[@]}" ; do
+   for card in ${mesa_cards[@]} ; do
addpredict "${card}"
done
nvidia_cards=$(echo -n /dev/nvidia*)
-   for card in "${nvidia_cards[@]}" ; do
+   for card in ${nvidia_cards[@]} ; do
addpredict "${card}"
done
render_cards=$(echo -n /dev/dri/renderD128*)
-   for card in "${render_cards[@]}" ; do
+   for card in ${render_cards[@]} ; do
addpredict "${card}"
done
shopt -u nullglob

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild
index a9b0dde7fb7c..f1ba7a921c29 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild
@@ -110,19 +110,19 @@ src_prepare() {
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card*)
-   for card in "${ati_cards[@]}" ; do
+   for card in ${ati_cards[@]} ; do
addpredict "${card}"
done
mesa_cards=$(echo -n /dev/dri/card*)
-   for card in "${mesa_cards[@]}" ; do
+   for card in ${mesa_cards[@]} ; do
addpredict "${card}"
done
nvidia_cards=$(echo -n /dev/nvidia*)
-   for card in "${nvidia_cards[@]}" ; do
+   for card in ${nvidia_cards[@]} ; do
addpredict "${card}"
done
render_cards=$(echo -n /dev/dri/renderD128*)
-   for card in "${render_cards[@]}" ; do
+   for card in ${render_cards[@]} ; do
addpredict "${card}"
done
shopt -u nullglob

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
index 16d4e4c94e35..fc5031f0e115 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
@@ -112,19 +112,19 @@ src_prepare() {
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card*)
-   for card in "${ati_cards[@]}" ; do
+   for card in ${ati_cards[@]} ; do
addpredict "${card}"
done
mesa_cards=$(echo -n /dev/dri/card*)
-   for card i

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-02-16 Thread Andreas K. Hüttel
commit: 5c4dbd05e7117c9cb714c707d1661bcb9fe1dd68
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Feb 16 17:35:46 2025 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Feb 16 17:36:47 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4dbd05

media-gfx/imagemagick: drop 6.9.13.16, 7.1.1.38, 7.1.1.38-r1

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild | 242 
 .../imagemagick/imagemagick-7.1.1.38-r1.ebuild | 254 -
 media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild  | 252 
 3 files changed, 748 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
deleted file mode 100644
index 8e26cfb2d9a6..
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
-   inherit git-r3
-   MY_P="imagemagick-"
-else
-   MY_PV="$(ver_rs 3 '-')"
-   MY_P="ImageMagick-${MY_PV}"
-   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://imagemagick.org/index.php";
-
-LICENSE="imagemagick"
-# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
-# If ABI is broken, change the bit after the '-'.
-SLOT="0/$(ver_cut 1-3)-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="
-   corefonts? ( truetype )
-   svg? ( xml )
-   test? ( corefonts )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   !media-gfx/graphicsmagick[imagemagick]
-   dev-libs/libltdl
-   bzip2? ( app-arch/bzip2 )
-   corefonts? ( media-fonts/corefonts )
-   djvu? ( app-text/djvu )
-   fftw? ( sci-libs/fftw:3.0 )
-   fontconfig? ( media-libs/fontconfig )
-   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-   graphviz? ( media-gfx/graphviz )
-   heif? ( media-libs/libheif:=[x265] )
-   jbig? ( >=media-libs/jbigkit-2:= )
-   jpeg? ( media-libs/libjpeg-turbo:= )
-   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   lcms? ( media-libs/lcms:2= )
-   lqr? ( media-libs/liblqr )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
-   pango? ( x11-libs/pango )
-   perl? ( >=dev-lang/perl-5.8.8:= )
-   png? ( media-libs/libpng:= )
-   postscript? ( app-text/ghostscript-gpl:= )
-   raw? ( media-libs/libraw:= )
-   svg? (
-   gnome-base/librsvg
-   media-gfx/potrace
-   )
-   tiff? ( media-libs/tiff:= )
-   truetype? (
-   media-fonts/urw-fonts
-   >=media-libs/freetype-2
-   )
-   webp? ( media-libs/libwebp:= )
-   wmf? ( media-libs/libwmf )
-   X? (
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libXext
-   x11-libs/libXt
-   )
-   xml? ( dev-libs/libxml2 )
-   lzma? ( app-arch/xz-utils )
-   zlib? ( sys-libs/zlib:= )
-"
-DEPEND="
-   ${RDEPEND}
-   X? ( x11-base/xorg-proto )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-   default
-
-   # for Darwin modules
-   elibtoolize
-
-   # For testsuite, see bug #500580#c3
-   local ati_cards mesa_cards nvidia_cards render_cards
-   shopt -s nullglob
-   ati_cards=$(echo -n /dev/ati/card*)
-   for card in "${ati_cards[@]}" ; do
-   addpredict "${card}"
-   done
-   mesa_cards=$(echo -n /dev/dri/card*)
-   for card in "${mesa_cards[@]}" ; do
-   addpredict "${card}"
-   done
-   nvidia_cards=$(echo -n /dev/nvidia*)
-   for card in "${nvidia_cards[@]}" ; do
-   addpredict "${card}"
-   done
-   render_cards=$(echo -n /dev/dri/renderD128*)
-   for card in "${render_cards[@]}" ; do
-   addpredict "${card}"
-   done
-   shopt -u nullglob
-   addpredict /dev/nvidiactl
-}
-
-src_configure() {
-   local depth=16
-   use q8 && depth=8
-   use q32 && depth=32

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2025-01-23 Thread Sam James
commit: d8b3a440d5094cccf9be4f2f0df11dd79c869828
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 24 04:56:16 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 24 04:56:36 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b3a440

media-gfx/imagemagick: fix addpredict use

Newer Portage bans use of colons in addpredict calls.

Signed-off-by: Sam James  gentoo.org>

 .../imagemagick/imagemagick-6.9.13.16-r1.ebuild| 34 ++--
 media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild | 34 ++--
 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild  | 34 ++--
 .../imagemagick/imagemagick-7.1.1.25-r1.ebuild | 36 +++---
 .../imagemagick/imagemagick-7.1.1.38-r1.ebuild | 36 +++---
 .../imagemagick/imagemagick-7.1.1.38-r2.ebuild | 36 +++---
 media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild  | 36 +++---
 media-gfx/imagemagick/imagemagick-.ebuild  | 36 +++---
 8 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index 3a27a91f6b96..080fc19e0b33 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -103,22 +103,22 @@ src_prepare() {
# For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
-   ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-   if test -n "${ati_cards}"; then
-   addpredict "${ati_cards}"
-   fi
-   mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-   if test -n "${mesa_cards}"; then
-   addpredict "${mesa_cards}"
-   fi
-   nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-   if test -n "${nvidia_cards}"; then
-   addpredict "${nvidia_cards}"
-   fi
-   render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-   if test -n "${render_cards}"; then
-   addpredict "${render_cards}"
-   fi
+   ati_cards=$(echo -n /dev/ati/card*)
+   for card in "${ati_cards[@]}" ; do
+   addpredict "${card}"
+   done
+   mesa_cards=$(echo -n /dev/dri/card*)
+   for card in "${mesa_cards[@]}" ; do
+addpredict "${card}"
+   done
+   nvidia_cards=$(echo -n /dev/nvidia*)
+   for card in "${nvidia_cards[@]}" ; do
+   addpredict "${card}"
+   done
+   render_cards=$(echo -n /dev/dri/renderD128*)
+   for card in "${render_cards[@]}" ; do
+   addpredict "${card}"
+   done
shopt -u nullglob
addpredict /dev/nvidiactl
 }

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
index d5470d00ae36..8e26cfb2d9a6 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -103,22 +103,22 @@ src_prepare() {
# For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
-   ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-   if test -n "${ati_cards}"; then
-   addpredict "${ati_cards}"
-   fi
-   mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-   if test -n "${mesa_cards}"; then
-   addpredict "${mesa_cards}"
-   fi
-   nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-   if test -n "${nvidia_cards}"; then
-   addpredict "${nvidia_cards}"
-   fi
-   render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-   if test -n "${render_cards}"; then
-   addpredict "${render_cards}"
-   fi
+   ati_cards=$(echo -n /dev/ati/card*)
+   for card in "${ati_cards[@]}" ; do
+   addpredict "${card}"
+   done
+   mesa_cards=$(echo -n /dev/dri/card*)
+   for card in "${mesa_cards[@]}" ; do
+   addpredict "${card}"
+   done
+   nvidia_cards=$(echo -n /dev/nvidia*)
+   for card in "${nvidia_cards[@]}" ; do
+   addpredict "${card}"
+   done
+   render_cards=$(echo -n /dev/dri/renderD128*)
+   for card in "${render_cards[@]}" ; do
+   addpredict "${card}"
+   done
shopt -u nullglob
addpredict /dev/nvidiactl
 }

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
in

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-31 Thread Sam James
commit: 5a7b112174a4e73440af9bf2fec6b9bef4db93da
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 31 13:49:39 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 31 13:49:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a7b1121

media-gfx/imagemagick: Stabilize 6.9.13.16-r1 arm, #941431

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index b31c19145569..3a27a91f6b96 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-18 Thread Arthur Zamarin
commit: 362213632ed2b9716cd3d95364079214e1745025
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Oct 18 17:32:37 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Oct 18 17:32:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36221363

media-gfx/imagemagick: Stabilize 6.9.13.16-r1 arm64, #941431

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index cb20dc5dae97..b31c19145569 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-14 Thread Sam James
commit: 79eb11e73ec0b44bd62fe85d55e7763f77548515
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 14 21:59:04 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 14 21:59:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79eb11e7

media-gfx/imagemagick: Stabilize 6.9.13.16-r1 sparc, #941431

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index d729ea35f4c3..cb20dc5dae97 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-13 Thread Sam James
commit: 6456f6dec81d9074c77d32ccaf3d65cee3e6d6ae
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 13 20:39:12 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 13 20:39:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6456f6de

media-gfx/imagemagick: Stabilize 7.1.1.38-r2 sparc, #941432

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
index bcbca49ee01a..81077e69b972 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-12 Thread Sam James
commit: 75204d1c2c8975f4c9ee5ca82e5825cd20eaa789
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 12 23:45:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 12 23:45:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75204d1c

media-gfx/imagemagick: Stabilize 7.1.1.38-r2 ppc64, #941432

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
index 349c48934e5d..4f2fac84c0e2 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-12 Thread Sam James
commit: 1b6ed73f89cd5c858120fd9dcc4561b8dcde60ac
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 12 23:45:21 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 12 23:45:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b6ed73f

media-gfx/imagemagick: Stabilize 7.1.1.38-r2 ppc, #941432

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
index 4f2fac84c0e2..bcbca49ee01a 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-12 Thread Sam James
commit: 65f0e8365888a7a3cce7d04f9136a6d82971777a
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 12 23:35:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 12 23:35:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f0e836

media-gfx/imagemagick: Stabilize 6.9.13.16-r1 ppc64, #941431

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index e86fb624831e..d729ea35f4c3 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-12 Thread Sam James
commit: 2c7550ef12f919c1e0ad7bc0b5b5394564a21a51
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 12 23:35:09 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 12 23:35:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c7550ef

media-gfx/imagemagick: Stabilize 6.9.13.16-r1 amd64, #941431

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index 4d6e99e280d2..e86fb624831e 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-12 Thread Sam James
commit: 4a6a5b821340934d27840e4a0d2197a7159ba48c
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 12 23:35:12 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 12 23:35:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6a5b82

media-gfx/imagemagick: Stabilize 7.1.1.38-r2 amd64, #941432

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
index 01129f6f085c..349c48934e5d 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-12 Thread Sam James
commit: 13df0a030b5a3c81b7385cdff08151881e559723
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 12 23:35:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 12 23:35:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13df0a03

media-gfx/imagemagick: Stabilize 6.9.13.16-r1 x86, #941431

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index 63df7afa7352..92cff9272d59 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-12 Thread Sam James
commit: c72f08f1e48b5b3df86f9dcdf04bfea4669aa414
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 12 23:35:08 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 12 23:35:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c72f08f1

media-gfx/imagemagick: Stabilize 6.9.13.16-r1 ppc, #941431

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index 92cff9272d59..4d6e99e280d2 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-12 Thread Sam James
commit: f8d1b9f84d23b5f6b68e6eabe19cf82882350501
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 12 23:35:11 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 12 23:35:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8d1b9f8

media-gfx/imagemagick: Stabilize 7.1.1.38-r2 x86, #941432

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
index bc9b5913ef75..01129f6f085c 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-11 Thread Sam James
commit: 56b835de43c60269973d4c7ea331338cd4eb9011
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 12 05:29:09 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 12 05:31:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b835de

media-gfx/imagemagick: workaround GCC 13 bug

-O3 implies -funswitch-loops which triggers an unfortunate rare edgecase
with one of the switch statements in ImageMagick. Apply a workaround
for GCC 13 for now (14+ is fixed already and it's latent otherwise).

The fix will land on the 13 branch shortly upstream but let's get the fix
out quickly on our end so we don't have to rush to stable it and so on
(although we will of course do it soon).

Bug: https://github.com/ImageMagick/ImageMagick/issues/7677
Bug: https://gcc.gnu.org/PR117100
Closes: https://bugs.gentoo.org/941208
Signed-off-by: Sam James  gentoo.org>

 ...1.25.ebuild => imagemagick-6.9.13.16-r1.ebuild} | 41 +-
 1.25.ebuild => imagemagick-7.1.1.25-r1.ebuild} |  3 ++
 ...-.ebuild => imagemagick-7.1.1.38-r2.ebuild} |  5 +++
 media-gfx/imagemagick/imagemagick-.ebuild  |  3 ++
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
similarity index 82%
copy from media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
copy to media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
index be2efbd13782..63df7afa7352 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild
@@ -4,17 +4,17 @@
 EAPI=8
 
 QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit autotools flag-o-matic perl-functions toolchain-funcs
+inherit flag-o-matic libtool perl-functions toolchain-funcs
 
 if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
inherit git-r3
MY_P="imagemagick-"
 else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -25,8 +25,8 @@ HOMEPAGE="https://imagemagick.org/index.php";
 LICENSE="imagemagick"
 # Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
 # If ABI is broken, change the bit after the '-'.
-SLOT="0/$(ver_cut 1-3)-18"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl 
+png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml 
zip zlib"
+SLOT="0/$(ver_cut 1-3)-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="
corefonts? ( truetype )
@@ -50,7 +50,6 @@ RDEPEND="
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( media-libs/libjpeg-turbo:= )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   jpegxl? ( >=media-libs/libjxl-0.6:= )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )
@@ -79,7 +78,6 @@ RDEPEND="
)
xml? ( dev-libs/libxml2 )
lzma? ( app-arch/xz-utils )
-   zip? ( dev-libs/libzip:= )
zlib? ( sys-libs/zlib:= )
 "
 DEPEND="
@@ -88,10 +86,6 @@ DEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-   "${FILESDIR}/${PN}--nocputuning.patch"
-)
-
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -103,10 +97,10 @@ pkg_setup() {
 src_prepare() {
default
 
-   #elibtoolize # for Darwin modules
-   eautoreconf
+   # for Darwin modules
+   elibtoolize
 
-   # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+   # For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
@@ -138,6 +132,9 @@ src_configure() {
 
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
 
+   # Workaround for bug #941208 (gcc PR117100)
+   tc-is-gcc && [[ $(gcc-major-version) == 13 ]] && append-flags 
-fno-unswitch-loops
+
local myeconfargs=(
$(use_enable static-libs static)
$(use_enable hdri)
@@ -152,7 +149,6 @@ src_configure() {
--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-10-05 Thread Sam James
commit: 270f6ebf2e886ed84478c624fc88bb74aaabb080
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  5 07:34:40 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  5 07:41:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270f6ebf

media-gfx/imagemagick: update HOMEPAGE

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild   | 2 +-
 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild| 2 +-
 media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild| 2 +-
 media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild | 2 +-
 media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild| 2 +-
 media-gfx/imagemagick/imagemagick-.ebuild| 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
index 43d4c8ad58a3..d5470d00ae36 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
@@ -20,7 +20,7 @@ fi
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
+HOMEPAGE="https://imagemagick.org/index.php";
 
 LICENSE="imagemagick"
 # Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index cd15c47edb36..51feb1ba7e34 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -20,7 +20,7 @@ fi
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
+HOMEPAGE="https://imagemagick.org/index.php";
 
 LICENSE="imagemagick"
 # Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
index 58f526bfb5c5..be2efbd13782 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
@@ -20,7 +20,7 @@ fi
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
+HOMEPAGE="https://imagemagick.org/index.php";
 
 LICENSE="imagemagick"
 # Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
index 224f22accf35..7a411d2e2d91 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
@@ -20,7 +20,7 @@ fi
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
+HOMEPAGE="https://imagemagick.org/index.php";
 
 LICENSE="imagemagick"
 # Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
index 8e08176c4db2..45cfe4d2db47 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
@@ -20,7 +20,7 @@ fi
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
+HOMEPAGE="https://imagemagick.org/index.php";
 
 LICENSE="imagemagick"
 # Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.

diff --git a/media-gfx/imagemagick/imagemagick-.ebuild 
b/media-gfx/imagemagick/imagemagick-.ebuild
index 8e08176c4db2..45cfe4d2db47 100644
--- a/media-gfx/imagemagick/imagemagick-.ebuild
+++ b/media-gfx/imagemagick/imagemagick-.ebuild
@@ -20,7 +20,7 @@ fi
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
+HOMEPAGE="https://imagemagick.org/index.php";
 
 LICENSE="imagemagick"
 # Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/files/, media-gfx/imagemagick/

2024-09-08 Thread Andreas K. Hüttel
commit: 81f653a24e06d7cf7048802531a83b432914e5f2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Sep  8 19:48:49 2024 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Sep  8 19:50:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f653a2

media-gfx/imagemagick: Revert some upstream changes to Perl build system

Closes: https://bugs.gentoo.org/939324
Bug: https://github.com/ImageMagick/ImageMagick/issues/7602
Bug: https://github.com/ImageMagick/ImageMagick/issues/7191
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 .../files/imagemagick-7.1.1.38-perl-1.patch|  28 +++
 .../files/imagemagick-7.1.1.38-perl-2.patch|  27 +++
 .../imagemagick/imagemagick-7.1.1.38-r1.ebuild | 254 +
 3 files changed, 309 insertions(+)

diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch 
b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch
new file mode 100644
index ..afd45b3417eb
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch
@@ -0,0 +1,28 @@
+From 3862ebc02771f33c309e9ee91b696aff0fbdc20e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= 
+Date: Sun, 8 Sep 2024 21:10:01 +0200
+Subject: [PATCH 1/2] Revert "install perl module into user-specified prefix
+ (#7192)"
+
+This reverts commit c09d35f22090585a0357ecfbd58786022a37aae7.
+---
+ PerlMagick/Makefile.PL.in | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/PerlMagick/Makefile.PL.in b/PerlMagick/Makefile.PL.in
+index 902f01dc2..622a502ea 100644
+--- a/PerlMagick/Makefile.PL.in
 b/PerlMagick/Makefile.PL.in
+@@ -223,9 +223,6 @@ WriteMakefile
+# Linker flags for building a dynamically loadable module
+'LDDLFLAGS' => $LDDLFLAGS_magick,
+ 
+-   # Install PerlMagick into ImageMagick prefix
+-   'INSTALL_BASE' => '@PREFIX_DIR@',
+-
+# Install PerlMagick binary into ImageMagick bin directory
+'INSTALLBIN'   => '@BIN_DIR@',
+ 
+-- 
+2.44.2
+

diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch 
b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch
new file mode 100644
index ..10418d8555e6
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch
@@ -0,0 +1,27 @@
+From 5e08a2474436574d7ed6de006573dd9bc036cd5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= 
+Date: Sun, 8 Sep 2024 21:10:13 +0200
+Subject: [PATCH 2/2] Revert "set perl install base to that of ImageMagick's"
+
+This reverts commit 2d5edb26e22dd34ac1e43936b5c461bf0dbdb03a.
+---
+ PerlMagick/quantum/Makefile.PL.in | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/PerlMagick/quantum/Makefile.PL.in 
b/PerlMagick/quantum/Makefile.PL.in
+index fabebd300..fa0bf3384 100644
+--- a/PerlMagick/quantum/Makefile.PL.in
 b/PerlMagick/quantum/Makefile.PL.in
+@@ -220,9 +220,6 @@ WriteMakefile
+# Linker flags for building a dynamically loadable module
+'LDDLFLAGS' => $LDDLFLAGS_magick,
+ 
+-   # Install PerlMagick into ImageMagick prefix
+-   'INSTALL_BASE' => '@PREFIX_DIR@',
+-
+# Install PerlMagick binary into ImageMagick bin directory
+'INSTALLBIN'   => '@BIN_DIR@',
+ 
+-- 
+2.44.2
+

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
new file mode 100644
index ..16ef267001e2
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   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"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-18"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl 
+png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml 
zip zlib"
+
+REQUIRED_USE="
+   corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-09-08 Thread Sam James
commit: 72545b8399e9a88e4c8ce7dcfea44ac8063b1515
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  8 09:08:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  8 09:08:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72545b83

media-gfx/imagemagick: add 7.1.1.38

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest  | 1 +
 .../{imagemagick-.ebuild => imagemagick-7.1.1.38.ebuild}| 6 +++---
 media-gfx/imagemagick/imagemagick-.ebuild   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 46e1db520182..189f0531 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,3 +1,4 @@
 DIST ImageMagick-6.9.13-16.tar.xz 9613864 BLAKE2B 
ba6aa3cfd283e234c91e4e79a5410ba4b920cac59f1e1b23da7e899bd7b05a520bfcebd60cf3032c50da2c65bd70592a10de6a41382f9dc65eb37b1fac0f6b39
 SHA512 
11f3cd6a278d2af21a2bfdd5e88fe1302278b8d8a49c2b42affc5f1138f62db334fb53afc93883309904f1e6198fa4b577a5b28361e84a0c8f278873251b4e30
 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 
9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080
 SHA512 
3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 
833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04
 SHA512 
0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e
+DIST ImageMagick-7.1.1-38.tar.xz 10778140 BLAKE2B 
f8abf53fefbebb9f6d6a28396aae1898ca52be22f56e60273ca68c1f40d5bbd1ac026542422f37ba489a9e46734fe36c5dd11fc0d819ed518b2371328f1bcf0b
 SHA512 
636e2061c11c012e2607a53a893eb227569f3a4e04e331499722f2c84dc0db3eedae63525bd530972a639e3a262ab4f61383a21ca8603f8f81e5629a29f54b89

diff --git a/media-gfx/imagemagick/imagemagick-.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
similarity index 98%
copy from media-gfx/imagemagick/imagemagick-.ebuild
copy to media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
index 904cbdbc135e..31879f9cdc1a 100644
--- a/media-gfx/imagemagick/imagemagick-.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -155,6 +155,7 @@ src_configure() {
$(use_with zip)
$(use_with zlib)
--without-autotrace
+   --with-uhdr
$(use_with postscript dps)
$(use_with djvu)
--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
@@ -226,8 +227,7 @@ src_install() {
DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
install
 
-   rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-   dodoc {AUTHORS,README}.txt
+   einstalldocs
 
if use perl; then
find "${ED}" -type f -name perllocal.pod -exec rm -f {} +

diff --git a/media-gfx/imagemagick/imagemagick-.ebuild 
b/media-gfx/imagemagick/imagemagick-.ebuild
index 904cbdbc135e..31879f9cdc1a 100644
--- a/media-gfx/imagemagick/imagemagick-.ebuild
+++ b/media-gfx/imagemagick/imagemagick-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -155,6 +155,7 @@ src_configure() {
$(use_with zip)
$(use_with zlib)
--without-autotrace
+   --with-uhdr
$(use_with postscript dps)
$(use_with djvu)
--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
@@ -226,8 +227,7 @@ src_install() {
DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
install
 
-   rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-   dodoc {AUTHORS,README}.txt
+   einstalldocs
 
if use perl; then
find "${ED}" -type f -name perllocal.pod -exec rm -f {} +



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-09-08 Thread Sam James
commit: e0b589d601c53e452618ecae9bc6cecbeb27b065
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  8 08:10:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  8 08:52:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b589d6

media-gfx/imagemagick: add 6.9.13.16

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest |   1 +
 media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild | 242 +
 2 files changed, 243 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index b54b227f16d8..46e1db520182 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,2 +1,3 @@
+DIST ImageMagick-6.9.13-16.tar.xz 9613864 BLAKE2B 
ba6aa3cfd283e234c91e4e79a5410ba4b920cac59f1e1b23da7e899bd7b05a520bfcebd60cf3032c50da2c65bd70592a10de6a41382f9dc65eb37b1fac0f6b39
 SHA512 
11f3cd6a278d2af21a2bfdd5e88fe1302278b8d8a49c2b42affc5f1138f62db334fb53afc93883309904f1e6198fa4b577a5b28361e84a0c8f278873251b4e30
 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 
9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080
 SHA512 
3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 
833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04
 SHA512 
0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
new file mode 100644
index ..1954fe32d565
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="
+   corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   lcms? ( media-libs/lcms:2= )
+   lqr? ( media-libs/liblqr )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   pango? ( x11-libs/pango )
+   perl? ( >=dev-lang/perl-5.8.8:= )
+   png? ( media-libs/libpng:= )
+   postscript? ( app-text/ghostscript-gpl:= )
+   raw? ( media-libs/libraw:= )
+   svg? (
+   gnome-base/librsvg
+   media-gfx/potrace
+   )
+   tiff? ( media-libs/tiff:= )
+   truetype? (
+   media-fonts/urw-fonts
+   >=media-libs/freetype-2
+   )
+   webp? ( media-libs/libwebp:= )
+   wmf? ( media-libs/libwmf )
+   X? (
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libXext
+   x11-libs/libXt
+   )
+   xml? ( dev-libs/libxml2 )
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib:= )
+"
+DEPEND="
+   ${RDEPEND}
+   X? ( x11-base/xorg-proto )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-03-04 Thread Sam James
commit: 6778970d9da0520a0c077657a381a35340690d3e
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 11:23:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 11:23:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6778970d

media-gfx/imagemagick: drop 7.1.1.11, 7.1.1.24

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest|   2 -
 media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild | 281 --
 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 253 ---
 3 files changed, 536 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index d024245f3ec8..b54b227f16d8 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,2 @@
 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 
9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080
 SHA512 
3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
-DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
-DIST ImageMagick-7.1.1-24.tar.xz 10561928 BLAKE2B 
992d1425a2e306f9bf85dfafb09f2869fae09b57a32c3b1992d4f478932ef6ec58368d70574f134e7226b09a6275cd1f4343064b36ca3fb8556a60d59138df2e
 SHA512 
78dbd763f70b36e95a728cff7a1e02ec1c5d3b9a8371161e306e77450f1a3c33a987f19dda3eca94dfa2435b4a29a97c5df5155915a73441f74174a98b36a7d9
 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 
833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04
 SHA512 
0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
deleted file mode 100644
index a4e1dd5cc61c..
--- a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit autotools flag-o-matic perl-functions toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
-   inherit git-r3
-   MY_P="imagemagick-"
-else
-   MY_PV="$(ver_rs 3 '-')"
-   MY_P="ImageMagick-${MY_PV}"
-   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
-# If ABI is broken, change the bit after the '-'.
-SLOT="0/$(ver_cut 1-3)-43"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip 
zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-   svg? ( xml )
-   test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   !media-gfx/graphicsmagick[imagemagick]
-   dev-libs/libltdl
-   bzip2? ( app-arch/bzip2 )
-   corefonts? ( media-fonts/corefonts )
-   djvu? ( app-text/djvu )
-   fftw? ( sci-libs/fftw:3.0 )
-   fontconfig? ( media-libs/fontconfig )
-   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-   graphviz? ( media-gfx/graphviz )
-   heif? ( media-libs/libheif:=[x265] )
-   jbig? ( >=media-libs/jbigkit-2:= )
-   jpeg? ( media-libs/libjpeg-turbo:= )
-   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   jpegxl? ( >=media-libs/libjxl-0.6:= )
-   lcms? ( media-libs/lcms:2= )
-   lqr? ( media-libs/liblqr )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
-   pango? ( x11-libs/pango )
-   perl? ( >=dev-lang/perl-5.8.8:= )
-   png? ( media-libs/libpng:= )
-   postscript? ( app-text/ghostscript-gpl:= )
-   raw? ( media-libs/libraw:= )
-   svg? (
-   gnome-base/librsvg
-   media-gfx/potrace
-   )
-   tiff? ( media-libs/tiff:= )
-   truetype? (
-   media-fonts/urw-fonts
-   >=media-libs/freetype-2
-   )
-   webp? ( media-libs/libwebp:= )
-   wmf? ( media-libs/libwm

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-03-04 Thread Sam James
commit: 0d2e1996d7f6c18d3f8dbff515eeb447a60ed9a3
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 11:22:52 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 11:22:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2e1996

media-gfx/imagemagick: drop 6.9.12.89-r1, 6.9.13.2

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest |   2 -
 .../imagemagick/imagemagick-6.9.12.89-r1.ebuild| 271 -
 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild  | 246 ---
 3 files changed, 519 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 8d687c068b97..d024245f3ec8 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,5 +1,3 @@
-DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
-DIST ImageMagick-6.9.13-2.tar.xz 9611768 BLAKE2B 
0b0bb7dec536b12f0f5dc83b03b33a122158a946ea38a44b48442124c5e11a7af33100e213c8332baa23bc45329cb66611bf2347631155bb16c3ceb6ccc185f6
 SHA512 
d693983eda6fba6b5e1d5d5bb4dc814dffd6a064c0464dded86c5f780ce52bef737d1bc870fae4c5bd039c419585fb374a0c4fbd19d94153d319eb8e3d5595b3
 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 
9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080
 SHA512 
3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-24.tar.xz 10561928 BLAKE2B 
992d1425a2e306f9bf85dfafb09f2869fae09b57a32c3b1992d4f478932ef6ec58368d70574f134e7226b09a6275cd1f4343064b36ca3fb8556a60d59138df2e
 SHA512 
78dbd763f70b36e95a728cff7a1e02ec1c5d3b9a8371161e306e77450f1a3c33a987f19dda3eca94dfa2435b4a29a97c5df5155915a73441f74174a98b36a7d9

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
deleted file mode 100644
index 8df9b4f96a83..
--- a/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
-   inherit git-r3
-   MY_P="imagemagick-"
-else
-   MY_PV="$(ver_rs 3 '-')"
-   MY_P="ImageMagick-${MY_PV}"
-   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
-# If ABI is broken, change the bit after the '-'.
-SLOT="0/$(ver_cut 1-3)-58"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-   svg? ( xml )
-   test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   !media-gfx/graphicsmagick[imagemagick]
-   dev-libs/libltdl
-   bzip2? ( app-arch/bzip2 )
-   corefonts? ( media-fonts/corefonts )
-   djvu? ( app-text/djvu )
-   fftw? ( sci-libs/fftw:3.0 )
-   fontconfig? ( media-libs/fontconfig )
-   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-   graphviz? ( media-gfx/graphviz )
-   heif? ( media-libs/libheif:=[x265] )
-   jbig? ( >=media-libs/jbigkit-2:= )
-   jpeg? ( media-libs/libjpeg-turbo:= )
-   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   lcms? ( media-libs/lcms:2= )
-   lqr? ( media-libs/liblqr )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
-   pango? ( x11-libs/pango )
-   perl? ( >=dev-lang/perl-5.8.8:= )
-   png? ( media-libs/libpng:= )
-   postscript? ( app-text/ghostscript-gpl:= )
-   raw? ( media-libs/libraw:= )
-   svg? (
-   gnome-base/librsvg
-  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-02-05 Thread Ionen Wolkens
commit: 42e40fb04d432c6cec18ada07a171964acde3003
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sun Feb  4 22:05:27 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Feb  6 05:03:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e40fb0

media-gfx/imagemagick: Stabilize 6.9.13.3 arm64, #921372

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index faedc8c5abbe..1b2db36a1bbf 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-02-05 Thread Ionen Wolkens
commit: 8b051c899dd0a90e46570f2d03e8150b954e5e66
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sun Feb  4 21:57:35 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Feb  6 05:03:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b051c89

media-gfx/imagemagick: Stabilize 7.1.1.25 sparc, #921371

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
index a8b8b723807a..013b431c3ab9 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-02-04 Thread Ionen Wolkens
commit: e1dc509a210c6dc44a4987627b1f2ac7bd82af12
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sun Feb  4 21:33:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Feb  4 21:43:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1dc509a

media-gfx/imagemagick: Stabilize 6.9.13.3 sparc, #921372

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index d46159e8f5b5..faedc8c5abbe 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: f2cd8e4fac6ac4527ac5c727ee4b53862db9ea23
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 22:27:32 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2cd8e4f

media-gfx/imagemagick: Stabilize 6.9.13.3 arm, #921372

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index d3922862ce18..d46159e8f5b5 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: d4455ab87ea0756234a3f933093be1855f3a37c4
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 20:58:37 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4455ab8

media-gfx/imagemagick: Stabilize 7.1.1.25 arm, #921371

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
index 3923e1e3fcff..a8b8b723807a 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: d69fff7d72d2a658220a41a3bd8949ed518ca2e1
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 20:47:03 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69fff7d

media-gfx/imagemagick: Stabilize 7.1.1.25 arm64, #921371

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
index ee41355fef0d..3923e1e3fcff 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: 89dc2ba5ab234d26d9c23b940f329d6ec057d0be
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 20:39:24 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89dc2ba5

media-gfx/imagemagick: Stabilize 6.9.13.3 ppc, #921372

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index 68cd4a309923..d3922862ce18 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: 257ec558021b50166f7ab7688486a1b17d6834cc
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 20:24:09 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=257ec558

media-gfx/imagemagick: Stabilize 6.9.13.3 ppc64, #921372

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index 4950f23a3200..68cd4a309923 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: bc7a24731e9c4a294e515e9eaeade4e58faafcec
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 18:48:11 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc7a2473

media-gfx/imagemagick: Stabilize 7.1.1.25 ppc64, #921371

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
index 42d62e6c1ccc..2dafa5f2a040 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: 68a984e3f12f6644776e91a4bc30faf98ddd034e
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 18:24:51 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a984e3

media-gfx/imagemagick: Stabilize 7.1.1.25 x86, #921371

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
index d84c15189e43..42d62e6c1ccc 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: ba94f190f6d5ba4bb4d563dfb8155a60aa94f8ef
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 18:20:07 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba94f190

media-gfx/imagemagick: Stabilize 7.1.1.25 amd64, #921371

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
index eb7f89a09b68..d84c15189e43 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: 864e7283b6f0c93138f3ece8405a0b54f6724c7b
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 18:28:30 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864e7283

media-gfx/imagemagick: Stabilize 6.9.13.3 amd64, #921372

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index 1954fe32d565..41be89a16222 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: e3163122f410dde1e4608f3935c7c7b9eb8b8b0e
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 19:28:43 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3163122

media-gfx/imagemagick: Stabilize 7.1.1.25 ppc, #921371

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
index 2dafa5f2a040..ee41355fef0d 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-20 Thread Viorel Munteanu
commit: cc1764ee0dbeb83614805930f5df786e49fc3681
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 18:32:08 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc1764ee

media-gfx/imagemagick: Stabilize 6.9.13.3 x86, #921372

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index 41be89a16222..4950f23a3200 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Sam James
commit: 97b1ab89de671ba1cfae9e5f77f4888c516f3a3c
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 05:50:49 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 05:51:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97b1ab89

media-gfx/imagemagick: add 7.1.1.25

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest|   1 +
 media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild | 252 ++
 2 files changed, 253 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index cf05590b2b8c..8d687c068b97 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,3 +3,4 @@ DIST ImageMagick-6.9.13-2.tar.xz 9611768 BLAKE2B 
0b0bb7dec536b12f0f5dc83b03b33a1
 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 
9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080
 SHA512 
3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-24.tar.xz 10561928 BLAKE2B 
992d1425a2e306f9bf85dfafb09f2869fae09b57a32c3b1992d4f478932ef6ec58368d70574f134e7226b09a6275cd1f4343064b36ca3fb8556a60d59138df2e
 SHA512 
78dbd763f70b36e95a728cff7a1e02ec1c5d3b9a8371161e306e77450f1a3c33a987f19dda3eca94dfa2435b4a29a97c5df5155915a73441f74174a98b36a7d9
+DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 
833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04
 SHA512 
0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
new file mode 100644
index ..eb7f89a09b68
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   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"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-18"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl 
+png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml 
zip zlib"
+
+REQUIRED_USE="
+   corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   jpegxl? ( >=media-libs/libjxl-0.6:= )
+   lcms? ( media-libs/lcms:2= )
+   lqr? ( media-libs/liblqr )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   pango? ( x11-libs/pango )
+   perl? ( >=dev-lang/perl-5.8.8:= )
+   png? ( media-libs/libpng:= )
+   postscript? ( app-text/ghostscript-gpl:= )
+   raw? ( media-libs/libraw:= )
+   svg? (
+   gnome-base/librsvg
+   media-gfx/potrace
+   )
+   tiff? ( media-libs/tiff:= )
+   truetype? (
+   media-fonts/urw-fonts
+   >=media-libs/freetype-2
+   )
+   webp? ( media-libs/libwebp:= )
+   wmf?

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Sam James
commit: 3d22a88af99bc189d577635c5385309878b27d10
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 05:45:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 05:51:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d22a88a

media-gfx/imagemagick: add 6.9.13.3

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest|   1 +
 media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild | 242 ++
 2 files changed, 243 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index a5ab184c7610..cf05590b2b8c 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,5 @@
 DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
 DIST ImageMagick-6.9.13-2.tar.xz 9611768 BLAKE2B 
0b0bb7dec536b12f0f5dc83b03b33a122158a946ea38a44b48442124c5e11a7af33100e213c8332baa23bc45329cb66611bf2347631155bb16c3ceb6ccc185f6
 SHA512 
d693983eda6fba6b5e1d5d5bb4dc814dffd6a064c0464dded86c5f780ce52bef737d1bc870fae4c5bd039c419585fb374a0c4fbd19d94153d319eb8e3d5595b3
+DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 
9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080
 SHA512 
3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-24.tar.xz 10561928 BLAKE2B 
992d1425a2e306f9bf85dfafb09f2869fae09b57a32c3b1992d4f478932ef6ec58368d70574f134e7226b09a6275cd1f4343064b36ca3fb8556a60d59138df2e
 SHA512 
78dbd763f70b36e95a728cff7a1e02ec1c5d3b9a8371161e306e77450f1a3c33a987f19dda3eca94dfa2435b4a29a97c5df5155915a73441f74174a98b36a7d9

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
new file mode 100644
index ..1954fe32d565
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="
+   corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   lcms? ( media-libs/lcms:2= )
+   lqr? ( media-libs/liblqr )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   pango? ( x11-libs/pango )
+   perl? ( >=dev-lang/perl-5.8.8:= )
+   png? ( media-libs/libpng:= )
+   postscript? ( app-text/ghostscript-gpl:= )
+   raw? ( media-libs/libraw:= )
+   svg? (
+   gnome-base/librsvg
+   media-gfx/potrace
+   )
+   tiff? ( media-libs/tiff:= )
+   truetype?

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: 3fcf218f40ebbb4a25118fc5e8f907e9d237ec5d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:32:40 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:32:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fcf218f

media-gfx/imagemagick: Stabilize 7.1.1.24 sparc, #921334

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
index cf0a9f897efd..1b4c19df2851 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: b41772a97d3340f9e23dbc103d751d2fcd7e08db
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:32:43 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:32:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41772a9

media-gfx/imagemagick: Stabilize 7.1.1.24 hppa, #921334

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
index 1b4c19df2851..2a467e80834a 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: 715b94f029c870c70b212e9ef73e14aa75bff593
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:32:29 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:32:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=715b94f0

media-gfx/imagemagick: Stabilize 7.1.1.24 arm, #921334

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
index 8ce16c95e507..fc8132a64d1e 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: e72e4494d69cbf64063668c1a88e344c487faedb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:32:31 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:32:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e72e4494

media-gfx/imagemagick: Stabilize 7.1.1.24 arm64, #921334

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
index fc8132a64d1e..670abf78867c 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: 8b354fdd682e27194dc04f0caa4293492438172b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:32:34 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:32:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b354fdd

media-gfx/imagemagick: Stabilize 7.1.1.24 ppc, #921334

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
index 670abf78867c..1e5eb039a244 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: c401bda8e947922a9287892c228b9307c2561ea6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:32:37 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:32:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c401bda8

media-gfx/imagemagick: Stabilize 7.1.1.24 ppc64, #921334

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
index 1e5eb039a244..cf0a9f897efd 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: 176cad8386f7f6d0bbd8587c1c98163aff41e484
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:31:25 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:31:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176cad83

media-gfx/imagemagick: Stabilize 6.9.13.2 hppa, #921335

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
index 7bc3a44e66ce..b99a78982242 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: af49998e1b0864b8819ab942427519b02c3b64de
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:31:22 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:31:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af49998e

media-gfx/imagemagick: Stabilize 6.9.13.2 sparc, #921335

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
index 31f89136cbcc..7bc3a44e66ce 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: d23b815d5855b01c3685ec84cfd5dcf65da652e7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:31:19 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:31:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d23b815d

media-gfx/imagemagick: Stabilize 6.9.13.2 ppc64, #921335

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
index 45fd2bb7877f..31f89136cbcc 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: 559f23f57ca4871c526641e91dd678cb9bd9061d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:31:16 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:31:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=559f23f5

media-gfx/imagemagick: Stabilize 6.9.13.2 ppc, #921335

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
index feea16c506ba..45fd2bb7877f 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: b8a17bff5a6a19d98fdfc047c9e4d6d60ca90abf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:31:10 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:31:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a17bff

media-gfx/imagemagick: Stabilize 6.9.13.2 arm, #921335

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
index d26272803a85..791a37849411 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Arthur Zamarin
commit: 66f9f94ea8d85b8dcc55aedbb68486f5553633db
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan  5 05:31:13 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan  5 05:31:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f9f94e

media-gfx/imagemagick: Stabilize 6.9.13.2 arm64, #921335

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
index 791a37849411..feea16c506ba 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Sam James
commit: b2c308ecb4c3a67e60d85ec795cd86924996740b
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 03:58:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 03:58:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c308ec

media-gfx/imagemagick: Stabilize 6.9.13.2 x86, #921335

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
index 102d35e4f68c..0e4507348455 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Sam James
commit: e9658233762225ea30bfd2847dc181fbf9a9302a
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 03:58:19 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 03:58:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9658233

media-gfx/imagemagick: Stabilize 7.1.1.24 amd64, #921334

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
index 099cddd93344..a121c722acf1 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Sam James
commit: ac0f27f7b73c92f4e506cd75e30bbc446e3e2bb1
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 03:58:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 03:58:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0f27f7

media-gfx/imagemagick: Stabilize 7.1.1.24 x86, #921334

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
index a121c722acf1..8ce16c95e507 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2024-01-04 Thread Sam James
commit: 4833268e48c182a1b7f0f64d958c92e0b93640da
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 03:58:36 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 03:58:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4833268e

media-gfx/imagemagick: Stabilize 6.9.13.2 amd64, #921335

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
index 0e4507348455..d26272803a85 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/files/

2023-12-30 Thread Conrad Kostecki
commit: 7985da9cf4ce8280bdb8f70e39d975cc4a8033a3
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Dec 29 14:05:40 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Dec 31 02:37:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7985da9c

media-gfx/imagemagick: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34535
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/imagemagick-6.9.13.0-bashism.patch   | 37 -
 .../files/imagemagick-7.1.1.22-bashism.patch   | 47 --
 2 files changed, 84 deletions(-)

diff --git a/media-gfx/imagemagick/files/imagemagick-6.9.13.0-bashism.patch 
b/media-gfx/imagemagick/files/imagemagick-6.9.13.0-bashism.patch
deleted file mode 100644
index 6c0e5e428bc8..
--- a/media-gfx/imagemagick/files/imagemagick-6.9.13.0-bashism.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/ImageMagick/ImageMagick6/pull/292
-
-From 9661325ece66c0262727cbcdffbe7efb59b5c46d Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Fri, 8 Dec 2023 09:47:06 +
-Subject: [PATCH] configure.ac: Fix bashism
-
-We need to use '=', not '==', or configure won't run with stricter POSIX
-shells as /bin/sh. This retains compatibility with Bash.
-
-Signed-off-by: Sam James 

- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e9cd4fb20..23c00268d 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -474,7 +474,7 @@ CFLAGS="$OPENMP_CFLAGS $CFLAGS"
- MAGICK_PCFLAGS="$MAGICK_PCFLAGS $OPENMP_CFLAGS"
- AC_SUBST([OPENMP_CFLAGS])
- AC_CHECK_DECL([_OPENMP],[OPENMP_ENABLED='yes'],[OPENMP_ENABLED='no'],[])
--if test "${OPENMP_ENABLED}" == 'yes' && \
-+if test "${OPENMP_ENABLED}" = 'yes' && \
-test "$ac_cv_prog_c_openmp" != 'unsupported'; then
- MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
- fi
-@@ -1247,7 +1247,7 @@ 
AC_DEFINE_UNQUOTED([X11_CONFIGURE_PATH],["$X11ConfigurePath"],[Location of X11 c
- # Find OpenMP library
- #
- GOMP_LIBS=''
--if test "${OPENMP_ENABLED}" == 'yes' && \
-+if test "${OPENMP_ENABLED}" = 'yes' && \
-test "$ac_cv_prog_c_openmp" != 'unsupported'; then
-   AC_CHECK_HEADER([omp.h], [], [AC_MSG_RESULT([OpenMP header file not 
found])])
-   if test "${GCC}" = "yes"; then

diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.22-bashism.patch 
b/media-gfx/imagemagick/files/imagemagick-7.1.1.22-bashism.patch
deleted file mode 100644
index 99441bbb69d6..
--- a/media-gfx/imagemagick/files/imagemagick-7.1.1.22-bashism.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://github.com/ImageMagick/ImageMagick/pull/6931
-
-From 2dd466333cd06773422795030ff2712181fbbb89 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Fri, 8 Dec 2023 09:41:59 +
-Subject: [PATCH] configure.ac: Fix bashism
-
-We need to use '=', not '==', or configure won't run with stricter POSIX
-shells as /bin/sh. This retains compatibility with Bash.
-
-Signed-off-by: Sam James 

- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9880be30ec..b19a087a85 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -474,7 +474,7 @@ CFLAGS="$OPENMP_CFLAGS $CFLAGS"
- MAGICK_PCFLAGS="$MAGICK_PCFLAGS $OPENMP_CFLAGS"
- AC_SUBST([OPENMP_CFLAGS])
- AC_CHECK_DECL([_OPENMP],[OPENMP_ENABLED='yes'],[OPENMP_ENABLED='no'],[])
--if test "${OPENMP_ENABLED}" == 'yes' && \
-+if test "${OPENMP_ENABLED}" = 'yes' && \
-test "$ac_cv_prog_c_openmp" != 'unsupported'; then
- MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
- fi
-@@ -1266,7 +1266,7 @@ 
AC_DEFINE_UNQUOTED([X11_CONFIGURE_PATH],["$X11ConfigurePath"],[Location of X11 c
- # Find OpenMP library
- #
- GOMP_LIBS=''
--if test "${OPENMP_ENABLED}" == 'yes'; then
-+if test "${OPENMP_ENABLED}" = 'yes'; then
-   AC_CHECK_HEADER([omp.h], [], [AC_MSG_RESULT([OpenMP header file not 
found])])
-   if test "${GCC}" = "yes"; then
- # Open64 (passes for GCC but uses different OpenMP implementation)
-@@ -3533,7 +3533,7 @@ if test "$enable_64bit_channel_masks" = 'yes'; then
- ])
- fi
- fi
--if test "$magick_channel_mask_depth" == '64'; then
-+if test "$magick_channel_mask_depth" = '64'; then
- MAGICK_FEATURES="Channel-masks(64-bit) $MAGICK_FEATURES"
- else
- MAGICK_FEATURES="Channel-masks(32-bit) $MAGICK_FEATURES"
-



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-12-27 Thread Sam James
commit: 2093f1a80afe379b2f1e59c125dc26a21b59
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 04:34:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 04:34:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2093f1a8

media-gfx/imagemagick: drop versions

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest |   8 -
 .../imagemagick/imagemagick-6.9.12.84-r1.ebuild| 271 
 .../imagemagick/imagemagick-6.9.12.89-r2.ebuild| 229 -
 media-gfx/imagemagick/imagemagick-6.9.12.93.ebuild | 234 -
 media-gfx/imagemagick/imagemagick-6.9.12.96.ebuild | 242 --
 media-gfx/imagemagick/imagemagick-6.9.13.0.ebuild  | 246 --
 .../imagemagick/imagemagick-7.1.1.11-r2.ebuild | 239 --
 media-gfx/imagemagick/imagemagick-7.1.1.15.ebuild  | 239 --
 media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild  | 252 --
 media-gfx/imagemagick/imagemagick-7.1.1.22.ebuild  | 253 ---
 .../imagemagick/imagemagick-7.1.1.6-r1.ebuild  | 281 -
 11 files changed, 2494 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 84084f01c3b8..a5ab184c7610 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,4 @@
-DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 
5d26cc4921d5fcf8b98a126816c3f03ba8c925fef02aab49b50b54cc9275f412a35797a0a5200e6de41b7fcec1c3936aaa6139227568adb80070141cd19bb805
 SHA512 
5b1294e171fe627d8197b771417b9939516175a36b6f33bc82f62558fbf6af7bd26dc357a17da44d73429e4dc56f79f8c8770e2ffa040b0fac31663d31fb4ef3
 DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
-DIST ImageMagick-6.9.12-93.tar.xz 9261928 BLAKE2B 
245ea5bdf49c1d4ca4e0cb34537748fe9604cdab22d4cf2ef6f809c8ba5b202daa79846fe7ad4249e558be005f505fab16153d8d39d01fc64466bbda53517887
 SHA512 
37a3d9b0b40aeb8e1f20e8497d5ce11dab1da2d18db0ce77d5762000c504671bccfb682bec16991a09afc6c7f27c141477413849e3e5d9697d9edd5c3bc276c8
-DIST ImageMagick-6.9.12-96.tar.xz 9275248 BLAKE2B 
81cad8da2d809d38c0146d54a7a39b75d39ac88138ef504a669aaa8293452baa1a1985568e80e4128e76fb3eded5d7111a45d47eea59b827e652ca5ee1a6396e
 SHA512 
ffdc40d37919ec19ffd47955a39351a3532caca355f73f93bda1577157346a7d8b5727c4c8abddc87262bd9442e1af4ad8aae748a1364c28a407c3fb8c42ffb5
-DIST ImageMagick-6.9.13-0.tar.xz 9274900 BLAKE2B 
de6cd337e0124c0f70ea98d500416626f9053c4ff6ec5dcf502e916bea19041e599b331009e746e232384eb25fee0d4560d5c666738a4227d291857b1576a34f
 SHA512 
c9587d92bb1c308a0472a54442804842f3f2dd30b99fe7bab909a66937a56ed0a1265e06b6c9fdea2dd4f2c6c33e0d513df1c8de8dfc1a49862fd08b950f73a1
 DIST ImageMagick-6.9.13-2.tar.xz 9611768 BLAKE2B 
0b0bb7dec536b12f0f5dc83b03b33a122158a946ea38a44b48442124c5e11a7af33100e213c8332baa23bc45329cb66611bf2347631155bb16c3ceb6ccc185f6
 SHA512 
d693983eda6fba6b5e1d5d5bb4dc814dffd6a064c0464dded86c5f780ce52bef737d1bc870fae4c5bd039c419585fb374a0c4fbd19d94153d319eb8e3d5595b3
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
-DIST ImageMagick-7.1.1-15.tar.xz 10200668 BLAKE2B 
e9910b94d1a47641785cf05b1bfe99f310619aa48d32eb42823b7e83b9be2904e6ebc63965e6eaca2ed1162e6b0055f54bac946602759941a0d20fbf7502bf9d
 SHA512 
afd6216d423a2b8b03727bac089bb83a0fe43c9bfc4c244d4ad5b1c8fa4c3a47be4c7556ef8f008debd0252c7b176c54caddd3c5c8b0ea4f5ca1836943326e8a
-DIST ImageMagick-7.1.1-18.tar.xz 10221468 BLAKE2B 
1c4813f9fce578c9389922de5a4dbd8b0d925d1589844e3a3209b1045e03a254801abe9bf8570309b1ac701cb42d62ac497cda77a83efa720cf4cddf3ccec09e
 SHA512 
5e62696089bc4f8510d19862d453d289db82bd6525b31575d61dfcfaf28b28f2d70d87dd4679972e2547380ac6c29520769f74825195ea529c2699be792baffd
-DIST ImageMagick-7.1.1-22.tar.xz 10225208 BLAKE2B 
9b69cd9ed2954c3c8802cf371362d7b60b9aed1475bd5a5c6615906873e4af91bb549ae9ccbe055ec57a69a7a31fb26523d6c283e5849c1c8792040a11875a3f
 SHA512 
d604e12a82b629f35d5b0617fc185e554d30e75823eb4d6729d532cee7de6ca702860b6b8496fc357a17cba38549d8d3079f91c321f3241a2c3835a3aa4343af
 DIST ImageMagick-7.1.1-24.tar.xz 10561928 BLAKE2B 
992d1425a2e306f9bf85dfafb09f2869fae09b57a32c3b1992d4f478932ef6ec58368d70574f134e7226b09a6275cd1f4343064b36ca3fb8556a60d59138df2e
 SHA512 
78dbd763f70b36e95a728cff7a1e02ec1c5d3b9a8371161e306e77450f1a3c33a987f19dda3eca94dfa2435b4a29a97c5df5155915a73441f74174a98b36a7d9
-DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/files/, media-gfx/imagemagick/

2023-12-27 Thread Sam James
commit: 504476c3b83167679845363c3c52b29bb3a71a6d
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 27 22:42:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 22:43:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504476c3

media-gfx/imagemagick: fix perl build w/ autoconf-2.72

Bug: https://bugs.gentoo.org/920788
Signed-off-by: Sam James  gentoo.org>

 .../files/imagemagick-7.1.1.24-c99.patch   | 47 ++
 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild  |  4 ++
 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild  |  1 +
 3 files changed, 52 insertions(+)

diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch 
b/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch
new file mode 100644
index ..affcb61f1fed
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/920788
+
+From f6e90ad1a649c4032b957fa101d30c14de3b7e5d Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Wed, 27 Dec 2023 22:37:42 +
+Subject: [PATCH] configure.ac: fixup LFS check for autoconf-2.72
+
+There are two problems with the check:
+1) The 'unknown' case has a problem which is rejected by stricter C compilers
+because it has -Wimplicit-int and -Wimplicit-function-declaration warnings. 
Fix that.
+
+2) For the 'other' case, we were using the value of ac_cv_sys_file_offset_bits 
for
+-D_FILE_OFFSET_BITS to pass down into the Perl module build, but autoconf-2.72
+drops the use of ac_cv_sys_file_offset_bits in 
cf09f48841b66fe76f606dd6018bb3a93242a7c9,
+so this ends up defining '-D_FILE_OFFSET_BITS=' which then breaks the build.
+
+I've added a hack for 2) to preserve the old behavior.
+
+Signed-off-by: Sam James 
+---
+ configure.ac | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 57c21edb77..99aa9c21af 100644
+--- a/configure.ac
 b/configure.ac
+@@ -503,7 +503,8 @@ if test "$enable_largefile" != no; then
+ unknown)
+ AC_MSG_CHECKING([for native large file support])
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([#include 
+-  main () {
++  #include 
++  int main () {
+   exit(!(sizeof(off_t) == 8));
+ }])],
+ [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
+@@ -511,6 +512,9 @@ if test "$enable_largefile" != no; then
+ [AC_MSG_RESULT([no])])
+ ;;
+ *)
++if test "$ac_cv_sys_file_offset_bits" = ''; then
++ac_cv_sys_file_offset_bits=64;
++fi
+ LFS_CPPFLAGS="$LFS_CPPFLAGS 
-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+ ;;
+ esac

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
index 6949eaa71ea1..102d35e4f68c 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
@@ -86,6 +86,10 @@ DEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-7.1.1.24-c99.patch"
+)
+
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
index 904cbdbc135e..099cddd93344 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
@@ -89,6 +89,7 @@ DEPEND="
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
+   "${FILESDIR}/${PN}-7.1.1.24-c99.patch"
"${FILESDIR}/${PN}--nocputuning.patch"
 )
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-12-27 Thread Sam James
commit: 8ec87ded9b4e59132694ac31b0547c01cc418fd5
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 27 22:15:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 22:22:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec87ded

media-gfx/imagemagick: add 7.1.1.24

Closes: https://bugs.gentoo.org/920684
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest|   1 +
 media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 252 ++
 2 files changed, 253 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ff21ab047534..84084f01c3b8 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -8,4 +8,5 @@ DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74c
 DIST ImageMagick-7.1.1-15.tar.xz 10200668 BLAKE2B 
e9910b94d1a47641785cf05b1bfe99f310619aa48d32eb42823b7e83b9be2904e6ebc63965e6eaca2ed1162e6b0055f54bac946602759941a0d20fbf7502bf9d
 SHA512 
afd6216d423a2b8b03727bac089bb83a0fe43c9bfc4c244d4ad5b1c8fa4c3a47be4c7556ef8f008debd0252c7b176c54caddd3c5c8b0ea4f5ca1836943326e8a
 DIST ImageMagick-7.1.1-18.tar.xz 10221468 BLAKE2B 
1c4813f9fce578c9389922de5a4dbd8b0d925d1589844e3a3209b1045e03a254801abe9bf8570309b1ac701cb42d62ac497cda77a83efa720cf4cddf3ccec09e
 SHA512 
5e62696089bc4f8510d19862d453d289db82bd6525b31575d61dfcfaf28b28f2d70d87dd4679972e2547380ac6c29520769f74825195ea529c2699be792baffd
 DIST ImageMagick-7.1.1-22.tar.xz 10225208 BLAKE2B 
9b69cd9ed2954c3c8802cf371362d7b60b9aed1475bd5a5c6615906873e4af91bb549ae9ccbe055ec57a69a7a31fb26523d6c283e5849c1c8792040a11875a3f
 SHA512 
d604e12a82b629f35d5b0617fc185e554d30e75823eb4d6729d532cee7de6ca702860b6b8496fc357a17cba38549d8d3079f91c321f3241a2c3835a3aa4343af
+DIST ImageMagick-7.1.1-24.tar.xz 10561928 BLAKE2B 
992d1425a2e306f9bf85dfafb09f2869fae09b57a32c3b1992d4f478932ef6ec58368d70574f134e7226b09a6275cd1f4343064b36ca3fb8556a60d59138df2e
 SHA512 
78dbd763f70b36e95a728cff7a1e02ec1c5d3b9a8371161e306e77450f1a3c33a987f19dda3eca94dfa2435b4a29a97c5df5155915a73441f74174a98b36a7d9
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
new file mode 100644
index ..904cbdbc135e
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   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"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-18"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl 
+png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml 
zip zlib"
+
+REQUIRED_USE="
+   corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   jpegxl? ( >=media-libs/libjxl-0.6:= )
+   lcms? ( media-libs/lcms:2= )
+   lqr? ( media-libs/liblqr )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   pango? ( x11-libs/pango )
+   perl? ( >=dev-lang/perl-5.8.8:= )
+   png? ( media-libs/libpng:= )
+   postscript?

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-12-27 Thread Sam James
commit: ddf993fbed863d7ee3310752a8b230910e14f5a1
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 27 22:10:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 22:22:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddf993fb

media-gfx/imagemagick: add 6.9.13.2

Bug: https://bugs.gentoo.org/920684
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest|   1 +
 media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild | 242 ++
 2 files changed, 243 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 910cd910ac68..ff21ab047534 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,6 +3,7 @@ DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f
 DIST ImageMagick-6.9.12-93.tar.xz 9261928 BLAKE2B 
245ea5bdf49c1d4ca4e0cb34537748fe9604cdab22d4cf2ef6f809c8ba5b202daa79846fe7ad4249e558be005f505fab16153d8d39d01fc64466bbda53517887
 SHA512 
37a3d9b0b40aeb8e1f20e8497d5ce11dab1da2d18db0ce77d5762000c504671bccfb682bec16991a09afc6c7f27c141477413849e3e5d9697d9edd5c3bc276c8
 DIST ImageMagick-6.9.12-96.tar.xz 9275248 BLAKE2B 
81cad8da2d809d38c0146d54a7a39b75d39ac88138ef504a669aaa8293452baa1a1985568e80e4128e76fb3eded5d7111a45d47eea59b827e652ca5ee1a6396e
 SHA512 
ffdc40d37919ec19ffd47955a39351a3532caca355f73f93bda1577157346a7d8b5727c4c8abddc87262bd9442e1af4ad8aae748a1364c28a407c3fb8c42ffb5
 DIST ImageMagick-6.9.13-0.tar.xz 9274900 BLAKE2B 
de6cd337e0124c0f70ea98d500416626f9053c4ff6ec5dcf502e916bea19041e599b331009e746e232384eb25fee0d4560d5c666738a4227d291857b1576a34f
 SHA512 
c9587d92bb1c308a0472a54442804842f3f2dd30b99fe7bab909a66937a56ed0a1265e06b6c9fdea2dd4f2c6c33e0d513df1c8de8dfc1a49862fd08b950f73a1
+DIST ImageMagick-6.9.13-2.tar.xz 9611768 BLAKE2B 
0b0bb7dec536b12f0f5dc83b03b33a122158a946ea38a44b48442124c5e11a7af33100e213c8332baa23bc45329cb66611bf2347631155bb16c3ceb6ccc185f6
 SHA512 
d693983eda6fba6b5e1d5d5bb4dc814dffd6a064c0464dded86c5f780ce52bef737d1bc870fae4c5bd039c419585fb374a0c4fbd19d94153d319eb8e3d5595b3
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-15.tar.xz 10200668 BLAKE2B 
e9910b94d1a47641785cf05b1bfe99f310619aa48d32eb42823b7e83b9be2904e6ebc63965e6eaca2ed1162e6b0055f54bac946602759941a0d20fbf7502bf9d
 SHA512 
afd6216d423a2b8b03727bac089bb83a0fe43c9bfc4c244d4ad5b1c8fa4c3a47be4c7556ef8f008debd0252c7b176c54caddd3c5c8b0ea4f5ca1836943326e8a
 DIST ImageMagick-7.1.1-18.tar.xz 10221468 BLAKE2B 
1c4813f9fce578c9389922de5a4dbd8b0d925d1589844e3a3209b1045e03a254801abe9bf8570309b1ac701cb42d62ac497cda77a83efa720cf4cddf3ccec09e
 SHA512 
5e62696089bc4f8510d19862d453d289db82bd6525b31575d61dfcfaf28b28f2d70d87dd4679972e2547380ac6c29520769f74825195ea529c2699be792baffd

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
new file mode 100644
index ..6949eaa71ea1
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="
+   corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx?

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/files/, media-gfx/imagemagick/

2023-12-08 Thread Sam James
commit: 31597fbf8f03899568708cc2bb23cac4f56e2ea1
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  8 09:45:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  8 09:53:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31597fbf

media-gfx/imagemagick: add 7.1.1.22

Bug: https://bugs.gentoo.org/917594
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest |   1 +
 .../files/imagemagick-7.1.1.22-bashism.patch   |  47 
 media-gfx/imagemagick/imagemagick-7.1.1.22.ebuild  | 253 +
 3 files changed, 301 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index f4cada7dfeef..910cd910ac68 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -6,4 +6,5 @@ DIST ImageMagick-6.9.13-0.tar.xz 9274900 BLAKE2B 
de6cd337e0124c0f70ea98d50041662
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-15.tar.xz 10200668 BLAKE2B 
e9910b94d1a47641785cf05b1bfe99f310619aa48d32eb42823b7e83b9be2904e6ebc63965e6eaca2ed1162e6b0055f54bac946602759941a0d20fbf7502bf9d
 SHA512 
afd6216d423a2b8b03727bac089bb83a0fe43c9bfc4c244d4ad5b1c8fa4c3a47be4c7556ef8f008debd0252c7b176c54caddd3c5c8b0ea4f5ca1836943326e8a
 DIST ImageMagick-7.1.1-18.tar.xz 10221468 BLAKE2B 
1c4813f9fce578c9389922de5a4dbd8b0d925d1589844e3a3209b1045e03a254801abe9bf8570309b1ac701cb42d62ac497cda77a83efa720cf4cddf3ccec09e
 SHA512 
5e62696089bc4f8510d19862d453d289db82bd6525b31575d61dfcfaf28b28f2d70d87dd4679972e2547380ac6c29520769f74825195ea529c2699be792baffd
+DIST ImageMagick-7.1.1-22.tar.xz 10225208 BLAKE2B 
9b69cd9ed2954c3c8802cf371362d7b60b9aed1475bd5a5c6615906873e4af91bb549ae9ccbe055ec57a69a7a31fb26523d6c283e5849c1c8792040a11875a3f
 SHA512 
d604e12a82b629f35d5b0617fc185e554d30e75823eb4d6729d532cee7de6ca702860b6b8496fc357a17cba38549d8d3079f91c321f3241a2c3835a3aa4343af
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48

diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.22-bashism.patch 
b/media-gfx/imagemagick/files/imagemagick-7.1.1.22-bashism.patch
new file mode 100644
index ..99441bbb69d6
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.22-bashism.patch
@@ -0,0 +1,47 @@
+https://github.com/ImageMagick/ImageMagick/pull/6931
+
+From 2dd466333cd06773422795030ff2712181fbbb89 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 8 Dec 2023 09:41:59 +
+Subject: [PATCH] configure.ac: Fix bashism
+
+We need to use '=', not '==', or configure won't run with stricter POSIX
+shells as /bin/sh. This retains compatibility with Bash.
+
+Signed-off-by: Sam James 
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9880be30ec..b19a087a85 100644
+--- a/configure.ac
 b/configure.ac
+@@ -474,7 +474,7 @@ CFLAGS="$OPENMP_CFLAGS $CFLAGS"
+ MAGICK_PCFLAGS="$MAGICK_PCFLAGS $OPENMP_CFLAGS"
+ AC_SUBST([OPENMP_CFLAGS])
+ AC_CHECK_DECL([_OPENMP],[OPENMP_ENABLED='yes'],[OPENMP_ENABLED='no'],[])
+-if test "${OPENMP_ENABLED}" == 'yes' && \
++if test "${OPENMP_ENABLED}" = 'yes' && \
+test "$ac_cv_prog_c_openmp" != 'unsupported'; then
+ MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
+ fi
+@@ -1266,7 +1266,7 @@ 
AC_DEFINE_UNQUOTED([X11_CONFIGURE_PATH],["$X11ConfigurePath"],[Location of X11 c
+ # Find OpenMP library
+ #
+ GOMP_LIBS=''
+-if test "${OPENMP_ENABLED}" == 'yes'; then
++if test "${OPENMP_ENABLED}" = 'yes'; then
+   AC_CHECK_HEADER([omp.h], [], [AC_MSG_RESULT([OpenMP header file not 
found])])
+   if test "${GCC}" = "yes"; then
+ # Open64 (passes for GCC but uses different OpenMP implementation)
+@@ -3533,7 +3533,7 @@ if test "$enable_64bit_channel_masks" = 'yes'; then
+ ])
+ fi
+ fi
+-if test "$magick_channel_mask_depth" == '64'; then
++if test "$magick_channel_mask_depth" = '64'; then
+ MAGICK_FEATURES="Channel-masks(64-bit) $MAGICK_FEATURES"
+ else
+ MAGICK_FEATURES="Channel-masks(32-bit) $MAGICK_FEATURES"
+

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.22.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.22.ebuild
new file mode 100644
index ..9917ab48a97c
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.22.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+i

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/, media-gfx/imagemagick/files/

2023-12-08 Thread Sam James
commit: b84ae93cc091ec886f92d9ad56e52ab68db41eb4
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  8 09:39:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  8 09:53:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b84ae93c

media-gfx/imagemagick: add 6.9.13.0

Bug: https://bugs.gentoo.org/917594
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest |   1 +
 .../files/imagemagick-6.9.13.0-bashism.patch   |  37 
 media-gfx/imagemagick/imagemagick-6.9.13.0.ebuild  | 246 +
 3 files changed, 284 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index afb3633f3502..f4cada7dfeef 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,6 +2,7 @@ DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 
5d26cc4921d5fcf8b98a126816c3f0
 DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
 DIST ImageMagick-6.9.12-93.tar.xz 9261928 BLAKE2B 
245ea5bdf49c1d4ca4e0cb34537748fe9604cdab22d4cf2ef6f809c8ba5b202daa79846fe7ad4249e558be005f505fab16153d8d39d01fc64466bbda53517887
 SHA512 
37a3d9b0b40aeb8e1f20e8497d5ce11dab1da2d18db0ce77d5762000c504671bccfb682bec16991a09afc6c7f27c141477413849e3e5d9697d9edd5c3bc276c8
 DIST ImageMagick-6.9.12-96.tar.xz 9275248 BLAKE2B 
81cad8da2d809d38c0146d54a7a39b75d39ac88138ef504a669aaa8293452baa1a1985568e80e4128e76fb3eded5d7111a45d47eea59b827e652ca5ee1a6396e
 SHA512 
ffdc40d37919ec19ffd47955a39351a3532caca355f73f93bda1577157346a7d8b5727c4c8abddc87262bd9442e1af4ad8aae748a1364c28a407c3fb8c42ffb5
+DIST ImageMagick-6.9.13-0.tar.xz 9274900 BLAKE2B 
de6cd337e0124c0f70ea98d500416626f9053c4ff6ec5dcf502e916bea19041e599b331009e746e232384eb25fee0d4560d5c666738a4227d291857b1576a34f
 SHA512 
c9587d92bb1c308a0472a54442804842f3f2dd30b99fe7bab909a66937a56ed0a1265e06b6c9fdea2dd4f2c6c33e0d513df1c8de8dfc1a49862fd08b950f73a1
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-15.tar.xz 10200668 BLAKE2B 
e9910b94d1a47641785cf05b1bfe99f310619aa48d32eb42823b7e83b9be2904e6ebc63965e6eaca2ed1162e6b0055f54bac946602759941a0d20fbf7502bf9d
 SHA512 
afd6216d423a2b8b03727bac089bb83a0fe43c9bfc4c244d4ad5b1c8fa4c3a47be4c7556ef8f008debd0252c7b176c54caddd3c5c8b0ea4f5ca1836943326e8a
 DIST ImageMagick-7.1.1-18.tar.xz 10221468 BLAKE2B 
1c4813f9fce578c9389922de5a4dbd8b0d925d1589844e3a3209b1045e03a254801abe9bf8570309b1ac701cb42d62ac497cda77a83efa720cf4cddf3ccec09e
 SHA512 
5e62696089bc4f8510d19862d453d289db82bd6525b31575d61dfcfaf28b28f2d70d87dd4679972e2547380ac6c29520769f74825195ea529c2699be792baffd

diff --git a/media-gfx/imagemagick/files/imagemagick-6.9.13.0-bashism.patch 
b/media-gfx/imagemagick/files/imagemagick-6.9.13.0-bashism.patch
new file mode 100644
index ..6c0e5e428bc8
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.9.13.0-bashism.patch
@@ -0,0 +1,37 @@
+https://github.com/ImageMagick/ImageMagick6/pull/292
+
+From 9661325ece66c0262727cbcdffbe7efb59b5c46d Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 8 Dec 2023 09:47:06 +
+Subject: [PATCH] configure.ac: Fix bashism
+
+We need to use '=', not '==', or configure won't run with stricter POSIX
+shells as /bin/sh. This retains compatibility with Bash.
+
+Signed-off-by: Sam James 
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e9cd4fb20..23c00268d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -474,7 +474,7 @@ CFLAGS="$OPENMP_CFLAGS $CFLAGS"
+ MAGICK_PCFLAGS="$MAGICK_PCFLAGS $OPENMP_CFLAGS"
+ AC_SUBST([OPENMP_CFLAGS])
+ AC_CHECK_DECL([_OPENMP],[OPENMP_ENABLED='yes'],[OPENMP_ENABLED='no'],[])
+-if test "${OPENMP_ENABLED}" == 'yes' && \
++if test "${OPENMP_ENABLED}" = 'yes' && \
+test "$ac_cv_prog_c_openmp" != 'unsupported'; then
+ MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
+ fi
+@@ -1247,7 +1247,7 @@ 
AC_DEFINE_UNQUOTED([X11_CONFIGURE_PATH],["$X11ConfigurePath"],[Location of X11 c
+ # Find OpenMP library
+ #
+ GOMP_LIBS=''
+-if test "${OPENMP_ENABLED}" == 'yes' && \
++if test "${OPENMP_ENABLED}" = 'yes' && \
+test "$ac_cv_prog_c_openmp" != 'unsupported'; then
+   AC_CHECK_HEADER([omp.h], [], [AC_MSG_RESULT([OpenMP header file not 
found])])
+   if test "${GCC}" = "yes"; then

diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.0.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.13.0.ebuild
new file mode 100644
index

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-10-27 Thread Michał Górny
commit: b774a5a469fbdfbfb37f588a9f6ba26f4b39d3c2
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 22 12:50:23 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 27 15:18:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b774a5a4

media-gfx/imagemagick: Remove redundant local flag descs

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/imagemagick/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-gfx/imagemagick/metadata.xml 
b/media-gfx/imagemagick/metadata.xml
index b1fc8d65f222..591c4245c3f7 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -13,7 +13,6 @@
Use media-fonts/corefonts 
which is required by some commands
Enable media-libs/libfpx 
support
Enable High Dynamic Range Images 
formats
-   Enable support for JPEG XL image 
format
Enable experimental liquid rescale support 
using media-libs/liblqr
Enable OpenCL support
Enable Pango support using 
x11-libs/pango



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-09-23 Thread Sam James
commit: 88726f96517bbd745a61a952c5b32351fc10f511
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 24 01:51:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 24 01:52:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88726f96

media-gfx/imagemagick: sync live

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild | 15 
 media-gfx/imagemagick/imagemagick-.ebuild | 29 ---
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild
index 93a5b83426a4..904cbdbc135e 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild
@@ -28,9 +28,11 @@ LICENSE="imagemagick"
 SLOT="0/$(ver_cut 1-3)-18"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl 
+png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml 
zip zlib"
 
-REQUIRED_USE="corefonts? ( truetype )
+REQUIRED_USE="
+   corefonts? ( truetype )
svg? ( xml )
-   test? ( corefonts )"
+   test? ( corefonts )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -78,9 +80,12 @@ RDEPEND="
xml? ( dev-libs/libxml2 )
lzma? ( app-arch/xz-utils )
zip? ( dev-libs/libzip:= )
-   zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-   X? ( x11-base/xorg-proto )"
+   zlib? ( sys-libs/zlib:= )
+"
+DEPEND="
+   ${RDEPEND}
+   X? ( x11-base/xorg-proto )
+"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(

diff --git a/media-gfx/imagemagick/imagemagick-.ebuild 
b/media-gfx/imagemagick/imagemagick-.ebuild
index a95c8b48d40c..904cbdbc135e 100644
--- a/media-gfx/imagemagick/imagemagick-.ebuild
+++ b/media-gfx/imagemagick/imagemagick-.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -25,12 +25,14 @@ HOMEPAGE="https://www.imagemagick.org/";
 LICENSE="imagemagick"
 # Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
 # If ABI is broken, change the bit after the '-'.
-SLOT="0/$(ver_cut 1-3)-43"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip 
zlib"
+SLOT="0/$(ver_cut 1-3)-18"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl 
+png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml 
zip zlib"
 
-REQUIRED_USE="corefonts? ( truetype )
+REQUIRED_USE="
+   corefonts? ( truetype )
svg? ( xml )
-   test? ( corefonts )"
+   test? ( corefonts )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -78,9 +80,12 @@ RDEPEND="
xml? ( dev-libs/libxml2 )
lzma? ( app-arch/xz-utils )
zip? ( dev-libs/libzip:= )
-   zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-   X? ( x11-base/xorg-proto )"
+   zlib? ( sys-libs/zlib:= )
+"
+DEPEND="
+   ${RDEPEND}
+   X? ( x11-base/xorg-proto )
+"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
@@ -177,6 +182,14 @@ src_configure() {
$(use_with corefonts windows-font-dir 
"${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
+
+   # Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open
+   # For now, let's make USE=hardened do 'limited', and have 
USE=-hardened
+   # reflect the upstream default of 'open'.
+   #
+   # We might change it to 'secure' and 'limited' at some point.
+   # See also bug #716674.
+   --with-security-policy=$(usex hardened limited open)
)
 
CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-09-23 Thread Sam James
commit: e761b7e2e843cedc7e486e5a6351da6bc6a27572
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 24 01:42:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 24 01:42:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e761b7e2

media-gfx/imagemagick: add 6.9.12.96 (w/ USE=hardened)

This adds a USE=hardened which sets the new configure arg (added between .92 
and .96)
called --with-security-policy.

It defaults upstream to 'open'. We follow that default for USE=-hardened, but
set it to 'limited' for USE=hardened.

Bug: https://bugs.gentoo.org/716674
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest |   1 +
 media-gfx/imagemagick/imagemagick-6.9.12.96.ebuild | 242 +
 2 files changed, 243 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 42908a9dcbbc..83b4155d2ce2 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,7 @@
 DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 
5d26cc4921d5fcf8b98a126816c3f03ba8c925fef02aab49b50b54cc9275f412a35797a0a5200e6de41b7fcec1c3936aaa6139227568adb80070141cd19bb805
 SHA512 
5b1294e171fe627d8197b771417b9939516175a36b6f33bc82f62558fbf6af7bd26dc357a17da44d73429e4dc56f79f8c8770e2ffa040b0fac31663d31fb4ef3
 DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
 DIST ImageMagick-6.9.12-93.tar.xz 9261928 BLAKE2B 
245ea5bdf49c1d4ca4e0cb34537748fe9604cdab22d4cf2ef6f809c8ba5b202daa79846fe7ad4249e558be005f505fab16153d8d39d01fc64466bbda53517887
 SHA512 
37a3d9b0b40aeb8e1f20e8497d5ce11dab1da2d18db0ce77d5762000c504671bccfb682bec16991a09afc6c7f27c141477413849e3e5d9697d9edd5c3bc276c8
+DIST ImageMagick-6.9.12-96.tar.xz 9275248 BLAKE2B 
81cad8da2d809d38c0146d54a7a39b75d39ac88138ef504a669aaa8293452baa1a1985568e80e4128e76fb3eded5d7111a45d47eea59b827e652ca5ee1a6396e
 SHA512 
ffdc40d37919ec19ffd47955a39351a3532caca355f73f93bda1577157346a7d8b5727c4c8abddc87262bd9442e1af4ad8aae748a1364c28a407c3fb8c42ffb5
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-15.tar.xz 10200668 BLAKE2B 
e9910b94d1a47641785cf05b1bfe99f310619aa48d32eb42823b7e83b9be2904e6ebc63965e6eaca2ed1162e6b0055f54bac946602759941a0d20fbf7502bf9d
 SHA512 
afd6216d423a2b8b03727bac089bb83a0fe43c9bfc4c244d4ad5b1c8fa4c3a47be4c7556ef8f008debd0252c7b176c54caddd3c5c8b0ea4f5ca1836943326e8a
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.96.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.96.ebuild
new file mode 100644
index ..6984b341f097
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.96.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-96"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="
+   corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-09-23 Thread Sam James
commit: 643f04360ac6f258d37d6fb5e0c71868a4e0f1c5
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 24 01:50:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 24 01:50:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643f0436

media-gfx/imagemagick: add 7.1.1.18 (w/ USE=hardened)

This adds a USE=hardened which sets the new configure arg (added between .15 
and .18)
called --with-security-policy.

It defaults upstream to 'open'. We follow that default for USE=-hardened, but
set it to 'limited' for USE=hardened.

Bug: https://bugs.gentoo.org/716674
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest|   1 +
 media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild | 247 ++
 2 files changed, 248 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 83b4155d2ce2..afb3633f3502 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -4,4 +4,5 @@ DIST ImageMagick-6.9.12-93.tar.xz 9261928 BLAKE2B 
245ea5bdf49c1d4ca4e0cb34537748
 DIST ImageMagick-6.9.12-96.tar.xz 9275248 BLAKE2B 
81cad8da2d809d38c0146d54a7a39b75d39ac88138ef504a669aaa8293452baa1a1985568e80e4128e76fb3eded5d7111a45d47eea59b827e652ca5ee1a6396e
 SHA512 
ffdc40d37919ec19ffd47955a39351a3532caca355f73f93bda1577157346a7d8b5727c4c8abddc87262bd9442e1af4ad8aae748a1364c28a407c3fb8c42ffb5
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-15.tar.xz 10200668 BLAKE2B 
e9910b94d1a47641785cf05b1bfe99f310619aa48d32eb42823b7e83b9be2904e6ebc63965e6eaca2ed1162e6b0055f54bac946602759941a0d20fbf7502bf9d
 SHA512 
afd6216d423a2b8b03727bac089bb83a0fe43c9bfc4c244d4ad5b1c8fa4c3a47be4c7556ef8f008debd0252c7b176c54caddd3c5c8b0ea4f5ca1836943326e8a
+DIST ImageMagick-7.1.1-18.tar.xz 10221468 BLAKE2B 
1c4813f9fce578c9389922de5a4dbd8b0d925d1589844e3a3209b1045e03a254801abe9bf8570309b1ac701cb42d62ac497cda77a83efa720cf4cddf3ccec09e
 SHA512 
5e62696089bc4f8510d19862d453d289db82bd6525b31575d61dfcfaf28b28f2d70d87dd4679972e2547380ac6c29520769f74825195ea529c2699be792baffd
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild
new file mode 100644
index ..93a5b83426a4
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   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"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-18"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri 
heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl 
+png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml 
zip zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   jpegxl? ( >=media-libs/libjxl-0.6:= )
+   lcms? ( media-libs/lcms:2= )
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-09-23 Thread Sam James
commit: c11d31691ed9311d74254d2f82e765cdd39e8ed5
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 24 00:28:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 24 00:28:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11d3169

media-gfx/imagemagick: Stabilize 7.1.1.11 x86, #907993

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
index 6c35215d2371..f19f905ecb82 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-09-23 Thread Sam James
commit: 925bdffca8aeea0856e3889c6b670c1d2fe8
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 24 00:28:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 24 00:28:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=925bd666

media-gfx/imagemagick: Stabilize 7.1.1.11 amd64, #907993

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
index a8e9e6c099de..6c35215d2371 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-08-30 Thread Sam James
commit: bb20387c668bd383f88e3ebf349f86470d2c0785
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 31 06:22:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 31 06:22:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb20387c

media-gfx/imagemagick: add 6.9.12.93

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest |   1 +
 media-gfx/imagemagick/imagemagick-6.9.12.93.ebuild | 234 +
 2 files changed, 235 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index b55305c4c2c3..71b3d4eddac3 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,5 @@
 DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 
5d26cc4921d5fcf8b98a126816c3f03ba8c925fef02aab49b50b54cc9275f412a35797a0a5200e6de41b7fcec1c3936aaa6139227568adb80070141cd19bb805
 SHA512 
5b1294e171fe627d8197b771417b9939516175a36b6f33bc82f62558fbf6af7bd26dc357a17da44d73429e4dc56f79f8c8770e2ffa040b0fac31663d31fb4ef3
 DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
+DIST ImageMagick-6.9.12-93.tar.xz 9261928 BLAKE2B 
245ea5bdf49c1d4ca4e0cb34537748fe9604cdab22d4cf2ef6f809c8ba5b202daa79846fe7ad4249e558be005f505fab16153d8d39d01fc64466bbda53517887
 SHA512 
37a3d9b0b40aeb8e1f20e8497d5ce11dab1da2d18db0ce77d5762000c504671bccfb682bec16991a09afc6c7f27c141477413849e3e5d9697d9edd5c3bc276c8
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.93.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.93.ebuild
new file mode 100644
index ..4f23d9fb6d1a
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.93.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-58"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="
+   corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   lcms? ( media-libs/lcms:2= )
+   lqr? ( media-libs/liblqr )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   pango? ( x11-libs/pango )
+   perl? ( >=dev-lang/perl-5.8.8:= )
+   png? ( media-libs/libpng:= )
+   postscript? ( app-text/ghostscript-gpl:= )
+   raw? ( media-libs/libraw:= )
+   svg? (
+   gnome-base/librsvg
+   media-gfx/potrace
+   )
+   tiff? ( media-libs/tiff:= )
+   truetype? (

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-08-30 Thread Sam James
commit: 7d5215df091a527c65c70b9eaaa15cd144476bf7
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 31 06:14:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 31 06:14:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d5215df

media-gfx/imagemagick: drop 7.1.1.8

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest   |   1 -
 media-gfx/imagemagick/imagemagick-7.1.1.8.ebuild | 281 ---
 2 files changed, 282 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 94ee9936315e..b55305c4c2c3 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,4 +2,3 @@ DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 
5d26cc4921d5fcf8b98a126816c3f0
 DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48
-DIST ImageMagick-7.1.1-8.tar.xz 10402336 BLAKE2B 
dd2f2b1fb1a42ae2da4d02cbb7d0d4c4afa6877f5b98a3b7d6cc2d3ce74fea5a2a30bf1680cdbf44fd3b37d40cb1957aebb12cf5f2dcc88b4ea90539218ed4e3
 SHA512 
99e786fe72465e414766cbef4f26fe48d89d6ea7a996197f9cc6b96492eacc8a9873b5440a7cd96bf097fafef6ff4765674d2295f4743b3c32eb2ff2dc9348ea

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.8.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.8.ebuild
deleted file mode 100644
index ffe558da8466..
--- a/media-gfx/imagemagick/imagemagick-7.1.1.8.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit autotools flag-o-matic perl-functions toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
-   inherit git-r3
-   MY_P="imagemagick-"
-else
-   MY_PV="$(ver_rs 3 '-')"
-   MY_P="ImageMagick-${MY_PV}"
-   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
-# If ABI is broken, change the bit after the '-'.
-SLOT="0/$(ver_cut 1-3)-43"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip 
zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-   svg? ( xml )
-   test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   !media-gfx/graphicsmagick[imagemagick]
-   dev-libs/libltdl
-   bzip2? ( app-arch/bzip2 )
-   corefonts? ( media-fonts/corefonts )
-   djvu? ( app-text/djvu )
-   fftw? ( sci-libs/fftw:3.0 )
-   fontconfig? ( media-libs/fontconfig )
-   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-   graphviz? ( media-gfx/graphviz )
-   heif? ( media-libs/libheif:=[x265] )
-   jbig? ( >=media-libs/jbigkit-2:= )
-   jpeg? ( media-libs/libjpeg-turbo:= )
-   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   jpegxl? ( >=media-libs/libjxl-0.6:= )
-   lcms? ( media-libs/lcms:2= )
-   lqr? ( media-libs/liblqr )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
-   pango? ( x11-libs/pango )
-   perl? ( >=dev-lang/perl-5.8.8:= )
-   png? ( media-libs/libpng:= )
-   postscript? ( app-text/ghostscript-gpl:= )
-   raw? ( media-libs/libraw:= )
-   svg? (
-   gnome-base/librsvg
-   media-gfx/potrace
-   )
-   tiff? ( media-libs/tiff:= )
-   truetype? (
-   media-fonts/urw-fonts
-   >=media-libs/freetype-2
-   )
-   webp? ( media-libs/libwebp:= )
-   wmf? ( media-libs/libwmf )
-   X? (

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-08-30 Thread Sam James
commit: 42e9d44408aecc5c7186cf8e01b4f2ade40de51e
Author: Cristian Othón Martínez Vera  cfuga  mx>
AuthorDate: Mon Jun 26 21:50:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 31 06:13:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e9d444

media-gfx/imagemagick: subscribe to media-libs/libjxl subslot

During the last update of ```media-libs/libjxl```, I realized that 
```media-gfx/imagemagick``` wasn't rebuild when it should be. Adding a subslot 
operator should fix it.

Signed-off-by: Cristian Othón Martínez Vera  cfuga.mx>
Closes: https://github.com/gentoo/gentoo/pull/31630
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.11-r1.ebuild | 2 +-
 media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild| 2 +-
 media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild | 2 +-
 media-gfx/imagemagick/imagemagick-7.1.1.8.ebuild | 2 +-
 media-gfx/imagemagick/imagemagick-.ebuild| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.11-r1.ebuild
index 7ebb6810d720..2d5dda784a19 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.11-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11-r1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( media-libs/libjpeg-turbo:= )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   jpegxl? ( >=media-libs/libjxl-0.6 )
+   jpegxl? ( >=media-libs/libjxl-0.6:= )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
index b2b6df693693..a8e9e6c099de 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( media-libs/libjpeg-turbo:= )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   jpegxl? ( >=media-libs/libjxl-0.6 )
+   jpegxl? ( >=media-libs/libjxl-0.6:= )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
index ddde0e92fe1b..11ec3563b60a 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( media-libs/libjpeg-turbo:= )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   jpegxl? ( >=media-libs/libjxl-0.6 )
+   jpegxl? ( >=media-libs/libjxl-0.6:= )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.8.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.8.ebuild
index bb71c03ea1cb..ffe558da8466 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.8.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( media-libs/libjpeg-turbo:= )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   jpegxl? ( >=media-libs/libjxl-0.6 )
+   jpegxl? ( >=media-libs/libjxl-0.6:= )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )

diff --git a/media-gfx/imagemagick/imagemagick-.ebuild 
b/media-gfx/imagemagick/imagemagick-.ebuild
index 7b351a60af4a..a95c8b48d40c 100644
--- a/media-gfx/imagemagick/imagemagick-.ebuild
+++ b/media-gfx/imagemagick/imagemagick-.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( media-libs/libjpeg-turbo:= )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   jpegxl? ( >=media-libs/libjxl-0.6 )
+   jpegxl? ( >=media-libs/libjxl-0.6:= )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-08-30 Thread Sam James
commit: 05b19d0c110faf84b66de12ce9a35590f0a5e5de
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 31 06:28:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 31 06:28:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b19d0c

media-gfx/imagemagick: add 7.1.1.15

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest|   1 +
 media-gfx/imagemagick/imagemagick-7.1.1.15.ebuild | 239 ++
 2 files changed, 240 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 71b3d4eddac3..42908a9dcbbc 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,4 +2,5 @@ DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 
5d26cc4921d5fcf8b98a126816c3f0
 DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
 DIST ImageMagick-6.9.12-93.tar.xz 9261928 BLAKE2B 
245ea5bdf49c1d4ca4e0cb34537748fe9604cdab22d4cf2ef6f809c8ba5b202daa79846fe7ad4249e558be005f505fab16153d8d39d01fc64466bbda53517887
 SHA512 
37a3d9b0b40aeb8e1f20e8497d5ce11dab1da2d18db0ce77d5762000c504671bccfb682bec16991a09afc6c7f27c141477413849e3e5d9697d9edd5c3bc276c8
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
+DIST ImageMagick-7.1.1-15.tar.xz 10200668 BLAKE2B 
e9910b94d1a47641785cf05b1bfe99f310619aa48d32eb42823b7e83b9be2904e6ebc63965e6eaca2ed1162e6b0055f54bac946602759941a0d20fbf7502bf9d
 SHA512 
afd6216d423a2b8b03727bac089bb83a0fe43c9bfc4c244d4ad5b1c8fa4c3a47be4c7556ef8f008debd0252c7b176c54caddd3c5c8b0ea4f5ca1836943326e8a
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.15.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.15.ebuild
new file mode 100644
index ..2d5dda784a19
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.15.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   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"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-43"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip 
zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   jpegxl? ( >=media-libs/libjxl-0.6:= )
+   lcms? ( media-libs/lcms:2= )
+   lqr? ( media-libs/liblqr )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   pango? ( x11-libs/pango )
+   perl? ( >=dev-lang/perl-5.8.8:= )
+   png? ( media-libs/libpng:= )
+   postscript? ( app-text/ghostscript-gpl:= )
+   raw? ( media-libs/l

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-08-30 Thread Sam James
commit: 7b83231dc5067b4ca3f1fd8587ca5c5c3941ed58
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 31 06:13:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 31 06:13:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b83231d

media-gfx/imagemagick: drop 6.9.12.86

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest |   1 -
 media-gfx/imagemagick/imagemagick-6.9.12.86.ebuild | 271 -
 2 files changed, 272 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index fb93069f5e2b..94ee9936315e 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,5 +1,4 @@
 DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 
5d26cc4921d5fcf8b98a126816c3f03ba8c925fef02aab49b50b54cc9275f412a35797a0a5200e6de41b7fcec1c3936aaa6139227568adb80070141cd19bb805
 SHA512 
5b1294e171fe627d8197b771417b9939516175a36b6f33bc82f62558fbf6af7bd26dc357a17da44d73429e4dc56f79f8c8770e2ffa040b0fac31663d31fb4ef3
-DIST ImageMagick-6.9.12-86.tar.xz 9259744 BLAKE2B 
dd87e8b7e4826ba0da239315b4acf0b92b05f08f88eb2f10b2b044d779eb317118d63f2a892b75a02e392e2eeadbb516289da1e3ccd3ad88e3feead3d3c2b239
 SHA512 
c391d40c0c0e3b34e3df28a0509bf7535cc18453b432e7dd0427b41298fb5f72a3b5d6ecc9edb37d8e298a7254abc7ac2a09e033dcfa4bcf722ce5cb188a8c71
 DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
 DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.86.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.86.ebuild
deleted file mode 100644
index e16f7e82db15..
--- a/media-gfx/imagemagick/imagemagick-6.9.12.86.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
-   inherit git-r3
-   MY_P="imagemagick-"
-else
-   MY_PV="$(ver_rs 3 '-')"
-   MY_P="ImageMagick-${MY_PV}"
-   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
-# If ABI is broken, change the bit after the '-'.
-SLOT="0/$(ver_cut 1-3)-58"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-   svg? ( xml )
-   test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   !media-gfx/graphicsmagick[imagemagick]
-   dev-libs/libltdl
-   bzip2? ( app-arch/bzip2 )
-   corefonts? ( media-fonts/corefonts )
-   djvu? ( app-text/djvu )
-   fftw? ( sci-libs/fftw:3.0 )
-   fontconfig? ( media-libs/fontconfig )
-   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-   graphviz? ( media-gfx/graphviz )
-   heif? ( media-libs/libheif:=[x265] )
-   jbig? ( >=media-libs/jbigkit-2:= )
-   jpeg? ( media-libs/libjpeg-turbo:= )
-   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   lcms? ( media-libs/lcms:2= )
-   lqr? ( media-libs/liblqr )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
-   pango? ( x11-libs/pango )
-   perl? ( >=dev-lang/perl-5.8.8:= )
-   png? ( media-libs/libpng:= )
-   postscript? ( app-text/ghostscript-gpl:= )
-   raw? ( media-libs/libraw:= )
-   svg? (
-   gnome-base/librsvg
-   media-gfx/potrace
-   )
-   tiff? ( media-libs/tiff:= )
-   truetype? (
- 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-08-30 Thread Sam James
commit: b4d31c1dfdae3b0544d5fc1ef5741d711083c103
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 31 06:15:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 31 06:15:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4d31c1d

media-gfx/imagemagick: revbump for earlier libjxl subslot dep

Signed-off-by: Sam James  gentoo.org>

 ...2.84.ebuild => imagemagick-6.9.12.84-r1.ebuild} |   0
 .../imagemagick/imagemagick-6.9.12.89-r1.ebuild|  44 +++-
 ...9-r1.ebuild => imagemagick-6.9.12.89-r2.ebuild} |   0
 media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild | 271 -
 ...11-r1.ebuild => imagemagick-7.1.1.11-r2.ebuild} |   0
 1.1.6.ebuild => imagemagick-7.1.1.6-r1.ebuild} |   0
 6 files changed, 43 insertions(+), 272 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.84-r1.ebuild
similarity index 100%
rename from media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild
rename to media-gfx/imagemagick/imagemagick-6.9.12.84-r1.ebuild

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
index 564d60496adb..c362e932a2e6 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -92,6 +92,16 @@ pkg_setup() {
 src_prepare() {
default
 
+   # Apply hardening, bug #664236
+   cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+   sed -i -e '/^$/ {
+   r policy-hardening.snippet
+   d
+   }' \
+   config/policy.xml || \
+   die "Failed to apply hardening of policy.xml"
+   einfo "policy.xml hardened"
+
# for Darwin modules
elibtoolize
 
@@ -227,3 +237,35 @@ src_install() {
insinto /usr/share/${PN}
doins config/*icm
 }
+
+pkg_postinst() {
+   local _show_policy_xml_notice=
+
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   # This is a new installation
+   _show_policy_xml_notice=yes
+   else
+   local v
+   for v in ${REPLACING_VERSIONS}; do
+   if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+   # This is an upgrade
+   _show_policy_xml_notice=yes
+
+   # Show this elog only once
+   break
+   fi
+   done
+   fi
+
+   if [[ -n "${_show_policy_xml_notice}" ]]; then
+   elog "For security reasons, a policy.xml file was installed in 
/etc/ImageMagick-6"
+   elog "which will prevent the usage of the following coders by 
default:"
+   elog ""
+   elog "  - PS"
+   elog "  - PS2"
+   elog "  - PS3"
+   elog "  - EPS"
+   elog "  - PDF"
+   elog "  - XPS"
+   fi
+}

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.89-r2.ebuild
similarity index 100%
copy from media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
copy to media-gfx/imagemagick/imagemagick-6.9.12.89-r2.ebuild

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
deleted file mode 100644
index c362e932a2e6..
--- a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
-   inherit git-r3
-   MY_P="imagemagick-"
-else
-   MY_PV="$(ver_rs 3 '-')"
-   MY_P="ImageMagick-${MY_PV}"
-   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
-# If ABI is brok

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-08-04 Thread Arthur Zamarin
commit: b2230d076a9a90fd43a65816c3f914176ddb5fd7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Aug  4 11:46:04 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Aug  4 11:46:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2230d07

media-gfx/imagemagick: Stabilize 6.9.12.89 arm, #907992

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
index 1bc09b15d248..1aa83e48c7ee 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-08-04 Thread Arthur Zamarin
commit: 9d09ac1abc30ce61b5b6fd40a92a8fcd69406c37
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Aug  4 11:46:29 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Aug  4 11:46:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d09ac1a

media-gfx/imagemagick: Stabilize 6.9.12.89 ppc64, #907992

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
index e51f94bb983a..c362e932a2e6 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-08-04 Thread Arthur Zamarin
commit: d86e9c0ce827be378b28b54969d20cef1d7cd189
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Aug  4 11:46:19 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Aug  4 11:46:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d86e9c0c

media-gfx/imagemagick: Stabilize 6.9.12.89 ppc, #907992

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
index 1aa83e48c7ee..e51f94bb983a 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-07-15 Thread Arthur Zamarin
commit: 5306c4bf50717dd347b3bc19f5e61eab5b084d7f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 15 08:48:16 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 15 08:48:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5306c4bf

media-gfx/imagemagick: Stabilize 6.9.12.89 arm64, #907992

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
index e16f7e82db15..1bc09b15d248 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-07-15 Thread Arthur Zamarin
commit: c3cfd4ecae6d9f6a4af48ee37aa98cfedf45c519
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 15 08:20:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 15 08:20:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3cfd4ec

media-gfx/imagemagick: Stabilize 7.1.1.11 arm64, #907993

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
index 06c8864f9b53..b2b6df693693 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-06-21 Thread Sam James
commit: 9ebf7624f96edb109c7efb89d7c85c0166db499b
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Jun 21 21:24:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 21 21:46:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ebf7624

media-gfx/imagemagick: stable 7.1.1.11 for sparc, bug #907993

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
index f31710b03d00..06c8864f9b53 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-06-17 Thread Sam James
commit: b9ba5c424b0ebeefdc5b9e890f93335c31fec0a0
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Jun 17 14:39:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 17 14:40:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ba5c42

media-gfx/imagemagick: stable 7.1.1.11 for hppa, bug #907993

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
index e6ea2a4d9f3c..f31710b03d00 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   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"
+   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"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-06-09 Thread Andreas K. Hüttel
commit: 1acdac076fe0168b2dc1ea9ed4340ba5ac3cdcb1
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Jun  9 14:41:16 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Fri Jun  9 14:41:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1acdac07

media-gfx/imagemagick: Drop overreaching hardening

Closes: https://bugs.gentoo.org/716674
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 ....ebuild => imagemagick-6.9.12.89-r1.ebuild} | 80 --
 ...-.ebuild => imagemagick-7.1.1.11-r1.ebuild} | 44 +---
 media-gfx/imagemagick/imagemagick-.ebuild  | 42 
 3 files changed, 15 insertions(+), 151 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
similarity index 72%
copy from media-gfx/imagemagick/imagemagick-.ebuild
copy to media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
index bb71c03ea1cb..564d60496adb 100644
--- a/media-gfx/imagemagick/imagemagick-.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
@@ -4,17 +4,17 @@
 EAPI=8
 
 QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit autotools flag-o-matic perl-functions toolchain-funcs
+inherit flag-o-matic libtool perl-functions toolchain-funcs
 
 if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
inherit git-r3
MY_P="imagemagick-"
 else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -25,8 +25,8 @@ HOMEPAGE="https://www.imagemagick.org/";
 LICENSE="imagemagick"
 # Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
 # If ABI is broken, change the bit after the '-'.
-SLOT="0/$(ver_cut 1-3)-43"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip 
zlib"
+SLOT="0/$(ver_cut 1-3)-58"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
svg? ( xml )
@@ -48,7 +48,6 @@ RDEPEND="
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( media-libs/libjpeg-turbo:= )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-   jpegxl? ( >=media-libs/libjxl-0.6 )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )
@@ -77,16 +76,11 @@ RDEPEND="
)
xml? ( dev-libs/libxml2 )
lzma? ( app-arch/xz-utils )
-   zip? ( dev-libs/libzip:= )
zlib? ( sys-libs/zlib:= )"
 DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-   "${FILESDIR}/${PN}--nocputuning.patch"
-)
-
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -98,20 +92,10 @@ pkg_setup() {
 src_prepare() {
default
 
-   #elibtoolize # for Darwin modules
-   eautoreconf
-
-   # Apply hardening, bug #664236
-   cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-   sed -i -e '/^$/ {
-   r policy-hardening.snippet
-   d
-   }' \
-   config/policy.xml || \
-   die "Failed to apply hardening of policy.xml"
-   einfo "policy.xml hardened"
+   # for Darwin modules
+   elibtoolize
 
-   # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+   # For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
@@ -157,7 +141,6 @@ src_configure() {
--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
$(use_with bzip2 bzlib)
$(use_with X x)
-   $(use_with zip)
$(use_with zlib)
--without-autotrace
$(use_with postscript dps)
@@ -173,7 +156,6 @@ src_configure() {
$(use_with jbig)
$(use_with jpeg)
$(use_with jpeg2k openjp2)
-   $(use_with jpegxl jxl)
$(use_with lcms)
$(use_with lqr)
$(use_with lzma)
@@ -187,1

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-05-31 Thread Sam James
commit: 385e04eeaacb88d59142e36e876c99352ad0ea56
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 04:12:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 04:20:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385e04ee

media-gfx/imagemagick: add 6.9.12.89

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest |   1 +
 media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild | 271 +
 2 files changed, 272 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 044b6d43a64d..21baffef3e46 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,5 @@
 DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 
5d26cc4921d5fcf8b98a126816c3f03ba8c925fef02aab49b50b54cc9275f412a35797a0a5200e6de41b7fcec1c3936aaa6139227568adb80070141cd19bb805
 SHA512 
5b1294e171fe627d8197b771417b9939516175a36b6f33bc82f62558fbf6af7bd26dc357a17da44d73429e4dc56f79f8c8770e2ffa040b0fac31663d31fb4ef3
 DIST ImageMagick-6.9.12-86.tar.xz 9259744 BLAKE2B 
dd87e8b7e4826ba0da239315b4acf0b92b05f08f88eb2f10b2b044d779eb317118d63f2a892b75a02e392e2eeadbb516289da1e3ccd3ad88e3feead3d3c2b239
 SHA512 
c391d40c0c0e3b34e3df28a0509bf7535cc18453b432e7dd0427b41298fb5f72a3b5d6ecc9edb37d8e298a7254abc7ac2a09e033dcfa4bcf722ce5cb188a8c71
+DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48
 DIST ImageMagick-7.1.1-8.tar.xz 10402336 BLAKE2B 
dd2f2b1fb1a42ae2da4d02cbb7d0d4c4afa6877f5b98a3b7d6cc2d3ce74fea5a2a30bf1680cdbf44fd3b37d40cb1957aebb12cf5f2dcc88b4ea90539218ed4e3
 SHA512 
99e786fe72465e414766cbef4f26fe48d89d6ea7a996197f9cc6b96492eacc8a9873b5440a7cd96bf097fafef6ff4765674d2295f4743b3c32eb2ff2dc9348ea

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
new file mode 100644
index ..e16f7e82db15
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-58"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   lcms? ( media-libs/lcms:2= )
+   lqr? ( media-libs/liblqr )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   pango? ( x11-libs/pango )
+   perl? ( >=dev-lang/perl-5.8.8:= )
+   png? ( media-libs/libpng:= )
+   postscript? ( app-text/ghostscript-gpl:= )
+   raw? ( media-libs/libraw:= )
+   svg? (
+   gnome-base/librsvg
+   media-gfx/potrace
+   )
+   tiff? ( media-libs/tiff:= )
+   truetype? (
+  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-05-31 Thread Sam James
commit: 9fa93fdfcba69cd446ac7f0fcfbe960e793d1b9b
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 04:19:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 04:20:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa93fdf

media-gfx/imagemagick: add 7.1.1.11

Signed-off-by: Sam James  gentoo.org>

 media-gfx/imagemagick/Manifest|   1 +
 media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild | 281 ++
 2 files changed, 282 insertions(+)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 21baffef3e46..fb93069f5e2b 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,5 +1,6 @@
 DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 
5d26cc4921d5fcf8b98a126816c3f03ba8c925fef02aab49b50b54cc9275f412a35797a0a5200e6de41b7fcec1c3936aaa6139227568adb80070141cd19bb805
 SHA512 
5b1294e171fe627d8197b771417b9939516175a36b6f33bc82f62558fbf6af7bd26dc357a17da44d73429e4dc56f79f8c8770e2ffa040b0fac31663d31fb4ef3
 DIST ImageMagick-6.9.12-86.tar.xz 9259744 BLAKE2B 
dd87e8b7e4826ba0da239315b4acf0b92b05f08f88eb2f10b2b044d779eb317118d63f2a892b75a02e392e2eeadbb516289da1e3ccd3ad88e3feead3d3c2b239
 SHA512 
c391d40c0c0e3b34e3df28a0509bf7535cc18453b432e7dd0427b41298fb5f72a3b5d6ecc9edb37d8e298a7254abc7ac2a09e033dcfa4bcf722ce5cb188a8c71
 DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 
5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147
 SHA512 
d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
+DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 
328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e
 SHA512 
b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48
 DIST ImageMagick-7.1.1-8.tar.xz 10402336 BLAKE2B 
dd2f2b1fb1a42ae2da4d02cbb7d0d4c4afa6877f5b98a3b7d6cc2d3ce74fea5a2a30bf1680cdbf44fd3b37d40cb1957aebb12cf5f2dcc88b4ea90539218ed4e3
 SHA512 
99e786fe72465e414766cbef4f26fe48d89d6ea7a996197f9cc6b96492eacc8a9873b5440a7cd96bf097fafef6ff4765674d2295f4743b3c32eb2ff2dc9348ea

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
new file mode 100644
index ..bb71c03ea1cb
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+   inherit git-r3
+   MY_P="imagemagick-"
+else
+   MY_PV="$(ver_rs 3 '-')"
+   MY_P="ImageMagick-${MY_PV}"
+   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/";
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-43"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png 
postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip 
zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+   svg? ( xml )
+   test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !media-gfx/graphicsmagick[imagemagick]
+   dev-libs/libltdl
+   bzip2? ( app-arch/bzip2 )
+   corefonts? ( media-fonts/corefonts )
+   djvu? ( app-text/djvu )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+   graphviz? ( media-gfx/graphviz )
+   heif? ( media-libs/libheif:=[x265] )
+   jbig? ( >=media-libs/jbigkit-2:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+   jpegxl? ( >=media-libs/libjxl-0.6 )
+   lcms? ( media-libs/lcms:2= )
+   lqr? ( media-libs/liblqr )
+   opencl? ( virtual/opencl )
+   opene

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-05-06 Thread Andreas K. Hüttel
commit: 5e9813aa6f8bbff10a21f2fb34a929fa796a8c42
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat May  6 20:34:39 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat May  6 20:34:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e9813aa

media-gfx/imagemagick: drop 6.9.12.77, 7.1.0.62, 7.1.0.62-r1

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 media-gfx/imagemagick/Manifest |   2 -
 media-gfx/imagemagick/imagemagick-6.9.12.77.ebuild | 271 
 .../imagemagick/imagemagick-7.1.0.62-r1.ebuild | 281 -
 media-gfx/imagemagick/imagemagick-7.1.0.62.ebuild  | 280 
 4 files changed, 834 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 4abd732ab107..044b6d43a64d 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,4 @@
-DIST ImageMagick-6.9.12-77.tar.xz 9220608 BLAKE2B 
11050da1710f381084f6758f0665270974c1913e164a0f4b1ee51433948fcf3b4c60c6b7cf5bc4be4958ef863bb14cb3311b08a1aff60907dc595c31eadcc67f
 SHA512 
ab6ad08496f955af28ed16669690fa07222ea741c62a4f98e1ae2b80a916557263d1ccbe66b3470c5edd3f0422bf626149560ae3574f76425ede69910b48faa2
 DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 
5d26cc4921d5fcf8b98a126816c3f03ba8c925fef02aab49b50b54cc9275f412a35797a0a5200e6de41b7fcec1c3936aaa6139227568adb80070141cd19bb805
 SHA512 
5b1294e171fe627d8197b771417b9939516175a36b6f33bc82f62558fbf6af7bd26dc357a17da44d73429e4dc56f79f8c8770e2ffa040b0fac31663d31fb4ef3
 DIST ImageMagick-6.9.12-86.tar.xz 9259744 BLAKE2B 
dd87e8b7e4826ba0da239315b4acf0b92b05f08f88eb2f10b2b044d779eb317118d63f2a892b75a02e392e2eeadbb516289da1e3ccd3ad88e3feead3d3c2b239
 SHA512 
c391d40c0c0e3b34e3df28a0509bf7535cc18453b432e7dd0427b41298fb5f72a3b5d6ecc9edb37d8e298a7254abc7ac2a09e033dcfa4bcf722ce5cb188a8c71
-DIST ImageMagick-7.1.0-62.tar.xz 10359080 BLAKE2B 
6f0c91f81cd7c43017b3b58b5bea032ef8ccdbbede05b1963e647d39813153d20f11cc24d3b7b50d5455a6c3075e765f468bdcf2b88725b2f37d139a2326956c
 SHA512 
db299bc84585b1f37d6fb5bfbc08264b19f4aa1b3e3dc28f14606310c5150ad103b8456d0856c1fae1efed137e0b02eb2beeccb504dfa39a10cb2aaacbfe47d3
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B 
ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d
 SHA512 
52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48
 DIST ImageMagick-7.1.1-8.tar.xz 10402336 BLAKE2B 
dd2f2b1fb1a42ae2da4d02cbb7d0d4c4afa6877f5b98a3b7d6cc2d3ce74fea5a2a30bf1680cdbf44fd3b37d40cb1957aebb12cf5f2dcc88b4ea90539218ed4e3
 SHA512 
99e786fe72465e414766cbef4f26fe48d89d6ea7a996197f9cc6b96492eacc8a9873b5440a7cd96bf097fafef6ff4765674d2295f4743b3c32eb2ff2dc9348ea

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.77.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.77.ebuild
deleted file mode 100644
index f7af824d63f1..
--- a/media-gfx/imagemagick/imagemagick-6.9.12.77.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
-   inherit git-r3
-   MY_P="imagemagick-"
-else
-   MY_PV="$(ver_rs 3 '-')"
-   MY_P="ImageMagick-${MY_PV}"
-   SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-# Please check this on bumps, SONAME is often not updated! Use abidiff on 
old/new.
-# If ABI is broken, change the bit after the '-'.
-SLOT="0/$(ver_cut 1-3)-58"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-   svg? ( xml )
-   test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   !media-gfx/graphicsmagick[imagemagick]
-   dev-libs/libltdl
-   bzip2? ( app-arch/bzip2 )
-   corefonts? ( media-fonts/corefonts )
-   djvu? ( app-text/djvu )
-   fftw? ( sci-libs/fftw:3.0 )
-   fontconfig? ( media-libs/fontconfig )
-   fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-   graphviz? ( media-gfx/graphviz )
-   heif? ( media-libs/libheif:=[x265] )
-   jbig? ( >=media-libs/jbigkit-2:= )
-   jpeg? ( media-libs/libjpeg-turbo:= )
-   jpeg2

[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-05-02 Thread Arthur Zamarin
commit: a0d03427b7cab942504ee908dd0116489720c698
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  2 19:11:27 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  2 19:11:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d03427

media-gfx/imagemagick: Stabilize 7.1.1.6 hppa, #905295

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild 
b/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
index af2f06173c2b..d082b29eab97 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

2023-05-02 Thread Arthur Zamarin
commit: 818ec0eab5c57b0e595673c85c2e83ca46a1296b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  2 19:11:26 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  2 19:11:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818ec0ea

media-gfx/imagemagick: Stabilize 6.9.12.84 hppa, #905295

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild
index 2b6f9396e544..f7af824d63f1 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild
@@ -14,7 +14,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"



  1   2   3   4   5   6   7   >