gentoo resync : 29.12.2022

6 files changed, 53 insertions, 28 deletions

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 27a86c06f7f6..f4affd575c26 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -5,9 +5,9 @@ DIST ImageMagick-6.9.12-28.tar.xz 9181044 BLAKE2B 2efc03da9e4c53b82479badfcc9a25
 DIST ImageMagick-6.9.12-35.tar.xz 9178620 BLAKE2B 8bcf8bcc8bee8fe3d996a3b9388fdc20a6bbd45dda35121a9fb84804277286cb17c3b6cf2e6096765aefe20a31f819f8bcf094b0b3b1c68b683b50ddc415b398 SHA512 ba1f49570d1f890bc313d4e58c53c2b7388108c64cd2c5ef7586a7568f72d5655fced1a22085e27858cffcf86b7548376970fc6947fccb36f4cfba48327089e6
 DIST ImageMagick-7.1.0-13.tar.xz 10311564 BLAKE2B 7cb3e58f548cbe0b9e1239df47ff4f42af2cd0b6ff4c417a62515ff9bd434ecabed2cc7f7cb7cf8880f20af3f6d7de33d7368f146b9ac7668149959966a463d8 SHA512 dac1fc229599a63703fc3aa1378de313dc94dfbfa71913dc408ef65c88ef33820b5ddab4c9a064a86cc35c0abb0136f0adb626bff9e227b52ed0d90993688044
 DIST ImageMagick-7.1.0-20.tar.xz 10339572 BLAKE2B 7e99a8b36089b1258f537dbdf8c674be17677da5450854e0dfe0ed3bd3722ec826099f7c22d615daece6d647e6c22f4d9aa7293fed9b4bebb77c163e3ac54bc3 SHA512 e07d8f8ede8f713f1c0bd571b6042062b154b95ab06b0479ec4162d242beba982bfa88438ac67985d4da6d18074bda4b0ac25a7c2ced44f19b54c21120441991
-EBUILD imagemagick-6.9.12.28.ebuild 7179 BLAKE2B c82d248b8debc199150564a6e426a7364f58694581bf2a36e883feb0da9dddbe093e58d51adbb1f2ada5ae1a0e651a8a16820c681097946c3fc63d13870fba04 SHA512 c5a8f6d240e17f2948a8fcf72bc74b2b54975301ebba4273b2f03094e60e975e9b318c633ffc1940cee6da2e2c3be35a3359d2028cf5a25eef4660bc399daf5b
-EBUILD imagemagick-6.9.12.35-r1.ebuild 7236 BLAKE2B 2466b01bcdaa6ec1d73ec16ca15899cfbcd0d61d6c5bf482e1f01e03db61f4c69c8710926287ebf8abd39f5543fa0eb6bcdc322116ee30e5407f693c2c7384ab SHA512 10419baaa82906ccc7ba5b8130183747936cf316a673f0f9584fa584c56be74c407a593f663c138299edd5e03c7fb69eb09c8b6eece78609fdaa241766575691
-EBUILD imagemagick-7.1.0.13.ebuild 7393 BLAKE2B 62c865149f7d907244665fbfa78b0bb2eedfdf124ec59d72a2943bfdf0cc6b7de051965d5b63a8e117709346f70b7ce066736a647238026e054c67fe2d537009 SHA512 3a6523aa2cfdfebbc325ced0db16f48c0e17f586e41140a16fbaf66ad7c8079e33e3f4a31bd774b874f3816aceb6a01ae2be2edf8337e9d89b6b92959a83962b
-EBUILD imagemagick-7.1.0.20-r1.ebuild 7456 BLAKE2B ba463b9b0c047982c3ae54669c435acfa1937c2abc32e3ea1159b91a4ad9efb699bc1caa579569a105c8029111e27f9ce259bfd0453583cb91054abe2b9c0c0a SHA512 354523f445ee8de722ba2ec1026b469b68c0f4261f3dc14762a32ec7de3fe53276ae363f5b02366cd8962706efc6e2fa4de4d79ebdf8bad28e2340b83c406347
-EBUILD imagemagick-9999.ebuild 7456 BLAKE2B ba463b9b0c047982c3ae54669c435acfa1937c2abc32e3ea1159b91a4ad9efb699bc1caa579569a105c8029111e27f9ce259bfd0453583cb91054abe2b9c0c0a SHA512 354523f445ee8de722ba2ec1026b469b68c0f4261f3dc14762a32ec7de3fe53276ae363f5b02366cd8962706efc6e2fa4de4d79ebdf8bad28e2340b83c406347
+EBUILD imagemagick-6.9.12.28.ebuild 7271 BLAKE2B 10af3bac2a382aefdb2d731fe40c2e59d9a61ea7801bae918eeff8f41f39123714ee75006aae03b18d413de740599dcf9ac12dbbf061c5e774947f90edacfb5d SHA512 f7eb66bad1739b447c462d23e2f391a268a62291b3b3642cd3404379fcce9e229e8a2386b90985bbdb98f884021b4202bfa78e2ea26903404aaa03f8824c861f
+EBUILD imagemagick-6.9.12.35-r1.ebuild 7328 BLAKE2B 440bba84bf2fd9df190f2954ca6ad290af88841fa94085e9e4cea26ed5419b82f3b667429f0d596d96b78f6714037f106a31a3aa7ab38253b4348498d0ef1c25 SHA512 556e1b05a49bd60d0750f80746cccdfb7a39428b63f2e8860772a1a58d5a16675fe6b66cbe6bb29a9ab388ff43b621f69264318a119fd4466876c1731252595f
+EBUILD imagemagick-7.1.0.13.ebuild 7485 BLAKE2B 896feef5fe189b78077bf00f94a6c97dcdadc41173ccbc1496892b2f226ad8e1acea5098cb4db713fb16580fe1283b0abb87d2d391a7924a8e8b46cccaea1bbf SHA512 faf93e670caf340354f5ecf2fc4e7321b6759aff9913b4a7c341c8664ac800ea113e66faadf16c080053bc0f706977298de923708b3e7ede2e136c955d6efb7c
+EBUILD imagemagick-7.1.0.20-r1.ebuild 7555 BLAKE2B e4db7228ea2ae637eef9b189faf54b5580892f10ef93509f976929138338a5dd17eaf7630a411749549076f283de5ef00227d581ed9ff5b7c00c2a9fcc43b697 SHA512 39204411775a0e8b13633727304e585a2eb8d5be426242f735896c71275e1a2c467cf220f5451f60082f77e26f36c345fd20da3f733f52b0e58a665aa51c08dd
+EBUILD imagemagick-9999.ebuild 7548 BLAKE2B 5ee411dfe66206ca1065a1acd6f3966d88e3f9b18a1e8dec9e108c4c6f8c76fe45c1810ab8dfa77439b7e8b3100a95a16676e930cd1bdbafc88e97449905ae58 SHA512 003ebd2be2fa54d713ecdf597db76d23d32b40127c92a1992b2fc0f6de230d9eedae61d80422a0dd2d6103099e5b2fb65dad3ecf8d7206f221dd4fa8a3c398a1
 MISC metadata.xml 1227 BLAKE2B de893eae7e8f8e299ae10df13d202819b60df3b85858eacbe3455c4f27627689e7790a6fdded32d11d3157c35b5a2e08cab958e84b8f5799bb298deca15a1d4c SHA512 726e0c2cea973806fef1a3f51da11fb525b6a2e75bf2221a0939adbe50d2d8e267c5e627eca571e39769e4c14b134d2b9be3792047523540620c2eac149dd066
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild
index 8c0ec1fe1979..170a23afd362 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -80,6 +80,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
 	default
 
@@ -123,9 +131,6 @@ src_configure() {
 	use q8 && depth=8
 	use q32 && depth=32
 
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
 	use perl && perl_check_env
 
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
@@ -134,6 +139,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable hdri)
 		$(use_enable opencl)
+		$(use_enable openmp)
 		--with-threads
 		--with-modules
 		--with-quantum-depth=${depth}
@@ -171,7 +177,6 @@ src_configure() {
 		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
 		$(use_with wmf)
 		$(use_with xml)
-		--${openmp}-openmp
 		--with-gcc-arch=no-automagic
 	)
 	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
index 5dfd56472f4f..e8658be55dc7 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
@@ -84,6 +84,14 @@ PATCHES=(
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
 	default
 	eautoreconf
@@ -128,9 +136,6 @@ src_configure() {
 	use q8 && depth=8
 	use q32 && depth=32
 
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
 	use perl && perl_check_env
 
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
@@ -139,6 +144,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable hdri)
 		$(use_enable opencl)
+		$(use_enable openmp)
 		--with-threads
 		--with-modules
 		--with-quantum-depth=${depth}
@@ -176,7 +182,6 @@ src_configure() {
 		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
 		$(use_with wmf)
 		$(use_with xml)
-		--${openmp}-openmp
 	)
 	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
 }
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild
index 18d26de38e7a..ac18f6d0a928 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -81,6 +81,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
 	default
 
@@ -124,9 +132,6 @@ src_configure() {
 	use q8 && depth=8
 	use q32 && depth=32
 
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
 	use perl && perl_check_env
 
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
@@ -135,6 +140,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable hdri)
 		$(use_enable opencl)
+		$(use_enable openmp)
 		--with-threads
 		--with-modules
 		--with-quantum-depth=${depth}
@@ -174,7 +180,6 @@ src_configure() {
 		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
 		$(use_with wmf)
 		$(use_with xml)
-		--${openmp}-openmp
 		--with-gcc-arch=no-automagic
 	)
 	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
index ce2194dd3355..f860410a5f2d 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
@@ -13,7 +13,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 ~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
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
@@ -85,6 +85,14 @@ PATCHES=(
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
 	default
 	eautoreconf
@@ -129,9 +137,6 @@ src_configure() {
 	use q8 && depth=8
 	use q32 && depth=32
 
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
 	use perl && perl_check_env
 
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
@@ -140,6 +145,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable hdri)
 		$(use_enable opencl)
+		$(use_enable openmp)
 		--with-threads
 		--with-modules
 		--with-quantum-depth=${depth}
@@ -179,7 +185,6 @@ src_configure() {
 		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
 		$(use_with wmf)
 		$(use_with xml)
-		--${openmp}-openmp
 	)
 	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
 }
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index ce2194dd3355..0b6122942f86 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -85,6 +85,14 @@ PATCHES=(
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
 	default
 	eautoreconf
@@ -129,9 +137,6 @@ src_configure() {
 	use q8 && depth=8
 	use q32 && depth=32
 
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
 	use perl && perl_check_env
 
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
@@ -140,6 +145,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable hdri)
 		$(use_enable opencl)
+		$(use_enable openmp)
 		--with-threads
 		--with-modules
 		--with-quantum-depth=${depth}
@@ -179,7 +185,6 @@ src_configure() {
 		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
 		$(use_with wmf)
 		$(use_with xml)
-		--${openmp}-openmp
 	)
 	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
 }