gentoo auto-resync : 15:04:2023 - 11:48:08

7 files changed, 606 insertions, 1 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5de0fb990f41..276150509609 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 665dbc339b66..6e2b76e1e0e8 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,7 +1,8 @@
+AUX gnofract4d-4.3_p20221125-clang16.patch 2070 BLAKE2B fad88eb8307a3387075f2b7c58b12103474f4a807039261a323759f5c5f9579612d6ef25ab93fab317352ee49ee2c90745c92e0ee1f776721940c95c563f1f71 SHA512 0bcb83dbd5486fbbe6ea683cdd85ce057dfef96203f5f4a6cc8b45d1da07b28da2afcff4d18bb584833c06222de15f8e4851d43949fb7090c580bd45635bd391
 DIST gnofract4d-4.3_p20211108.tar.gz 18271921 BLAKE2B b73fef616b8a91827edd514ec128bcb6d63a8fc8f1433989e31bd9f11711a9568a61358dcca23846bff461ef6a8addeae68cc5ab5f4ae29b6e9b2857bdbad2b8 SHA512 0d95f31ac9b1b82bfd459ac896c73bfcffb3b256750093cdccee976839112fcaeb42260c0eb48ef4f30dc0504f5b84cc425f6568997c05639993354756f9ef75
 DIST gnofract4d-4.3_p20221114.tar.gz 18275321 BLAKE2B 029babc09810aa2a2fe0a627144bd347cb363666a9412cce067c2ce505fd8d554a3e12058ab74ccc5d1ff29587e96276026e685ee586e3961c92f72b30fe72d5 SHA512 d45183c0dc77959210b512ecfb35a8487ebf103ec5d46f815f4a2e05655ed5cc2f5fd1399f644fd919a459ffdb54dfe32a7745991dd37f527f5b79747aa22618
 DIST gnofract4d-4.3_p20221125.tar.gz 18275177 BLAKE2B 24fcd71818a98a3137b485046f295b523884d05ece694e37cf871e1fdaba7b26ac870675895a7a361e5d1fe142b0ae68c720c6e39615226951e8e1af6f57c848 SHA512 75d8d12441a0e2024f0ef125fee5cbe8dcc10c4c48ba366d5529644ae743928b998f85369aafc6e737cb994a82ebdcbe941e11c916c0d0996e785a146469e359
 EBUILD gnofract4d-4.3_p20211108.ebuild 1474 BLAKE2B 082b15fe148c31e01455f535fa53f1a4b74c2d011d78b2b9d4e7a9a5c72c146840af2a3f676d5e69e61a3a9b6e3c219d8d3bdbcb8c1c562c6199e1f7d8154069 SHA512 20d32d3c0d0596da82b626e7cf470e1cd200e62d48e86c8275e0716086321e582e34c3805a756c004383dc3265d620dc422655c5536b324ed37d81a8607f0d28
 EBUILD gnofract4d-4.3_p20221114.ebuild 1410 BLAKE2B 80abe21f54fdfc63c5d95b4ce3ed1d69d8c46650d9b71755b5bed2417b4b3aafa64f3bb6f88a5d1093639a79e4253b53b520ccef42c8764d10d8a57f699129c4 SHA512 b2fd0d9e865b88d858ba05f48e9cc48cb10d5c238b74f72f75a26793ae7d8eb4d1b832c7e22421a467fd9a6e57bd3f4c2d3d781826af8ebbf3c83506caa4c8f4
-EBUILD gnofract4d-4.3_p20221125.ebuild 1408 BLAKE2B 4fe74239f64cb0d453fe33cdaee7988f8c3be213da94683b619ad79e31477e8b6fc081b88e39aed6c5e817be52a32a90d4e3d58e8e2f7576746d0f696a964a6e SHA512 858e1147e4a048d41b8289aac7669d92e4e7344daedbe08a136b1293a107983a516e923cf660b0f619e2cdf07adc6c8631c37302cc8260fd9bf548d3d0bafe8d
+EBUILD gnofract4d-4.3_p20221125-r1.ebuild 1470 BLAKE2B 9316290a45026d2aae523d8e59059fcf08cecf886757c7dd49af0d8532176b6bec30f6e3f01ade36656437be6410502f9486b5f482d7b293df7cbe735d007850 SHA512 030a61800bd923a76e929312a908bc3b45634d891bb48cdd8d605ff23c5ed363293e33e1a9050f74d8e47bc67e787861597e77ee47b6c2171dcc43b056c215ef
 MISC metadata.xml 474 BLAKE2B 6dcdd891ae9b2b69a1f7a2e3de6bc867894444743825642abddac1701d75bd2ec1542a5e6d4c86b76b2e209ccdc4db53e680692a0e6c7c99c280ff96fe6a13a2 SHA512 7b815ce8a870b158e39845840082ea3a87738d1f7c63b6aee869758deb3475f7f2c1c1f1831bfdc8af911c1f7825c514cf26c76af5bb32464e9fa2a308ba8a05
diff --git a/media-gfx/gnofract4d/files/gnofract4d-4.3_p20221125-clang16.patch b/media-gfx/gnofract4d/files/gnofract4d-4.3_p20221125-clang16.patch
new file mode 100644
index 000000000000..3ca2ae35911a
--- /dev/null
+++ b/media-gfx/gnofract4d/files/gnofract4d-4.3_p20221125-clang16.patch
@@ -0,0 +1,44 @@
+https://github.com/fract4d/gnofract4d/pull/254
+
+From dd92a4bf2c6e68352203c511f465846e5c96407b Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Fri, 14 Apr 2023 09:33:28 +0200
+Subject: [PATCH] Declare image_lookup, gradient in fract_stdlib.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This avoids test failures in generated code with C compilers
+that do not support implicit function declartions:
+
+>           raise fracttypes.TranslationError(
+                "Error reported by C compiler:%s" % output)
+E           fract4d_compiler.fracttypes.TranslationError: Error reported by C co
+mpiler:/tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_9ebc1853081db2ea5eb7cce846
+42cd4e.c: In function ‘pf_calc’:
+E           /tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_9ebc1853081db2ea5eb7c
+ce84642cd4e.c:282:1: error: implicit declaration of function ‘image_lookup’
+E             282 | image_lookup(t__a_cf1image,z_re,z_im, &t__cf10, &t__cf11, &t
+__cf12);
+E                 | ^~~~~~~~~~~~
+
+
+>           raise fracttypes.TranslationError(
+                "Error reported by C compiler:%s" % output)
+E           fract4d_compiler.fracttypes.TranslationError: Error reported by C compiler:/tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_2ccc81a001cdf717973d45d4cbd12778.c: In function ‘pf_calc’:
+E           /tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_2ccc81a001cdf717973d45d4cbd12778.c:323:1: error: implicit declaration of function ‘gradient’
+E             323 | gradient(t__a__gradient,t__cf09, &t__cf010, &t__cf011, &t__cf012);
+E                 | ^~~~~~~~
+--- a/fract4d/c/fract_stdlib.h
++++ b/fract4d/c/fract_stdlib.h
+@@ -52,6 +52,9 @@ extern "C"
+     double read_float_array_2D(void *array, int x, int y);
+     int write_float_array_2D(void *array, int x, int y, double val);
+ 
++    void image_lookup(void *im, double x, double y, double *pr, double *pg, double *pb);
++    void gradient(void *grad_object, double index, double *r, double *g, double *b);
++
+ #ifdef __cplusplus
+ }
+ #endif
+
diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20221125.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20221125-r1.ebuild
index 8fc1f112c6e4..2132a58fe933 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.3_p20221125.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20221125-r1.ebuild
@@ -38,6 +38,10 @@ distutils_enable_tests pytest
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3_p20221125-clang16.patch
+)
+
 src_prepare() {
 	sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index eb5ba53e3ca2..43c013a1732a 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,10 +3,14 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.12-64.tar.xz 9174728 BLAKE2B 8d6f4b6d5b8c2bd6aae3ac38ee5662c5eecfc94e98f8c5e7497b28fec69a9e1fc8b6a4f88bd794b0ed1649db88c8cd9836a335ee17ada27b11361488f4e23566 SHA512 307dd4ed4505b977282cc08065fd735200ce39e9a391d3b0faa47dedc788900c21cbf6b9bbd71cac0c9fafea6cc9b6f22a22f7c50a1764067fcf901d06e89025
 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-7.1.0-62.tar.xz 10359080 BLAKE2B 6f0c91f81cd7c43017b3b58b5bea032ef8ccdbbede05b1963e647d39813153d20f11cc24d3b7b50d5455a6c3075e765f468bdcf2b88725b2f37d139a2326956c SHA512 db299bc84585b1f37d6fb5bfbc08264b19f4aa1b3e3dc28f14606310c5150ad103b8456d0856c1fae1efed137e0b02eb2beeccb504dfa39a10cb2aaacbfe47d3
+DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d SHA512 52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48
 EBUILD imagemagick-6.9.12.64-r1.ebuild 7285 BLAKE2B 332bd486f9807138c1f173ee9c91d0d888f4da09314b492aaf5ca22552d8e0467235fde94799612cbdbf7b9e43d9b839e5ef0f71c07d2bcd9611c49e4984be73 SHA512 8e176e41f60abd639c0c39f949afc59ca1c4468d8c2059b592d3d4edf8c6a8591c0a2fa89a14e4bba259ed16786f726a67024f5f59d313fe38bd06fc538a45f7
 EBUILD imagemagick-6.9.12.77.ebuild 7426 BLAKE2B 71d71047513610da3bb50f973ff3b8968718a0df69d2e443f81b42addf1a12bf5c422219ad92d4b8a0a996402890c605f3b439c8d11d199d2176c3f218e3b46f SHA512 e9b5e34dccbb20d2365787372006f128ddfeeffeea7cfece03911ffa191c69b324d6e32acd6593befd911a7c8384c3cf4f2b0cdf2d596f7438fe50942f529121
+EBUILD imagemagick-6.9.12.84.ebuild 7434 BLAKE2B 35b81957b99859ca85ab40f7c72ae808650220700e7d207ee1d97cebdbd79196cde4fd602640645ddffb60d9c769a2e8cd87a59e55cf36f4588682e1489b631c SHA512 cc84cacfdbaf6a72b1e56c345f22f0537e497b3dcb7a15279db6ac60dd8c6dd8ebbd9e4d4dc5e72bd82ee6a567e5da7ddf5eb50b85923374517aefb30853be99
 EBUILD imagemagick-7.1.0.62-r1.ebuild 7780 BLAKE2B 2657812e172c8df3de26c88687c54cf3f892ee8817b6a2b3ffeb8179a6915fd4888858f1489fe1604944051714a6d9e3a72b3824fb49b44af1f31aa4ab458a51 SHA512 8c429466771721f800714051adcf5f8b8990e6ffb6bb7df399a6e594d9d67d79e0fbc4886a84bb9d9d7f93fec8dad9a06bfe1c785103fce0e6af914ee9a320f9
 EBUILD imagemagick-7.1.0.62.ebuild 7719 BLAKE2B 59c7465caa1d4e165f9e26fbd701e20cd7c09e9609859713c43a68366b028abce4f247823419bf5b6a3e5057ae3687be940ed01879e96bde9a35ffb6111da286 SHA512 246d9c907a4186857cb66496f3e1ddb2a10d3558a8b9580f7e1229a20e81fd30f0f47f7f70152db559c707ee7863e83621ca08a841ca382ce29cdedb22b7feeb
+EBUILD imagemagick-7.1.1.6.ebuild 7780 BLAKE2B 2657812e172c8df3de26c88687c54cf3f892ee8817b6a2b3ffeb8179a6915fd4888858f1489fe1604944051714a6d9e3a72b3824fb49b44af1f31aa4ab458a51 SHA512 8c429466771721f800714051adcf5f8b8990e6ffb6bb7df399a6e594d9d67d79e0fbc4886a84bb9d9d7f93fec8dad9a06bfe1c785103fce0e6af914ee9a320f9
 EBUILD imagemagick-9999.ebuild 7780 BLAKE2B 2657812e172c8df3de26c88687c54cf3f892ee8817b6a2b3ffeb8179a6915fd4888858f1489fe1604944051714a6d9e3a72b3824fb49b44af1f31aa4ab458a51 SHA512 8c429466771721f800714051adcf5f8b8990e6ffb6bb7df399a6e594d9d67d79e0fbc4886a84bb9d9d7f93fec8dad9a06bfe1c785103fce0e6af914ee9a320f9
 MISC metadata.xml 1260 BLAKE2B ca25d6d7f6286db6fdab38bbbda7c519b28733923a6f2a3f1ddcc79436d149111dc853aa1e44d805bd9e0f97c0e76496bfe815c4065d581390ceec849610d67a SHA512 128ed34ce2e6ee36977f4990bc2be2ded256b3516bab9e91640f29f985a34f59de7835414aea4752257f6228c8b1796bb68b51ae9e4453ce078cd63cb383c2d5
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild
new file mode 100644
index 000000000000..b8d2fa1c3ff7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.84.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} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+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:= )
+	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
+
+	# Apply hardening, bug #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			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 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
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--with-gcc-arch=no-automagic
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in ${HOME} for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		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
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		# bug #472766
+		doins "${T}"/99${PN}
+	fi
+
+	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-7.1.1.6.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
new file mode 100644
index 000000000000..085bd89a9b6a
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.6.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} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+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"
+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? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	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}-9999-nocputuning.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	#elibtoolize # for Darwin modules
+	eautoreconf
+
+	# Apply hardening, bug #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=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
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--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)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with jpegxl jxl)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == 9999 ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		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
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	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 "7.0.8.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-7"
+		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
+}