gentoo auto-resync : 16:11:2022 - 00:53:49

5 files changed, 6 insertions, 4 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 36c3dcdc286f..8c43dd26b79a 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 6484fdeb18c1..d6df914e0d2a 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -17,5 +17,5 @@ EBUILD wine-staging-7.18.ebuild 11195 BLAKE2B 96902242f3a26b3b6629247f89d4673ede
 EBUILD wine-staging-7.19.ebuild 11123 BLAKE2B c5de757465bb7033ebc20796b6a4319eb115bc60f6c1512f3b9eaf3e9cc2a23e63900a4aafb379fb27f30642c698902759808aea9c76883c05f7bc30ff723912 SHA512 43321290cc12244b7a917885d9f3574362864d34f1360a500e17de15bc0a6cba34493fb986aff9168abb91d0cc1d57ded684b92bd31ae9a9b3ed6fa10ff8ad92
 EBUILD wine-staging-7.20.ebuild 11123 BLAKE2B 269c3156f5b190e358a498830930c6a26c09c6a5be5a7db899572496a95e739f8508115c007832ff568a31b984a66584149b408c8d38552931fb9e04e2136be8 SHA512 3b1fb7c272f27b4cced6112655f38270c95ed95fa844bc861489413070e8921438be57afe6138a8674ca67c97ef09a92d4d1ba8ebcaa26069b4857b2b7b60de3
 EBUILD wine-staging-7.21.ebuild 11224 BLAKE2B bf13e52b8c69cce318a89c8d2e88a3a52131fc7b56147206c4ffd04457af17c7f8f4574334eff2067115787d94adeea5d656a68640dc4ecc8ca185176da1c11c SHA512 6814a3750f3b58ac7c894c14113cd2f9520094e2c7f788270b5a432ffacbd985e8001a12f9fad6e6d28cd467de608c5e80561b2984865b67a674078d1e30d670
-EBUILD wine-staging-9999.ebuild 11224 BLAKE2B bf13e52b8c69cce318a89c8d2e88a3a52131fc7b56147206c4ffd04457af17c7f8f4574334eff2067115787d94adeea5d656a68640dc4ecc8ca185176da1c11c SHA512 6814a3750f3b58ac7c894c14113cd2f9520094e2c7f788270b5a432ffacbd985e8001a12f9fad6e6d28cd467de608c5e80561b2984865b67a674078d1e30d670
+EBUILD wine-staging-9999.ebuild 11291 BLAKE2B da78b56c05f8af7c979dac56b4fa109dff1a7268147ecda1312cee6161b401f45b3fb02c971b1a6a0a46908ab1b6f8d7684c7d248dd677e6049c2639efb75167 SHA512 cf468f51a3dd8ac12841436bfb277d5c433ef39ba74a5931180f8c3e387adabbdae99644497c40eba780f7004f654c069b41a97ac8171bb87e34eb773db4f8f0
 MISC metadata.xml 2352 BLAKE2B c3bc247559ce143b4c8497b17dbeccf283ecb70463ca8230ba46d949c0def97f15c0b676149524111f7d151722d7c6343dc16dddaba5093fba60c62389da778d SHA512 a05a2b4bdaa01b7f097cf824f2b949b2e5ece864c7307dfca42a384711c9db09f486c3d398c9c1f187daadfcc646bb14fe7c488140fea2a3f7092a5e3a8011d1
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index a2cb290f769f..37968fe103e5 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -128,7 +128,6 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
 	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-7.21-crossflags.patch
 )
 
 pkg_pretend() {
@@ -282,6 +281,8 @@ src_configure() {
 
 			# use *FLAGS for mingw, but strip unsupported
 			: "${CROSSCFLAGS:=$(
+				# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
+				append-cflags '-fno-strict-aliasing'
 				filter-flags '-fstack-clash-protection' #758914
 				filter-flags '-fstack-protector*' #870136
 				filter-flags '-mfunction-return=thunk*' #878849
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 48cae2773c1a..d46e6b19e1d9 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -16,5 +16,5 @@ EBUILD wine-vanilla-7.18.ebuild 10232 BLAKE2B e8c105a4b6a3d40bc162311d1c31c16d77
 EBUILD wine-vanilla-7.19.ebuild 10232 BLAKE2B e8c105a4b6a3d40bc162311d1c31c16d77ab04868b744d3681e8ccaee4191581920d59df57ee96d50959d75f7cb57ae98584cfa84ba30264e744e613bc88fe64 SHA512 a257e4eb3e0456a95c9b9305b9ba4af1f875300a69df57ba4fba11db9c4c170b9d12569c2cfd3555259225e250cb8409b5fbee9b199d218e45601ba7572e3a75
 EBUILD wine-vanilla-7.20.ebuild 10233 BLAKE2B 6013fb4f81e9dfd926ae56846f651d6f784e76e7011d84d08e7d6334304868d627ec95f956a5521432de50fc97e3329a497a1d9e73cc5d6814e72edd2e66f248 SHA512 2b253e06a33470d544f1fac9568e7117eb3688e712dc6d0315e182116cb07b699eafdbffb9c37d85d902457b25a1c10db60aca517a81de1f1bd2cd06ed57a184
 EBUILD wine-vanilla-7.21.ebuild 10334 BLAKE2B 9b731f7b9b1802f94c5c06b374eae9d6f3867d407d9ceacec19b52ab5b23e26f8569d475aa10d961b948742094940336109c5664398f6ff0e82851d1c6fec7af SHA512 2d3ea9a457d650260fdb19e186327c5b78ce5fad178d5155813a83707548cc582905837ada8a34cd07f22afa39661f77c622a7ca3c861c91b3ba3b668fecc274
-EBUILD wine-vanilla-9999.ebuild 10334 BLAKE2B 9b731f7b9b1802f94c5c06b374eae9d6f3867d407d9ceacec19b52ab5b23e26f8569d475aa10d961b948742094940336109c5664398f6ff0e82851d1c6fec7af SHA512 2d3ea9a457d650260fdb19e186327c5b78ce5fad178d5155813a83707548cc582905837ada8a34cd07f22afa39661f77c622a7ca3c861c91b3ba3b668fecc274
+EBUILD wine-vanilla-9999.ebuild 10401 BLAKE2B bdf428f36099f673065d81c0d8cb4026e45f85c4c68563f2228fe389d32c83add15df1ced604fbbef2eadf001f6ca3754adbd85bac570223c6e1b59feb82c886 SHA512 6d2ba7beab462964363620164574b605ecd834eaaab6c21aa374cfa98058b39f1b21bf6cfed059bb4c44827361fa149d530e732b2bb6a9e9d6c5495c8be33f56
 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 5b5c6577712d..19bde159c386 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -125,7 +125,6 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
 	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-7.21-crossflags.patch
 )
 
 pkg_pretend() {
@@ -250,6 +249,8 @@ src_configure() {
 
 			# use *FLAGS for mingw, but strip unsupported
 			: "${CROSSCFLAGS:=$(
+				# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
+				append-cflags '-fno-strict-aliasing'
 				filter-flags '-fstack-clash-protection' #758914
 				filter-flags '-fstack-protector*' #870136
 				filter-flags '-mfunction-return=thunk*' #878849