gentoo resync : 29.12.2022

4 files changed, 15 insertions, 22 deletions

diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 53442b99610d..0d26d9146707 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,7 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274
 DIST GraphicsMagick-1.3.37.tar.xz 5623688 BLAKE2B d6d5c8a07ec2aa2e60399887fa788751104c6917af295bb5a7bb1281d4a547462dd76cdde98f09cc00322bc3d7c89258dcd9d50506cfcec47a606efd90163b2a SHA512 971e05480a65eb99ff3c0d874675bcbffc24eafec1cacd03f5ef410ae014f82329f3590393100927f753feb183be1105fe0cfc5b0f775a30b0e6dc0c6b8a77af
 DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B 132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9 SHA512 478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a
 DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B 166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1 SHA512 c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09
-EBUILD graphicsmagick-1.3.37.ebuild 3200 BLAKE2B dcc9f75b410f671a4aaa8da96bd40672e005cacc0f0138e42a7d20924738ae514845548d612d404a76069e2b604e7aacea0957b70d893e7eb07550886204bf5a SHA512 fcadc6d72188e1106b0374ecdbf6ea5c37b3fb8e24ef4e453e291c080ee95f51440360938872c86ca011a17f4945d97065836c3b06c6aabcb4f5c9b7ae7c762c
-EBUILD graphicsmagick-1.3.38.ebuild 3746 BLAKE2B 126886c157531dcf84278813df6c365a94992c753c865ad09cf897eee7f5e0b93458cde1676999539c99ff33cc7b2fafe8b830cb2ccfc4379f6479bcdddb8847 SHA512 118d0b3fe97b2dcfaea78c59b367986292b773165ba50a10e1c5ae3c1bf78e7704cc92b9c17e06d0b8b8fa2ad23c26c50f76e6279d0f8e6eeda6b5c8ca431507
-EBUILD graphicsmagick-9999.ebuild 3746 BLAKE2B 126886c157531dcf84278813df6c365a94992c753c865ad09cf897eee7f5e0b93458cde1676999539c99ff33cc7b2fafe8b830cb2ccfc4379f6479bcdddb8847 SHA512 118d0b3fe97b2dcfaea78c59b367986292b773165ba50a10e1c5ae3c1bf78e7704cc92b9c17e06d0b8b8fa2ad23c26c50f76e6279d0f8e6eeda6b5c8ca431507
+EBUILD graphicsmagick-1.3.37.ebuild 3284 BLAKE2B a961ae6eeac3513f8b9055e1c896858d8ff2bdd001c98c400c71d39bd93301e38cad2d0df90f90523720dcd7272f3a4b78eba76c29aa182bc97e31ef6f6362ee SHA512 5ea8bb429f5a918aa6e1e7d83357b225014ba04573202cd23026f5dc09681e9cb7684248a706b1133c0cbf2d061ec2b5e3e4c6b902685f62590cdc13cfe2c3ee
+EBUILD graphicsmagick-1.3.38.ebuild 3641 BLAKE2B 8e18031c113bc50d90bdf32f539f736a692430496576c48ebc6573cd4d5343e403af36b8ffb7bb1a22de94c5515330a479ae18b56cabab00f797065a4c7d0140 SHA512 38fea7dfdae7ad89a6047ca9552701f311293b24900cb7c0b618fcd7cb06065c2c0bf42f8a34610af354acd9c1d8c560d2e5fb3520e057db36ed7de10d71446d
+EBUILD graphicsmagick-9999.ebuild 3648 BLAKE2B da1cf7a0a5c0e0561260966299e75b50524e926de039e59da23d3eee2d7bb23a35949965e271f3bb93933dbe287a616f4cc51dc4f9b24504d57d839b8b514447 SHA512 b288f52e832ee509c626af387ff6d754e0c3e42df6149ab5acc2a60465707a9dbc4d829db0da339c0595ff4ed5a880bf3b2a7b3cd76473dbcef21299aa463372
 MISC metadata.xml 1405 BLAKE2B 450ce6e18c6debd66f923847912746cc3f522f923b2290e7815326cc9a8e4dfa9f57e0ed0d66ade4b09d71f6ecb2da810665530ae4876abcfd77dbbf0696829c SHA512 88d109fb876d4fef9dc7b9270c6418e8cc9820d6a085b0faabe647225ae4e5fa731335d7b45bb022a531eaf0ab4c9302be5a802603dd8ecc8ef484ba3bbf74ba
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
index 03a95689ff0e..85263d8a19fe 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
@@ -57,6 +57,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.19-perl.patch
 )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
 	default
 
@@ -68,19 +76,14 @@ src_configure() {
 	use q16 && depth=16
 	use q32 && depth=32
 
-	local openmp=disable
-	if use openmp && tc-has-openmp ; then
-		openmp=enable
-	fi
-
 	local myeconfargs=(
-		--${openmp}-openmp
 		--enable-largefile
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable debug prof)
 		$(use_enable debug gcov)
 		$(use_enable imagemagick magick-compat)
+		$(use_enable openmp)
 		$(use_with threads)
 		$(use_with dynamic-loading modules)
 		--with-quantum-depth=${depth}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
index c640b1b4cc74..926fa312e060 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
@@ -91,6 +91,7 @@ src_configure() {
 		$(use_enable debug prof)
 		$(use_enable debug gcov)
 		$(use_enable imagemagick magick-compat)
+		$(use_enable openmp)
 		$(use_with threads)
 		$(use_with dynamic-loading modules)
 		--with-quantum-depth=${depth}
@@ -121,12 +122,6 @@ src_configure() {
 		$(use_with X x)
 	)
 
-	if use openmp && tc-has-openmp ; then
-		myeconfargs+=( --enable-openmp )
-	else
-		myeconfargs+=( --disable-openmp )
-	fi
-
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index c640b1b4cc74..bd91b4160147 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -91,6 +91,7 @@ src_configure() {
 		$(use_enable debug prof)
 		$(use_enable debug gcov)
 		$(use_enable imagemagick magick-compat)
+		$(use_enable openmp)
 		$(use_with threads)
 		$(use_with dynamic-loading modules)
 		--with-quantum-depth=${depth}
@@ -121,12 +122,6 @@ src_configure() {
 		$(use_with X x)
 	)
 
-	if use openmp && tc-has-openmp ; then
-		myeconfargs+=( --enable-openmp )
-	else
-		myeconfargs+=( --disable-openmp )
-	fi
-
 	econf "${myeconfargs[@]}"
 }