gentoo auto-resync : 27:02:2024 - 05:40:23

21 files changed, 460 insertions, 48 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index cd5e349288ae..50ee96828c5b 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index 335475862807..f3105dccaeee 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -6,6 +6,7 @@ AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf
 AUX wine-proton-7.0.6-mingw64-11.0.0.patch 849 BLAKE2B 26833ef532e7c5b8b0ae1442485c6c44f55a550c571942be2a894aada62ce87398973dfa5619f5a8d498b51479dda84eeae72803370539a7d28575a74310e173 SHA512 189bb20e8c399374567db308c2d3cf43a2b5e2d76b43970edaa3975c0c4ddb7fa245b9d05ed0f7a3452c8bf5264e743acff5a4830a94abd1c7df13664afc21e7
 AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cfd7666363bede5dddedd2449e07251823b1ce86a717e06d342eec782aff501f27bc23433511c163da0b2a50c411df7ac53 SHA512 82ff0510fcab35471aa0db8f32f48cd62dbf78b3f5f36e3d191b86be55cb476df1ee689e5cd53c95d4f02199b5900eb0c8a45959693739a6c35e4c8b3cfa243f
 AUX wine-proton-8.0.4-restore-menubuilder.patch 382 BLAKE2B 04df3b2e495f49b4d66bc70a1198a3ab6c4dbb95c3ff145069b7086cf87de7233a1f5d6e56c861c0ff6f7e4b0869bb7ddf29a35ca9f32e47c05bf71fd0823ef3 SHA512 08bf5accb1ccf38519d5054c2d297da87aef0df5b5b5336d96e4b98a3af202ae8220c1e8cdf282c24b2706628e14a1afb7ff5f21f4a7a9f8e3f4f301f9e44c57
+AUX wine-proton-9.0-rpath.patch 356 BLAKE2B f988fefb9590d1c8735f480349172b7c7634256ef07bfe19bc5a7e04363d1832cc999d7c30b78dc5af2f4a1c9bfac1f4fa5458461b865864dc3bbdff4e9f71fa SHA512 f0de44022c856ed9b058e6c64146e464e375114d56bcc369a7e72df847a4de0ad31cbb06042df3f6836b681cd342b8a228cf514a51ed9796542a4d9ea42a03e6
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-4.tar.gz 48317622 BLAKE2B 53047016897c8919cf3b51d7e51025806d267bb2f04fb3d464b8cf0f133c36b53d9c6c3e591aff4c71a95c6e167eed67b6ad84cc549e1aa1682175233da79835 SHA512 837772856aafb4d47c700997655c0d98f17cafdcc76008e04d064dd071e8d3163ed094bfc57441ef8ec4f2f7ea6303815351dc707ce5515f8c22f9aba8c5f83b
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
@@ -13,4 +14,5 @@ EBUILD wine-proton-7.0.6.ebuild 11701 BLAKE2B 8ea28df1e61349ab91b8930a720c1d265e
 EBUILD wine-proton-8.0.4.ebuild 12191 BLAKE2B 52012f33cf665f915bfa6e86d73727862b27d1e1f334c6b4ec55e77519eea84e6a01821f4f0928dfbc6006708ddfb89c6e267f1de7f77b809688a5f52dbba04d SHA512 9ad84e5477b4e698239faec970992d20d1dca660e0009785d81a1c8d3f307caf8356771bd1b7ab705e0f1880655c23a357a5b547ab3eb05ca3cded82ea4621f7
 EBUILD wine-proton-8.0.5c.ebuild 12316 BLAKE2B 33035edca356091865ab26c2355cc7cf5d0d509699fb1e12226c5fff3ac608d4909ace1dfa802789f81992a6b0c0dfc397514dcc4e3e94a29c24ea93efbdd633 SHA512 b5c2f44f48e09258b81240b7b4b545b5c4d283416fd083d97faffb1ecc2937c25973a687c48900eaae5fda08f2d451af5bce482f4beeb39cafd7025df1da72cb
 EBUILD wine-proton-8.0.9999.ebuild 12376 BLAKE2B bc65e631edfc12ab8f86f4bbb74bf12337ccff6da5357c182bd63a8214e51072eaef566a4847435bab2520b3eef8d16caba30b9e4a42de112a4d251cc2b15342 SHA512 4796664c55b7ff0b20c8015a20828606ca8f08215bb8f4e9c03bc7b8adb86b755bf923be277e99646f64e99d0cf3a1434426f86dd5b0f5c248ac2dc22e5e3a71
-MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
+EBUILD wine-proton-9.0.9999.ebuild 13484 BLAKE2B 82de343c4faf7e6aada72ffdf7ac52206bfd3432b0f0f34b75e6c001b0353e83e26be9281af301d6dcf86c77aa99e8a3c21a268544e4280354ca3a591ce49958 SHA512 d2f75869288714c2e709aa43815ec4b05adb9b6eaa3681da545e06429b1a285ff58ba423515556a851579c6b8d00e4c36539be690e7208e5b2627d937bf1fb0c
+MISC metadata.xml 1528 BLAKE2B 7f7a6ed659838e294adb23bc9855249b2c659ef7c1d8e13e81c9f2ea84723080ae0e4ec94be60449f074b5e35fff9969927f3e27c8a85b8a3457bd58e3fe0674 SHA512 64e6bb278f461c3bcfe4da1ecefbd8e94ed43734d29ac20f7fe8b9f2e1ce16ccfc4937cf83eab57252d5cce3f96a585882c3e30a5a1d511052b6d5c74c001ecf
diff --git a/app-emulation/wine-proton/files/wine-proton-9.0-rpath.patch b/app-emulation/wine-proton/files/wine-proton-9.0-rpath.patch
new file mode 100644
index 000000000000..78e4393d390d
--- /dev/null
+++ b/app-emulation/wine-proton/files/wine-proton-9.0-rpath.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -813,8 +813,11 @@
+             ;;
+         esac
+         ;;
+     esac
++
++    # do this at the end because it needs double dollar for makefile
++    WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"])
+     ;;
+ esac
+ 
+ enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
diff --git a/app-emulation/wine-proton/metadata.xml b/app-emulation/wine-proton/metadata.xml
index e0ea57df1f22..16afd8a54c41 100644
--- a/app-emulation/wine-proton/metadata.xml
+++ b/app-emulation/wine-proton/metadata.xml
@@ -20,6 +20,13 @@
 		<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="vkd3d">Enable DirectX 12 support using <pkg>app-emulation/vkd3d</pkg></flag>
+		<flag name="wow64">
+			Enable running 32bit applications without 32bit ELF
+			multilib by mapping to 64bit calls (experimental,
+			may have worse OpenGL performance or other issues
+			compared to USE=abi_x86_32) -- still requires (just)
+			<pkg>dev-util/mingw64-toolchain</pkg> with abi_x86_32
+		</flag>
 	</use>
 	<upstream>
 		<changelog>https://github.com/ValveSoftware/Proton/wiki/Changelog</changelog>
diff --git a/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild
new file mode 100644
index 000000000000..42b55c99ed92
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild
@@ -0,0 +1,414 @@
+# Copyright 2022-2024 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..12} )
+inherit autotools flag-o-matic multilib multilib-build prefix
+inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
+	EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+else
+	SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-wine-${WINE_PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Valve Software's fork of Wine"
+HOMEPAGE="https://github.com/ValveSoftware/wine/"
+
+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
+	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+	perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+	usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
+"
+REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
+
+# 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="
+	dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	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}]
+	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}]
+		net-libs/gnutls:=[${MULTILIB_USEDEP}]
+	)
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
+# gcc: for -latomic with clang
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	sys-devel/gcc:*
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libdrm[video_cards_amdgpu?,${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	pulseaudio? ( media-libs/libpulse[${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}] )
+"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	gecko? (
+		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+	)
+	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
+	)
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	!crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
+	)
+"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900332)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-musl.patch
+	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
+	"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
+	"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
+	"${FILESDIR}"/${PN}-9.0-rpath.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}) \
+			$(use abi_x86_32 || use wow64 && echo 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"
+				eerror "--> Note that mingw builds are default for ${PN} even without this USE."
+				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
+
+	if tc-is-clang; then
+		# -mabi=ms was ignored by <clang:16 then turned error in :17
+		# and it still gets used in install phase despite --with-mingw,
+		# drop as a quick fix for now which hopefully should be safe
+		sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+
+		# needed by Valve's fsync patches if using clang (undef atomic_load_8)
+		sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
+			-i dlls/{ntdll,winevulkan}/Makefile.in || die
+	fi
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# similarly to staging, append to `wine --version` for identification
+	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
+
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	# proton variant also needs specfiles and vulkan
+	tools/make_specfiles || die # perl
+	dlls/winevulkan/make_vulkan -x vk.xml || die # python
+	# tip: if need more for user patches, with portage can e.g. do
+	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
+	#     > /etc/portage/env/app-emulation/wine-proton
+}
+
+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
+
+		$(usev wow64 --enable-archs=x86_64,i386)
+
+		# upstream (Valve) doesn't really support misc configurations (e.g.
+		# adds vulkan code not always guarded by --with-vulkan), so force
+		# some major options that are typically needed by games either way
+		# TODO?: --without-mingw could make sense *if* using clang, assuming
+		# bug #912237 is resolved (consider when do USE=wow64 in proton-9)
+		--with-freetype
+		--with-mingw # needed by many, notably Blizzard titles
+		--with-opengl
+		--with-vulkan
+		--with-x
+
+		# ...and disable most options unimportant for games and unused by
+		# Proton rather than expose as volatile USEs with little support
+		--without-capi
+		--without-cups
+		--without-gphoto
+		--without-gssapi
+		--without-krb5
+		--without-netapi
+		--without-opencl
+		--without-pcap
+		--without-pcsclite
+		--without-sane
+		ac_cv_lib_soname_odbc=
+
+		# afaik wayland support in 9.0.x currently cannot do opengl/vulkan
+		# yet making it mostly pointless for a gaming-oriented build
+		# (IUSE="X wayland" may be added in wine-proton-10 or 11)
+		--without-wayland
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		$(use_enable video_cards_amdgpu amd_ags_x64)
+		--disable-tests
+		$(use_with alsa)
+		$(use_with fontconfig)
+		$(use_with gstreamer)
+		$(use_with nls gettext)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pulseaudio pulse)
+		$(use_with sdl)
+		$(use_with ssl gnutls)
+		$(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 xcomposite)
+		$(use_with xinerama)
+
+		--without-vosk # unpackaged, file a bug if you need this
+	)
+
+	filter-lto # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+
+	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
+	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
+	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
+	then
+		has_version -b sys-devel/binutils &&
+			append-ldflags -fuse-ld=bfd ||
+			append-ldflags -fuse-ld=lld
+		strip-unsupported-flags
+	fi
+
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# CROSSCC was formerly recognized by wine, thus been using similar
+	# variables (subject to change, esp. if ever make a mingw.eclass).
+	local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
+	local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
+	local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
+
+	conf+=(
+		ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
+		ac_cv_prog_i386_CC="${mingwcc_x86}"
+
+		CROSSCFLAGS="${CROSSCFLAGS:-$(
+			filter-flags '-fstack-protector*' #870136
+			filter-flags '-mfunction-return=thunk*' #878849
+			CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
+		)}"
+
+		CROSSLDFLAGS="${CROSSLDFLAGS:-$(
+			filter-flags '-fuse-ld=*'
+
+			CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
+		)}"
+	)
+
+	# order matters with multilib: 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
+
+		if (( bits == 64 )); then
+			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
+
+		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
+
+	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
+	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
+	# one or the other could be missing and that is unexpected for users
+	# and some tools like winetricks)
+	if use abi_x86_64; then
+		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine64 ${WINE_PREFIX}/bin/wine
+			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+
+			# also install wine(1) man pages (incl. translations)
+			local man
+			for man in ../build64/loader/wine.*man; do
+				: "${man##*/wine}"
+				: "${_%.*}"
+				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+				newins ${man} wine.1
+			done
+		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine ${WINE_PREFIX}/bin/wine64
+			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
+		fi
+	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)
+	dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+
+	if use strip; then
+		ebegin "Stripping Windows (PE) binaries"
+		find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+			-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
+		eend ${?} || die
+	fi
+
+	dodoc ANNOUNCE* AUTHORS README* documentation/README*
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT=
+}
+
+pkg_postinst() {
+	[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
+
+	if use !abi_x86_32 && use !wow64; then
+		ewarn "32bit support is disabled. While 64bit applications themselves will"
+		ewarn "work, be warned that it is not unusual that installers or other helpers"
+		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
+		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
+	elif use abi_x86_32 && has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
+	then
+		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+		ewarn "applications under ${PN} will likely not be usable."
+	fi
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index fbc29746f0f8..b7561b2ddb80 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -13,11 +13,11 @@ DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853
 DIST wine-staging-9.1.tar.gz 9650475 BLAKE2B d5ef171f5314c3d980bf3404b4a7e51b57e8320fb3b08c42231078816b821b6a019e9d0dc2b11607d6f74bc7ab7c495166acafdc3c093136a44c9716084d7e9e SHA512 070e09acf8bca60a4f2512874f48f653cc03a7fcfcfef34b4f292731d49e0670a5cf69557c268fc5dc11f0a7a8e0e7347d9665b98e6bb47e0521e3fe164ff118
 DIST wine-staging-9.2.tar.gz 9662465 BLAKE2B 6b78558c9b4ff5d6afb1e44163e35bef2bd56c4dd492262e479d191490dd97a2a008e6c4d8b6f5a4305e1195781519e5cee94eb2c80ab76e87a522127c692e1b SHA512 9b04e1359c1b485fabc7de5b3e685f8e8b8f60951b0168484aaaecce9e524df45813edfdf4a6f3b1b69bffee4e3ba4c5b7eeabcdf260f1409d1d72f0e9a00cd0
 DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221 SHA512 56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6
-EBUILD wine-staging-8.0.ebuild 12836 BLAKE2B 6851d4d9aa839fef0e25e471543b4eba2545144998a12e096c934f256ada37b51c062a8ebe4093ff4e98b6c307b12dadf2735e4c76484b802b9a25ae9a37b85a SHA512 319561efaeeb894dc3008c0e1b539f27a3e7617130efd96c3efbdcd7dabacbf4cf46a3fdd93bef27155511afd667302495a4b8a76a3f00a8b670b904c9f0e5b6
-EBUILD wine-staging-8.21.ebuild 14976 BLAKE2B 5d032f089ef4134e0736745d191ae376e195c2f1d4a00ae114e73089bfd3ef09b6ba3bbf18ea5c2486949039fed73f987a7e137e44cb63b07acf85237ff14480 SHA512 fc9dd6fedca35885512a8256feef4e1fba3f94f2ba43de926b2b6673351208c8832360849130074d43c7926b3388013d800388b77b8a525e1e2f6be9fd1d21d0
-EBUILD wine-staging-9.0.ebuild 14688 BLAKE2B d229ce4c8a930b108292003fa9e5a79737a9dc996c1db87dbade39dddfbbd306b840a54eda3163fd4bc9fdfa6f6273e6de779a81900173c7078b9d207144b1d2 SHA512 660c1c6205472698b7d1c74418bc9cbdf73debe1b388c554a42a1de410147fc7b970848e1599dfde5d4cdce5abbce65654c625380769f7eea28f05b9756c42bb
-EBUILD wine-staging-9.1.ebuild 14818 BLAKE2B ff27eac8bf43cb190d8590d202e53a9eed22ad68a8d077919bc3c4753334a7416be070959df93c96483ee5d393dcb76392a40608622a84f83a042b5d854c744c SHA512 7e53965cdfc64c88710d9303b81e227a7640dc45df86d50bde20de6011558883d6dee445398de4fbecb4ba542e955f70ab476031155dd372f33dd9f305f08305
-EBUILD wine-staging-9.2.ebuild 14818 BLAKE2B 6b7ae50197ccf6863592d8b2463798db04d5d2f7cba2e5c3d5f497c1a95510307ef492ddc14f3ae5122795c426e145957c3c9b0a84917710a0d862b6d80a1d98 SHA512 f3a6b242494ef800de01890481dde1a011b20c15dcf0b4f5b1670b61e08e990cc68238c92a8c2bb8ad093b876f1947a1d934e675619f10f236285619a82735b4
-EBUILD wine-staging-9.3.ebuild 14818 BLAKE2B 6b7ae50197ccf6863592d8b2463798db04d5d2f7cba2e5c3d5f497c1a95510307ef492ddc14f3ae5122795c426e145957c3c9b0a84917710a0d862b6d80a1d98 SHA512 f3a6b242494ef800de01890481dde1a011b20c15dcf0b4f5b1670b61e08e990cc68238c92a8c2bb8ad093b876f1947a1d934e675619f10f236285619a82735b4
-EBUILD wine-staging-9999.ebuild 14818 BLAKE2B 6b7ae50197ccf6863592d8b2463798db04d5d2f7cba2e5c3d5f497c1a95510307ef492ddc14f3ae5122795c426e145957c3c9b0a84917710a0d862b6d80a1d98 SHA512 f3a6b242494ef800de01890481dde1a011b20c15dcf0b4f5b1670b61e08e990cc68238c92a8c2bb8ad093b876f1947a1d934e675619f10f236285619a82735b4
+EBUILD wine-staging-8.0.ebuild 12784 BLAKE2B 4f3cc62c2834489d51bef78cecd10e8311a9d9c4982062da46c4248f183ce78eaaac84ea779335926c99464b7c2e873a36d90bf1a2a18f7e5589811e2203e93c SHA512 ddd4f828c7c5ab6eceb07b80415b1d211907476ff856ae21ce2bfabc64736bc7f08c7054565b4fb621373f38ffc4597d733696063abb87ac7b8c74e68c0dcc7b
+EBUILD wine-staging-8.21.ebuild 14935 BLAKE2B a12b9d717d706e140950d2e74365717511ede5991ee5b669b7e212424cf254948f8679b6265606ec43f4af7780a022735f5f39f9914b0c62d5d364126451d7cf SHA512 4d89fe2f770f5a7c76257b78003281bd73bf9822c567526703bdc47ff9b34ea3d76a55723c5bc12facac684d50b077b57a2b55bd08aac7a0d0759c1fed1da14f
+EBUILD wine-staging-9.0.ebuild 14647 BLAKE2B d8d9efa99a7a4198b19f5927329ecbcced227a433441f07a08f889b953513a9471e68c2aff9522514bcb3704161af1d60e9d934431051a91a5f935680dbaaabc SHA512 9546288049de1c3ecec39b274e3d6797bf0f16e3435bfb9c032a2d329f8f9bca8ff6263fe694ce42032bf700c52949ebcb68720e75e4cc682e3840a471234ea9
+EBUILD wine-staging-9.1.ebuild 14777 BLAKE2B ed50e1eceed51fec964d390a52d1d29c588e023f7355e8802d7ed2e2ca2b5237582828da6f3ba39c4a60c4b08a15f499b04ae064d843c008dede36abdafd079b SHA512 23c964575bba58ff76a0b5b567edc93197e98b0bf6a9a27fd19a81da87b51ac7e41b7284af6d606f95ddaf58e61c4ac7c1ef3cef40368cc1c7af7eb3b596e180
+EBUILD wine-staging-9.2.ebuild 14777 BLAKE2B f4917eabd72e0d5f0973ab155a69b56a4594b4a2caf66fc9bea1cfa082a0f7df7897699c8e8e1aa8e29d38519734d241c20d9bb1a1ed305e52011d873d42fe54 SHA512 2702a2196d46f804db3c85c892559386224793150258808614a19b72f3675e32d61dfb43cd273a28ade286d64d742f5f362b288efc6f427b483c4a3ff5f716dc
+EBUILD wine-staging-9.3.ebuild 14777 BLAKE2B f4917eabd72e0d5f0973ab155a69b56a4594b4a2caf66fc9bea1cfa082a0f7df7897699c8e8e1aa8e29d38519734d241c20d9bb1a1ed305e52011d873d42fe54 SHA512 2702a2196d46f804db3c85c892559386224793150258808614a19b72f3675e32d61dfb43cd273a28ade286d64d742f5f362b288efc6f427b483c4a3ff5f716dc
+EBUILD wine-staging-9999.ebuild 14777 BLAKE2B f4917eabd72e0d5f0973ab155a69b56a4594b4a2caf66fc9bea1cfa082a0f7df7897699c8e8e1aa8e29d38519734d241c20d9bb1a1ed305e52011d873d42fe54 SHA512 2702a2196d46f804db3c85c892559386224793150258808614a19b72f3675e32d61dfb43cd273a28ade286d64d742f5f362b288efc6f427b483c4a3ff5f716dc
 MISC metadata.xml 2594 BLAKE2B 13e3de45c997289498e6a99a5e473b9fa28afe40b05ca554279aa7977acb03a7cb8cd2f203443ad346633125637d93e120b7bbe315ff5a1b0c25873681982a2b SHA512 2b7b2ebaeeb90c33607b405921738ece7a24713e0cdbe907f8447a37b2250d0f12a7b020ba5e81af2caf904650a05e2d2b845bd28c60a80355d125cca1f914d9
diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 8cf4172ff020..f851c01b3b71 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -275,7 +275,6 @@ src_configure() {
 
 	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}
 
diff --git a/app-emulation/wine-staging/wine-staging-8.21.ebuild b/app-emulation/wine-staging/wine-staging-8.21.ebuild
index 0af9b3b34ab1..fee2fc010537 100644
--- a/app-emulation/wine-staging/wine-staging-8.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.21.ebuild
@@ -331,8 +331,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index f9096affab24..bc8e31eca376 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -339,8 +339,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
diff --git a/app-emulation/wine-staging/wine-staging-9.1.ebuild b/app-emulation/wine-staging/wine-staging-9.1.ebuild
index 4ec95df08d29..51b9fa2f2d1f 100644
--- a/app-emulation/wine-staging/wine-staging-9.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic optfeature multilib multilib-build
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -339,8 +339,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
diff --git a/app-emulation/wine-staging/wine-staging-9.2.ebuild b/app-emulation/wine-staging/wine-staging-9.2.ebuild
index 6b83fcb60f31..662ff1444ee7 100644
--- a/app-emulation/wine-staging/wine-staging-9.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic optfeature multilib multilib-build
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -339,8 +339,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
diff --git a/app-emulation/wine-staging/wine-staging-9.3.ebuild b/app-emulation/wine-staging/wine-staging-9.3.ebuild
index 6b83fcb60f31..662ff1444ee7 100644
--- a/app-emulation/wine-staging/wine-staging-9.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic optfeature multilib multilib-build
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -339,8 +339,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 6b83fcb60f31..662ff1444ee7 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic optfeature multilib multilib-build
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -339,8 +339,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 0abc6c980fbb..39601d2b84ed 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -8,11 +8,11 @@ DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a
 DIST wine-9.1.tar.xz 30028220 BLAKE2B 92d4bbaf02b414b657351fb51cb3d3a5a267ab9242a3effc8296fa73b540e23dce534d4e3e82b492f4b8539ce459b40e6d44f6708da4e5585ab2afb22045b8cf SHA512 12ec508b1e457a94391ab3072ed602ff07da2e5beb4bbe4f76e42d71e87f7fa11f6531f1f1c71e96e884b10a99240a9eaf999867479b8eeadf3576df46e0a73a
 DIST wine-9.2.tar.xz 30062580 BLAKE2B f7deac8b89d99df3cb5ff264c2cc572b696a5885051753263dabceedbf27298d7bec5d96e0047d8d3b6c401608ad0ddd384bb1e2b48f698bdee331e2895e48f9 SHA512 9bffc10e573cc0ee0aaa37b09dda642c64c1456e39518256e39a752dc249e67283dece865cdb3e495b0950553a0dc004d906ecfc032c8fff936f3ef71c2d1a0d
 DIST wine-9.3.tar.xz 30098792 BLAKE2B fa6f0c73f0886918b035557a37c0553feeea5692ae15e8d67fc4360c59c1bbab9f7f93e58ae29a41800da50b961b49957cf2d060d6b5da34bd956bf7cb3e5fab SHA512 3d75a0e1360765aca453d120e1f47fb50716119f3cab2be1176003a19bba31a6affae4a845840ce52665d97e0edd46dc78a13462d6d6a7e861cd970a0a3d4d1d
-EBUILD wine-vanilla-7.0.2.ebuild 11888 BLAKE2B 8051c140b1d69eb8b42b3a067c0f221fecb6e1ba00c3f19ece657026991a8e9e9a35b60b21afcddabf9b5a9ed139c7d597929a7c3143512a704626d04a5005ff SHA512 82119c2fe2a18eebc3f771c488f7d86faffce4b61eb0271c36ea80c3c8ad603428d40c939ac1195f737954825e5c5af81ea84ebd89249b3d9e9878d02edb1ec3
-EBUILD wine-vanilla-8.0.2.ebuild 11976 BLAKE2B 1a6f012dc5f783135920e533735066589b3325a7f833609237e1e124c0f9a3397dd703936cd1655d0612dea4f014052296df7e7c696c8b6dff21cd91fc8bf2e5 SHA512 6c8782afbb9724e4c3086de52d635b030e7360cfcaebd592d7ea2870544053da48d0ef40c025ed6d2498b02b7ffd5e03e9dc0cddc1c226054d63caff0a3560c8
-EBUILD wine-vanilla-9.0.ebuild 13438 BLAKE2B 58a89c172a0c83bce54af384b902d4ca6957df32fca10bd6a165eecd5542056c12e0b23205b8e382fbb307e25ec7a640a82ef7256fecac498351df881cabfae6 SHA512 19ff4eb9d408a8347cb5a1bd2117f7daae95d75dc2b452172b68dab9d5e1ea64536710440621354a9dc6f005e777fc952c772503b11e2e5cf4bfe099bc1e81a6
-EBUILD wine-vanilla-9.1.ebuild 13569 BLAKE2B ae3ef57a97c6fcbdd0bbec3397c9863ea1ec5063f33f9df0b7dff91496aaa97308bd0d0512f9649d7904c08fb6f451847109a90aa928ef34d8e8ff667ee6c337 SHA512 439213f6cb4ec77fd22a5b6c13bd990dfc6876d0c73a15e92a490e194112a17de42fde30bea36dc1334409bbab4a5d070f10f70c629c7ee86c4c9041421f9dda
-EBUILD wine-vanilla-9.2.ebuild 13569 BLAKE2B df81479efea0a61e9383558ecc4b4165dd47d54c974274e69afc3c4f32aa827caf4ac6a12997fec08ba279f7643ecc737c6dd97fbcc0bede0a9a611e743f65e7 SHA512 8e0b5ac1df68b30a73df58bee7f678d47ee5b64188dea816106aa97653a90e055e259b1add4deb40333a3270a931b6ae2410c7f5d587856ed798be9e55c86bb5
-EBUILD wine-vanilla-9.3.ebuild 13569 BLAKE2B df81479efea0a61e9383558ecc4b4165dd47d54c974274e69afc3c4f32aa827caf4ac6a12997fec08ba279f7643ecc737c6dd97fbcc0bede0a9a611e743f65e7 SHA512 8e0b5ac1df68b30a73df58bee7f678d47ee5b64188dea816106aa97653a90e055e259b1add4deb40333a3270a931b6ae2410c7f5d587856ed798be9e55c86bb5
-EBUILD wine-vanilla-9999.ebuild 13569 BLAKE2B df81479efea0a61e9383558ecc4b4165dd47d54c974274e69afc3c4f32aa827caf4ac6a12997fec08ba279f7643ecc737c6dd97fbcc0bede0a9a611e743f65e7 SHA512 8e0b5ac1df68b30a73df58bee7f678d47ee5b64188dea816106aa97653a90e055e259b1add4deb40333a3270a931b6ae2410c7f5d587856ed798be9e55c86bb5
+EBUILD wine-vanilla-7.0.2.ebuild 11836 BLAKE2B b1aa3749855c54d9d939571ed7d970adaa86a44506ee87494552a366734c477733c11da7e40285f75f2d402a2171e62f7f4b2bd337a9a30e3cd343aa3e1062b6 SHA512 704a9ed7f0e0d4180691aa5c2b959d828d837376f735386298ccca1b84da35ea916958020513b2f7ec24374e4e13051cd9c23aac446b0e12d9b7659366e7e146
+EBUILD wine-vanilla-8.0.2.ebuild 11924 BLAKE2B 8ad9949f3cf7c73d16b9b19407954060393537fdcd805e4658ebcd4ed6ebb9f66cba069b791e35c38c4901a64f53139705dc1aea68671871c178be94b278cd7c SHA512 781a1b3fbf2ce971f303c566fa2945a2f0cb25c39a608f81148360cea82559f83e99d663cffd5f348390502ab410d75d022ca0fb43467c0a2aae2278765f8015
+EBUILD wine-vanilla-9.0.ebuild 13397 BLAKE2B 6e48a3aadad85f644abd7e66078dd5e2d3d49f6de09c5bcfd7181c0734d5a8aa36668fb7f6db1670b91928a3a6ad1767d339c38cb75203c4b84d6b5f2aa524f2 SHA512 5301d5dbf94666577ca767083a657d52e5660a39e8a7754e16ae6cdfef1aae736279bd3cb14bedfdf8db38cffcc2755212c93a391052ebda62c6acb3ec97b6c3
+EBUILD wine-vanilla-9.1.ebuild 13528 BLAKE2B 69e3aeab1161ad16b7e6150cc72f09a54453140a7dc0d75e1f8d2952ff799a7a6b36b372b53dc03e133ca1cfc3b1d7fecf949fa6579ba4b8821130afa94488b7 SHA512 6c96d1e1923bb64dd8b29ed976b61948c648fc7bb43420e10a47653add02445bc3e5862a95dd0c5036afbb536aafce9ea3037edb86b1fa2327a3b356fc286dc2
+EBUILD wine-vanilla-9.2.ebuild 13528 BLAKE2B 16278b3acc69f68a50eab33e6a98d5a9eaebb65e08bd1d6eb58f6a040dc8a1d2e02c5730f9ba1f070f9f0c97c0584baca52f00240e9132557cf4eb9a3a985047 SHA512 0bce1057382bd4387e3eadde22126dbbc60ec01a8099c47a33c5e1a5b5d7ae332b3ffb47f896d78bdccdca5e4f2e223b504225f26f1e9a3794ed354a7eab408a
+EBUILD wine-vanilla-9.3.ebuild 13528 BLAKE2B 16278b3acc69f68a50eab33e6a98d5a9eaebb65e08bd1d6eb58f6a040dc8a1d2e02c5730f9ba1f070f9f0c97c0584baca52f00240e9132557cf4eb9a3a985047 SHA512 0bce1057382bd4387e3eadde22126dbbc60ec01a8099c47a33c5e1a5b5d7ae332b3ffb47f896d78bdccdca5e4f2e223b504225f26f1e9a3794ed354a7eab408a
+EBUILD wine-vanilla-9999.ebuild 13528 BLAKE2B 16278b3acc69f68a50eab33e6a98d5a9eaebb65e08bd1d6eb58f6a040dc8a1d2e02c5730f9ba1f070f9f0c97c0584baca52f00240e9132557cf4eb9a3a985047 SHA512 0bce1057382bd4387e3eadde22126dbbc60ec01a8099c47a33c5e1a5b5d7ae332b3ffb47f896d78bdccdca5e4f2e223b504225f26f1e9a3794ed354a7eab408a
 MISC metadata.xml 2661 BLAKE2B 1e62db8bd53d07c696e7b64fce4fa444f7ce27feddf4b4be775e11de095527ca1f8308618b17f488d0b23ff75872fd9b70b256a14c49dfe0f33db81b6e43fa57 SHA512 f0d889a19a037d127363036c7b71468ca9aa7532dab1293e8558ecdcfa82e5f9bc52a7f8dd4a035ac5aa3c14fc9bce3ea28bcb1912157dcc4404fcd77c339ec8
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index c0597ce761f0..bc8a900aa368 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -257,7 +257,6 @@ src_configure() {
 
 	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}
 
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 7fb2fd5fd620..6ac6557b4934 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -251,7 +251,6 @@ src_configure() {
 
 	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}
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index 10bb870877c1..c78034274b86 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -293,8 +293,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
index 2b35c7b1d3f9..3960ebc67c6b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic optfeature multilib multilib-build
+inherit autotools flag-o-matic multilib multilib-build optfeature
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -293,8 +293,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
index f9fd23e3c79a..593d2fed1eee 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic optfeature multilib multilib-build
+inherit autotools flag-o-matic multilib multilib-build optfeature
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -293,8 +293,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
index f9fd23e3c79a..593d2fed1eee 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic optfeature multilib multilib-build
+inherit autotools flag-o-matic multilib multilib-build optfeature
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -293,8 +293,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index f9fd23e3c79a..593d2fed1eee 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic optfeature multilib multilib-build
+inherit autotools flag-o-matic multilib multilib-build optfeature
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -293,8 +293,6 @@ src_configure() {
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-		filter-flags -fno-plt # build failure
-
 		# CROSSCC was formerly recognized by wine, thus been using similar
 		# variables (subject to change, esp. if ever make a mingw.eclass).
 		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}