gentoo auto-resync : 13:05:2023 - 11:51:15

14 files changed, 376 insertions, 24 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d4320762a15f..6f19e25df9db 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 7cc609310094..cc48c5585ecd 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,5 +1,5 @@
-DIST protontricks-1.10.1.tar.gz 160943 BLAKE2B 12361ce009a62bdba8c420069f87879bf22e047df8bd6d843fb8672222fe6ab04d61f03a44c43a147729461a2f872e2239ee97d737aba28ffdbb273e797be218 SHA512 0b6e3277ea8a106d2bc52cc805b0c3a023733f0a6554fabfe9f32ff27d1bdf04058a419a719c7ca81dc45759a803a83b03408806e4b9328664e572655a3c4df0
 DIST protontricks-1.10.2.tar.gz 162325 BLAKE2B 5e9d0bf2970ad0e9a5ef5e399af5e327781c94f3e76e36db3a93a93d59102436a54e926a72a22b4640178534d2b9e62452543706c7ec10ce4591f15ce00ac4f3 SHA512 f644e13f356f899b8084ed1d347c210b624c09676f3a644f973610d1134658dd2951e8f85178606639b0eca8c386e9abac89c658a7076e4126278ff955549f10
-EBUILD protontricks-1.10.1.ebuild 1400 BLAKE2B feec99d4f2752b0d7735527ea8440db1da66347202a57146ce1d733132409313a222e15c8310de411ff4c1f8f43ab2b34b0f207b78de1faa0e905ea6a3e3ad3e SHA512 6c6e74e9f11951dafa2baaafcc0eb6a703635e546551ae7620ef667b4c4d388eeca6e69740a17c64e1c9c1247012e28c0eea8ff5907cf1572b3cb59507f3a002
-EBUILD protontricks-1.10.2.ebuild 1354 BLAKE2B 096ef197b4dbf053f225846f91af2d4fc4ddaa6ea34663a3647c9e291b52bf2fc473434de2424159680b2031a472e08668dab34c227cf0c89c33207b58a4b73b SHA512 60f5a31286cfbc810d8adec51428416dda24bc707507a8262bd020dfd1dc7e3a089730f8dd12232087e0fb45efc41125c50674c27816dae48c43715314cde249
+DIST protontricks-1.10.3.tar.gz 162698 BLAKE2B 7e3f696f3589a4a92d2cc6132132546bc0c38a5110d688cd486c2d52bd37275b8df4085edc38d4876583aa0d5ec0a9de599ca05616bf92812decf624e2259406 SHA512 c389a712bcbb9dace8e6b3fa10ddb9db0a67abbd3b8d000d312fd59bb682aa68c10d5411b10b31948967536418e56116ac435054ff6d6999bc471ba2a97ca6ba
+EBUILD protontricks-1.10.2.ebuild 1353 BLAKE2B 5425ca792df9caa7dfc57d2422edf2c1b0697d8339f00896d0b077f1f1fc9ab139fd75bfe0e3f1bdb02644db4fd7ae05a38d4b14579337d37331095988f6cf66 SHA512 d3f84d7097d011390ebc553fcba9579fd88fd0991eb5dcdd2f99a46f3be086ec07e9b477a0908890833bb73d3219b3653420803ed059574b251202a63de7eb70
+EBUILD protontricks-1.10.3.ebuild 1354 BLAKE2B 096ef197b4dbf053f225846f91af2d4fc4ddaa6ea34663a3647c9e291b52bf2fc473434de2424159680b2031a472e08668dab34c227cf0c89c33207b58a4b73b SHA512 60f5a31286cfbc810d8adec51428416dda24bc707507a8262bd020dfd1dc7e3a089730f8dd12232087e0fb45efc41125c50674c27816dae48c43715314cde249
 MISC metadata.xml 809 BLAKE2B dc0506e6f3224adc867438699359c4eafc389041846c644818732036e04bcb9c789e358a08effdb4b9ff4430521f7fe8ff6800b75aa93d6313e3d85395467741 SHA512 351bb79dc7921e6c62100b3354546185d31578b044393ea5e5b5fea089eb47164882ff4ede30d8a575dea31ec9d0927793f8109d9e63ca4ad6954c1affdbe6f4
diff --git a/app-emulation/protontricks/protontricks-1.10.2.ebuild b/app-emulation/protontricks/protontricks-1.10.2.ebuild
index dae98e9c173d..a878a6c3640f 100644
--- a/app-emulation/protontricks/protontricks-1.10.2.ebuild
+++ b/app-emulation/protontricks/protontricks-1.10.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/Matoking/protontricks"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+gui"
 
 RDEPEND="app-emulation/winetricks
diff --git a/app-emulation/protontricks/protontricks-1.10.1.ebuild b/app-emulation/protontricks/protontricks-1.10.3.ebuild
index 222d67177b2a..dae98e9c173d 100644
--- a/app-emulation/protontricks/protontricks-1.10.1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.10.3.ebuild
@@ -7,15 +7,14 @@ PYTHON_COMPAT=( python3_{9..11} pypy3 )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 pypi xdg-utils
 
 DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
 HOMEPAGE="https://github.com/Matoking/protontricks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="+gui"
 
 RDEPEND="app-emulation/winetricks
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 7ac42dc5cf0a..0f3f2b84d697 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -8,9 +8,9 @@ DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B c9540195ea885d9f1e980232b0af471e92c
 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
 DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5 SHA512 42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
-EBUILD wine-staging-8.0.ebuild 11423 BLAKE2B 5ed089c9f324987781b07199ec0e4f3e1f656d47cc4d38015d1aada738ce80875a66d592e401fd5513a779fae12fc2b1d457ee86d923fd0b802eac7f804e8f52 SHA512 7f777431fd79ef885e8a91a36934d19154c904a809b9eccb4d68758460ceca1fcc1327f8e2a0e65dd8bba831e291b76dc14f92f237f41471ec14e2e9117043bb
-EBUILD wine-staging-8.5.ebuild 11610 BLAKE2B d4be8eae237beaea4257c9b242b08f60598f0f9da358ea84c8eabe23e431ae2aa834bb067544b3d584d9d2622aed2089ae240decb58ae2d72f704a6bc39188a0 SHA512 f0e8060ad6d638e3be4d0c39659007c3a15a0217611f431f34f88a6916b74b831e2142cf67a16081b2a7e723ddc149d2ac752956d6cf4b2b3b3b8500e24da4b9
-EBUILD wine-staging-8.6.1.ebuild 11628 BLAKE2B 9b446133e5f666eb27ca32e98da0c44f3687146c14cc893dfb51b46cee915407f0b87380fd3692ca99cf5d9a7d7df764faa272669e80b80ac4181c1fff718c2b SHA512 fdb79c0b12401f20499719df110a9d810c35c6c73de2d5db0a55fc7ea3fa78d7928571a60dbf9572521d2e0e697dfc1d0d13d7a968c825bfbdf021f15e41895e
-EBUILD wine-staging-8.7.ebuild 11649 BLAKE2B 58108ebeecfd7e54d8caf4e7547901b4d369ef1b038837f1604211e4173ba6db5130e72d3c8edb44c671d03b1e2f90c06aed63afd5d8f0e67a759a7012efdfcd SHA512 ca893e70293a4c0c020d99c5e30253867b4b474036d3985b50aa85b01ef5733d4413b8afd585ff6e0d484fc9f30f17f419ccff98db231f635d1204e67a2bdb37
-EBUILD wine-staging-9999.ebuild 11649 BLAKE2B 58108ebeecfd7e54d8caf4e7547901b4d369ef1b038837f1604211e4173ba6db5130e72d3c8edb44c671d03b1e2f90c06aed63afd5d8f0e67a759a7012efdfcd SHA512 ca893e70293a4c0c020d99c5e30253867b4b474036d3985b50aa85b01ef5733d4413b8afd585ff6e0d484fc9f30f17f419ccff98db231f635d1204e67a2bdb37
-MISC metadata.xml 2301 BLAKE2B 9b65253f5a19d8aafc6c9ccd361a0b8cdd14a600ddd51bf163603c7400b2c39bf147f7fe671e3aba68ff8f8f2874eec0b64dd73afe4dabad3667cd23ca99aee0 SHA512 885f7c8e2239733193d16b32bb29a21285ff732092ae0c095056ee311bdf9b7135200a29ede5958d668acf9777640f139ffc5ffe43b1455356ce4bc897621401
+EBUILD wine-staging-8.0.ebuild 11470 BLAKE2B f988ebcc9231ef7cabe3b2da0c0519a051965dd9e3350ea226c02c02ea43a6cd67cbc277f4ccfa93296ad195c9341f3fad2441ec1c0259226e3620586928af13 SHA512 671959d80bdda9734f5509f4cdb9d4fbb59f97fec1705fb835e0e7b931c3efca627e8c336741c80f14478a205c832302400ab56f2049c2aab11f5511efe5b67d
+EBUILD wine-staging-8.5.ebuild 11657 BLAKE2B a7bad3b695c5f302b4b93a15e17333e1ed82323ff4b6ded6934a0cc06d9afd6db3f570a4443a735f897192f5c362512747c3e7b1c780cc906876cd09d08224d1 SHA512 bb0732750a148b98597fe389bae7f8ca89b4d820bd134b612b29b52212377e2be0c445cc4bd362a07625045e919b070a389c3ed57497a411324a764c4843ca90
+EBUILD wine-staging-8.6.1.ebuild 11675 BLAKE2B 6fb4f0133ac85c2b6db8bce5c84ddbba028238685cb824d7ee3c33a898ea69ef4b71e1cabfe28e8b0f51ce66bddc2ce867eb0b0a387152d923c8ba8163db8302 SHA512 a17a7812ab60f796e478fe86b996ae0c5e5b95e8f5938034055dd5bf038d28452ae3ae68b974c2ed557441658e0330d153ae9ef4cef08179977f61a5388f4dd9
+EBUILD wine-staging-8.7.ebuild 11697 BLAKE2B eaa74c9b521e106d56d9b4b8db31ede38791c6905a9f34f88bfc1df319dbef8897326ba9784895a503dae1b01cd82c83483752e57ead7014c0fcd3c22c58d8a1 SHA512 f5df024269ec03e0e8467c117b98540999a49d20484bf0356632669442eae341f82da4657ee805493fb6cd6bc30faff76c183686ed4e9562f562879727a115b4
+EBUILD wine-staging-9999.ebuild 11688 BLAKE2B 70f7acae6068c125bd7fc449809ab904bd6cfc8e9c197188ec681141dddd72c78a3ec9728d61efd58fd05a68f1195be687d6bc9a74e4980462cf87daef2cae6a SHA512 3941d407f0e35ace3a079309b763043c8d44462911895c6552cb1d393178b7c10f219277dd7c870b59045d52cda71519f0633001a5a766ac1b6e9c6cabe9173a
+MISC metadata.xml 2390 BLAKE2B aa4087a0d17d80d3495f36fc3dc1c436a757a06f5df6113deb03c129ee7e3b9ed5967784fdc37c3f572f70d997f0a88d887a9c33f038501f87348b2c913f4327 SHA512 9dd1a6ccbefa7853a50b51242248e88bc690fc57446545bf2f946f7673bc8ff4ec1870909ee4060dcc07fe177c0e4118dd374874a1f467401db15f1d385b69ec
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
index b67374f154aa..6b988d9f6ff4 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -32,6 +32,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
 		<flag name="vulkan">Enable Vulkan drivers</flag>
 	</use>
 	<upstream>
+		<bugs-to>https://bugs.winehq.org/describecomponents.cgi?product=Wine-staging</bugs-to>
 		<remote-id type="github">wine-staging/wine-staging</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 3b1d7f1ce6fe..06a39f07e0f3 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -11,7 +11,7 @@ WINE_MONO=7.4.0
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/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
@@ -23,7 +23,9 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
+HOMEPAGE="
+	https://wiki.winehq.org/Wine-Staging
+	https://gitlab.winehq.org/wine/wine-staging/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild b/app-emulation/wine-staging/wine-staging-8.5.ebuild
index 1f2310f1a252..1d9218bfa197 100644
--- a/app-emulation/wine-staging/wine-staging-8.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.5.ebuild
@@ -13,7 +13,7 @@ WINE_MONO=7.4.0
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/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
@@ -25,7 +25,9 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
+HOMEPAGE="
+	https://wiki.winehq.org/Wine-Staging
+	https://gitlab.winehq.org/wine/wine-staging/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
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 ad9ce9a33eff..cab12fde862c 100644
--- a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
@@ -13,7 +13,7 @@ WINE_MONO=7.4.0
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/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
@@ -25,7 +25,9 @@ fi
 S="${WORKDIR}/wine-$(ver_cut 1-2)"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
+HOMEPAGE="
+	https://wiki.winehq.org/Wine-Staging
+	https://gitlab.winehq.org/wine/wine-staging/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild b/app-emulation/wine-staging/wine-staging-8.7.ebuild
index 0865619a8b23..f7296349f46f 100644
--- a/app-emulation/wine-staging/wine-staging-8.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.7.ebuild
@@ -25,7 +25,9 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
+HOMEPAGE="
+	https://wiki.winehq.org/Wine-Staging
+	https://gitlab.winehq.org/wine/wine-staging/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 0865619a8b23..bbf0f0ca9656 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -13,19 +13,21 @@ WINE_MONO=7.4.0
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/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"
+		https://gitlab.winehq.org/wine/wine-staging/-/archive/v${PV}/${P}.tar.bz2"
 	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"
+HOMEPAGE="
+	https://wiki.winehq.org/Wine-Staging
+	https://gitlab.winehq.org/wine/wine-staging/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 93f07e141f11..752898966f82 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -6,10 +6,12 @@ DIST wine-8.0.1.tar.xz 29057128 BLAKE2B f1e04ddc7531704b4229d1bdb6e742ff20886dff
 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-8.8.tar.xz 29181484 BLAKE2B 43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac SHA512 e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 EBUILD wine-vanilla-7.0.2.ebuild 10513 BLAKE2B 59e4829bd78bba7b4aec2e0ad29b41241f8977f7f427b9de345c40e0739fe7b122c03fd833d1f83f64b07d23e1327747caafa4664b45e9396ee0180540121800 SHA512 152ce8e64ad259555d762ccfeacd7fc8aecbacd756952cd8ca67efc1da3d8dc3876d2dbc58b31be41db327c0388d7ca0e23e6a1877df428125ed3b3807e8f36d
 EBUILD wine-vanilla-8.0.1.ebuild 10531 BLAKE2B c0f7101f6ea462bb6107b9c655a3c08f8da17caaad36f8dffea37f629fd874dcd9c76cd74ae6de3bd0a9cbd2a8f44c61a6d8f6cc682d070aa6a3e58dfc627394 SHA512 af0c61ad944252e9111a3f7bb8fa031c5e85c6c5d11e8f4516d812fba9c0febc617fb1c7fd577ecdf5849e9b70a0b932113cd3e8d72d2d3821a35d5220b679d3
 EBUILD wine-vanilla-8.5.ebuild 10713 BLAKE2B a1976bfa2133d561e669f611ef487d335d26e986526cc41a173e1629522e81cd85f8576c1b26c0023d882253f37e46b85dbfa14d86d59b95fd1200c47869c3d8 SHA512 d3a04376eca69532e2f1249961f00241c38a4f1434097dddd4e7aa5a23aca79120f52f081a779739a317fcb189c2981b5551fe2758d5553b21b31d3388bd2769
 EBUILD wine-vanilla-8.6.ebuild 10713 BLAKE2B 30ac5423669115fc490ed64bc58d884a64f9b080968797631b75c4db0247a70c23d00e093d37b98857a9d4ec14d539920746cd2bc3f7a7daf4991a5a3098adbf SHA512 c55bb1013836ba5f7bb2054939b54198902d07e0b6ef703e2025dc507f322c123fc28fadf47d43e6c62e2943bc7b2bf047f4147cf0fd1881a31cf90323636617
 EBUILD wine-vanilla-8.7.ebuild 10752 BLAKE2B fd8ed4c4bb537108cffb5bbb9edf5bbc942d289eaa02cda12237c4dc6df849161b7d8b426717732ff49ad4d826f97e32ea7107c182bbcb50e3752698ecfa5351 SHA512 7ce00cfcb1f65c0a72acc1d3adbb4157b75d8853a31f580f4eb29701c9ee54f804078174b43cb1552bab488381f5716ac035ae7092629ae06ec4f8ddef7998f7
+EBUILD wine-vanilla-8.8.ebuild 10752 BLAKE2B fd8ed4c4bb537108cffb5bbb9edf5bbc942d289eaa02cda12237c4dc6df849161b7d8b426717732ff49ad4d826f97e32ea7107c182bbcb50e3752698ecfa5351 SHA512 7ce00cfcb1f65c0a72acc1d3adbb4157b75d8853a31f580f4eb29701c9ee54f804078174b43cb1552bab488381f5716ac035ae7092629ae06ec4f8ddef7998f7
 EBUILD wine-vanilla-9999.ebuild 10752 BLAKE2B fd8ed4c4bb537108cffb5bbb9edf5bbc942d289eaa02cda12237c4dc6df849161b7d8b426717732ff49ad4d826f97e32ea7107c182bbcb50e3752698ecfa5351 SHA512 7ce00cfcb1f65c0a72acc1d3adbb4157b75d8853a31f580f4eb29701c9ee54f804078174b43cb1552bab488381f5716ac035ae7092629ae06ec4f8ddef7998f7
-MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9
+MISC metadata.xml 2457 BLAKE2B 8db962735b0e8100e5704eebdc621cd2ce40609533462b54be1ed9ef5d8ac6f36be3c0084bed86ee282486b39799214b517bedb93f76cb1c47ddb4b3bf2b7ae6 SHA512 4dba75e603d0eb0445957998800412b33e8dc7fb9654a8f47fd4dc84f67422fcc8eca847e67adbeb347e866883087f13510976979c7c6b7de1fa14a7eedfa6e1
diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml
index e92a16054eeb..6692b0b1d557 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -33,6 +33,7 @@ This variant of the Wine packaging does not include external patchsets
 		<flag name="vulkan">Enable Vulkan drivers</flag>
 	</use>
 	<upstream>
+		<bugs-to>https://bugs.winehq.org/describecomponents.cgi?product=Wine</bugs-to>
 		<remote-id type="sourceforge">wine</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.8.ebuild
new file mode 100644
index 000000000000..b8ac1a27c65a
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.8.ebuild
@@ -0,0 +1,339 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=7.4.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	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"
+	S="${WORKDIR}/wine-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
+
+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 odbc 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}] )
+	odbc? ( dev-db/unixODBC[${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
+			games-emulation/dosbox-staging
+		)
+	)
+	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 )"
+BDEPEND="
+	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 #900338)
+	res_getservers # false positive
+)
+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
+)
+
+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_prepare() {
+	# 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)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	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
+}