gentoo auto-resync : 29:08:2022 - 10:46:12

3 files changed, 19 insertions, 15 deletions

diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 426bea1db4df..e0d3aadd5a57 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -6,6 +6,6 @@ DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79ed
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516
-EBUILD mingw64-toolchain-10.0.0-r1.ebuild 9328 BLAKE2B e91bd2477f615bf385b3fda1b35e3628848e33d3bcf8182c9d7726d91f1f10e2ba987b9beb4c3a241c2bdd9d61cc7bba430374ecad823db89ce34038035f915b SHA512 69bcac9b4199e037814465fae9aea75cf6197e6bc02f810ec55a57455d740a893f77332afb33fa12168ed6735039e8a7829b18d1838be00cb1afba6979495cc2
-EBUILD mingw64-toolchain-10.0.0_p1.ebuild 9312 BLAKE2B 9ff31f32c8d33d0934f72e1d5c6e1425523ab5a7175d7def1d3030fa828e61229d4364fe98e4eda69ab2332f0e65af8c5d586840ff896785d3698b5ccd7ac6c9 SHA512 0838259a07e7331bbad432ae25aa832b7846406e722959436268e4c9718dcc07dda4ac4a21230497ca23e7ac63daf2ef07a6c003dcde600e2a421640f60067da
+EBUILD mingw64-toolchain-10.0.0-r1.ebuild 9371 BLAKE2B b548c0bd45d41351440a8fa865b3c1a5d10e8c99d7a045d10c1b4884a02349c6c8887b7f69f7a4f84f4ccdffd3ce367a0dbac74a319c909dcc15f219c95486cc SHA512 17d959e20c2dd38e7acd3b7837ef164ec32d5e4b206351b827e68323f57483e0b301d07223419f8b6ecbc517648455257a38e90e15fab1aacbc89936cf67f7b8
+EBUILD mingw64-toolchain-10.0.0_p1.ebuild 9354 BLAKE2B 14d5d8d971a33ef2baffd00bad8e0a8cbd2db532c2f9cb7209af947e51ef81f7ad3daed918c08d32dc2d13748a4b77ba65a3c58b9e7b72d2e8caa8a2ceef3307 SHA512 820dab603465230009ac601e896cdea613ea2911ab920f8467f6fad61ceebec5ad8cc416cdc8f3f5a6e69a7809319cb01f97ab7e67446617c083c0fe110a73de
 MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
index 2ae2ce9b80cb..0bfc818d9698 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
@@ -199,12 +199,14 @@ src_compile() {
 
 		# econf is not allowed in src_compile and its defaults are
 		# mostly unused here, so use configure directly
-		eval '
-			local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
-			[[ ${conf_'${id}'@a} =~ a ]] && conf+=( "${conf_'${id}'[@]}" )
-			[[ ${2} && ${conf_'${id}_${2}'@a} =~ a ]] && conf+=( "${conf_'${id}_${2}'[@]}" )
-			conf+=( ${EXTRA_ECONF} ${MWT_'${id^^}'_CONF} )
-			[[ ${2} ]] && conf+=( ${MWT_'${1^^}_${2^^}'_CONF} )'
+		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
+
+		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
+		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
+		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
+
+		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
+		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
 
 		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."
 
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild
index 2f07f8f08e07..3b878de762bf 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild
@@ -31,7 +31,7 @@ LICENSE="
 	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
 	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain"
 SLOT="0"
-#KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="+abi_x86_32 custom-cflags debug"
 
 RDEPEND="
@@ -200,12 +200,14 @@ src_compile() {
 
 		# econf is not allowed in src_compile and its defaults are
 		# mostly unused here, so use configure directly
-		eval '
-			local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
-			[[ ${conf_'${id}'@a} =~ a ]] && conf+=( "${conf_'${id}'[@]}" )
-			[[ ${2} && ${conf_'${id}_${2}'@a} =~ a ]] && conf+=( "${conf_'${id}_${2}'[@]}" )
-			conf+=( ${EXTRA_ECONF} ${MWT_'${id^^}'_CONF} )
-			[[ ${2} ]] && conf+=( ${MWT_'${1^^}_${2^^}'_CONF} )'
+		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
+
+		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
+		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
+		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
+
+		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
+		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
 
 		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."