gentoo auto-resync : 29:04:2023 - 17:15:23

33 files changed, 455 insertions, 64 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 48e204163213..ee5a30cd9e2f 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index b8499e6f1d45..99ca17c597f4 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -7,9 +7,9 @@ DIST dxvk-libdisplay-info-d39344f466.tar.bz2 81232 BLAKE2B af76ccd3c40bc953008bc
 DIST dxvk-spirv-headers-0bcc624926.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c
 DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5cebeb6e13713db1c26a0b833dead2fb522227861abc60b2d0cda8e3f46f8e89cccb629e01081ba27763989ad6fd336c60a475b198c1c8 SHA512 69238d37d0af0162e0fd68094cd2fa9baa320497d34a9de491dea086c23291d0815b51e89218b1f0ee2b3314cbc8ac1809d6edb15ca51fcb282fe1e2b39a1a77
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
-EBUILD dxvk-1.10.3.ebuild 4444 BLAKE2B e61ecb0fea37a499e9967902b25baa9b9e1b3f98be9e43bbd2828c14ea8d005f4029f697fe90b4bc71c151d62cb7ab507bf903844a7d7ced8e529863aa29fa34 SHA512 73eabad530dcf9e322dcd18b8dc23b5acd82627201947ac6e76df7c42b159bb658775d679259e94b4d9479e13b0e0c2bd3bf953d5d195a9e995f5f5da407e1d4
-EBUILD dxvk-2.0.ebuild 5321 BLAKE2B 04ab5443db73e4f9c3b15787a133d76364119253c834ae6d56c58f5f13118b1b6d2d3bdd346140d08259648179ff01c4da9f9a02bce2f3ae4aeaa0fe1ee388eb SHA512 5d0090ae388e9a0fda34bdbacf8b733c7ed8ac2c99aa5a9a0cc9a1dc353dd8e2019fbd3f927144168625650010ba8ee95f92f3d64e0301e62d21f672599dfe39
-EBUILD dxvk-2.1.ebuild 6112 BLAKE2B 8a0232d60f08a86287d16375eb1e3eacd68c9075dd1e239d22f318f5e25b3de164d3aeea47acd6fa25a47011d5f0758381a3bb23cded69323dc84d72493c580d SHA512 f2b9545b9d9b2899d058b7c797db254472aca2063ba009f6d8bbfc3775912088321b834761754b96b18feb9793cfcb4bd59450b468dbbe934c47e4a382d7a8ff
-EBUILD dxvk-2.1_p20230207.ebuild 6239 BLAKE2B 4aee6adff997d157b8521cfa04416aec9c5a0954e6a4157cbb6c3dbe24783cc11d608167dc83d9ba56649e922c4461183f239f1d498336dedf92f99bfed2a075 SHA512 8c6a296d3b8091be57344bc97bf802c812c5b4bdb4d0d2b2f8c1e5a37ea32e6ee57c8d292c8fb6b465051162ab9557ae2c7ec6f0e917fea3b4e82214f5b13eef
-EBUILD dxvk-9999.ebuild 6061 BLAKE2B a58c90e467fdd6e263eb9369e1d862a1e2ed9085c26a0c7f59bc9a58cf81296461a3ff68053aae688b74ba19f5933c18fe516411d3609b0efb75e93db0dbf18e SHA512 53e623a745aa6e5e8f46a1b230aa53f22d3bdb56dbe941e642c1ee5b449314a417dbc3d618c02a68753b400381e201e8aa106c1eb3ddc18b234d4cad788de3b3
+EBUILD dxvk-1.10.3.ebuild 4574 BLAKE2B 98b8ad4cd975358d4087f311ebc4a869c8e48e47027fcd311ee3092fa3eaf686da03d94f938e7bfe7da58e178e3d3a90c13b9f9d1fe966dec5a4e721d125ea50 SHA512 70b52b5ea973df3279c776a54a060ef318d40f2b984398da312c77b1e92dc27e4ce8f7a5ab0559d8447c34fd8cbe81a150ddecdadf73ffa122b02c6790b1b478
+EBUILD dxvk-2.0.ebuild 5451 BLAKE2B 6a692920d5d38091442cde552563bcd5084e9dd386d01e18c5fda17dc73509824f0d5388cb73cbc063d64f62b466588a9a7061315add05400f3e08d214894901 SHA512 f2f5cec77261a93ea1848a3ddbecafe4dee12e5cf5ac12618da5c34921d6c35ee324b2827c97acf245d2b1fbf797ee0009bcdeffb4c261eab7f233947c4cc112
+EBUILD dxvk-2.1.ebuild 6242 BLAKE2B c47decfdc8e3033b55cfa72fc604b68be50040c2be12a78ed4ae9e1c7ee24b27dd2ef656918f03d2a1b4bdec7b4b0c4cd570185aa1da900e2069ea73d01963e6 SHA512 7be5723826f4377177b7f495458c5367e44e86bef73a42e532a5686d1f92ffaa96d86431eef0336bf1107fe6fcd909985adab4b52cff49dd053c06b483f4d287
+EBUILD dxvk-2.1_p20230207.ebuild 6369 BLAKE2B 398a1adba70078512e9ca63dc878f9118c2c5fa8255776b722f51d452c19e11184b716c1f55e83045cc885ae1858d099d2b3d831bd0e24b8c596eb35adb9f78f SHA512 f3d693fd4d5ed0d1512af5809ad1926af7babd1df5046907f02f31bd6bf816ccad14955e38d905976ba59f53675f618b665bd0302750893a124fbbfd98f0329c
+EBUILD dxvk-9999.ebuild 6191 BLAKE2B 0a6aaeb7cfea3751582f15361348049e2719b62377ce3b658513708be39dd5aafe3d73f70aae73f1d33c393c2246ada86be97e4ae90513ff7399468973393c78 SHA512 a6d1aadb5ce38e047ca6fe216e366406dc8291070be80df754e919554e70fa3012143c051d83f32e5d68a42a6014f8ae8d4afc2a871b039957e8d47699f1110b
 MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b
diff --git a/app-emulation/dxvk/dxvk-1.10.3.ebuild b/app-emulation/dxvk/dxvk-1.10.3.ebuild
index 3995d9ee33e0..e9f3f4344b63 100644
--- a/app-emulation/dxvk/dxvk-1.10.3.ebuild
+++ b/app-emulation/dxvk/dxvk-1.10.3.ebuild
@@ -73,10 +73,14 @@ src_configure() {
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP
-			filter-flags '-fstack-clash-protection' #758914
-			filter-flags '-fstack-protector*' #870136
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
+			if has_version '<dev-util/mingw64-toolchain-11' ||
+				{ use crossdev-mingw &&
+					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+			then
+				filter-flags '-fstack-protector*' #870136
+			fi
 		fi
 
 		CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/dxvk/dxvk-2.0.ebuild b/app-emulation/dxvk/dxvk-2.0.ebuild
index 48c2560d3808..f2b240b7f42a 100644
--- a/app-emulation/dxvk/dxvk-2.0.ebuild
+++ b/app-emulation/dxvk/dxvk-2.0.ebuild
@@ -89,10 +89,14 @@ src_configure() {
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP
-			filter-flags '-fstack-clash-protection' #758914
-			filter-flags '-fstack-protector*' #870136
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
+			if has_version '<dev-util/mingw64-toolchain-11' ||
+				{ use crossdev-mingw &&
+					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+			then
+				filter-flags '-fstack-protector*' #870136
+			fi
 		fi
 
 		CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/dxvk/dxvk-2.1.ebuild b/app-emulation/dxvk/dxvk-2.1.ebuild
index d58b78a8f0ef..1e497fc5a838 100644
--- a/app-emulation/dxvk/dxvk-2.1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.1.ebuild
@@ -98,10 +98,14 @@ src_configure() {
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP
-			filter-flags '-fstack-clash-protection' #758914
-			filter-flags '-fstack-protector*' #870136
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
+			if has_version '<dev-util/mingw64-toolchain-11' ||
+				{ use crossdev-mingw &&
+					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+			then
+				filter-flags '-fstack-protector*' #870136
+			fi
 		fi
 
 		CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild b/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
index 24b2a3ad1e50..c3830098d829 100644
--- a/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
+++ b/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
@@ -100,10 +100,14 @@ src_configure() {
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP
-			filter-flags '-fstack-clash-protection' #758914
-			filter-flags '-fstack-protector*' #870136
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
+			if has_version '<dev-util/mingw64-toolchain-11' ||
+				{ use crossdev-mingw &&
+					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+			then
+				filter-flags '-fstack-protector*' #870136
+			fi
 		fi
 
 		CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild
index 7b1ccff1d6f4..313a58896371 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@@ -94,10 +94,14 @@ src_configure() {
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP
-			filter-flags '-fstack-clash-protection' #758914
-			filter-flags '-fstack-protector*' #870136
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
+			if has_version '<dev-util/mingw64-toolchain-11' ||
+				{ use crossdev-mingw &&
+					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+			then
+				filter-flags '-fstack-protector*' #870136
+			fi
 		fi
 
 		CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest
index c0f48599a491..fa6d054fa956 100644
--- a/app-emulation/vkd3d-proton/Manifest
+++ b/app-emulation/vkd3d-proton/Manifest
@@ -10,8 +10,8 @@ DIST vkd3d-proton-spirv-headers-ae217c1780.tar.gz 415130 BLAKE2B 0c6444c4c1cb43b
 DIST vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz 1299014 BLAKE2B 0b1e635aaa6eebec3525b13698a064e0e5b8a78829a772cbe9e1890148059bf396bc5c830e8d6ee3070a3343775991642565283994c65acfa0d82a91590b7d84 SHA512 ecb2158cad55edb4ba069383668f3b311a2f6aa6777b5b7ed94795d454622426ee34fee52b13c97d2f07b5b2f965815ee61a0203b76a0b0d2c708a4786d06b96
 DIST vkd3d-proton-vulkan-headers-9f93cbe76a.tar.gz 1811251 BLAKE2B 6993e6e7301925a949a8ee18d7d0dec48adc8d4c66bb759929891241b64dd8f4bf4e563e86b40020123d5eced74b3ab02b86f3488b7d782c3cd4536079a3ddec SHA512 d0a157a560b58b676bbef115097423a4ab22928cd08a1010d2f3695bbf5fe3af79653b8db6ec00fa061ff46010749dc13526488f53cac6860af2a1918d873a19
 DIST vkd3d-proton-vulkan-headers-b7a86d3b2b.tar.gz 1753074 BLAKE2B a2588e84edd09a04c3622a95310acc781432d6a962c69c1f5a709b65e2bfeb5196d9d217b0d261532c4b5c1424f13ff64d33728303c989fdbce3048741add486 SHA512 377ada7a9721c225067c6548475109cf4ad1f3d677b835fbe7a4bc7520621acd816cc59d4b75b23bc28f25891b556792cf853b98c0dfb915856774ff27eb6aba
-EBUILD vkd3d-proton-2.6.ebuild 6185 BLAKE2B 5d86945bcb6193370e55b3b295fef3a865fa1abe397026c6456e08f764c34e1d473fc0b55c4b9797e3812f16c676412524dea73235c10189eb8f4fc50642f2a8 SHA512 0a884190cad38b587d2cc5791f60792d58907135d76ca31265f706bae2bec40281fabc66478c59af3781643c91747563815a80427fd69a2ce317ae1921a8416c
-EBUILD vkd3d-proton-2.8.ebuild 6661 BLAKE2B cf769ef74a29aeac41fee8b6d6d59522d22ede312723aed52a381fe94ccd8366dcf37fc436099487eafe738ba5c8b1ae23f92df9b5ee21ca2a47fabf92ccbd04 SHA512 272f6875fb49a250a8c08dd7ca5b81148d8e4ec916984089f2385afeb03aecca07904c9c672f048a4cdf41f18eeefeef136631c8cd8ff1673ad450fda6a262e9
-EBUILD vkd3d-proton-2.8_p20230207.ebuild 6723 BLAKE2B b55700e5d85ab8e2245e411c513f8c3ffaeedc7016640940a51eb2ee2bbfc8262eb5ac32bd6311fd1fd18eddea9ec2f978f4f946a66b2f71a3e8e8f6c45aac22 SHA512 eb90e6abb12d4ed61d1eefaee76066f26075511ae2299099871be99bead4592c9237d2bb1287920677dc8c08411d8c12c2d830306f8e059b4c499db6a3bb0452
-EBUILD vkd3d-proton-9999.ebuild 6663 BLAKE2B bb56548c08e6632f095851dc403b2b610819798babf3a66f36f709018fe3d469eac320e4f8c27488bb0d040e301ab776d46139a97cc538eb09257077a9902ca9 SHA512 e396296b59aea3a220b6d9cdc1e2445632470bc6a3337b77058f517c2bef9b5b3992d4b95c5f0a03f3dc4cdd1836921330e51e68557b345f64249600d15a6d2d
+EBUILD vkd3d-proton-2.6.ebuild 6320 BLAKE2B 9ece39beef60987f5d40067bb41389c096e1e1d2ab2ac2657e49d4eb32f812f494cc46ccdc7751b8a4dc7a9ec455a7d701af5c08c85f658bd48a3e0fe65f582a SHA512 27f56dce941b389f245f9b14e44d2e989a228d000bb6839d9493c0ab23a694389c4116d021b86ea463f74abc056843053318f5bee26f432e5d70c82bebb58b44
+EBUILD vkd3d-proton-2.8.ebuild 6796 BLAKE2B c5710526633779dc43491ea1f30a730419bc8d9329ba648da4910c7136478ce45f5e6a744f03eee9ce0965834bc9e51bed6a1b0c570d36f82dbd4bf25c1920a3 SHA512 f968660442196632988520bbeec3ed22fe3d01f6e2f0cc794939c9c8c757ec844e02ff3674962230115212e3d2f47c2d471b4a6472ae541835c87a6c4a5c1b01
+EBUILD vkd3d-proton-2.8_p20230207.ebuild 6853 BLAKE2B 2fb3812590992e1875bc52b45826b8a48ca381701f57f94c9d6f116ef195d86a16604ff6bff6b337b8c419dcac6dd30538261dc1878ff8f7c903fe2c5687ee62 SHA512 ae3d509b52ca4dbf1c4f8966a462b6be162982755ab632e2a6287dfaa1390d459917cadf8dc85d5f721b2bc261ffbd5d2654b91b07f48479a974101a91197e80
+EBUILD vkd3d-proton-9999.ebuild 6798 BLAKE2B 5652728cac9c2ecd54d0b42bdc9476d0cc0a3fb55226bb548b862ab01551130dfd88e68f3748d517756ffba451fb4e5db72ae2372fd85d488bc3b25853cfff0d SHA512 e683087d92a722c1552138d82b3023b4dc44a591db3ffd0289d74407a8c1ae3f92741fbf813fcb8dda97274e194fa02bc230d93f15da8660e8706884d82df975
 MISC metadata.xml 618 BLAKE2B 4382557118c0ea56972d05a10c9cc1f94a4fbcc58a414f1cd5e4354ce6ed1de15c95377f167ed5627231c2887ecce3c00756908720458fedddea5ed6732771ff SHA512 b5cc86b412c30ee5d54868a87c9f4892337c83988b738806532cd9e2cc295a2326e776030c19cae9a2e9dd4f5f615b1d962ec48a4b310fd8a94ec4024dde99ab
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
index 8ff79bbbd1ba..2e3e5c86e2ce 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -103,10 +103,14 @@ src_configure() {
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP WIDL
-			filter-flags '-fstack-clash-protection' #758914
-			filter-flags '-fstack-protector*' #870136
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
+			if has_version '<dev-util/mingw64-toolchain-11' ||
+				{ use crossdev-mingw &&
+					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+			then
+				filter-flags '-fstack-protector*' #870136
+			fi
 		fi
 
 		CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild
index 633364ef6384..9acb9d5109a0 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -108,10 +108,14 @@ src_configure() {
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP WIDL
-			filter-flags '-fstack-clash-protection' #758914
-			filter-flags '-fstack-protector*' #870136
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
+			if has_version '<dev-util/mingw64-toolchain-11' ||
+				{ use crossdev-mingw &&
+					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+			then
+				filter-flags '-fstack-protector*' #870136
+			fi
 		fi
 
 		CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230207.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230207.ebuild
index 58f1162cda67..0365c48985cf 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230207.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.8_p20230207.ebuild
@@ -109,10 +109,14 @@ src_configure() {
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP WIDL
-			filter-flags '-fstack-clash-protection' #758914
-			filter-flags '-fstack-protector*' #870136
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
+			if has_version '<dev-util/mingw64-toolchain-11' ||
+				{ use crossdev-mingw &&
+					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+			then
+				filter-flags '-fstack-protector*' #870136
+			fi
 		fi
 
 		CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
index 55490ce310fc..cb9a067747c6 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -108,10 +108,14 @@ src_configure() {
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP WIDL
-			filter-flags '-fstack-clash-protection' #758914
-			filter-flags '-fstack-protector*' #870136
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
+			if has_version '<dev-util/mingw64-toolchain-11' ||
+				{ use crossdev-mingw &&
+					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+			then
+				filter-flags '-fstack-protector*' #870136
+			fi
 		fi
 
 		CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index d028a3ff240a..af0b174c79d5 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -7,9 +7,9 @@ AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cf
 DIST proton-wine-7.0-5.tar.gz 45724439 BLAKE2B d5ad4f00ca658b31c562c2ff4eb5ae33707126eee44ccfd9f33084ab5d184743034541efe3f9d18eb2a6941111da4c5134555f93769e8370b118b6f04e00ae1e SHA512 b16ace9c0bfa6d2685ea53617be2bba7e82c5c8da604f9e188bf782219785cfaed4317578c4314f2bde89d363a2e115f3bceeaa69d4a85f078a5fdb1ec64d33b
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-1d.tar.gz 48198535 BLAKE2B 7ed7c4130d4c74d3f411880d253727469cbdaa78943b7783f3d2162177072503bffd588ba3c6c147014ce4e422850cb49e83c2d2d807777fcd01c101199f922d SHA512 4a5a2a2753f8fd025f8c0fe56341a67ed780befc8ae9bffe03872019d4227ec8324edf892c327b99330c3de29a3b8adaac656b41d3487de03a8a82cef9234da7
-EBUILD wine-proton-7.0.5.ebuild 10514 BLAKE2B 598b8593b601dbcc4d23c888cfe849f8fd62e225a718a0f9436748a673871900a58f119244766f706aa45c5d7373f691969f550ffb81cd0f01de475d01f817d1 SHA512 a61e86c1cf0d180512da2e07b4bdc029307d760dee138bb90d747852be92c1cd98a9552824a651e646d3322d810ae80f0dbcc8f72fb840c669b5a073cc167f62
-EBUILD wine-proton-7.0.6.ebuild 10519 BLAKE2B 4f3009aa1c1bc54dfacc9a264b9ff411dc402c4964ffda280563626d757ba4fc56f83da1019b414a2590b3d9c159fccc656079786c7af16d2c35d8b7ce6ab0ab SHA512 ea934f2f71e7054bb52861453da351e81b7272aab09caf617162ca0f23aa90e6b0003daa5b9ec01caa735207f18d0cb75643b912b8d9209bbd0c141aa6716778
-EBUILD wine-proton-7.0.9999.ebuild 10519 BLAKE2B 4f3009aa1c1bc54dfacc9a264b9ff411dc402c4964ffda280563626d757ba4fc56f83da1019b414a2590b3d9c159fccc656079786c7af16d2c35d8b7ce6ab0ab SHA512 ea934f2f71e7054bb52861453da351e81b7272aab09caf617162ca0f23aa90e6b0003daa5b9ec01caa735207f18d0cb75643b912b8d9209bbd0c141aa6716778
-EBUILD wine-proton-8.0.1d.ebuild 10571 BLAKE2B 61318d905fc5fae990c115d14ff130cd49c34347d19c3c000889b5f6caab1a3b71295c3f2dbbeba9d316bcc1b6c1d22cbb2df8b5254868d37f53ee67967d8556 SHA512 5ef719ed250cb85a95072b0f9bbdb2c0daab41180a3a86aaab109ec66bb6aa1265a5bd97aeec3072704b2b95e1c30f5e152aa4e3f61d271794284e8c029e8ace
-EBUILD wine-proton-8.0.9999.ebuild 10571 BLAKE2B 61318d905fc5fae990c115d14ff130cd49c34347d19c3c000889b5f6caab1a3b71295c3f2dbbeba9d316bcc1b6c1d22cbb2df8b5254868d37f53ee67967d8556 SHA512 5ef719ed250cb85a95072b0f9bbdb2c0daab41180a3a86aaab109ec66bb6aa1265a5bd97aeec3072704b2b95e1c30f5e152aa4e3f61d271794284e8c029e8ace
+EBUILD wine-proton-7.0.5.ebuild 10463 BLAKE2B dcf02ff2ec1ee2720e849dad0d3bc0408c3ff5f87693c76f23b1e6fa53fc3b1f3edea6912601b52e7792e8c0d913d2f2780d5de6bc52ecf878d320d8db204515 SHA512 79ba000715910b4d33d1a96aeeebdb5006e92d1e147beacf104c7504f17d8f58c275bb824da9c58101d6d4b471e7f946d0ed64eb0f7a23dcbff5d01987b2b18b
+EBUILD wine-proton-7.0.6.ebuild 10468 BLAKE2B 6776113c3bbf9340b028355d164d9875c5c75c37711ff0c638336777bdb7b4c0529d8d087616d6cf88d2185aaa54330b2359e0550e817b3f82940d493db11a62 SHA512 19ea07774efc5d82cd7ce4ab3b520ff5554aad65efb6a20c593ea262af4a063a80b03f691d8b986dfae9adc507970e5fa50c5d70f5867865b9934490b1436754
+EBUILD wine-proton-7.0.9999.ebuild 10468 BLAKE2B 6776113c3bbf9340b028355d164d9875c5c75c37711ff0c638336777bdb7b4c0529d8d087616d6cf88d2185aaa54330b2359e0550e817b3f82940d493db11a62 SHA512 19ea07774efc5d82cd7ce4ab3b520ff5554aad65efb6a20c593ea262af4a063a80b03f691d8b986dfae9adc507970e5fa50c5d70f5867865b9934490b1436754
+EBUILD wine-proton-8.0.1d.ebuild 10520 BLAKE2B 8ea5ffaf512ca46588491a4478db8d518a23dede07df3ea5ef075d9f28e5ed7082f9adec0aadccf6b32a26455a134a705d7c01c593f9f8ecfd9aa1a063742a3f SHA512 76cb1f93deb70d365d9615078f4ced3b381d4746590fd56d1685f41869c94e3609c37ef37704c27f3203ad8edd0fc5db2f192a7bd551050df431d763f10bf7c1
+EBUILD wine-proton-8.0.9999.ebuild 10520 BLAKE2B 8ea5ffaf512ca46588491a4478db8d518a23dede07df3ea5ef075d9f28e5ed7082f9adec0aadccf6b32a26455a134a705d7c01c593f9f8ecfd9aa1a063742a3f SHA512 76cb1f93deb70d365d9615078f4ced3b381d4746590fd56d1685f41869c94e3609c37ef37704c27f3203ad8edd0fc5db2f192a7bd551050df431d763f10bf7c1
 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
diff --git a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
index afa0bed7c071..00a57d5aac94 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
@@ -254,7 +254,6 @@ src_configure() {
 
 		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
 		: "${CROSSCFLAGS:=$(
-			filter-flags '-fstack-clash-protection' #758914
 			filter-flags '-fstack-protector*' #870136
 			filter-flags '-mfunction-return=thunk*' #878849
 			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 6cb4c973b3db..2c927df19297 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -256,7 +256,6 @@ src_configure() {
 
 		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
 		: "${CROSSCFLAGS:=$(
-			filter-flags '-fstack-clash-protection' #758914
 			filter-flags '-fstack-protector*' #870136
 			filter-flags '-mfunction-return=thunk*' #878849
 			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
index 6cb4c973b3db..2c927df19297 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
@@ -256,7 +256,6 @@ src_configure() {
 
 		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
 		: "${CROSSCFLAGS:=$(
-			filter-flags '-fstack-clash-protection' #758914
 			filter-flags '-fstack-protector*' #870136
 			filter-flags '-mfunction-return=thunk*' #878849
 			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild b/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
index e514971ce399..62e33d58f9bd 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
@@ -258,7 +258,6 @@ src_configure() {
 		: "${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
 			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
index e514971ce399..62e33d58f9bd 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
@@ -258,7 +258,6 @@ src_configure() {
 		: "${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
 			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index d3dec88c6a02..c5535dcc1c94 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -3,11 +3,14 @@ AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a41810
 DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.5.tar.xz 29064032 BLAKE2B 35fa6d7ec88ff67d9acf13466b3618eb45d664bed0a9ee581e46cb6e7692395837c8c8e86dead1dbcad582ef29c674a0df4b7180addee837b466eba7fdcd350a SHA512 f6aaab8a32eb7bce7f48d21d99417c9e6e8fe41b3d36320762775ef954db7ddd4fcff01d56475f35038d814557834a41a9e3ae85e5cae8a1b820c5044b42a327
 DIST wine-8.6.tar.xz 29118124 BLAKE2B e4659785722f0c1adb9ce4a156fbafc8484977a5fe2f4a6e1d5eaf8f1f14c6787f080b9d389cdd8716eb7fd00ee2879fab2042af5dcb970530d2e19628442c73 SHA512 602680675f5e062121767769106199179c52a6dd93e97b9b8b4d8365134c72f7745e37d4e3edf6c89c553fb1bfe55b914e77177508fb4f032410d423359abba7
+DIST wine-8.7.tar.xz 29158096 BLAKE2B 73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c SHA512 0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203 SHA512 76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.5.tar.gz 9530306 BLAKE2B 9457fb44aea427c2c09d6329f2f585ae7e14ca32950204019136616d73ad1b83b629297499197b91fb542784b8e5b6edd8743ee6a72794ce58ef5c6b1d27f308 SHA512 9d347c55a62f661bdcc102d373e05d162217b7b1348bdb6f2b114d20e35146862379d2cf03a96916bd1d52166a538af55d48e25a169cd6ee23818673bd35909a
 DIST wine-staging-8.6.1.tar.gz 9527141 BLAKE2B be43c642e6caa0f7e28a0aa45f736b839fe277a54c573955940523b6a27a0e4b7b5d531a027aab4a3c21a413fcac129dc16a7241700f2f848061fadafc9e695f SHA512 28bb066b55293e73df072cceb27a191365d6a319d859e6797bc443e830bb6ddd22cdbf7d9692b43e8eb7f2feb68ac1205aa440c60b37ab7c10ebeab83aa590ce
-EBUILD wine-staging-8.0.ebuild 11426 BLAKE2B 616e32fb223e84e7267eac5399b666e8364572316d4dcfa8023eb22243f16240a67699e69947cb75b7c557b02ac3f8cc65860a81878abe68e72b4384ae5a67c2 SHA512 5bf84720e364705f7f88ebb3fb37bcf6eaf7ecbb8d540ac37f3ef0dd4d467b2c28a9932b979ca4c1b251fe677c6a2aa360fc7c9020504d30275e19f9d48c1741
-EBUILD wine-staging-8.5.ebuild 11613 BLAKE2B 404d37d25e8c747e6313e94c550eb1f6e6848a0c32b0ba400b71c6a7f484bf17bf540a7a04c3bcb558d9349a5e0f4a369cef82f1d3bffa950fb0ee8ab9c2b86b SHA512 e54f8ac543ce6e6cfbd6e7245f91ab18c107843cf6cd13659bfa45cd660d4fc3e0384588b1e01011558c6be5dcc1d449778c09201a433ad27b2028ed39b37f33
-EBUILD wine-staging-8.6.1.ebuild 11631 BLAKE2B 161ed4855270e2d85bb179cb352e097704c1de0d1a0117f51b9a06c863664ff9e7e9d8c3e7ef36cc51763cc7cb098a02e56725b5094af71a2702f2dd0b720e71 SHA512 b6453691506d6e91bdb09a868836c6df963cc12b9ade9a8683e9461ae0e2a994160df5a2826a6d9e899859888b601d1ee3c16d22e02879e195ce6e6f36c92c13
-EBUILD wine-staging-9999.ebuild 11652 BLAKE2B 1122b5ecdefe5cb912764a02ce78d1e39ad37ae4db13dbff27bae6fee19cc6d7e60aef56006158ba781d45088b29552d109ec4569597f4730a787c46b2fe1c16 SHA512 b0a404756103efd50d0a02f83819602893e627be80ca77e2314982f2bdb57bf50d5e4623162dc2785c26eec42043ba49d647c60a87f6d7ab32775215a3967306
+DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5 SHA512 42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
+EBUILD wine-staging-8.0.ebuild 11374 BLAKE2B c344311d6ac4014f1f33a3c4300a50e84aabdb17dad87b8b0c85700ff071806b51eaf059688cff6747af57da25a66617126896dcf000009199f6ff2e7a0cbbbf SHA512 ba1008f8042bc0b98a519ea037880d46d1d04f50788b4a314aa785e082daee2e3e4ba7e09327b8c04259e95ece70bec46f98d30545953162593d3a37a1f16fb1
+EBUILD wine-staging-8.5.ebuild 11561 BLAKE2B 8db49d40916dbd2d4b843de2296fd782cc9758736910e9dddece4c09400fa65faa24374948c17f568d2bc7e4286e707befa958c32395828778d2870743d831a8 SHA512 26da354080bf37e91a0957ae0cc718ce11ae3abe1d519331497003ca648643a53efae66d2e37c72d11c52a254b1bdbcdc744b382548be8eeb69061c7c58200b7
+EBUILD wine-staging-8.6.1.ebuild 11579 BLAKE2B e1b24f28073b67c53e96704e709b35f23093170ef108e4999eec7aa472daa72d04e0e4f20818a080c93d2e0e6a642274e94baf683023f1546f85bc73b2c85d2f SHA512 2ede1d7025e52b68fb7969b1cc04d06373ccde737b62c3c1e8346ea58731050e01a2ad9f052a05db957897d0c1ea7f3786c32b8473d2031253cedc71ab6ab5f5
+EBUILD wine-staging-8.7.ebuild 11600 BLAKE2B 2237d5d2986b735e339b2d1e86135a9d2acca918705b600374c2eaab5f7f3d79423c895761bdde4056a0b04eaebe2e197fcd74c53c43b5b7c13839d7e928bffa SHA512 37c02ba98f86b3a96fa6100f75f2d1162c13578b20076dc69c64e13fb6cb9228cd7d2a10387e6e94e5616344e70261126f5d7b0fdb1db28337586f64630380a3
+EBUILD wine-staging-9999.ebuild 11600 BLAKE2B 2237d5d2986b735e339b2d1e86135a9d2acca918705b600374c2eaab5f7f3d79423c895761bdde4056a0b04eaebe2e197fcd74c53c43b5b7c13839d7e928bffa SHA512 37c02ba98f86b3a96fa6100f75f2d1162c13578b20076dc69c64e13fb6cb9228cd7d2a10387e6e94e5616344e70261126f5d7b0fdb1db28337586f64630380a3
 MISC metadata.xml 2301 BLAKE2B 9b65253f5a19d8aafc6c9ccd361a0b8cdd14a600ddd51bf163603c7400b2c39bf147f7fe671e3aba68ff8f8f2874eec0b64dd73afe4dabad3667cd23ca99aee0 SHA512 885f7c8e2239733193d16b32bb29a21285ff732092ae0c095056ee311bdf9b7135200a29ede5958d668acf9777640f139ffc5ffe43b1455356ce4bc897621401
diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 46496d8f280b..b026f1191e19 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -292,7 +292,6 @@ src_configure() {
 			: "${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
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild b/app-emulation/wine-staging/wine-staging-8.5.ebuild
index 5f90e2ce8870..55c1dba456f6 100644
--- a/app-emulation/wine-staging/wine-staging-8.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.5.ebuild
@@ -302,7 +302,6 @@ src_configure() {
 			: "${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
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
index 61b4b60e0323..838b42bb44f6 100644
--- a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
@@ -302,7 +302,6 @@ src_configure() {
 			: "${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
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild b/app-emulation/wine-staging/wine-staging-8.7.ebuild
new file mode 100644
index 000000000000..5fa84f123373
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.7.ebuild
@@ -0,0 +1,369 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=7.4.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="
+		https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
+		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/wine-${PV}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+	+gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+	+truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite
+	xinerama"
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? ( games-emulation/dosbox )
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )"
+# gitapply.sh prefers git but can fallback to patch+extras
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		dev-vcs/git
+		(
+			sys-apps/gawk
+			sys-apps/util-linux
+		)
+	)
+	dev-lang/perl
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+	) )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900334)
+	res_getservers # false positive
+)
+QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
+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
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
+		git-r3_src_unpack
+
+		EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
+		EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
+		EGIT_CHECKOUT_DIR=${S}
+		einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	local patchinstallargs=(
+		--all
+		--no-autoconf
+		-W winemenubuilder-Desktop_Icon_Path #652176
+		${MY_WINE_STAGING_CONF}
+	)
+
+	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
+
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with smartcard pcsclite)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with wayland)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+	)
+
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	filter-lto # build failure
+	use mingw || filter-flags -fno-plt # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		pe_arch=i386
+		if (( bits == 64 )); then
+			pe_arch=x86_64
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		if use mingw; then
+			# CROSSCC is no longer recognized by Wine, but still use for now
+			# (future handling for CROSS* variables is subject to changes)
+			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+			# 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-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+			: "${CROSSLDFLAGS:=$(
+				filter-flags '-fuse-ld=*'
+				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+			export CROSS{C,LD}FLAGS
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	if use mingw; then
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+		use debug ||
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+	fi
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 4057184984fe..5fa84f123373 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -303,7 +303,6 @@ src_configure() {
 			: "${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
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index ab6eea318560..7f8eb0326de2 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -8,12 +8,12 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.5.tar.xz 29064032 BLAKE2B 35fa6d7ec88ff67d9acf13466b3618eb45d664bed0a9ee581e46cb6e7692395837c8c8e86dead1dbcad582ef29c674a0df4b7180addee837b466eba7fdcd350a SHA512 f6aaab8a32eb7bce7f48d21d99417c9e6e8fe41b3d36320762775ef954db7ddd4fcff01d56475f35038d814557834a41a9e3ae85e5cae8a1b820c5044b42a327
 DIST wine-8.6.tar.xz 29118124 BLAKE2B e4659785722f0c1adb9ce4a156fbafc8484977a5fe2f4a6e1d5eaf8f1f14c6787f080b9d389cdd8716eb7fd00ee2879fab2042af5dcb970530d2e19628442c73 SHA512 602680675f5e062121767769106199179c52a6dd93e97b9b8b4d8365134c72f7745e37d4e3edf6c89c553fb1bfe55b914e77177508fb4f032410d423359abba7
 DIST wine-8.7.tar.xz 29158096 BLAKE2B 73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c SHA512 0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
-EBUILD wine-vanilla-7.0.1.ebuild 10516 BLAKE2B a6ae70e54cf3267bb6eff8a47d7c549ba9e8843b2ec0e24eee8e68ca3a3c1e1ebf570e23a8ff5fd6c520c8ceea635f2b8a08d9960fc030318220b644b02a30fc SHA512 64d3a95a34baeb68d021fd1de2faf796fde0e38ab9f56e98885961a80e9e8e26a4fdf755be28a18d1bbbe058a56825f8dfee1d4fc6b2ff67f06080dd5b982d07
-EBUILD wine-vanilla-7.0.2.ebuild 10517 BLAKE2B 6976d611eb52e0f20a2094685ee2d9b9db34ef17d424d43d59acf5fb864ee15ca60b964f12e16841238c3232a74debc134602dff6e08c81ee0dda82ee92bceaa SHA512 ea0dcbb249ff0f9fd7cff93af24ca5fe1cb6afbc11cbe28a6e8c2561c3721a4e555a0ea81dd816ae8597fbba7ae0f4b0f79a1b9c9f72800635dce1936b789e94
-EBUILD wine-vanilla-8.0.1.ebuild 10536 BLAKE2B 570e44c1e402460e42d2bf2bfe5f9e68c51ea3a3fca45c0032b0a07977a64480364e7d3f2a192a98eb8e5d8c7059b55b6a99fe88f63290964ed4001c4f68ccaa SHA512 defe5841154d8f3819dc52180a1c81812a1b1f8c842f5a14ec30877c453b5296d92d1c586823ab3232562ae3a52fe254866c1e3197d395cc6b76d731accc8a63
-EBUILD wine-vanilla-8.0.ebuild 10534 BLAKE2B 01742704db68023493742748281f19933ef206236ccc2b1bb16dd276ad6910362509a2f3c89c1c0803fa13bad0bf294356c6abe81207e750de1f1dc04ecc5bab SHA512 313ca0bfc18b4ec6bc300d7998a64ddc720e9b4463f8f240f539f9e814ee1fe8fea0b32ac35c510f06f328824441b05f347f8ea6d71caabd57641988e778369f
-EBUILD wine-vanilla-8.5.ebuild 10716 BLAKE2B 1538ea47e8e0f3ad6a7cb11be52b8e60519ece845080ed97afb678f14b66e8320dd68b89119bf8db46b8ec45957c31d5f49617493a5c71b4a5cb7f5c6dea8f95 SHA512 2074327e2084b6b9ffe0296783e5a5898d0cdeceb7051a4f5b06b6892da2aec3312130faaa3537a5e8f2062be1ab9ea2265250a469304852e12392c32f8a54e3
-EBUILD wine-vanilla-8.6.ebuild 10716 BLAKE2B dd0f65bdb5fd09dd8472ad6a0e12f16be1387d3a13073c49fa710338bd35dd609eca0f7cc8843463f950c1033b93117e5efc93bfc3b8a660ce4f1231d86cda22 SHA512 88876b330fce27446260dcf3b2929c998ced065897a9d03f614f3efcd415142a1a0ea5a07b0e9dbf933aa73c0d66c6d860ff97670285c05033b473ed709c27a0
-EBUILD wine-vanilla-8.7.ebuild 10755 BLAKE2B 7d231ec760614c7639bf8fa8af1886de56331e719e2fec5a1babd169f7d74b8afcf89c35e5ff6d19d3448832dcfa46f8d93117988973a448a609458d0a9b027a SHA512 f2de3b8584cc8fa1935bef044b6e97da2f6d977647997ef33d58831a856bc6260d2668f98d6f29d0e508a38902c37d909e3f1c43482018e4edd3c91264e15632
-EBUILD wine-vanilla-9999.ebuild 10755 BLAKE2B 7d231ec760614c7639bf8fa8af1886de56331e719e2fec5a1babd169f7d74b8afcf89c35e5ff6d19d3448832dcfa46f8d93117988973a448a609458d0a9b027a SHA512 f2de3b8584cc8fa1935bef044b6e97da2f6d977647997ef33d58831a856bc6260d2668f98d6f29d0e508a38902c37d909e3f1c43482018e4edd3c91264e15632
+EBUILD wine-vanilla-7.0.1.ebuild 10464 BLAKE2B b5603c6780368944b292b43f9fed0dbdb19b26eb62afb2a4715024fe47c87a3f9f10e826811b3c1d6738c1eeddf163e99aa3c63f8f029cfc91bfa3c4a7aa854b SHA512 f1b5eeb278d97e9eccbffa703a9e15906d6802a8d3d0565a5afac5884477b8f2c35036a29a0241274db4654fc24607c2a977cc6874539a9b8f09f30c886e0f23
+EBUILD wine-vanilla-7.0.2.ebuild 10465 BLAKE2B 77f2e17ae9d6f0cce5e56bcff48e587b603aa9b777191ee283bf3eaeec4ec4a445f51315c0cedb46f8998b7d0a35323e6e14fb52422a5b58d54050b272637103 SHA512 4baf39bf102aa117569d52b6c91ba2033240ed6d999a8451d03beba51c5b3c0be80e8977ef2399aa8505e9a1c76135a810b2d8efd965770f150ec3783f68d331
+EBUILD wine-vanilla-8.0.1.ebuild 10484 BLAKE2B 91447942870dd18f64cc76a585e839d1aaefd3cd42f49f3e951b4c15c7b6ac0075b7040f83311e706839a57d8453f7fb4943240fbce00a6f5efbd0d488662fd3 SHA512 d77cc66f013c8bcf724cb6e2dec2dc6819588152102ea8965ae367b1d3684dee4f172c6b5f8d0ed05447825926eda89b231eb29f4391c272f32f425ebbcad0cb
+EBUILD wine-vanilla-8.0.ebuild 10482 BLAKE2B 4799350a68a4cb5a502cca2e1bec64e41ee129bfd1586d043f3d304d290f3e71c33b41eb61266f7373a95dd7a08b26541712319ba0abd15f3d0a025925e6a6eb SHA512 b18871d2b4278e21edb49c18df42402dc877897c1cda67f469d1a4761d8327fefd448347f432a7a450c9109feace3daf644f6677b879f4f4ebebdf8d3b55e4a3
+EBUILD wine-vanilla-8.5.ebuild 10664 BLAKE2B bb8f2424f63c3666c70cc16ddf69c344e9ac1451bd464e228fc6ae76f84597fae3e76d44dd383a9547cc9ebf5a6ff1a48f8b0993ae356075d31fed325430b4f6 SHA512 d6b170bdcc7521141882ef7783ed859cfdb73d4afcf201875e4641c0ac6e6c3e31ed76b06a58a67a69cd0c1e21032d14b626ea85c6bdec85c212708ad5c49f94
+EBUILD wine-vanilla-8.6.ebuild 10664 BLAKE2B d0c16227f804337acad7409f549b7ab7709e83a2447d96fa567c6afdb9b782d11814e98f1287ab1253d1d001dac326a570b74ffdcdbebaaa38dfd573c23962f0 SHA512 7cce48f61d2643497acb6b5db3d72cbc858322ce5620184c61f05da2879950db3fad4c39618e869d26e0ced22a9aed9d348bb75432749e42263b754faecdccad
+EBUILD wine-vanilla-8.7.ebuild 10703 BLAKE2B de73ee32c16983718cc7360cf63a7bac44dff5f844c8cbe0c4f3e9fcc86a84f7e7908af0ce1b10da48fe9af521ad94999d37f9c4166ade22e86deb45dca8add4 SHA512 f876c3f5b0155b797a4dfc0d37026e0f2bbc96a89fa7a12229eaa6382207f578ff0633065f8b714d64283571000c7988ae50305cdd1e4a233c653acf9802980d
+EBUILD wine-vanilla-9999.ebuild 10703 BLAKE2B de73ee32c16983718cc7360cf63a7bac44dff5f844c8cbe0c4f3e9fcc86a84f7e7908af0ce1b10da48fe9af521ad94999d37f9c4166ade22e86deb45dca8add4 SHA512 f876c3f5b0155b797a4dfc0d37026e0f2bbc96a89fa7a12229eaa6382207f578ff0633065f8b714d64283571000c7988ae50305cdd1e4a233c653acf9802980d
 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
index fe61b00a0b55..df0b0a5acf85 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
@@ -260,7 +260,6 @@ src_configure() {
 		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
 		if use mingw; then
 			: "${CROSSCFLAGS:=$(
-				filter-flags '-fstack-clash-protection' #758914
 				filter-flags '-fstack-protector*' #870136
 				filter-flags '-mfunction-return=thunk*' #878849
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index 87cd1e61cd65..b598b2d226b2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -260,7 +260,6 @@ src_configure() {
 		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
 		if use mingw; then
 			: "${CROSSCFLAGS:=$(
-				filter-flags '-fstack-clash-protection' #758914
 				filter-flags '-fstack-protector*' #870136
 				filter-flags '-mfunction-return=thunk*' #878849
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
index 44ecd77a00df..8324d426aadb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
@@ -262,7 +262,6 @@ src_configure() {
 			: "${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
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
index e12c775a10d0..2d1ceabcfd5b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
@@ -262,7 +262,6 @@ src_configure() {
 			: "${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
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild
index 69a8a4af667a..d31d47a75832 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild
@@ -267,7 +267,6 @@ src_configure() {
 			: "${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
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild
index f0ab1e9a0897..12a5764467f8 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild
@@ -267,7 +267,6 @@ src_configure() {
 			: "${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
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild
index 1a71740166ff..9d33f21d9645 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild
@@ -268,7 +268,6 @@ src_configure() {
 			: "${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
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 1a71740166ff..9d33f21d9645 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -268,7 +268,6 @@ src_configure() {
 			: "${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
 				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"