gentoo auto-resync : 31:12:2023 - 05:49:48

3 files changed, 0 insertions, 86 deletions

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 5e7685581779..b9701eb49ec8 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,5 +1,3 @@
-AUX imagemagick-6.9.13.0-bashism.patch 1393 BLAKE2B 1d43871cc303cee54135facc76883675b6ed79aaaf7d855af62b9ce35ff637467e6c6fada21a51473b60be382dd0a0cc6fe2fea57feaf052d28104dfb608cba5 SHA512 a160339878a5c0e7bce2d414065ed24f507f143f10f5225db035f3e06fc814f86f0d3c3e55d3d7323af58e2d2da1452e9ee38ffe5c0c985f2d3f21106197a2dc
-AUX imagemagick-7.1.1.22-bashism.patch 1748 BLAKE2B 51e409a6ca3b20f2e32b94e4db51c5fddbc65084f78450ef88c5de045588047125bdf8e219778778bc7ff8400b6d2f384533d60163468be2eec09f5c4360deef SHA512 7de05b293422b6fd11f7b72853c00d6e3f17f1925c66f6edebcf8a124ce7bcad48a354494ab8523fe0422094745d6e4c6e9df8ed53b11742c64d781cc56907e6
 AUX imagemagick-7.1.1.24-c99.patch 1796 BLAKE2B 38b6834affb557d24d05a0242e249e73ec6b1994c2eb1d8fa1e81eed758a38f8383c2c0ac2af3746f4835dd7065c295e077d22033293316ebd747fc886bb2c48 SHA512 1977ab84a0b53fbeafa4c95ef7d2d792ab3459685e0ee96871cd75440a8f190c7d0e6adb639fa75db33d80efe09010f5d08ef443ccd8d458faa95fdde980ccc4
 AUX imagemagick-9999-nocputuning.patch 327 BLAKE2B 5b9b732a434733fa5ab1b554bf7e5516260e8a8f243ab8bc61f95f6833185c3a997f5b046dc24690aeebfad925e0e180d98791aae1ad910e9aa069f0108dbd89 SHA512 647c367470deaaaa1ee14a02f80c8ed63de294ea7211a9010fad029bc9b254e27bc41c461561c28c2e24166fc17d0023238755160f8f22af641b0858e4bdceea
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
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..000000000000
--- 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 <sam@gentoo.org>
-Date: Fri, 8 Dec 2023 09:47:06 +0000
-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 <sam@gentoo.org>
----
- 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..000000000000
--- 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 <sam@gentoo.org>
-Date: Fri, 8 Dec 2023 09:41:59 +0000
-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 <sam@gentoo.org>
----
- 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"
-