gentoo auto-resync : 05:03:2025 - 01:46:50

23 files changed, 72 insertions, 111 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c0a2e155e87c..1af2ab5b50c2 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index a2806a5b210b..282b1db6d433 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -2,7 +2,7 @@ DIST virt-manager-4.1.0.tar.gz 3151412 BLAKE2B 1b4203be81bd7b82251225d691a4d9068
 DIST virt-manager-5.0.0.tar.xz 1466724 BLAKE2B b8b93587b1e1cdb398f33e4820aeaa9c1aecfbe26cd54597830fcbc009a51e70b0dd10b947b9392a1d3fdc5b28c19573a1d417b5748c38658b6e03725023bcfb SHA512 d0cb7eb844fc98ad29413717e5fa5834bc6f9f6cb6b9339b59c2721bb37a58f71280e3d2a04a64a6021614626329d76c92474f826bb1d9b7a9040b479f20d4e8
 DIST virt-manager-5.0.0.tar.xz.asc 833 BLAKE2B f97127a4cb1c0c24c6627c5d8e1e510075df3ad492e716f0cf07e5f41b3226295da4d73f5cef5903a9bc5a3d7a6f34bd07e7b0f2e21e9d42997c117708de1ada SHA512 e0bec28ce61af5dd2a6895006d60e11dd7b384cd4fec305ebfbf05831864aeb334d212511d6f92827fe15f6d6dcab3ff1d13309afa686d3e8e76c6b354ffa494
 EBUILD virt-manager-4.1.0-r1.ebuild 2721 BLAKE2B 5016f76f4672d45c5471152ae585900d93fb89059c3d5aaa54c8f70baf7a27c7757f701ef8feb257b5169461b74b45193106c9cc4306a802bfa9d421846cc690 SHA512 779bdc4120c4ee413fe2d52298d55ecd5fe03145e040f72889651141805c3a18f4e8d5d331105bc0e98889156e26ee7def5e5cf8aead865549c2f9f5478629be
-EBUILD virt-manager-5.0.0-r1.ebuild 3167 BLAKE2B e7b78ec457e4a7227b91887fc8123c4d5daf80f70d3ff2fe4c01a2924b592c437898a0cdfd03ff674a8c866a87ac4a7041a5861106b059bbf4ec1e7baf72d0cb SHA512 94d949acd42a7fb35d7dd68503ef15b10029578de1df03559f5a552ffd4fdb99d5854c0bdd1772e9bb456ad82f160a0234a3f91ea288d726e04a61695a19e99c
+EBUILD virt-manager-5.0.0-r1.ebuild 3166 BLAKE2B e1deb28e5b679da1dfe17da3678f997d910730e3c5e49837a7a61088cc768bb31983e6f5b3048cc803445fc696b9e6446b58da7b175b0032077aecb788dfacf0 SHA512 7b247446a2f512682286ce2b650cd33566c781ce32cce1eb8bd26caf7778955107ca53f02f58cd5bc039e541f5b741cf695b2dea7094a1bd3e4e3fa9a001af01
 EBUILD virt-manager-5.0.0.ebuild 2481 BLAKE2B 38d3e1755ec5323f46b48868cddd9ceaf6a0d9ff5269c2431ef8431214190ce86188fb0897da6b50c9cb362d6078d6ac1274d2723059ddb71ee7597670f1efc5 SHA512 0c88d7e98613b71f334e85abdfa60bec9724e5f8c5890d5be87b4d03f2c1e3fc7a60c379b8e5f279008de6112232443c4602d69a397c893829ed3f638a0d43b3
 EBUILD virt-manager-9999.ebuild 3168 BLAKE2B ebea5332062e04f3f8d60bdbd57d657b0c2cd2aed2d86f35d571d3373710509bc9667d70e791d4c4978497818b577d1cf3da0164e17ad523aaabba62721acc90 SHA512 e762d554f31089e76acbf306cb67324b5e984860ea3a80aba52b86d96360bab369fbaea94a7070f9c144cc0c14cf9cfeac02829ebad15f9c420b97f67ce22419
 MISC metadata.xml 1327 BLAKE2B 42d57e2d66b6e1fba8824d8a1ef9527bd9c402a5c9c66d922e37de15e98de0827642832482846a87a7f16787d3d2372ff2b8d4caeaae51d8c3a3c396eedf6502 SHA512 5266d1e1c2a74e3a27b4519440a10296c80c3e6b0938c3fb086a74d88a7a7d0338c52b15417c18b11945061d74cbd60a565613dc79432630b3a5ac97704e5d68
diff --git a/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild
index 088df49121c5..8a6fe19615cf 100644
--- a/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild
+++ b/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild
@@ -19,7 +19,7 @@ else
 		https://releases.pagure.org/${PN}/${P}.tar.xz
 		verify-sig? ( https://releases.pagure.org/${PN}/${P}.tar.xz.asc	)
 	"
-	KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index b9c575aa31af..d3941a1db1fe 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -8,7 +8,7 @@ AUX wine-proton-9.0-rpath.patch 356 BLAKE2B f988fefb9590d1c8735f480349172b7c7634
 AUX wine-proton-9.0.4-binutils2.44.patch 4104 BLAKE2B 4a0884969ade4ea83890672392dd29eb641f6c82ecdd8a6dd47853cc59e2cea73d42a95ce2197fc2833170aed7af508b19136f11859501dec22909297a691905 SHA512 f3bec4565acb4446783e44ac9823978ed1f8881814f7cae7ad5c5bd8d70cf5f13e68f0abefcf1038426b9b055fec1dabf3a6bbfc21bae1420654fdabe7bd206f
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
 DIST proton-wine-9.0-4.tar.gz 49339922 BLAKE2B 914ca093ac288c26400e4eeb2ea33943fc8ad89052aa7c97b5c44286dc175745720455d65163baa90b0d0271eb8028549315a3e8095b91947db2bd96c6fc4852 SHA512 e061f0a55b25493f67ca3add8c7e41020bb57cb15e8fb4fdf3c23f0cab2d00b703c90fbcf0dc1ca8b67e1726a76cee910e9ea6f567c88bc6c520dd6c9dbb75e9
-EBUILD wine-proton-8.0.5c.ebuild 14121 BLAKE2B bbaf471271e08f64d2b20f8b30f33f513d4c514c0a3bf038a755b3f19838541c74923284d05bfc6d31fe49544eb1ecabbf62c3f8123eae8f89844cae8c63b88e SHA512 6608b20961d1c01075ad7c10ed69662a210392237c3517fe96619d18cab2f2f558e41a19e626abf40f61d729f58d22bf298a8dffef7d461522cc0f192d67ba31
-EBUILD wine-proton-9.0.4.ebuild 15021 BLAKE2B 3bfb04e574253024219717cec16c31fae51521371421d8011fb4945be9af4ba129a7dd2cbd9950036641d67adc4bad08d5a4a2511d20f92cb031a21d75dee796 SHA512 d4b834af9c385785a6fe9ab06bb8678381ebf28644fbe831f2ecb304554deb9a60b828e2443f9a7a3a411d2d131cfd0191b8fb3e37c404ed253c575b142b303c
-EBUILD wine-proton-9999.ebuild 15149 BLAKE2B 4bad54ba765db4081a3c42e7d6fc913ec6db4ae44af55550c538b460a50bdfcfdb6e46f8125e5e9f394005c518dc43cd751cc8f2799412b54f42823a8fbb113b SHA512 e6b1165db49039ee1733f562fe6e433537ca02f918280fd960663dc6dbadae2835f007b7e91e44acf29bace81908ff6229af8419090939af73fd059379fdedd1
-MISC metadata.xml 1561 BLAKE2B c56918ab8f385550a8afd059d6df3e4c8cec39a0820b327a88b72a8159f1852cdc33c6b5e24cb8bdcef628707b6bc80950044a5998c7ac4c4017b017eef80c29 SHA512 1f5b24e0151d29c377082acab47d58e6b324602b01f688250cd32789a01c5269eb8dc65fc8ba8e0830e54c2c2d07ee5f14876754fe906c6480cdd962c262bb3b
+EBUILD wine-proton-8.0.5c.ebuild 14098 BLAKE2B 3214ea465353df4d50edb71aa2fe238e08553698a65db90ca19557718309a3d2e6207a6294083b0fbf61664c019866fc84100a5b362f8099e9fc81579ad13c2b SHA512 035c7008dae7879f81c43fb793214b81c29e1e03fe8094f5dbbc2c965cbd44d7ca67b633dbe6b29682847266830e19f2e5eb09cc37063f128f8b1e81ca2d8c90
+EBUILD wine-proton-9.0.4.ebuild 14998 BLAKE2B c39b6443ddf2c514e8ebae97f45aeef1391de32f0799bc604f66628e8f62184e29cfe09e60a2450260af36ccb4c527aab9907ed417fffdb9ff4b8fa7e0bc40c1 SHA512 8325fb956d2b0a1522eada49a9da8361afcf01994824740d20ffc173403b645f246d20e5044ba38d9cabbae7e6ecd90edbb69b63b039da485773eb9971669606
+EBUILD wine-proton-9999.ebuild 15126 BLAKE2B cbe47634ce384171c50fa864245d6224985323a5c16e4e4fa405fc0997600c4d8b5979e73e9a07d5ccba998551ea9e7db1c47bfb13fbb79610e82af3f2010715 SHA512 920664d039f07cd38d9890741b4d188eacf544cdb85ff5fe97b320bbacf36a8557fb384827720f6f5d9499a41d9798df772d458eda8d012ddb36a8b45827db4a
+MISC metadata.xml 1476 BLAKE2B e17a532f40065e98b599ead3d1cf8a47a8c6e048bc98fa3dc261776c336a8d343b8bd9f816d34a0f7c325ea1eae350fc93cb034cf6b0a96b23071589e35d90af SHA512 0257664f1f7d25f69960a0c73c7a1fc3532b3e4ea263ac5e57c62c158e4b9afa0834f450a62a5cdccaa46e9a19d9b75eaffb756dc3ebb37ceda87f53e16e257e
diff --git a/app-emulation/wine-proton/metadata.xml b/app-emulation/wine-proton/metadata.xml
index 4e53c42efe00..330e8b084f6d 100644
--- a/app-emulation/wine-proton/metadata.xml
+++ b/app-emulation/wine-proton/metadata.xml
@@ -17,7 +17,6 @@
 		</flag>
 		<flag name="gecko">Enable mshtml support using <pkg>app-emulation/wine-gecko</pkg></flag>
 		<flag name="mono">Enable .NET support using <pkg>app-emulation/wine-mono</pkg></flag>
-		<flag name="osmesa">Enable off-screen rendering (OpenGL in bitmaps) support</flag>
 		<flag name="perl">Install helpers that require perl (winedump/winemaker)</flag>
 		<flag name="sdl">Enable gamepad support using <pkg>media-libs/libsdl2</pkg></flag>
 		<flag name="wow64">
diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 6843554f7424..b340c0774c60 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -29,8 +29,8 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
 	+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags +dbus
-	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-	perl pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l
+	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls perl
+	pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l
 	video_cards_amdgpu +xcomposite xinerama
 "
 
@@ -52,7 +52,6 @@ WINE_DLOPEN_DEPEND="
 	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? (
 		dev-libs/gmp:=[${MULTILIB_USEDEP}]
@@ -241,7 +240,7 @@ src_configure() {
 		$(use_with fontconfig)
 		$(use_with gstreamer)
 		$(use_with nls gettext)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pulseaudio pulse)
 		$(use_with sdl)
diff --git a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
index 440bd3ad68dd..b793da353866 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
@@ -29,8 +29,8 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
 	+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags +dbus
-	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-	perl pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l
+	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls perl
+	pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l
 	video_cards_amdgpu wow64 +xcomposite xinerama
 "
 REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
@@ -53,7 +53,6 @@ WINE_DLOPEN_DEPEND="
 	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? (
 		dev-libs/gmp:=[${MULTILIB_USEDEP}]
@@ -263,7 +262,7 @@ src_configure() {
 		$(use_with fontconfig)
 		$(use_with gstreamer)
 		$(use_with nls gettext)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pulseaudio pulse)
 		$(use_with sdl)
diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild b/app-emulation/wine-proton/wine-proton-9999.ebuild
index 8e09199023e6..09a70c2435d6 100644
--- a/app-emulation/wine-proton/wine-proton-9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9999.ebuild
@@ -29,8 +29,8 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
 	+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags +dbus
-	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-	perl pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l
+	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls perl
+	pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l
 	video_cards_amdgpu wow64 +xcomposite xinerama
 "
 REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
@@ -53,7 +53,6 @@ WINE_DLOPEN_DEPEND="
 	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? (
 		dev-libs/gmp:=[${MULTILIB_USEDEP}]
@@ -263,7 +262,7 @@ src_configure() {
 		$(use_with fontconfig)
 		$(use_with gstreamer)
 		$(use_with nls gettext)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pulseaudio pulse)
 		$(use_with sdl)
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index b87b82f4d074..c5fab13ab2b7 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -10,9 +10,9 @@ DIST wine-staging-10.0.tar.gz 9490601 BLAKE2B 2843d6fbeca285a258dbb7505e2451d183
 DIST wine-staging-10.1.tar.gz 9542987 BLAKE2B d23934dd7da9f324935087ad7cff74e544bc8191e3570a125e468c18a170459135ef37cce3780f4625c8b4e330c5bf3f32c59d1cd034a465def3ec60c7efa65c SHA512 1b837a2b0c417dcf1821139b0cf220995305b22e59cc5d93b5055d4c6dc9c36da7b05f6a9f136b5f1a60618e497c0e4d295343880504f7ebb1e9fafeb2f0b38a
 DIST wine-staging-10.2.tar.gz 9386579 BLAKE2B 2a6346a3091bc187cb6ecacb5bff28975cf1e0343254b83cb6fcb907eb0f2f418838e29b7093f4e1683f4402f3a8278fd58465b92f4f83a20e4962faa9a55a6a SHA512 e5ef197786c8dd50f21d000a19ec3c9acff6d93fcf975f3539e5fe54a951e31bbe97b882ce8f8b00f35757c85ffe377c966bb7b95b6cfb8e25d95ca9f2bc5e10
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718 SHA512 362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
-EBUILD wine-staging-10.0.ebuild 15607 BLAKE2B 217e6d06c39d684fe618a113b2c87410cc480bbc820409633e1945c75fb1167a0631b457ae350558f858dcf78b6390fe59c037bff140ca6498c9e2805829f926 SHA512 959034be3111ec72d9b080acfe147808bface3a2163d3130b24c357113d62b1601d65cd30c63858a6d2130c9a33be5339bae96d26ec1a4168c8407206da94090
-EBUILD wine-staging-10.1.ebuild 15607 BLAKE2B 217e6d06c39d684fe618a113b2c87410cc480bbc820409633e1945c75fb1167a0631b457ae350558f858dcf78b6390fe59c037bff140ca6498c9e2805829f926 SHA512 959034be3111ec72d9b080acfe147808bface3a2163d3130b24c357113d62b1601d65cd30c63858a6d2130c9a33be5339bae96d26ec1a4168c8407206da94090
-EBUILD wine-staging-10.2.ebuild 14912 BLAKE2B 153680409a9a30f8b1ee168943eff0c08150d2a4b45c728391dca0f0f3eb06a04984c30c803a2d14f918ff5d68bc82124794499294778fc581a67f4f13feec80 SHA512 e257c89fe4fa368e4b8305872ca81f784b7d8d446234940dba9cfeea4bb3703a12490b578af7b48f05a4a1aa2a9c01e252012182c1f90a882db187bfc0e4efe4
-EBUILD wine-staging-9.0.ebuild 15812 BLAKE2B 22f490c43be208335e726212916a95eb377048e0c67d400223cc33d0a9d870e427f8da43ce82c7c2c8188c654d654050196dac4803a2477c26871ed32c52d859 SHA512 9777651d4a2755e63c1674f73aad2a0cc344da8f1a26eb57dd188d5807536e305b02a0c0a58f67252471ffd76e55a0d9253117b5d772942d5ea9f94b7859c105
-EBUILD wine-staging-9999.ebuild 14946 BLAKE2B 593b839a3f3d2984d3907a2811aeb17e165f61e3b38eef674e7e490c3c298d775f402104bfa2d9de936d1c20f3b673b2130cf466c0626bebf1254b1f6872549a SHA512 6d0cd420a4071bf2a527d80f902365f8f7e26f1a2864dae1d5005a281b82547083f2b6f7eb8a8d4c4546885bf25457490d8ef3cac06eb66f37cb020556f71499
-MISC metadata.xml 2718 BLAKE2B 6848ef9723706ba3437fe18dbacf798cc2f266545c9241ceb9b5e83600bd1e82e80e9bc1d963f7a62e3b974af90d6e330305aaa77b9d578e20201ba1172fd775 SHA512 c89ca2bce23e50982f5cf846d58fe9f962da0eb8e13d7065fbba5e07afa072a9df000accf1fdb3829225b1fe3434d706be55749aa6b7d34e1f28ac91f82fa436
+EBUILD wine-staging-10.0.ebuild 15577 BLAKE2B 0e1884a58ff1a199faf4ec16ce00488efe604616d48771b8c60a2ea1e8157fba3bb8af3cc4d9f38b41c48ae0fe9a5cfcd5c7d612833850c832914fd4e24f445b SHA512 011883299f5e2087671f600cf2ceaa28c9960f6a50a6514a2a46a29ce222df5153438569b6c9d4c3fa36d9644e5c3a2adce12df21cad0c5ee762b44a576e9376
+EBUILD wine-staging-10.1.ebuild 15577 BLAKE2B 0e1884a58ff1a199faf4ec16ce00488efe604616d48771b8c60a2ea1e8157fba3bb8af3cc4d9f38b41c48ae0fe9a5cfcd5c7d612833850c832914fd4e24f445b SHA512 011883299f5e2087671f600cf2ceaa28c9960f6a50a6514a2a46a29ce222df5153438569b6c9d4c3fa36d9644e5c3a2adce12df21cad0c5ee762b44a576e9376
+EBUILD wine-staging-10.2.ebuild 14882 BLAKE2B 22f9de28c34fc196efbb7ec0ea0f3ffd26a7cf6e3330e9760a96c5d711886b89596b26943c2c1d4008092800e86aa57d04cd82897f0210621bf12c7151a6eca0 SHA512 35224e453261e4164218d269dcd55be965c2a4566c631f3e34752d5ddbf4a28e036673f4f4255115521e23eac6bf5361ef3a41276b01be362656b7e8b08a8a11
+EBUILD wine-staging-9.0.ebuild 15782 BLAKE2B c211258535d08aed5f878dbe6d8e7df30229128d3fd84b20f9090711e27f14b0f98033abde5536db4eb01f74bc8c934e9fdd08d2fe75cf5cba60d941c4e743d9 SHA512 26bde08bc29971c0d7bfee39cad0d262bc11803ef7302f3ee890b5f8bbb9c9507fce09188beaef7162158d6158a0f644cb626f39cc5d11e37023fa38eb454c77
+EBUILD wine-staging-9999.ebuild 14916 BLAKE2B 912e67caded0814a2d3492fec8a2f525a5b0ecf5a3fd699a761a0f90210b7f838ba06ba5114c9fedc630bc5b3592086b2340a854a8c8ba907b5c523038ba1451 SHA512 6875f9dd661466ba1786f8091a95c48d40d347b12868ec613f8cb8dea10d9e15629afce41e0bcd8bf1f4e4f43c3a35d87ed06d9f9a939b5ec1d5f33c4e8a1c2a
+MISC metadata.xml 2633 BLAKE2B 9e8d90c3e1057c2087150657a6cb7e33609d981b11a8a490bf9479c85e9759b32dfb0d4d3179e1cd04192f6949c083d21097eac5ac47e7e38e9fd252b1df5133 SHA512 3f4df059fe41f12b5cbe8f5a5596646bae991860dad281572dcf4cb74596446bcea50d274418c6b2640d4e2a1818e9f14c784596ab3ceff8a7fa2551839371cd
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
index 814d877adcbe..8cbdba795852 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -24,7 +24,6 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
 		<flag name="mingw">Build PE files using a MinGW toolchain for better compatibility</flag>
 		<flag name="mono">Enable .NET support using <pkg>app-emulation/wine-mono</pkg></flag>
 		<flag name="netapi">Enable support for configuring remote shares using <pkg>net-fs/samba</pkg></flag>
-		<flag name="osmesa">Enable off-screen rendering (OpenGL in bitmaps) support</flag>
 		<flag name="pcap">Support packet capture software (e.g. wireshark)</flag>
 		<flag name="perl">Install helpers that require perl (winedump/winemaker)</flag>
 		<flag name="samba">Pull in <pkg>net-fs/samba</pkg> with winbind for NTLM auth support</flag>
diff --git a/app-emulation/wine-staging/wine-staging-10.0.ebuild b/app-emulation/wine-staging/wine-staging-10.0.ebuild
index 308ff1a0162b..f39be8491538 100644
--- a/app-emulation/wine-staging/wine-staging-10.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-10.0.ebuild
@@ -38,8 +38,8 @@ IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
 	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-	+ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+	+strip +truetype udev +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama
 "
 # bug #551124 for truetype
@@ -63,10 +63,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -297,7 +294,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)
diff --git a/app-emulation/wine-staging/wine-staging-10.1.ebuild b/app-emulation/wine-staging/wine-staging-10.1.ebuild
index 308ff1a0162b..f39be8491538 100644
--- a/app-emulation/wine-staging/wine-staging-10.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-10.1.ebuild
@@ -38,8 +38,8 @@ IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
 	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-	+ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+	+strip +truetype udev +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama
 "
 # bug #551124 for truetype
@@ -63,10 +63,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -297,7 +294,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)
diff --git a/app-emulation/wine-staging/wine-staging-10.2.ebuild b/app-emulation/wine-staging/wine-staging-10.2.ebuild
index abce0fb8e199..5a4db8f22225 100644
--- a/app-emulation/wine-staging/wine-staging-10.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-10.2.ebuild
@@ -38,8 +38,8 @@ IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
 	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-	+ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+	+strip +truetype udev +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama
 "
 # bug #551124 for truetype
@@ -63,10 +63,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -296,7 +293,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)
diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index fa7cc2f0f157..49959cf9bbcd 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -37,7 +37,7 @@ SLOT="${PV}"
 IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+	kerberos +mingw +mono netapi nls opencl +opengl pcap perl
 	pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
 	+truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite
 	xinerama
@@ -63,10 +63,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -305,7 +302,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 9839169937b5..6a55fe4a74ce 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -42,8 +42,8 @@ IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
 	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-	+ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+	+strip +truetype udev +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama
 "
 # bug #551124 for truetype
@@ -67,10 +67,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -300,7 +297,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 54b73ca64fcb..d35ca6b138fd 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -7,10 +7,10 @@ DIST wine-10.1.tar.xz 32026152 BLAKE2B 573c4cc10c96c164eb02111b0a457be5500ab42c6
 DIST wine-10.2.tar.xz 32050716 BLAKE2B 78a60d82640c9ffdf8a96b58aaa8a86cce0f67d48dc082e97a2bfaf077f849b99fa7d5418a42d2f18176afedd9a7270a08ca872af5c43c10fd64fe1eddf7cfdf SHA512 893395e29d72898579850c4084838c76b8a53659b4a3917e47d853733fafaa0e57bfde31437862955cdfab94327622eb290488d6120d76eeb2a4fa70dff5ef67
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb SHA512 e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
-EBUILD wine-vanilla-10.0.ebuild 14522 BLAKE2B 33853d2c30da59520cad0c6f09d9fb75d2e7f94695f38834f67d7436734c78cdd3a9d25452e53e94ab53ff71d8adea50191a2d1aec7442674aa3f3fba79e38c8 SHA512 2a812c038e82c83c41e16920ecf59cdf829d6a11c30ba49f152d3902fc1a39c537c692d51dc732af36e11775cb34f53fbbef63a807b8fe58261d707963e47d02
-EBUILD wine-vanilla-10.1.ebuild 14524 BLAKE2B 325715d8442cfef99df29675522edff14a1890a92f2daf16ba5e0b8a12f4561d52cd82198cf7cc584b5f3c433e6dd516f66713891df5394ab66e223ff8468c21 SHA512 bc453ca62bc930fa93e97429bb9f7093c33dc474ec8a578c61a0675083c9ac17ca726737c23a71e2fe83485420e0e62c66fafc57394d0d2162a5fff7a09a538f
-EBUILD wine-vanilla-10.2.ebuild 13829 BLAKE2B 10deb3eb8ad20b05cdc748eb6d9f5df178e3695bdd13b7a7c6d557e6acb664cfbf5f96e174bd6381144657487c17b7d99ec82e10bc81c8f30847f269cb93c9eb SHA512 37698915958835f6ae3c9cb454e90982bed6229f46ecd317c6b7dd0c6bf7de12268d7b1bd5bbf75a5d00114b05eeb48b3070956cfa9a6781535121d033a657b6
-EBUILD wine-vanilla-8.0.2.ebuild 13019 BLAKE2B f47289950b744f96ba53e6cf4d00e581ff4b5775e667d3e976cb1cc40009738b22025b2ffd5d19ee8475f27be5d988b7482fe005e2f90d1eded7bd1c264f4ac7 SHA512 1051daf2a50aa69c9f0e6237d2ede6752b2eae115e898a268a514c43303cc1d96cb24cffdc93d610f673699492cfe8f035a90ae5680fe5e3f2aeee7d7f41d9b5
-EBUILD wine-vanilla-9.0.ebuild 14297 BLAKE2B ebb667b5bc70d9c3daab952eaf9ba99cbd953891b154589ac955638a866104f74443c4b80116ce8feebd103676fcfee4c6a06008132c7c5a9d66d6e960918eb6 SHA512 bf1afdd4252befdeb37326a278a456484c100b1c6f0aad792f3d47af3acc389403d1d640dfcac7536ddcb4ad1cdbce82593bc9c4681a3a503403209441847480
-EBUILD wine-vanilla-9999.ebuild 13863 BLAKE2B 8ba2d7cd7a997c97d2f8f284eed2cf3a5efecf7ecf2225c2e4543d0cb1b306de682f88520da1233a6ef6a1b729954cac6d433f757f3c860c2cd697a3d91433cf SHA512 8a020c43d1e106525230ba0e0b6233fbe952bb69d9694d1645624cbb52eab69713a6c6ce078cc21a606b113615f258deaea0b91a1f8f1281b9233b33785a7949
-MISC metadata.xml 2694 BLAKE2B 01c000d837b123829986a3f60d8d70b7f3a294ed5b51a024f65c132daa7536237632c76113c866c250178bd44f833c2de6d3e4c77904dfa5ff7e8fb9a7dd332e SHA512 749d959889c8669c07e3f85c79780a08038b2547f4a9b343cb4f38bd79e62a36909723d405ce2f9c8c509720d7817bd2da21fd832b15ff63dd0bca04745319b6
+EBUILD wine-vanilla-10.0.ebuild 14492 BLAKE2B 144fbd586c698224121bf9a2b3fe863dc3342796a9bba715b6d2bb8880a7ffadc4a9194e0893a949aadd0a0c5958fb852db1c50a271ceae57c55bc9deb550fff SHA512 3a32acdf80140154781af6b4177aceef2c7518a465370c6c557ddea2d57deb9ae1b46797288a40fb06c5dbeff74c07d65de6a3e5f1506894e09faf47bcd9459c
+EBUILD wine-vanilla-10.1.ebuild 14494 BLAKE2B 6e61a54de54038f619944b434e11d4b692306a56f50a7193db7882ad6642e5b5c2ab81bf97f236a42eb1de9b9fe93c8e437bccd253cfb9ed6afb043a00835325 SHA512 e0ad544f5bbba21285809a8466a6fba3422af6a0c2cf373e3586c7d09613a0798e6d7abc76ba96052f9b55328337f2a623ac4fc73d8c0a687c9cdd20bab2f8be
+EBUILD wine-vanilla-10.2.ebuild 13799 BLAKE2B 5443b67f58b850c08d927183f74a366a15832be3ba6eb47c2f39a6f0087ffa9cfeab986f9c61d454907f07b5087dd8e8ec0bc479ed74abefef0ce8ef28a0dbb7 SHA512 c0c3fb053a93b02ccdfe92e81c64f0201ee611907474416321ffd7e254a9e59416f25d3bfbcebbd86484c62251dba1a8c82a9296d218ceac03f8fc328eac9ff7
+EBUILD wine-vanilla-8.0.2.ebuild 12989 BLAKE2B 7d0c26640bdcc8058e39a4b5213b17329297c808e829bef0d6c2e50e2220e4aa391ef61e57d4636a8af41146f2e483efd451e9084b9d4ba1896b8d0ca41d5c54 SHA512 1d54a432b9f0497e9316affb138ff4375f8944ab3765b6b53b4f97e396f6ca1984086c099841170b26d226eeafad4650c609b0c99956351cd0486db488c79544
+EBUILD wine-vanilla-9.0.ebuild 14267 BLAKE2B 5baa32520fe0b205779283071708a723b365b083717ac606f131709dbe9664ae4c01b21eb8afa011bf06efffb477666ba13147c25dbde5f41681496970b31202 SHA512 923c6640b0d66a1bbf6b8c13fa82729a5317f2d7ea3003843a2f60d42b4c03c586b09633094f102ba48f33052131eea61f1cb2a7a0076d261b22de95118dbe4d
+EBUILD wine-vanilla-9999.ebuild 13833 BLAKE2B 2df8edc571e2a3362d05cb63fd4f96f6380028368b436e3e60e8a22e2a0938ce7e8f7016934aa4ed81c797e4824b2f69ce28fdc99e3dbed64baa0d4db7c87496 SHA512 867f37013536a796666de7873dd619287a4ed4f050a4448685b5885f055c884c9741d1c2185417949fee62ccb167631d2344e6cad62d3e9e5f8ee412ae61b8c9
+MISC metadata.xml 2609 BLAKE2B 661213a596367cb5a894c3bef5f76760702d98af719dff4f279222a66e70a029a353850e5b23303182c59abfef308248a785d9b347b28b861d36f85286bf2bea SHA512 886470078e89a55ef1aaa248f1b5aab84da1d8ed86fdf387d137fa51badfd9658cb99ac7cd42d321ed212979b690bdb236e9de68c6bdd7e647dc22cbfc75778d
diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml
index dd7a4eda1c35..8356618ad2f1 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -24,7 +24,6 @@ This variant of the Wine packaging does not include external patchsets
 		<flag name="mingw">Build PE files using a MinGW toolchain for better compatibility</flag>
 		<flag name="mono">Enable .NET support using <pkg>app-emulation/wine-mono</pkg></flag>
 		<flag name="netapi">Enable support for configuring remote shares using <pkg>net-fs/samba</pkg></flag>
-		<flag name="osmesa">Enable off-screen rendering (OpenGL in bitmaps) support</flag>
 		<flag name="pcap">Support packet capture software (e.g. wireshark)</flag>
 		<flag name="perl">Install helpers that require perl (winedump/winemaker)</flag>
 		<flag name="samba">Pull in <pkg>net-fs/samba</pkg> with winbind for NTLM auth support</flag>
diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild
index d402e8142ed6..0f4edbb98e62 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild
@@ -32,8 +32,8 @@ IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
 	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-	+ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+	+strip +truetype udev +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama
 "
 # bug #551124 for truetype
@@ -57,10 +57,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -260,7 +257,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild
index fb43916272f3..15cbd19b2310 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild
@@ -32,8 +32,8 @@ IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
 	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-	+ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+	+strip +truetype udev +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama
 "
 # bug #551124 for truetype
@@ -57,10 +57,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -260,7 +257,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.2.ebuild
index 51e759a24b10..339938d64acc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-10.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-10.2.ebuild
@@ -32,8 +32,8 @@ IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
 	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-	+ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+	+strip +truetype udev +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama
 "
 # bug #551124 for truetype
@@ -57,10 +57,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -259,7 +256,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index 997fc15550b4..ff774423182b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -30,9 +30,9 @@ SLOT="${PV}"
 IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux +ssl +strip +truetype
-	udev +unwind usb v4l +vulkan +xcomposite xinerama
+	kerberos +mingw +mono netapi nls odbc opencl +opengl pcap perl
+	pulseaudio samba scanner +sdl selinux +ssl +strip +truetype udev
+	+unwind usb v4l +vulkan +xcomposite xinerama
 "
 # bug #551124 for truetype
 REQUIRED_USE="
@@ -53,10 +53,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -231,7 +228,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index d1e8119eee1c..2479d9296621 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -31,8 +31,8 @@ SLOT="${PV}"
 IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+	kerberos +mingw +mono netapi nls odbc opencl +opengl pcap perl
+	pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
 	+truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite
 	xinerama
 "
@@ -57,10 +57,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -258,7 +255,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 872bc955f08e..8ee0f458d65c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -36,8 +36,8 @@ IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
 	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
 	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-	+ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+	+strip +truetype udev +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama
 "
 # bug #551124 for truetype
@@ -61,10 +61,7 @@ WINE_DLOPEN_DEPEND="
 		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}] )
-		)
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
 		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
@@ -263,7 +260,7 @@ src_configure() {
 		$(use_with nls gettext)
 		$(use_with opencl)
 		$(use_with opengl)
-		$(use_with osmesa)
+		--without-osmesa # media-libs/mesa no longer supports this
 		--without-oss # media-sound/oss is not packaged (OSSv4)
 		$(use_with pcap)
 		$(use_with pulseaudio pulse)