Adding metadata

5 files changed, 22 insertions, 570 deletions

diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index ea32e6a846ca..ae6df0f3c000 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,7 +1,5 @@
 DIST proton-wine-10.0-3.tar.gz 52629264 BLAKE2B 14edd27b736e3c980d8b92ed8e9c1f3c07084431ffbc9253ddf3b800fa47ac0b21ef22e402decb6e3ad505574b9b37aa4ac1fe8e210f9df2d2f0ca7762326571 SHA512 0140fcb4a145542d4163ad2a25fb0da8d361b202e4d77bad852e533487524d0abe772e38feec91ca0b14bad7c6ac8e44282d776adf31b9bcba1d95d31b5551b8
 DIST proton-wine-10.0-4.tar.gz 52736432 BLAKE2B 71986c2362934879d5d9a74ea13e29593240a9e7a5dc6b9a9ffdfdaf528be4dec2ac34500afcd525fa256d2fed2efc1e3cb6bd7c5f51b4e4249d714ca9bbc3ef SHA512 e74aece7dad25fd1e8041d370718bfd0dd695469c7b74d95209ac6030d0fb30221d1ccce7c8483dddb097c0f1b2df768452de79fd4041c46dd3695934816dd2a
-DIST proton-wine-11.0-1-beta1.tar.gz 53902344 BLAKE2B 759d53ac8936ff237d6e232a9f2a37603cebd7fc4932a615c16dea14a8b90d25788fc73f897fa28371390d01ba1995df5d1f47d201213300a478f8e4eb746113 SHA512 e63df1fce8cae09e82c626a172cc58625e027da1247eab571eebd8798fece028ae606573ab73720ca087078d67c0403e27b91e94cddd62710affda4b3de4265d
-DIST proton-wine-11.0-1-beta2.tar.gz 53908987 BLAKE2B 9ce53b6fc0a4cb9f09e1e1e5db8a7109ddf400cfa229d1af0884f901a42260fc7e9916056c99e6e8cb784ef052838a3bf73a83465811a893568a044ae936d114 SHA512 94d4a6b0a8c709619f3653ca50a393c2f84bd91fa7deaaab8ec6391bf10c71657db460058ca83974e8eb571e2acb968b2a130134bffa736897b42f1c92524066
 DIST proton-wine-11.0-1-beta5.tar.gz 53906737 BLAKE2B ddaae0ab842eb46b3b9f2d482a3a6d447c23d48edc89262ea9b4457f9c0ad5f67cdf08c8dc90323a02766ff6260ede5d3ed4ee743825a8d292f0dcfd68814ec6 SHA512 e5849b3b8a22d010fd11f34902d882a5bab2b6eceb5c59d9c0972dc3367c24b8b1da1fd2ee024b46808163f0b8e33930e55ca675a9e08fd9d2e6c405e8d496f3
 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
diff --git a/app-emulation/wine-proton/wine-proton-11.0.1_beta1.ebuild b/app-emulation/wine-proton/wine-proton-11.0.1_beta1.ebuild
deleted file mode 100644
index 3a1217305ed3..000000000000
--- a/app-emulation/wine-proton/wine-proton-11.0.1_beta1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-inherit eapi9-ver optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
-
-WINE_GECKO=2.47.4
-WINE_MONO=10.4.1
-WINE_PV=$(ver_rs 2-3 -)
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
-	EGIT_BRANCH="bleeding-edge"
-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 BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
-	|| ( WTFPL-2 public-domain )
-"
-SLOT="${PV}"
-IUSE="
-	+X +alsa crossdev-mingw +dbus ffmpeg +fontconfig +gecko +gstreamer
-	llvm-libunwind +mono nls perl pulseaudio +sdl selinux +ssl udev
-	+unwind usb v4l wayland video_cards_amdgpu xinerama
-"
-# headless is not really supported here, and udev needs sdl due to Valve's
-# changes (bug #959263), use normal wine instead if need to avoid these
-REQUIRED_USE="
-	|| ( X wayland )
-	udev? ( sdl )
-"
-
-# 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:=[${WINE_USEDEP}]
-	media-libs/freetype[${WINE_USEDEP}]
-	media-libs/libglvnd[X?,${WINE_USEDEP}]
-	media-libs/vulkan-loader[X?,wayland?,${WINE_USEDEP}]
-	X? (
-		x11-libs/libXcomposite[${WINE_USEDEP}]
-		x11-libs/libXcursor[${WINE_USEDEP}]
-		x11-libs/libXfixes[${WINE_USEDEP}]
-		x11-libs/libXi[${WINE_USEDEP}]
-		x11-libs/libXrandr[${WINE_USEDEP}]
-		x11-libs/libXrender[${WINE_USEDEP}]
-		x11-libs/libXxf86vm[${WINE_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${WINE_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${WINE_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
-	ssl? (
-		dev-libs/gmp:=[${WINE_USEDEP}]
-		net-libs/gnutls:=[${WINE_USEDEP}]
-	)
-	v4l? ( media-libs/libv4l[${WINE_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${WINE_USEDEP}]
-		x11-libs/libXext[${WINE_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${WINE_USEDEP}] )
-	ffmpeg? ( media-video/ffmpeg:=[${WINE_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${WINE_USEDEP}]
-		media-libs/gst-plugins-base:1.0[opengl,${WINE_USEDEP}]
-		media-libs/gstreamer:1.0[${WINE_USEDEP}]
-	)
-	pulseaudio? ( media-libs/libpulse[${WINE_USEDEP}] )
-	udev? ( virtual/libudev:=[${WINE_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( llvm-runtimes/libunwind[${WINE_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${WINE_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${WINE_USEDEP}] )
-	video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu,${WINE_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${WINE_USEDEP}]
-		x11-libs/libxkbcommon[${WINE_USEDEP}]
-	)
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${WINE_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	gstreamer? (
-		media-libs/gst-plugins-bad:1.0[${WINE_USEDEP}]
-		media-plugins/gst-plugins-libav:1.0[${WINE_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${WINE_USEDEP}]
-	)
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	selinux? ( sec-policy/selinux-wine )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	|| (
-		sys-devel/gcc:*
-		llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
-	)
-	>=sys-kernel/linux-headers-6.14
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )
-"
-
-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
-# intentionally ignored: https://gitlab.winehq.org/wine/wine/-/commit/433c2f8c06
-QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/wine.*-preloader"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-musl.patch
-	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
-	"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
-	"${FILESDIR}"/${PN}-9.0-rpath.patch
-	"${FILESDIR}"/${PN}-11.0.1-restore-menubuilder.patch
-)
-
-src_prepare() {
-	# similarly to staging, append to `wine --version` for identification
-	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
-
-	wine_src_prepare
-
-	# this is kind-of best effort and ignores llvm slots, ideally
-	# atomic-builtins should be package.use.force then could drop this
-	if tc-is-clang && [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
-		has_version -d 'llvm-runtimes/compiler-rt[-atomic-builtins(-)]'
-	then
-		# needed by Valve's fsync patches if using compiler-rt w/o atomics
-		sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
-			-i dlls/{ntdll,winevulkan}/Makefile.in || die
-	fi
-
-	# proton variant also needs specfiles and vulkan
-	tools/make_specfiles || die # perl
-	dlls/winevulkan/make_vulkan -X video.xml -x vk.xml || die # python
-}
-
-src_configure() {
-	local wineconfargs=(
-		# upstream (Valve) doesn't really support misc configurations (e.g.
-		# adds vulkan code not always guarded by --with-vulkan), so force
-		# some options that are typically needed by games either way
-		--with-freetype
-		--with-opengl
-		--with-vulkan
-
-		# ...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-hwloc
-		--without-krb5
-		--without-netapi
-		--without-opencl
-		--without-pcap
-		--without-pcsclite
-		--without-sane
-		ac_cv_header_bluetooth_bluetooth_h=no
-		ac_cv_header_bluetooth_rfcomm_h=no
-		ac_cv_lib_soname_odbc=
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		$(use_enable video_cards_amdgpu amd_ags_x64)
-		--disable-tests
-
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with dbus)
-		$(use_with ffmpeg)
-		$(use_with fontconfig)
-		$(use_with gstreamer)
-		$(use_with nls gettext)
-		--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 unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with wayland)
-		$(use_with xinerama)
-
-		--without-piper # unpackaged, for tts but unusable without steam
-		--without-vosk # unpackaged, file a bug if you need this
-	)
-
-	wine_src_configure
-}
-
-src_install() {
-	use perl || local WINE_SKIP_INSTALL=(
-		${WINE_DATADIR}/man/man1/wine{dump,maker}.1
-		${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}}
-	)
-
-	wine_src_install
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT=
-}
-
-pkg_postinst() {
-	wine_pkg_postinst
-
-	[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
-
-	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
-		games-util/game-device-udev-rules
-
-	ewarn
-	ewarn "Warning: please consider ${PN} provided as-is without real"
-	ewarn "support. Upstream does not want bug reports unless can reproduce"
-	ewarn "with real Steam+Proton, and Gentoo is largely unable to help"
-	ewarn "unless it is a build/packaging issue. So, if need support, try"
-	ewarn "normal Wine or Proton instead."
-
-	if ver_replacing -lt 11; then
-		elog
-		elog "Note that >=${PN}-11 now has ntsync support that can be used"
-		elog "rather than setting WINEFSYNC=1. It is used by default if /dev/ntsync"
-		elog "exists unless PROTON_NO_NTSYNC=1 is set. Requires CONFIG_NTSYNC in"
-		elog "the kernel and, if built as a module, will need a file containing"
-		elog "ntsync in ${EROOT}/etc/modules-load.d/ to be auto-loaded."
-	fi
-}
diff --git a/app-emulation/wine-proton/wine-proton-11.0.1_beta2.ebuild b/app-emulation/wine-proton/wine-proton-11.0.1_beta2.ebuild
deleted file mode 100644
index 3a1217305ed3..000000000000
--- a/app-emulation/wine-proton/wine-proton-11.0.1_beta2.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-inherit eapi9-ver optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
-
-WINE_GECKO=2.47.4
-WINE_MONO=10.4.1
-WINE_PV=$(ver_rs 2-3 -)
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
-	EGIT_BRANCH="bleeding-edge"
-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 BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
-	|| ( WTFPL-2 public-domain )
-"
-SLOT="${PV}"
-IUSE="
-	+X +alsa crossdev-mingw +dbus ffmpeg +fontconfig +gecko +gstreamer
-	llvm-libunwind +mono nls perl pulseaudio +sdl selinux +ssl udev
-	+unwind usb v4l wayland video_cards_amdgpu xinerama
-"
-# headless is not really supported here, and udev needs sdl due to Valve's
-# changes (bug #959263), use normal wine instead if need to avoid these
-REQUIRED_USE="
-	|| ( X wayland )
-	udev? ( sdl )
-"
-
-# 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:=[${WINE_USEDEP}]
-	media-libs/freetype[${WINE_USEDEP}]
-	media-libs/libglvnd[X?,${WINE_USEDEP}]
-	media-libs/vulkan-loader[X?,wayland?,${WINE_USEDEP}]
-	X? (
-		x11-libs/libXcomposite[${WINE_USEDEP}]
-		x11-libs/libXcursor[${WINE_USEDEP}]
-		x11-libs/libXfixes[${WINE_USEDEP}]
-		x11-libs/libXi[${WINE_USEDEP}]
-		x11-libs/libXrandr[${WINE_USEDEP}]
-		x11-libs/libXrender[${WINE_USEDEP}]
-		x11-libs/libXxf86vm[${WINE_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${WINE_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${WINE_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
-	ssl? (
-		dev-libs/gmp:=[${WINE_USEDEP}]
-		net-libs/gnutls:=[${WINE_USEDEP}]
-	)
-	v4l? ( media-libs/libv4l[${WINE_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${WINE_USEDEP}]
-		x11-libs/libXext[${WINE_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${WINE_USEDEP}] )
-	ffmpeg? ( media-video/ffmpeg:=[${WINE_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${WINE_USEDEP}]
-		media-libs/gst-plugins-base:1.0[opengl,${WINE_USEDEP}]
-		media-libs/gstreamer:1.0[${WINE_USEDEP}]
-	)
-	pulseaudio? ( media-libs/libpulse[${WINE_USEDEP}] )
-	udev? ( virtual/libudev:=[${WINE_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( llvm-runtimes/libunwind[${WINE_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${WINE_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${WINE_USEDEP}] )
-	video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu,${WINE_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${WINE_USEDEP}]
-		x11-libs/libxkbcommon[${WINE_USEDEP}]
-	)
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${WINE_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	gstreamer? (
-		media-libs/gst-plugins-bad:1.0[${WINE_USEDEP}]
-		media-plugins/gst-plugins-libav:1.0[${WINE_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${WINE_USEDEP}]
-	)
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	selinux? ( sec-policy/selinux-wine )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	|| (
-		sys-devel/gcc:*
-		llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
-	)
-	>=sys-kernel/linux-headers-6.14
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )
-"
-
-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
-# intentionally ignored: https://gitlab.winehq.org/wine/wine/-/commit/433c2f8c06
-QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/wine.*-preloader"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-musl.patch
-	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
-	"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
-	"${FILESDIR}"/${PN}-9.0-rpath.patch
-	"${FILESDIR}"/${PN}-11.0.1-restore-menubuilder.patch
-)
-
-src_prepare() {
-	# similarly to staging, append to `wine --version` for identification
-	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
-
-	wine_src_prepare
-
-	# this is kind-of best effort and ignores llvm slots, ideally
-	# atomic-builtins should be package.use.force then could drop this
-	if tc-is-clang && [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
-		has_version -d 'llvm-runtimes/compiler-rt[-atomic-builtins(-)]'
-	then
-		# needed by Valve's fsync patches if using compiler-rt w/o atomics
-		sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
-			-i dlls/{ntdll,winevulkan}/Makefile.in || die
-	fi
-
-	# proton variant also needs specfiles and vulkan
-	tools/make_specfiles || die # perl
-	dlls/winevulkan/make_vulkan -X video.xml -x vk.xml || die # python
-}
-
-src_configure() {
-	local wineconfargs=(
-		# upstream (Valve) doesn't really support misc configurations (e.g.
-		# adds vulkan code not always guarded by --with-vulkan), so force
-		# some options that are typically needed by games either way
-		--with-freetype
-		--with-opengl
-		--with-vulkan
-
-		# ...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-hwloc
-		--without-krb5
-		--without-netapi
-		--without-opencl
-		--without-pcap
-		--without-pcsclite
-		--without-sane
-		ac_cv_header_bluetooth_bluetooth_h=no
-		ac_cv_header_bluetooth_rfcomm_h=no
-		ac_cv_lib_soname_odbc=
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		$(use_enable video_cards_amdgpu amd_ags_x64)
-		--disable-tests
-
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with dbus)
-		$(use_with ffmpeg)
-		$(use_with fontconfig)
-		$(use_with gstreamer)
-		$(use_with nls gettext)
-		--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 unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with wayland)
-		$(use_with xinerama)
-
-		--without-piper # unpackaged, for tts but unusable without steam
-		--without-vosk # unpackaged, file a bug if you need this
-	)
-
-	wine_src_configure
-}
-
-src_install() {
-	use perl || local WINE_SKIP_INSTALL=(
-		${WINE_DATADIR}/man/man1/wine{dump,maker}.1
-		${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}}
-	)
-
-	wine_src_install
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT=
-}
-
-pkg_postinst() {
-	wine_pkg_postinst
-
-	[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
-
-	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
-		games-util/game-device-udev-rules
-
-	ewarn
-	ewarn "Warning: please consider ${PN} provided as-is without real"
-	ewarn "support. Upstream does not want bug reports unless can reproduce"
-	ewarn "with real Steam+Proton, and Gentoo is largely unable to help"
-	ewarn "unless it is a build/packaging issue. So, if need support, try"
-	ewarn "normal Wine or Proton instead."
-
-	if ver_replacing -lt 11; then
-		elog
-		elog "Note that >=${PN}-11 now has ntsync support that can be used"
-		elog "rather than setting WINEFSYNC=1. It is used by default if /dev/ntsync"
-		elog "exists unless PROTON_NO_NTSYNC=1 is set. Requires CONFIG_NTSYNC in"
-		elog "the kernel and, if built as a module, will need a file containing"
-		elog "ntsync in ${EROOT}/etc/modules-load.d/ to be auto-loaded."
-	fi
-}
diff --git a/app-emulation/wine-proton/wine-proton-11.0.1_beta5.ebuild b/app-emulation/wine-proton/wine-proton-11.0.1_beta5.ebuild
index 3a1217305ed3..1735048d6db6 100644
--- a/app-emulation/wine-proton/wine-proton-11.0.1_beta5.ebuild
+++ b/app-emulation/wine-proton/wine-proton-11.0.1_beta5.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{13..14} )
-inherit eapi9-ver optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
+inherit eapi9-ver flag-o-matic optfeature python-any-r1
+inherit readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4
 WINE_MONO=10.4.1
@@ -117,18 +118,16 @@ RDEPEND="
 "
 DEPEND="
 	${WINE_COMMON_DEPEND}
-	|| (
-		sys-devel/gcc:*
-		llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
-	)
 	>=sys-kernel/linux-headers-6.14
 	X? ( x11-base/xorg-proto )
 "
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-lang/perl
+	sys-devel/binutils:*
 	sys-devel/bison
 	sys-devel/flex
+	sys-devel/gcc:*
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	wayland? ( dev-util/wayland-scanner )
@@ -156,22 +155,19 @@ src_prepare() {
 
 	wine_src_prepare
 
-	# this is kind-of best effort and ignores llvm slots, ideally
-	# atomic-builtins should be package.use.force then could drop this
-	if tc-is-clang && [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
-		has_version -d 'llvm-runtimes/compiler-rt[-atomic-builtins(-)]'
-	then
-		# needed by Valve's fsync patches if using compiler-rt w/o atomics
-		sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
-			-i dlls/{ntdll,winevulkan}/Makefile.in || die
-	fi
-
 	# proton variant also needs specfiles and vulkan
 	tools/make_specfiles || die # perl
 	dlls/winevulkan/make_vulkan -X video.xml -x vk.xml || die # python
 }
 
 src_configure() {
+	# Valve does not really support anything but gcc+bfd, and some of
+	# their modifications to Wine have been fragile and accumulating
+	# issues that they have no interest in fixing (bug #977021)
+	tc-is-gcc || unset AR AS CC CPP CXX LD NM OBJ{COPY,DUMP} RANLIB READELF STRIP
+	tc-ld-is-bfd || append-ldflags -fuse-ld=bfd
+	strip-unsupported-flags
+
 	local wineconfargs=(
 		# upstream (Valve) doesn't really support misc configurations (e.g.
 		# adds vulkan code not always guarded by --with-vulkan), so force
diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild b/app-emulation/wine-proton/wine-proton-9999.ebuild
index 7f80f5085ff5..836a60ef899e 100644
--- a/app-emulation/wine-proton/wine-proton-9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{13..14} )
-inherit eapi9-ver optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
+inherit eapi9-ver flag-o-matic optfeature python-any-r1
+inherit readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4
 WINE_MONO=10.4.1
@@ -117,18 +118,16 @@ RDEPEND="
 "
 DEPEND="
 	${WINE_COMMON_DEPEND}
-	|| (
-		sys-devel/gcc:*
-		llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
-	)
 	>=sys-kernel/linux-headers-6.14
 	X? ( x11-base/xorg-proto )
 "
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-lang/perl
+	sys-devel/binutils:*
 	sys-devel/bison
 	sys-devel/flex
+	sys-devel/gcc:*
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	wayland? ( dev-util/wayland-scanner )
@@ -156,22 +155,19 @@ src_prepare() {
 
 	wine_src_prepare
 
-	# this is kind-of best effort and ignores llvm slots, ideally
-	# atomic-builtins should be package.use.force then could drop this
-	if tc-is-clang && [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
-		has_version -d 'llvm-runtimes/compiler-rt[-atomic-builtins(-)]'
-	then
-		# needed by Valve's fsync patches if using compiler-rt w/o atomics
-		sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
-			-i dlls/{ntdll,winevulkan}/Makefile.in || die
-	fi
-
 	# proton variant also needs specfiles and vulkan
 	tools/make_specfiles || die # perl
 	dlls/winevulkan/make_vulkan -X video.xml -x vk.xml || die # python
 }
 
 src_configure() {
+	# Valve does not really support anything but gcc+bfd, and some of
+	# their modifications have been fragile and accumulating issues
+	# that they seemingly have no interest in fixing (bug #977021)
+	tc-is-gcc || unset AR AS CC CPP CXX LD NM OBJ{COPY,DUMP} RANLIB READELF STRIP
+	tc-ld-is-bfd || append-ldflags -fuse-ld=bfd
+	strip-unsupported-flags
+
 	local wineconfargs=(
 		# upstream (Valve) doesn't really support misc configurations (e.g.
 		# adds vulkan code not always guarded by --with-vulkan), so force