gentoo auto-resync : 31:08:2023 - 10:10:44

13 files changed, 71 insertions, 233 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6eefe7d383b2..7b1625f55d38 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index a2c89e7c812b..449f4601b6c3 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,5 +1,3 @@
-DIST ahoviewer-2.0.0_pre20220124.tar.gz 502882 BLAKE2B 9476c42dd36615f9106b6db0386b20c8922092fe68674f7a4439ca64458c00e3c1943a7402aed752ec91395e0684ce7cd89b0ac2de7f198edb39ebccef782fbd SHA512 0cf01c7011ae506fcff9700c46a06a57fdccc8f8a274d86a8438c926f0513e4e5851bdb37cb6ee7f8b673894938aafa7c2cb485773db04b977ec5f8b8634da3e
 DIST ahoviewer-2.0.0_pre20220827.tar.gz 502441 BLAKE2B 3d784a729a5221f457e0e9378f6baf5bdac6bbd800658467c7abf8c5c402da9a10357f3bb9642acce2390c0cf98fd236ff82f707ff1ce189bac079fe275cc89b SHA512 e9d20eb69c03417ca9d7cb708bbf69056c0ee525c7e7da55d273af72f74d038210f10841a07add839c171b473ce338880736cf874a58aa572f35393c86021ac1
-EBUILD ahoviewer-2.0.0_pre20220124.ebuild 1849 BLAKE2B 7800160da56d0a2cd0b098fe4e6d1c9333bf9d3c5720013f90a58bbfc9025fcbe1459a30ad8212d9f5735b622f79f31d542a645f528ee22fd89ec5e022330228 SHA512 9c6c5ea5f00f3ee2d1e3779d79c3cd9f3ef4df49e330cfa594e8f27f154168de3dd782bd8fd54d2648a5329a38cc67b507da4bf82bf085e5889c8a6f23cc5347
 EBUILD ahoviewer-2.0.0_pre20220827.ebuild 1910 BLAKE2B facdb7d5397e885b4cfa94b644027a975c997ecc3cdf4f26c58e078fc33976c188f3b567ae68097ccd81745e7a754cc90e1ebfd55257361e9abda23be4c8eb2d SHA512 0a416a1a4e860070e5129d58cf853a78a88ae05ddcc7671fb512bd6cb5b8e2731e22f1fcc0f62a65b12789756f937429db23da765a0c0a2b64003f004aa2517d
 MISC metadata.xml 520 BLAKE2B 8bdfd40b379bc5a256e0c9723a6f38800a13bc196dadda3ecb04ca830877a83f453d4201b435b45c299e69600b1e7c2687ad3ab5a1235796a216f8326bd95609 SHA512 14247aa1880217fb82e5775b8726ec14867f32089ab88937a84aca44d06310e5ebd25fb3386b35ba6eace3eb223a7c3a642df93c5a25333146646fbf5e75c273
diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild
deleted file mode 100644
index a1f6266cd7e6..000000000000
--- a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-MY_COMMIT="420959bef25d069424244b1fbd788e6b7eedd903"
-
-DESCRIPTION="A GTK image viewer, manga reader, and booru browser"
-HOMEPAGE="https://github.com/ahodesuka/ahoviewer"
-SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="keyring gnutls +gstreamer plugins +rar +ssl +zip"
-
-DEPEND="dev-cpp/atkmm:0
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0
-	dev-cpp/pangomm:1.4
-	dev-libs/glib:2
-	dev-libs/libconfig:=[cxx]
-	dev-libs/libsigc++:2
-	dev-libs/libxml2:2
-	media-libs/libnsgif
-	net-misc/curl
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gstreamer:1.0
-	)
-	plugins? (
-		dev-libs/gobject-introspection
-		dev-libs/libpeas
-	)
-	rar? ( app-arch/unrar:= )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:=
-			net-libs/gnutls:=
-			net-misc/curl[curl_ssl_gnutls]
-		)
-		!gnutls? (
-			dev-libs/openssl:=
-			net-misc/curl[curl_ssl_openssl]
-		)
-	)
-	zip? ( dev-libs/libzip:= )
-"
-RDEPEND="${DEPEND}
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0[X]
-		media-libs/gst-plugins-good:1.0
-		|| (
-			media-plugins/gst-plugins-vpx
-			media-plugins/gst-plugins-libav
-		)
-	)"
-
-# In future (-beta), pull https://github.com/ahodesuka/ahoviewer-plugins
-# directly via SRC_URI="plugins? ( )", or add as a separate package. It
-# depends on how the plugins are handled.
-#PDEPEND="plugins? ( x11-misc/ahoviewer-plugins )"
-
-S="${WORKDIR}/ahoviewer-${MY_COMMIT}"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature keyring libsecret)
-		$(meson_feature gstreamer)
-		$(meson_feature plugins libpeas)
-		$(meson_feature rar libunrar)
-		$(meson_feature zip libzip)
-	)
-
-	meson_src_configure
-}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index c5a5126fa73f..423270684bce 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,18 +2,18 @@ AUX imagemagick-9999-nocputuning.patch 327 BLAKE2B 5b9b732a434733fa5ab1b554bf7e5
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 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-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
-DIST ImageMagick-7.1.1-8.tar.xz 10402336 BLAKE2B dd2f2b1fb1a42ae2da4d02cbb7d0d4c4afa6877f5b98a3b7d6cc2d3ce74fea5a2a30bf1680cdbf44fd3b37d40cb1957aebb12cf5f2dcc88b4ea90539218ed4e3 SHA512 99e786fe72465e414766cbef4f26fe48d89d6ea7a996197f9cc6b96492eacc8a9873b5440a7cd96bf097fafef6ff4765674d2295f4743b3c32eb2ff2dc9348ea
-EBUILD imagemagick-6.9.12.84.ebuild 7398 BLAKE2B 8d008c24c598beeb0310fc20fb15191e46ae6f9201fc1377ef42aed6c982f38a498faac5dffcad016d924c352bdba1113aaccb65a16e7f636e1b1a8bc58bdaf3 SHA512 44437431485556b35d046dde691d723aac9d79ea023e4f4dae2eb59c94c382f619f4d3c086bb4e3dae41ab9cf217c9a6ab289e6e3ebcc7b7c983176f384f5b93
-EBUILD imagemagick-6.9.12.86.ebuild 7406 BLAKE2B 8ec5b53905aea991534d854fe060ed4112885fa49928da5eb94bcbf06e3a84faca7748a811f5a9381721848563b0fe0a1d41d0d6abee004a252246497d56fd1e SHA512 a96b9ac902a34e507361342c4a17469e681da09bd8cead4c254b4a5a5ce3909d5aeeb6b5fbd296b43c23cfa86d95c9a2a168daed410b5405a0cb378a44ef6d37
-EBUILD imagemagick-6.9.12.89-r1.ebuild 6444 BLAKE2B 7585630a40907f09e5216f96e7e41a481ad29bbdc8a34cc60f1f5e5c6a10a7ba4d2c9c1240e6f24ddb6be9fb0f441b03bfccdcb5751dcf059fad52b86a8eecbd SHA512 7a5ec731808e700e828b56968ddc761bf8295d16b2723bdec58f80e8e5a8adef5a9828145497ce8a3072163622ad8e52af026c2869fc979a0057525b955a4960
-EBUILD imagemagick-6.9.12.89.ebuild 7402 BLAKE2B 2c147f01b989d532bc5a63876e782e87033918208ae67a69cde9b3d1079a36fe1bfa9141ee1e916565f01c7a371fb76331758431e6dc9eaab9027dca6168c1d1 SHA512 19e66356c2ed38bbd2c54b9c406af2ffdc5f459e2b47bfad4ac1d2ae0b4f10c32f650f0ca74f47990b788cee39b83e0eb09748a8ca32d4e70e68e79a8522da3b
-EBUILD imagemagick-7.1.1.11-r1.ebuild 6804 BLAKE2B 6f33891f69fa5996457d4dd4c8f3282a5be9a59e95a3d6522af0925f52467ab20a0effd9eacd6720913e1d37ee794523eec5dc135f755d25d87e6a6141345ffd SHA512 f9ee698c763a68ece549146b450d78b57dcc1dc9eb2d271d311f4c451d6c6571ddd2d4adfa1e65e8b37dfa7dd0de0b516b219f04cf6b904d30dcb12b3c3136cc
-EBUILD imagemagick-7.1.1.11.ebuild 7762 BLAKE2B f81dfc19c956fe851d925bf993c27dd3ccff35f7fbd6c3870ed8b3e3a5b24c0eeb6d5a933136ed3f1feefbf42a675be9b25a3167ec11f7ec736591508eb24c5c SHA512 7c81d48c878dbac451be6e3332cbb1693c2d88ad8f92ef7838d1a7a06e542bf942b7f5053525a225432075fcca7f4f155274e236acfe6d44f303edc0491cedea
-EBUILD imagemagick-7.1.1.6.ebuild 7744 BLAKE2B 1111c6eb68ebd7dfa390ffd6141735edef84fe0f1f8c911d288d6296986838d4c67535472724ba7ffe4fae5bfe22135a2c3fb1e6f21f7b8b9709d90a3a490d71 SHA512 ffc5d1b0a73c24480937522945281f316841cd800bc5086f4aa53a282d970092278b89d03badabd570dc71cec23240b1d370739e5f4f59952b943e988daa4c13
-EBUILD imagemagick-7.1.1.8.ebuild 7752 BLAKE2B 1c7099ff24e7881478887242c49b42217a9a3c9014af15c96ab0525b468bdb2182ce4032eac1b61a8b6a2b6f36b810ef5332264b14e6812e3296257584e49f2c SHA512 b16e3254e9d7bd3083f5198b3719c9a4ca0982eed25f60a1c559a04f765d6d73a352b02ea35ea8d391e18f5df12f5b87937f7062b3a21b0a4ddf53a29aa6bc0f
-EBUILD imagemagick-9999.ebuild 6791 BLAKE2B 910d0a94a459970fdd35e486bae9fac8dcb6d83c22d4ae7a9bac3e033c8bd34c13207601c0d91990a7d1a451e4f5072187eec6c536a8fdadc1eb71a1544b3764 SHA512 b48373dbc46cd99b3a7b336a1591132e1d19fab82ee950633dd7b4e607ec4f1ce4e87df06402e52079fb3d3bde1b215a2db485b2b8f4128e34d710bb5e37d1d2
+EBUILD imagemagick-6.9.12.84-r1.ebuild 7398 BLAKE2B 8d008c24c598beeb0310fc20fb15191e46ae6f9201fc1377ef42aed6c982f38a498faac5dffcad016d924c352bdba1113aaccb65a16e7f636e1b1a8bc58bdaf3 SHA512 44437431485556b35d046dde691d723aac9d79ea023e4f4dae2eb59c94c382f619f4d3c086bb4e3dae41ab9cf217c9a6ab289e6e3ebcc7b7c983176f384f5b93
+EBUILD imagemagick-6.9.12.89-r1.ebuild 7402 BLAKE2B 2c147f01b989d532bc5a63876e782e87033918208ae67a69cde9b3d1079a36fe1bfa9141ee1e916565f01c7a371fb76331758431e6dc9eaab9027dca6168c1d1 SHA512 19e66356c2ed38bbd2c54b9c406af2ffdc5f459e2b47bfad4ac1d2ae0b4f10c32f650f0ca74f47990b788cee39b83e0eb09748a8ca32d4e70e68e79a8522da3b
+EBUILD imagemagick-6.9.12.89-r2.ebuild 6444 BLAKE2B 7585630a40907f09e5216f96e7e41a481ad29bbdc8a34cc60f1f5e5c6a10a7ba4d2c9c1240e6f24ddb6be9fb0f441b03bfccdcb5751dcf059fad52b86a8eecbd SHA512 7a5ec731808e700e828b56968ddc761bf8295d16b2723bdec58f80e8e5a8adef5a9828145497ce8a3072163622ad8e52af026c2869fc979a0057525b955a4960
+EBUILD imagemagick-6.9.12.93.ebuild 6451 BLAKE2B 3e5d3f8bf3e2f362d24d9f184235053e590d967e2435b71a857ef78a4ada3a7089891edb09e7f2ec1ae0d928175df5292a1b250c8de7dde518b9b5e027bb3c21 SHA512 e0eaab71d74ef49c526c65dbd36599fd404fd00fcc77089ff595db9079a61ac864184d5ac6181e1b4872ffd722abc87deb97cfcb4218039f3c6ff780f5c97ee1
+EBUILD imagemagick-7.1.1.11-r2.ebuild 6806 BLAKE2B 547348a923d5d16c38be41563e55a2b7a3f52698092bb4c4597ee27c9cfe293a357d53cc331dc762df0b946c6632f8f19ef5729ab69aa7aee17406784039c3ca SHA512 976aeaf0d765a98c06b7406e22429a8d822d13f99d7fd8753c361365c9e698e33da2cd679c00594c8026a929ccf96cd697c10ae0e5fbf8355b77c7bec432d0c2
+EBUILD imagemagick-7.1.1.11.ebuild 7764 BLAKE2B 0556797ded3f5d8da08ab14b1c07df97d15d6fd2e4ca197c986e73c04f9d3c11e2d24312de44aef207dc55e64be9dda2b6735fa900aa287ddc1d48667424bc80 SHA512 8facb8b9d1af301011178e4d57f0f47b75e4ef663bd7a81604529da9b1f1058bdeea992cfd4fef568acdd9ea71389732707f099e32a510467dcb7dda9c4eab7f
+EBUILD imagemagick-7.1.1.15.ebuild 6806 BLAKE2B 547348a923d5d16c38be41563e55a2b7a3f52698092bb4c4597ee27c9cfe293a357d53cc331dc762df0b946c6632f8f19ef5729ab69aa7aee17406784039c3ca SHA512 976aeaf0d765a98c06b7406e22429a8d822d13f99d7fd8753c361365c9e698e33da2cd679c00594c8026a929ccf96cd697c10ae0e5fbf8355b77c7bec432d0c2
+EBUILD imagemagick-7.1.1.6-r1.ebuild 7746 BLAKE2B 20ffa460dadbc7cefa506ad2eaae6d25bbb004b2f406ee0df63618b66104b82053bbbc76379102c7205d9f37eed331afa303fbd3715f050bcd5605f63e8bbcaa SHA512 5996f87886c66b5ee5db7d4caaef0116555abe01762179cce99f1577d1de1c2a2865bf68f79a0bbdf648fb903d638a719fb119a762276c6e966d02a56b408fe9
+EBUILD imagemagick-9999.ebuild 6793 BLAKE2B 431d879e422f286dd7d8febbb7892613d243a151f0787232ec33c2ff658223dc1f0a8d760a35b753992df0f954dfd7616ae53408660e30532b22ed59bdf71b1f SHA512 f33342a7bf0c6410fcd642b6628b749da4bd893e3e5ce47c2a25d4b3b0c547659688b54908b578ffb01a2c8cdb2492edec8193eb94e87cc3ac1e379de14e93d9
 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-r1.ebuild
index 8df9b4f96a83..8df9b4f96a83 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild
+++ b/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 '/^<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
 
@@ -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.86.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.89-r2.ebuild
index e16f7e82db15..564d60496adb 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.86.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.89-r2.ebuild
@@ -92,16 +92,6 @@ pkg_setup() {
 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
 
@@ -237,35 +227,3 @@ 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.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.93.ebuild
index c362e932a2e6..4f23d9fb6d1a 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.93.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}"
@@ -28,9 +28,11 @@ LICENSE="imagemagick"
 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 )
+REQUIRED_USE="
+	corefonts? ( truetype )
 	svg? ( xml )
-	test? ( corefonts )"
+	test? ( corefonts )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -76,9 +78,12 @@ RDEPEND="
 	)
 	xml? ( dev-libs/libxml2 )
 	lzma? ( app-arch/xz-utils )
-	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"
 
 pkg_pretend() {
@@ -92,16 +97,6 @@ pkg_setup() {
 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
 
@@ -237,35 +232,3 @@ 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-7.1.1.11-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.11-r2.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-r2.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.8.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.15.ebuild
index bb71c03ea1cb..2d5dda784a19 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.15.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}"
@@ -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 )
@@ -101,16 +101,6 @@ src_prepare() {
 	#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
@@ -247,35 +237,3 @@ 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 "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
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.6-r1.ebuild
index ddde0e92fe1b..11ec3563b60a 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.6-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-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 7b351a60af4a..a95c8b48d40c 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.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 )