7 files changed, 388 insertions, 9 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 9c08881cef91..2bb3d1c81adf 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 0f3f2b84d697..c7be2e3a79e2 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -4,13 +4,16 @@ 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
+DIST wine-8.8.tar.xz 29181484 BLAKE2B 43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac SHA512 e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 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
 DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5 SHA512 42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
+DIST wine-staging-8.8.tar.gz 9509284 BLAKE2B f8a25b9a3a52b8bfc98d8eea6c22f9648d8e6040d12dd4a8a2dd13199ced954292f141c4b4ae4fc7748d5fa7f6b0fa1cdd535a27b1495150bdee5f50b940ab8d SHA512 7178ab98ca77a2892f9c827d1af51c9b98fe8c9559f6708fc63f73d3ebed96bd1a158179c5eed83d4c89bc57f0120e9cafddb1e0dbb77587054ae29a60eddaf5
 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
+EBUILD wine-staging-8.5.ebuild 11658 BLAKE2B d6753f0f2279d1a3650508e7589d9a4e99c314d84297b3e33cb605e652bee3cac8e3b87902a684fd58f46e3bf7f483e250ecd957d891c0710e8a0ed30997d529 SHA512 db58cd413b511aff416071187989aa6e313a92ed230b511a2869b614fcd4e47c0ce0cb46ace9891135c8f9ca2f265ca6978afec2173f60a5cf84df26af02fa44
+EBUILD wine-staging-8.6.1.ebuild 11676 BLAKE2B 9a8cccc8ed69b4a4e1ec893b62b409bb300520c9838ca4eaf8c6f1137958634add6fb1a06cd51a5ada4e6f853d3e08fceae27bf0aec1b114da42001614225f73 SHA512 206a50ba10a889efad7d946632370f1a561ddc62e3150473db863e39fae72be9616adfe3605f0c76e2cbac5ab8adadafbb4efd86869457d8d85fbbdaae3cdb87
+EBUILD wine-staging-8.7.ebuild 11698 BLAKE2B f2bd42b2238b459ff63fd1fd9893dca0e1f8c4035e3644af53089a24e12ec252261228b8a5db7aa1a7e0acbb847fd8c2370f15d079ab4a26a56637eaf37402e7 SHA512 7b438481f7cb552064922f72cc21cc5ef7bc3d893ffc29001c06f52135760ce6547c52dd3cf6cb058c7658a07b31811bb8c821dcc4e3b2a4a552a3d81be97d64
+EBUILD wine-staging-8.8.ebuild 11697 BLAKE2B d30b90315932767b0665eed8c4f81ed15149c5fe7825fc3e3a0b065e3af5cfe62d330a898c6c8f4ac44eccaf20d805eee5876b8c6f2afe520b51d451eb1ee2cb SHA512 a0bdc27c94a52fe90f5019190e25062414501ac0dd00a7be31d46ce91d7ba7f75f0536802bda7a8e8298244e8d33a13840d0a94219320ded33995f43d14a8657
+EBUILD wine-staging-9999.ebuild 11697 BLAKE2B d30b90315932767b0665eed8c4f81ed15149c5fe7825fc3e3a0b065e3af5cfe62d330a898c6c8f4ac44eccaf20d805eee5876b8c6f2afe520b51d451eb1ee2cb SHA512 a0bdc27c94a52fe90f5019190e25062414501ac0dd00a7be31d46ce91d7ba7f75f0536802bda7a8e8298244e8d33a13840d0a94219320ded33995f43d14a8657
 MISC metadata.xml 2390 BLAKE2B aa4087a0d17d80d3495f36fc3dc1c436a757a06f5df6113deb03c129ee7e3b9ed5967784fdc37c3f572f70d997f0a88d887a9c33f038501f87348b2c913f4327 SHA512 9dd1a6ccbefa7853a50b51242248e88bc690fc57446545bf2f946f7673bc8ff4ec1870909ee4060dcc07fe177c0e4118dd374874a1f467401db15f1d385b69ec
diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild b/app-emulation/wine-staging/wine-staging-8.5.ebuild
index 1d9218bfa197..df75c4969c98 100644
--- a/app-emulation/wine-staging/wine-staging-8.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 
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 cab12fde862c..18f222e446b5 100644
--- a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 
diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild b/app-emulation/wine-staging/wine-staging-8.7.ebuild
index f7296349f46f..bf02447a2a5e 100644
--- a/app-emulation/wine-staging/wine-staging-8.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 
diff --git a/app-emulation/wine-staging/wine-staging-8.8.ebuild b/app-emulation/wine-staging/wine-staging-8.8.ebuild
new file mode 100644
index 000000000000..b969d1e39e6f
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.8.ebuild
@@ -0,0 +1,376 @@
+# 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_{10..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://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"
+	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
+	https://gitlab.winehq.org/wine/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
+			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 )"
+# 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 bbf0f0ca9656..b969d1e39e6f 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 
@@ -19,7 +19,7 @@ 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://gitlab.winehq.org/wine/wine-staging/-/archive/v${PV}/${P}.tar.bz2"
+		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/wine-${PV}"