gentoo auto-resync : 12:12:2024 - 02:01:23

author: V3n3RiX <venerix@koprulu.sector> 2024-12-12 02:01:24 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-12-12 02:01:24 +0000
commit: 39c32f4d5dca9f6293fccb69e9d50baf494c8de4 (patch)
tree: ec772fdf23a7279a60e9063b01c2dc909741a197 /app-emulation
parent: 494ca58c9f5243dd4b56557aa8c41bce76e95ec3 (diff)
39 files changed, 996 insertions, 83 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index be3710f254c4..e9acc194d7e0 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 00d404cdc097..3f41afd029f4 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -18,6 +18,8 @@ AUX virtlockd.init-r2 564 BLAKE2B 5979d26e8a3b4e402b3945f831b7304b1c6a4916172832
 AUX virtlogd.init-r2 563 BLAKE2B 815fb795e225ddeb6a29d9983fc3821ce5efa460fa452251c393f19a460a4e9940678e89751482331d9fbef2f8f85988890ee59889d74b8aca01257fa98bc62f SHA512 405b43dade3e3e88199bd6871b6fb9bc99da4b59b05927ed1871176d13452ce3ce2d6de4c05dcd765c4433ba0d7ab0fe9d053964cc6de33f38c538dd21a74cd3
 DIST libvirt-10.1.0.tar.xz 9444244 BLAKE2B bfdce9d067e3a319b81d867d27f1a6b4e724ab6aaa25d19d7383c9be26ad7dc92b3c0aaa92894b772f09e20c3c2eb0ea0a8707feee4c63be58578fa22854305f SHA512 08e73ae15de5681430b62db85ec9901242dca5e9a4ca9685614f4a67092c6e28f27f9187144b3ceb18ad6b40e6eb1a90b1a4b056b0888724d04a62002ee2bc48
 DIST libvirt-10.1.0.tar.xz.asc 833 BLAKE2B 1046403fb6ee084eb68e081a0fa4a1cfbf30378faf2f54591917ab6a4648a4c2a23da055cfe2577ec7ec80922c29ca7a918386259f747f052abfdfc420ff7749 SHA512 40ec184b4c33f21bf99d38fec0722e165854f723017f3cddaef63120cdf8dcf6df0c03b7e4aea5c3706f65d46f5335db667321b1ece1c123d9517fcd303b2bd8
+DIST libvirt-10.10.0.tar.xz 9673792 BLAKE2B 8042ce1493c3ffd6e6deeb7d94d0744da18850fe416480487a57ffd33bf3390f587849f308aad12fd38c887628f90137ba717ea11ef7e0f73a97b157fa985a6e SHA512 b4e8a5f7d5c15387e5f3e82ac9661feb6e89c6b3b13d869bca63d9686e1e1e8d193a1fc84a19a09b3da1c868837ee76d1b3964a6e5f7ad5d669449b0a6aa4b53
+DIST libvirt-10.10.0.tar.xz.asc 833 BLAKE2B c26069fb79d2f26c8f7763033ef71267512c923ce9b3eb97a416dcf4dd1535c86ba0ee6710c66bd8f62c724799fb99f839aa93861022c862ecdf6789cb6906d4 SHA512 912c572f91e0934c7954f7bf496d1fd212d57f6327f07d297f35b8f791087a71cb243e4d125c377921518339f9516288a1ddb6589fd13804eb91adeedda705a9
 DIST libvirt-10.3.0.tar.xz 9476852 BLAKE2B 8c47840113904d72aeb1e9bf900a99a8b0e3d41391c9a8fee4277f2793f18fefc50d113e8cbea52dedfd03b93f430416bcd25fe90ee6820c95ac6f468b84212f SHA512 dd2b151a19877e57e11b582b1c11542319f8b7b7cd3d7d51304442aa7d5eb1a8490d2887d340191c3ecc561320ea453773763083364579de0a40ada9c244fc59
 DIST libvirt-10.3.0.tar.xz.asc 833 BLAKE2B 4d54a3701a15383464e1be5155344f783cd2fe297f2a7cfd4ef9ead7cef9267122e91e16d08329e2448ffe77f10625a3fa3443bbeab97ba8fc83ec6e4ec250dd SHA512 d32bbc2a36b03eccfc931c3e5accae2d4ed5a59e4d40fc44f8fb269684201097ea03e0afcf6eae124efac7b8c43d32e4e79d276c13ea81809acd40b97ef3ceb9
 DIST libvirt-10.5.0.tar.xz 9530296 BLAKE2B 59b6b114e6d4c4752839775ec22b17f530ac86f0252647b312b7f98e9ba856d949727eed5cb47b6b92589e2ce2587fe02505d6653a4e7ba3a3685b5c81a8ebc0 SHA512 e4976849cff7bdae0b7fda0644490f0ca743efc11c35a2fae45bb0f6f467b85644c1d04d1f3d1b10affdc6d9b8dcc0a3c255e527e0bdd73cdd4d1c81d5c418e7
@@ -31,6 +33,7 @@ DIST libvirt-9.8.0.tar.xz.asc 833 BLAKE2B 3ecd0a925992eeadd50675f7ad8e815bde532c
 DIST libvirt-9.9.0.tar.xz 9321556 BLAKE2B 21eae5a95feaf7f5c6ba8dd48732c08212904882a11c48eccfa827d85ddc3df7e064503f21710dbe1b678670e02f003674de915a43a7403fbf85685c4832e21d SHA512 77cea28acf4f3e8c92fbd5bd72ad084be183c07f14e3a9ce35d6d9d62d36ee97a30cef55fb204b3e43f282890ecd7d5827a784a517e7f4ed8b22ee502c3f09d7
 DIST libvirt-9.9.0.tar.xz.asc 833 BLAKE2B 3de3674d33c595692e71eeb9c312de76e865d3859d2482ec5b4d29d3cd7644cde080cba0001668efe7876b462f78c0233ab76076ef32943e118b34cca8c1ab4d SHA512 357fc2d1bdbbc26c6e0119a1b5c42e86a116f94bb714da855ab27ca83da0e50c7239d1b8abde3cee8a460ac537f63d518f43470d8329b727b39491771ad191e5
 EBUILD libvirt-10.1.0-r4.ebuild 10208 BLAKE2B ba05957d24d5b4b92fe2eb074924c43788bd1ee2c6608a9c981c1773a8f233da5b6a7e0e023a72c6a0770ceee6381e9d921dd59998d0d5c7ff61e385040d0e8d SHA512 40cbf881868ca0a4459a77ed925c2ff2548c8a32710f20a950aa36a39b29a4cdec4c5064b76ce51993a1e265f3f6a0954f3d79674b63b646b995f263e4877a1d
+EBUILD libvirt-10.10.0.ebuild 10072 BLAKE2B b3b6dd462d2c817a03a63ac2017b3d157ffc8334c20ac579a013bd59de99b0764358149d2853d421244eec5e6aa4e91ba40864f84c4d1afe4cba78c8aef55f77 SHA512 f1d8c447a8c4933be27e20260add44c66046743739f98fa3502ce3e942da61acb0258438c12d165bdd3e4783ab01bc40e9b86bf7ecc2c8aa7a6305390b4c51b2
 EBUILD libvirt-10.3.0-r4.ebuild 10193 BLAKE2B 01515dc6f7d77c235b2be818a8f27af6996282cf08d33d57bd84f9a2d3b12ff82082883123d88fc13d6cb8a249c2986ee888e11ab3a9be9de29c24940b6d8352 SHA512 a56a13ce5165a300849708ac6052fbf6703fe0d6db0f05101679f628f43f9e14289e7e3d303f8e0dd66b74160926e32624797df6048e137d88c8fe3b2abcee3f
 EBUILD libvirt-10.5.0-r2.ebuild 10075 BLAKE2B 2093b04c2cd3690694d250e9435fe7222e88320f4e21384a11e62bf015f3a0636fadb39e040b87d3e62b1cc343dd09abb3d661912fa0ff9188f8dfdb512ec887 SHA512 0e1c5927c420dcc26f2bdb165112bb7d559a7c4f045ce582e0ed001028b1bbe186646d8b1301abfaa06aeeed65773ed14654bd0277c3dd7cbeeb39ebde87c0d8
 EBUILD libvirt-10.6.0-r1.ebuild 10075 BLAKE2B 2093b04c2cd3690694d250e9435fe7222e88320f4e21384a11e62bf015f3a0636fadb39e040b87d3e62b1cc343dd09abb3d661912fa0ff9188f8dfdb512ec887 SHA512 0e1c5927c420dcc26f2bdb165112bb7d559a7c4f045ce582e0ed001028b1bbe186646d8b1301abfaa06aeeed65773ed14654bd0277c3dd7cbeeb39ebde87c0d8
diff --git a/app-emulation/libvirt/libvirt-10.10.0.ebuild b/app-emulation/libvirt/libvirt-10.10.0.ebuild
new file mode 100644
index 000000000000..d87fbdaace17
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-10.10.0.ebuild
@@ -0,0 +1,393 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://download.libvirt.org/${P}.tar.xz
+		verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
+	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-debug/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.8.1:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[lvm]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-4.2
+		app-crypt/swtpm
+		dev-libs/json-c:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		|| (
+			>=net-firewall/iptables-1.4.10[ipv6(+)]
+			net-firewall/nftables
+		)
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtiofsd? ( app-emulation/virtiofsd )
+	virtualbox? ( <app-emulation/virtualbox-7.1.0 )
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="
+	${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-10.7.0-fix-paths-for-apparmor.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nbd nbdkit)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu json_c)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature test tests)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+		-Dopenwsman=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# Workaround for bug #938302
+	if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/wine-gecko/Manifest b/app-emulation/wine-gecko/Manifest
index 97e51577cf17..1d6656be1980 100644
--- a/app-emulation/wine-gecko/Manifest
+++ b/app-emulation/wine-gecko/Manifest
@@ -10,7 +10,7 @@ DIST wine-gecko-2.47.4-x86.msi 55187968 BLAKE2B f0ecd9cf41290082918be54eb9646aa3
 DIST wine-gecko-2.47.4-x86.tar.xz 43025064 BLAKE2B 2a73c12585b502ae11188482cbc9fb1f45f95bfe4383a7615011104b132f4845f9813d01fb40277e1934fab5f1b35ab40b4f4a66a9967463dd1d666a666904e9 SHA512 1279456eca4439e9adc3c97678fabeca42cc89f683246805ca14f85fc104bf4ba970fb6490f4ebd0938fc8e0a0ca372b000fdd5165f900070eeee30a1aeec117
 DIST wine-gecko-2.47.4-x86_64.msi 53898752 BLAKE2B dabc9957670d388b3c24fb850c444f28561b200f608f8cb6434d661198dc09786d8c61d5ad007fa9f3a1820425b5b9b46253a6b825d5461539a76c0c4d8e8315 SHA512 075f95ff7a33ad0af6ad53fe8f0f6e2ab233ceb950957d2fbf7d4955543dfe143d14fade283061df14562e6345a7cbaf754fc92d591ea03a5573accb290ae530
 DIST wine-gecko-2.47.4-x86_64.tar.xz 41935496 BLAKE2B 62856a88266b4757602c0646e024f832974a93f03b9df253fd4895d4f11a41b435840ad8f7003ec85a0d8087dec15f2e096dbfb4b01ebe4d365521e48fd0c5c0 SHA512 1defbbc1fb5029bf43872a4e1c49995b61e0f106b1fcc4c99159bf4788226981b9ba8a25a2296d3a9312dbfa7e27b469ca27c0867afb218990d45f68705dbfbe
-EBUILD wine-gecko-2.47.2.ebuild 1068 BLAKE2B 109fca0499f49910023123846bde360fb9a798f1901de07e6e4e46780680601f949511cf76024a72412b9c58413a206905bf701f4099d63ef8659fd5d1b25704 SHA512 fde7f514b9cf3f6201450c08dfe2ceef4b4a684bb65c3acd867cd7b48892d457a69f954073ce7d08ef99a6926ddc264fde3e98373db6b9936bb4c827a736950a
-EBUILD wine-gecko-2.47.3.ebuild 1068 BLAKE2B 109fca0499f49910023123846bde360fb9a798f1901de07e6e4e46780680601f949511cf76024a72412b9c58413a206905bf701f4099d63ef8659fd5d1b25704 SHA512 fde7f514b9cf3f6201450c08dfe2ceef4b4a684bb65c3acd867cd7b48892d457a69f954073ce7d08ef99a6926ddc264fde3e98373db6b9936bb4c827a736950a
-EBUILD wine-gecko-2.47.4.ebuild 1068 BLAKE2B 109fca0499f49910023123846bde360fb9a798f1901de07e6e4e46780680601f949511cf76024a72412b9c58413a206905bf701f4099d63ef8659fd5d1b25704 SHA512 fde7f514b9cf3f6201450c08dfe2ceef4b4a684bb65c3acd867cd7b48892d457a69f954073ce7d08ef99a6926ddc264fde3e98373db6b9936bb4c827a736950a
+EBUILD wine-gecko-2.47.2.ebuild 1275 BLAKE2B cc9fb505b9e019ca70e085d2f7ec979e3e5e606f983e6f5a0c622a2f4849175a2be6c787bb948ef49168f1e80f4a17765b4411732e7e11db7c81ede5b3511add SHA512 b1732ad8f3a028f035280592ac8271b1c64b6d052de6ed00073ec0aea97f56c0482e72b3f84f4dc364338e5619be40c39c01dc361f0f98c1ee635aca99fdb455
+EBUILD wine-gecko-2.47.3.ebuild 1275 BLAKE2B cc9fb505b9e019ca70e085d2f7ec979e3e5e606f983e6f5a0c622a2f4849175a2be6c787bb948ef49168f1e80f4a17765b4411732e7e11db7c81ede5b3511add SHA512 b1732ad8f3a028f035280592ac8271b1c64b6d052de6ed00073ec0aea97f56c0482e72b3f84f4dc364338e5619be40c39c01dc361f0f98c1ee635aca99fdb455
+EBUILD wine-gecko-2.47.4.ebuild 1275 BLAKE2B cc9fb505b9e019ca70e085d2f7ec979e3e5e606f983e6f5a0c622a2f4849175a2be6c787bb948ef49168f1e80f4a17765b4411732e7e11db7c81ede5b3511add SHA512 b1732ad8f3a028f035280592ac8271b1c64b6d052de6ed00073ec0aea97f56c0482e72b3f84f4dc364338e5619be40c39c01dc361f0f98c1ee635aca99fdb455
 MISC metadata.xml 360 BLAKE2B 0ba4f28c9fb2b313f332b56122c9293d60094c1d7c8bc76928818003bc7e3e07385b370759a676ecd5714dc74bf1bba66680c9ceb4655bc4d10767e9483d947e SHA512 feb28080c619be3fa965d7ebdcdb01587ba9dac001737a485d5746b97951638aff49493e9b5ae22ddc29b37a1b09a9f1b1703b979d3531d8e10ea331d0e12085
diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
index 9c72aed51647..11113939eae9 100644
--- a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
+++ b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
@@ -22,6 +22,9 @@ S=${WORKDIR}
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="${PV}"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
 KEYWORDS="amd64 x86"
 IUSE="+abi_x86_32 abi_x86_64 +shared"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild
index 9c72aed51647..11113939eae9 100644
--- a/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild
+++ b/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild
@@ -22,6 +22,9 @@ S=${WORKDIR}
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="${PV}"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
 KEYWORDS="amd64 x86"
 IUSE="+abi_x86_32 abi_x86_64 +shared"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild
index 9c72aed51647..11113939eae9 100644
--- a/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild
+++ b/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild
@@ -22,6 +22,9 @@ S=${WORKDIR}
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="${PV}"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
 KEYWORDS="amd64 x86"
 IUSE="+abi_x86_32 abi_x86_64 +shared"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 6b2aa721166b..446a769fc719 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -10,13 +10,16 @@ DIST wine-mono-9.2.0-x86.msi 84566016 BLAKE2B 08c106998536622cdda10065304416a338
 DIST wine-mono-9.2.0-x86.tar.xz 43901320 BLAKE2B 125d81049bca105e8967338659dd21c174388dfc8be9802a5984b8fc11b4da22b82512590481d45ebd7554f89c5e9cad9c59b4406ba04436ada5b52ea2aea0cc SHA512 7d0039b7c77ed968c0e00eacd3bf716d3ec9dffc86f6cc2c2f9439320b889ae2e05cc4f9aade5e1a0122a86ee4b86cea4224e666aba0d0bb3f2fa6fb0d18f8ae
 DIST wine-mono-9.3.0-x86.msi 84572160 BLAKE2B b6e13d5245b17c0f2857771c8bcfc7ca248d13f300df69970b5994d3287e3e4db0c49601b0cd29b7f6764f2abda5b54a3f0bf1ad1d2beb28033adba9276c7b5c SHA512 d5bb8ed9cc963292b37edb2ac3fb5945346b9632a080d5413ebde3470ff1702c9fdd0d4a25c0cd228e56abe11f6e1cf3d949a2c26099bf2fdef41aaf65f686ef
 DIST wine-mono-9.3.0-x86.tar.xz 43906032 BLAKE2B 94dc27d305fb062f845064c07dcd00d2daaf9647ae5353e18267314b6534018bf22b1411981ef8e3cb9ef8fa0d91da662211376a309a243100d691386b1840e4 SHA512 094113aad504fa46d9f3b0ca6f7926c14fbda3edbbbc5dab307f19114fec0173a451a604b2083f399e61d5c6704971a0d602930cc9ba11502c863ec67318c480
+DIST wine-mono-9.3.1-x86.msi 84572160 BLAKE2B 82f0aaec4cb816b28708c8bd8f347a128451046f33958b63d8cf6b6009d2f426f03d419017de4303f722ac0232bb2c9a1aba957411114ffc0b392db930888f69 SHA512 6653c6dd5484f3687be7ce13ca74e95abb5b0fa3c6901d57a97f4a218986e68154846ef19bf8ef5667f375b61600bb37e2e339b62a638a5eacd6f15a0022fc8a
+DIST wine-mono-9.3.1-x86.tar.xz 43896120 BLAKE2B 5f4c2a07355a3d394086467f1b0c45698cd83731a4137b59975abdeda2d564f44922a67b1bec111e4209c4fe74247486076e95dffc84d88b5b7a02774efd070b SHA512 cc4faff237b46d870e1afeb99be1e77f8f0d599c8567dfc365256558b4ec533efee3d5324bfe1bd5bc7f318112899dd800e3e2ef9cbc6d50063f47fc7039c879
 DIST wine-mono-9.4.0-x86.msi 84639232 BLAKE2B fc53dadf9c73c489f0333ab25aa2ce85df7f1dcf82fd475ea0265772441f1b29804bd378e555f71eafc851393c833c5aef97f10103257ccb6c6951c46fcb5bd9 SHA512 c8907d1f3b04bfc86a4d230148558964984f4ce33a732802ccbbc89b3593bce1c32b2fae105db0efa7e1e7ee97e955e51b682f06efe595408ba4031b55b8fe0f
 DIST wine-mono-9.4.0-x86.tar.xz 43941584 BLAKE2B a4d88b274e06a8f8f02e2f74e55fd0df5e4836f45295af711f2f3d3f2bf18432bc7c41c9c2392a0e6b584b67358740acd7f3572cafd32afd08060e8c9e060c0a SHA512 2ea3fa22f64019ff71b4c368e3b83608c2b0cf4ffb63fc349b29e41ddc17d015bf431d41788ce3139ddc19336690b9460c983d18eea514351f069671012895f2
-EBUILD wine-mono-7.0.0.ebuild 683 BLAKE2B c1cc8efdce2f3e2b2f5473542d7591dd3a4e375c834d9b66eda4110b429f8bef5471d771ac4bde8cc392feac0528da9bffd3bcc3dd5368d4fd7d04f6001d7715 SHA512 033ff95831b9e6c9222d6ee8e12eb147bd288179b2ffdc1fe23a63dfef7a8465bf40049ccf67d82368d1e9c0456885c6cab8a8f1adc46abfc888c5db8d676997
-EBUILD wine-mono-7.4.0.ebuild 683 BLAKE2B c1cc8efdce2f3e2b2f5473542d7591dd3a4e375c834d9b66eda4110b429f8bef5471d771ac4bde8cc392feac0528da9bffd3bcc3dd5368d4fd7d04f6001d7715 SHA512 033ff95831b9e6c9222d6ee8e12eb147bd288179b2ffdc1fe23a63dfef7a8465bf40049ccf67d82368d1e9c0456885c6cab8a8f1adc46abfc888c5db8d676997
-EBUILD wine-mono-8.1.0.ebuild 683 BLAKE2B c1cc8efdce2f3e2b2f5473542d7591dd3a4e375c834d9b66eda4110b429f8bef5471d771ac4bde8cc392feac0528da9bffd3bcc3dd5368d4fd7d04f6001d7715 SHA512 033ff95831b9e6c9222d6ee8e12eb147bd288179b2ffdc1fe23a63dfef7a8465bf40049ccf67d82368d1e9c0456885c6cab8a8f1adc46abfc888c5db8d676997
-EBUILD wine-mono-9.1.0.ebuild 683 BLAKE2B c1cc8efdce2f3e2b2f5473542d7591dd3a4e375c834d9b66eda4110b429f8bef5471d771ac4bde8cc392feac0528da9bffd3bcc3dd5368d4fd7d04f6001d7715 SHA512 033ff95831b9e6c9222d6ee8e12eb147bd288179b2ffdc1fe23a63dfef7a8465bf40049ccf67d82368d1e9c0456885c6cab8a8f1adc46abfc888c5db8d676997
-EBUILD wine-mono-9.2.0.ebuild 683 BLAKE2B c1cc8efdce2f3e2b2f5473542d7591dd3a4e375c834d9b66eda4110b429f8bef5471d771ac4bde8cc392feac0528da9bffd3bcc3dd5368d4fd7d04f6001d7715 SHA512 033ff95831b9e6c9222d6ee8e12eb147bd288179b2ffdc1fe23a63dfef7a8465bf40049ccf67d82368d1e9c0456885c6cab8a8f1adc46abfc888c5db8d676997
-EBUILD wine-mono-9.3.0.ebuild 685 BLAKE2B 8d9fa5e5c01db8a36f5f3dc677af7ff6d5fbd4c6758854ea077d4ceeacae88fc609cb448f5c1fbdc6ed0319857a270943117f80c40d0a1b27a010a53b50220a6 SHA512 b40de9993e45953afba1c2ede52d79687dcd2635b02edddc2db515866929fa5e1b97ed3497fdf87a9a39b7878e6a41388970b95b1d6701ab20639fc4d47a9e8c
-EBUILD wine-mono-9.4.0.ebuild 685 BLAKE2B 8d9fa5e5c01db8a36f5f3dc677af7ff6d5fbd4c6758854ea077d4ceeacae88fc609cb448f5c1fbdc6ed0319857a270943117f80c40d0a1b27a010a53b50220a6 SHA512 b40de9993e45953afba1c2ede52d79687dcd2635b02edddc2db515866929fa5e1b97ed3497fdf87a9a39b7878e6a41388970b95b1d6701ab20639fc4d47a9e8c
+EBUILD wine-mono-7.0.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92
+EBUILD wine-mono-7.4.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92
+EBUILD wine-mono-8.1.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92
+EBUILD wine-mono-9.1.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92
+EBUILD wine-mono-9.2.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92
+EBUILD wine-mono-9.3.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92
+EBUILD wine-mono-9.3.1.ebuild 1012 BLAKE2B fae25c2cfe8499ebfc2743604fa782e022ee2eaa8e9f245c9f89915213841051a5460b0831febfd49b12a175db5dc26fe91544fffb31af403b3e0ef800284cd7 SHA512 0e0dde3c85f78e7b06c48ae2bc9531e4d278c31e0337762d9c5e13a6b8fe27547dc598f16bcfa5773e5e224869b2744148bc4259412cea4e5b68e74f92d492ff
+EBUILD wine-mono-9.4.0.ebuild 890 BLAKE2B ad2e5524bdf84120a8025117258a8d62d3c730af80a6c9153a69f5f0214502ae18a2d231e8dd6b3e20ffd2204f8d4fa2285b62a2534edc2df545ce293cc7606f SHA512 30fe3161b3e5d68d4caf76d0ac7202757553d660346bb0e26cb53bf85b25b697b00cfb1f20efb495bddf4b73f1e8f3af3f920ccd94005474740aae948ab7bd92
 MISC metadata.xml 869 BLAKE2B fccb940bff530c2e7c311060ef585efc8f62c00480435fe62cdae5eaa5dd58fd6d41354f6656c166700114e356f7bd60c791a77e86a2cce2bf4421bb778d28dc SHA512 fba10cccd3d072a96332a065f3b08cca213b18820e14a0e0a8e135ad2a986b158766bed07bae7c468f445642145a25350f2cdee58d8a4ccb916fc6a0ea7b4a62
diff --git a/app-emulation/wine-mono/wine-mono-7.0.0.ebuild b/app-emulation/wine-mono/wine-mono-7.0.0.ebuild
index 145968f94d46..a422ad716d3b 100644
--- a/app-emulation/wine-mono/wine-mono-7.0.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-7.0.0.ebuild
@@ -16,6 +16,9 @@ S=${WORKDIR}
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
 KEYWORDS="amd64 x86"
 IUSE="+shared"
 
diff --git a/app-emulation/wine-mono/wine-mono-7.4.0.ebuild b/app-emulation/wine-mono/wine-mono-7.4.0.ebuild
index 145968f94d46..a422ad716d3b 100644
--- a/app-emulation/wine-mono/wine-mono-7.4.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-7.4.0.ebuild
@@ -16,6 +16,9 @@ S=${WORKDIR}
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
 KEYWORDS="amd64 x86"
 IUSE="+shared"
 
diff --git a/app-emulation/wine-mono/wine-mono-8.1.0.ebuild b/app-emulation/wine-mono/wine-mono-8.1.0.ebuild
index 145968f94d46..a422ad716d3b 100644
--- a/app-emulation/wine-mono/wine-mono-8.1.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-8.1.0.ebuild
@@ -16,6 +16,9 @@ S=${WORKDIR}
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
 KEYWORDS="amd64 x86"
 IUSE="+shared"
 
diff --git a/app-emulation/wine-mono/wine-mono-9.1.0.ebuild b/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
index 145968f94d46..a422ad716d3b 100644
--- a/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
@@ -16,6 +16,9 @@ S=${WORKDIR}
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
 KEYWORDS="amd64 x86"
 IUSE="+shared"
 
diff --git a/app-emulation/wine-mono/wine-mono-9.2.0.ebuild b/app-emulation/wine-mono/wine-mono-9.2.0.ebuild
index 145968f94d46..a422ad716d3b 100644
--- a/app-emulation/wine-mono/wine-mono-9.2.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-9.2.0.ebuild
@@ -16,6 +16,9 @@ S=${WORKDIR}
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
 KEYWORDS="amd64 x86"
 IUSE="+shared"
 
diff --git a/app-emulation/wine-mono/wine-mono-9.3.0.ebuild b/app-emulation/wine-mono/wine-mono-9.3.0.ebuild
index 43d16fc30de9..a422ad716d3b 100644
--- a/app-emulation/wine-mono/wine-mono-9.3.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-9.3.0.ebuild
@@ -16,7 +16,10 @@ S=${WORKDIR}
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
+KEYWORDS="amd64 x86"
 IUSE="+shared"
 
 src_install() {
diff --git a/app-emulation/wine-mono/wine-mono-9.3.1.ebuild b/app-emulation/wine-mono/wine-mono-9.3.1.ebuild
new file mode 100644
index 000000000000..5addc85e06a4
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-9.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="
+	https://gitlab.winehq.org/wine/wine/-/wikis/Wine-Mono/
+	https://gitlab.winehq.org/mono/wine-mono/
+"
+# (this release wasn't uploaded to winehq/gitlab and is only on github)
+SRC_URI="
+	shared? ( https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.tar.xz )
+	!shared? ( https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.msi )
+"
+S=${WORKDIR}
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
+KEYWORDS="amd64 x86"
+IUSE="+shared"
+
+src_install() {
+	insinto /usr/share/wine/mono
+
+	if use shared; then
+		doins -r ${P}
+	else
+		doins "${DISTDIR}"/${P}-x86.msi
+	fi
+}
diff --git a/app-emulation/wine-mono/wine-mono-9.4.0.ebuild b/app-emulation/wine-mono/wine-mono-9.4.0.ebuild
index 43d16fc30de9..a422ad716d3b 100644
--- a/app-emulation/wine-mono/wine-mono-9.4.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-9.4.0.ebuild
@@ -16,7 +16,10 @@ S=${WORKDIR}
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+# keep straight-to-stable, builds nothing and the stabilization process
+# is wasteful and annoying for users using ~testing wine in stable
+# (wine also pins to specific versions, so stable won't use latest)
+KEYWORDS="amd64 x86"
 IUSE="+shared"
 
 src_install() {
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index 2d0931feb517..33b9fd809935 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -13,9 +13,11 @@ DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
 DIST proton-wine-9.0-2.tar.gz 49125171 BLAKE2B ac1e4a63f94689bc4fcc6ab4e2d12cfc214f54181515434ab950d8975d131a5f6333b1e6cb9b67eda61cf3e652e57e27e60ba3cff6a6ac403b07178f382f7e25 SHA512 82efee3100da80f650229d1abf3df4896ab71af4a79c6e5cf03aa646c56f435daf07c6f084a3264067cf90ce509102e3d7ee6d4bf7d0650baf645b5ece08cc7c
 DIST proton-wine-9.0-3.tar.gz 49153588 BLAKE2B 81f80fbcf7045c9e08b8c4fd5feeb24fdc65f4266d6ecc2198e8638e56e6fd65cbf7e6d3d113d84ea0bd24ac8bb4780db0bb8dbfdf93f120b4f3b6a5948eedae SHA512 1ec948c781576bc21d5735db4ad572c7d73ecd046d2d2e45958ddc08ec9591441397bb582bfe8b5eb94c584da7000cf4ab138b67bda4b3e717568842595f0d8f
-EBUILD wine-proton-7.0.6.ebuild 13153 BLAKE2B 3774cef4e20e5fa5c4d10c981d2d93f1930c9459f479d7fdf5f61040640b9d353819a6e4a7839b00391fa6ae2866ab09182ba0385b21144b342f6636fbcfbee0 SHA512 cd4ff8343b63d46a1daef66f8f037a371d02b1f4828db3e6dbc58e26629ba1804e77e37cc0b598d17d312ac2d1a4313957c757218cc02115b74741683b3abd40
-EBUILD wine-proton-8.0.5c.ebuild 14095 BLAKE2B 80200c693ba957e885e8065767a0384381d18f7e82a76fb50521445dadaed6c273405f3b59a2994f85384738e3c2b49aaa54e75b07a4e17b47e58d86ae5541ce SHA512 f15e546aded5dd5d225b9c3d9ef0e776ce9a8e3e4508e479dc46b08c7e84a49cb48f8342729a558b1185d77e209c6e31411106977f011aac62de25001e22e560
-EBUILD wine-proton-9.0.2.ebuild 14995 BLAKE2B b3a53bc57f4acf7048912456bc7d240a383f179d8ea0307f61ad1327ea99836817b91678b5cf75a6701d47fc4f6539149aa82579c14f38f3c45a6af112129186 SHA512 e1aa470471e9908291e6750b789c5521118d89fa8cd943c2f0377f3be540309777575bcf0aa7d55b00195b444a450dc6e28959677458143a297675b93d8d3e13
-EBUILD wine-proton-9.0.3.ebuild 14996 BLAKE2B a270e939e31f821701a5cdc670c24f6b12ccd951fd67bfac00bb724887202935e586a9dfa0969f676eb8a6410dde198340a17c613cb932cc961a92311f8e2ca5 SHA512 cd89c2cb37df3902f644c89c00ad397d19f6c4011a0cecaff1b915bf7cdbdc3ac261f8f401e6d982dd1916594d5d784da36eb36c076aba81c21efff3bc07a11b
-EBUILD wine-proton-9999.ebuild 15109 BLAKE2B e8f16a84bcfdec766b4d94e496e84314f18d6e389c94660a28843d01e4c71d99cef7ab9f180190b2ef891a863256a8e14700729acf44fdc61c4296efb36f5ee4 SHA512 12e386732444bc2c9878a7b34fdf5ab89331b22f70cefa53d05fd818dc2bbd9d1c80a42856002c8e887e82a41345d044d7803f7a8a57bc08be42af73c1fcb8bf
+DIST proton-wine-9.0-4.tar.gz 49339922 BLAKE2B 914ca093ac288c26400e4eeb2ea33943fc8ad89052aa7c97b5c44286dc175745720455d65163baa90b0d0271eb8028549315a3e8095b91947db2bd96c6fc4852 SHA512 e061f0a55b25493f67ca3add8c7e41020bb57cb15e8fb4fdf3c23f0cab2d00b703c90fbcf0dc1ca8b67e1726a76cee910e9ea6f567c88bc6c520dd6c9dbb75e9
+EBUILD wine-proton-7.0.6.ebuild 13138 BLAKE2B d309ce8c55dc63f99f54205c9e7601decb0400cd73aa14fd7a10c2b3a45162a8abbb0b32ca8ba21d18637ffb75fe2ab88422c3d7a899679fcc459f1807173901 SHA512 90fcde31389524651e300680554ed27451eba0fb099599ea1a13ea10e24f9c147c8c3555c688262240db8ebc13c061541b841e8dd6d1966ea2d54a70141c8a93
+EBUILD wine-proton-8.0.5c.ebuild 14090 BLAKE2B bff5e2b5f272af1aeaa1ca0de729b71e2629a8006c0700e633ff189b29360a42c51ccdf2e34195a198787c1a30be1e2c98fd92204e0a4ade1f1fda643db0ba26 SHA512 519b265f61adeb062cb886ec1fe109371b40f9fefcf06d9143639141054f2037e1ec25adc832b35fba5f2de234aa1d470edf2500bf0656880be7d32f137d060a
+EBUILD wine-proton-9.0.2.ebuild 14990 BLAKE2B 88c90b9f79fcb843ddcbc976c5e731a778b7c422cefb488fd2a34ff3e5f00eb225d06ee88dc75803a8827da17eff72e60feecba5029974baa393e76ebecfc930 SHA512 cfa95408eedd6a3c121a4b469f3675dbf6aff717c7a405f1068ab02ce6411434dcde561a29fd63d92a32322f38989077ddd98c27ccc05c1f1c453a1a54a367c1
+EBUILD wine-proton-9.0.3.ebuild 14991 BLAKE2B fb49d46c896c8891f141ad42a6c0361f3160681c680a1aabfbe28826f9036f2d11c701d91c8d5309e044b94ef571846822c0b0c694a3905d5ff4902f0b765ecf SHA512 5cab481b8ab3e08948b803ee713af5b30996e659e2bcb713fcc03d4b33fd58599f9a87d9598242d6ce34fe9bafcc90fe919f7a79a36322444fedab4f6503edae
+EBUILD wine-proton-9.0.4.ebuild 14991 BLAKE2B 7b8f8fdfe9784b6d436d36a9258bec4c793ad8f80fa02ec69d50b11fbf3e2bb1b9a522d542517dbba31bc46b96a17ba7ce8a55fd916e6a13e8c2f180152ccc0e SHA512 960a21425ddc327854f3e608569104b2f10226c8309909c8d77fdd66be770d0fd7514de2d55cc6ba1cc7571eb68b73cedc8cb1c7329b542b5093ebfca7d03946
+EBUILD wine-proton-9999.ebuild 15118 BLAKE2B cbd7e649fe3887d2f8ef0c08f0c71c8d5ed7e34b41e24468ffe96658393f2839e2ba73cdc18d066a068756e31c7d47ce674137c38de2f428e77c7f523878775d SHA512 b4bd206699b1d4a9129e0d5a2b39bf506677868a670b660c038df3de9d2b0593029f7ba0faeae793cd09933f83a0b87cc88ae6df7ee6826f19a6bffea3119545
 MISC metadata.xml 1593 BLAKE2B 2e07980ce479dbb737394a5b74576925da936ca2ef5c0767b036cad7f56460ae0a6c73e8a416679f512a5195d037329ce9d3ace9808f68e024baf8640f462d94 SHA512 9f99896328a6337e7a2228977a3b7d853e78aef50a19ee40c43d18f657ead529553d7ea788bae1d408bd074f240cb555ba42558a54cd3ff8ab530b167e813d55
diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 4ebc2d33e911..c4630cc016e8 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -12,10 +12,10 @@ WINE_GECKO=2.47.3
 WINE_MONO=7.4.0
 WINE_PV=$(ver_rs 2 -)
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
-	EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+	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}"
@@ -76,7 +76,7 @@ WINE_COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
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 484175067031..ca291e4a2bfa 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -12,10 +12,10 @@ WINE_GECKO=2.47.3
 WINE_MONO=8.1.0
 WINE_PV=$(ver_rs 2 -)
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
-	EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+	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}"
@@ -76,7 +76,7 @@ WINE_COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -98,7 +98,7 @@ DEPEND="
 	${WINE_COMMON_DEPEND}
 	|| (
 		sys-devel/gcc:*
-		sys-libs/compiler-rt:*[atomic-builtins(-)]
+		llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
 	)
 	sys-kernel/linux-headers
 	x11-base/xorg-proto
@@ -171,7 +171,7 @@ src_prepare() {
 		# than do LLVM_SLOT it may(?) be better to force atomic-builtins
 		# then could drop this altogether in the future
 		if [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
-			has_version 'sys-libs/compiler-rt[-atomic-builtins(-)]'
+			has_version '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/' \
diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
index e025b12e1398..21ce4922b7c7 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
@@ -12,10 +12,10 @@ WINE_GECKO=2.47.4
 WINE_MONO=9.1.0
 WINE_PV=$(ver_rs 2 -)
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
-	EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+	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}"
@@ -77,7 +77,7 @@ WINE_COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -102,7 +102,7 @@ DEPEND="
 	${WINE_COMMON_DEPEND}
 	|| (
 		sys-devel/gcc:*
-		sys-libs/compiler-rt:*[atomic-builtins(-)]
+		llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
 	)
 	sys-kernel/linux-headers
 	x11-base/xorg-proto
@@ -111,7 +111,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	sys-devel/bison
@@ -183,7 +183,7 @@ src_prepare() {
 		# than do LLVM_SLOT it may(?) be better to force atomic-builtins
 		# then could drop this altogether in the future
 		if [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
-			has_version 'sys-libs/compiler-rt[-atomic-builtins(-)]'
+			has_version '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/' \
diff --git a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
index 2b91f26fbdd4..1f038c794152 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
@@ -12,10 +12,10 @@ WINE_GECKO=2.47.4
 WINE_MONO=9.2.0
 WINE_PV=$(ver_rs 2 -)
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
-	EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+	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}"
@@ -77,7 +77,7 @@ WINE_COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -102,7 +102,7 @@ DEPEND="
 	${WINE_COMMON_DEPEND}
 	|| (
 		sys-devel/gcc:*
-		sys-libs/compiler-rt:*[atomic-builtins(-)]
+		llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
 	)
 	sys-kernel/linux-headers
 	x11-base/xorg-proto
@@ -111,7 +111,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	sys-devel/bison
@@ -183,7 +183,7 @@ src_prepare() {
 		# than do LLVM_SLOT it may(?) be better to force atomic-builtins
 		# then could drop this altogether in the future
 		if [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
-			has_version 'sys-libs/compiler-rt[-atomic-builtins(-)]'
+			has_version '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/' \
diff --git a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
new file mode 100644
index 000000000000..1755a53c0c96
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
@@ -0,0 +1,448 @@
+# 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..13} )
+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.3.1
+WINE_PV=$(ver_rs 2 -)
+
+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-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[X,${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}] )
+"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	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? ( llvm-runtimes/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-devel/gcc:*
+		llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
+	)
+	sys-kernel/linux-headers
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		sys-devel/binutils
+		llvm-core/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}-8.0.5c-vulkan-libm.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
+
+		# note: this is kind-of best effort and ignores llvm slots, rather
+		# than do LLVM_SLOT it may(?) be better to force atomic-builtins
+		# then could drop this altogether in the future
+		if [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
+			has_version '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
+	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)
+	)
+
+	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
+	# 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
+
+			# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
+			# strip-unsupported-flags miss these during compile-only tests
+			# (primarily done for 23.0 profiles' -z, not full coverage)
+			filter-flags '-Wl,-z,*'
+
+			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; then
+		# difficult to tell what is needed from here, but try to warn
+		if has_version 'x11-drivers/nvidia-drivers'; then
+			if 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."
+				ewarn "Multi-card setups may need this on media-libs/mesa as well."
+			fi
+		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+			ewarn "media-libs/mesa seems to be in use 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
+	fi
+
+	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."
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild b/app-emulation/wine-proton/wine-proton-9999.ebuild
index 84d47f7e7cab..4319a3a8efc7 100644
--- a/app-emulation/wine-proton/wine-proton-9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9999.ebuild
@@ -9,10 +9,10 @@ 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.3.0
+WINE_MONO=9.3.1
 WINE_PV=$(ver_rs 2 -)
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
 	EGIT_BRANCH="bleeding-edge"
@@ -77,7 +77,7 @@ WINE_COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -102,7 +102,7 @@ DEPEND="
 	${WINE_COMMON_DEPEND}
 	|| (
 		sys-devel/gcc:*
-		sys-libs/compiler-rt:*[atomic-builtins(-)]
+		llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
 	)
 	sys-kernel/linux-headers
 	x11-base/xorg-proto
@@ -111,7 +111,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	sys-devel/bison
@@ -183,7 +183,7 @@ src_prepare() {
 		# than do LLVM_SLOT it may(?) be better to force atomic-builtins
 		# then could drop this altogether in the future
 		if [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
-			has_version 'sys-libs/compiler-rt[-atomic-builtins(-)]'
+			has_version '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/' \
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 0551519bc7f1..397cbb3442a5 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -11,10 +11,10 @@ DIST wine-staging-9.19.tar.gz 9460757 BLAKE2B 20b5cb89b73409bb45129cc59ed776271c
 DIST wine-staging-9.20.tar.gz 9518651 BLAKE2B 77bd59dfc9f18a159d6256e3b5c92a8badbdf64c7e2f86fe0dbd2372d28e7643adb35b9f209ea431f4ea49c0db65f07681fc53272e9e26e3f8a6284baba352fe SHA512 fec41c68bc9396d0c40545f6eadd7ad7ba2ecdd886df6e5060be9e288e95790040f70a3c889ce8fa26b42829bef702d31f105eeede795f0a1d17f716f6c6682d
 DIST wine-staging-9.21.tar.gz 9564841 BLAKE2B e890ecf3743ec662325a248829d69011ae48189e4694c357ddded0d0f4b46ed7431b94715960f52ceaabe0f7b8790c546f98c78febe8c93fd613848283f94d8e SHA512 fb7a5c0c0c72047649d031c1caaeb6b3626f23c38535b37cc331acd30dac26fd299b0f7abd54dc2396940ef01dc816415c74bd894bb77f08bcab988eb3685890
 DIST wine-staging-9.22.tar.gz 9541167 BLAKE2B c409058075dc413bdca77cb7e6da9ba43aee3f6110902536f1ded7260e6fdbe985210b5f168fbfa1a6839b98e4ebaddacad00a162d4ad43ff30e3ccba25c9b2e SHA512 e46fccbc9417765d4c93ac8f39a44f9a6c91e60c4325745726e81d5f1c3330171da3e02d7a3dad9a7df55fa9d2d31e182cb605eaa1a8006d94eecb02f489cc93
-EBUILD wine-staging-9.0.ebuild 15782 BLAKE2B 7a1174b6a68d487a92dc64f4da323e69a55462fe9beefdf4f3641dbe9bdc389a9860608ab13eac39574c6b79e4162520826743048d150ef6cfcf00b8a4c76ad6 SHA512 1c95ae0ad40513bd9c582601db8f906b0fd56865a2ac2108057016785c33d5991e4ceade3c9f3dc06a6eeb7e0b3b5349b3142d1881cc429e19c7da951154568e
-EBUILD wine-staging-9.19.ebuild 15573 BLAKE2B 61a48483d56cdad3b3ac281fc75f41a04ee347b927ebd66ebae9a6d0e60c23fc543c7fd7152f59dcbc2d251f60a26e06f021c49bbc94fb31f8b99101b50536cf SHA512 b7ff1ece6f3bdb508307ff0a583b04a7e5d09d4fc49a1c70076deaef854fadc9a09ec6ee40b438c5b9a02980d482678be95c94f8131dd4aeb5fde22a6cb525ef
-EBUILD wine-staging-9.20.ebuild 15577 BLAKE2B 985a2ce2583921b6ea3c5eb4e38acf786a09eb10953a8ac35f8cdb8c0e7f85324b0cf7484a3afa5fd08f3aaaecadc4486d73e62ea3576892257ec6f079415611 SHA512 9be8a7a7c9003b3612241d0cefef4acd26eba63c53a08b2654396614dfaf064d5f85d360639b32083ff3bbdc7f78eb081dbea965073e54be804bfd1f520c913a
-EBUILD wine-staging-9.21.ebuild 15577 BLAKE2B 985a2ce2583921b6ea3c5eb4e38acf786a09eb10953a8ac35f8cdb8c0e7f85324b0cf7484a3afa5fd08f3aaaecadc4486d73e62ea3576892257ec6f079415611 SHA512 9be8a7a7c9003b3612241d0cefef4acd26eba63c53a08b2654396614dfaf064d5f85d360639b32083ff3bbdc7f78eb081dbea965073e54be804bfd1f520c913a
-EBUILD wine-staging-9.22.ebuild 15577 BLAKE2B 985a2ce2583921b6ea3c5eb4e38acf786a09eb10953a8ac35f8cdb8c0e7f85324b0cf7484a3afa5fd08f3aaaecadc4486d73e62ea3576892257ec6f079415611 SHA512 9be8a7a7c9003b3612241d0cefef4acd26eba63c53a08b2654396614dfaf064d5f85d360639b32083ff3bbdc7f78eb081dbea965073e54be804bfd1f520c913a
-EBUILD wine-staging-9999.ebuild 15577 BLAKE2B a9652d09175c30916b5be4c604d3d7fd08cf4ba08af28635579c35dd6aa2800028c7a31a3c0146f5db8ddbdc22b89f432b713eadac5c1b1f5c4861c85587059b SHA512 37582d08dac2e0df14c6eb2f7c625e8ee83eca2d13d15004002ca036fe52bb189b8370b12c8ddc2c2f502c151d74f5a74d77a25b00e6fd0185f8ba5f484b09d7
+EBUILD wine-staging-9.0.ebuild 15782 BLAKE2B 715718be1cee4347d2327af0f8efe8973d1322183b3512e2c6a03078d8c6660c989c0d51c63d410a4c8c52c776b8a1d8b4c07462e8ce1154e9b15e505dffc3c3 SHA512 7b5e2f2abc68c255937eeb53b4662d5065a43b5bee86534d7ec701d5ea87c4ff8f3abede513aba2d73e99e5e7b2f05ff8897dd4d9e2cc00e3754adad7a8f6aab
+EBUILD wine-staging-9.19.ebuild 15573 BLAKE2B d8670581f281b7e52daab482c3929e1c819f878f6b0f349981584390bdc35891ac5a995f993604687a6e1ab24f0020885861128aa715e253842fb42ec5d9faa9 SHA512 7636c7324caaaf905f4a84c88564d855e02531493a4d3fd3f543184bfd6d651c51e4f50cb89af731b2881315c42ee820824b791e3243d718cc2442a30193bd0c
+EBUILD wine-staging-9.20.ebuild 15577 BLAKE2B c00f13d1a1fb41b040c8a0e7b71a231fd905dec6827dc36d34e03ba9a333a8b51f8069fe6f014080ad9078510907ed142b02dfc8e084e38eaaceb0356afb7586 SHA512 7e2c3490e46825f4c87b5f427c937445d7a6a348402c10a637c9b05a758094baed0ff5dce7bd08526e705e941b0e2d105414319491646a92129e2ec49a6efc31
+EBUILD wine-staging-9.21.ebuild 15577 BLAKE2B c00f13d1a1fb41b040c8a0e7b71a231fd905dec6827dc36d34e03ba9a333a8b51f8069fe6f014080ad9078510907ed142b02dfc8e084e38eaaceb0356afb7586 SHA512 7e2c3490e46825f4c87b5f427c937445d7a6a348402c10a637c9b05a758094baed0ff5dce7bd08526e705e941b0e2d105414319491646a92129e2ec49a6efc31
+EBUILD wine-staging-9.22.ebuild 15577 BLAKE2B c00f13d1a1fb41b040c8a0e7b71a231fd905dec6827dc36d34e03ba9a333a8b51f8069fe6f014080ad9078510907ed142b02dfc8e084e38eaaceb0356afb7586 SHA512 7e2c3490e46825f4c87b5f427c937445d7a6a348402c10a637c9b05a758094baed0ff5dce7bd08526e705e941b0e2d105414319491646a92129e2ec49a6efc31
+EBUILD wine-staging-9999.ebuild 15577 BLAKE2B 89236ab018b719162dcd15ce17e8130983b223596f3a434444cea02716ecce181f059606d90e3344e0aa14dc99582ae45989f9a685a527639dc1ce700ea3c02a SHA512 57ec46c07d740785b9f3322f1efa94fa3b0ec653d4366ad037103433fd58f4d8d6c733adf2bcc990e9f88e532e998dc2d92547800c59585bf7dedc62e0ad8b30
 MISC metadata.xml 2659 BLAKE2B 8a80b12643e82b98b71bc408e2fd79736da01c8f7d914c7a592cb685893ea3896bc44fecf0160faec803b284d3f6bb38cf36fb4745d9d43e0e1ced8702fcaf9d SHA512 a271e537318a4e90236c195f1f8c24c3255b5465345246627797d37238e2b6292d0734a9ab19542ee34fc1e9312dc4418694992f5ce3c53310228cc6bf14ef90
diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index 991310a78caf..7bd88b9de330 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -102,7 +102,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -151,7 +151,7 @@ BDEPEND="
 	)
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	sys-devel/bison
diff --git a/app-emulation/wine-staging/wine-staging-9.19.ebuild b/app-emulation/wine-staging/wine-staging-9.19.ebuild
index e0c51c2bc68d..dc7cc79a6db5 100644
--- a/app-emulation/wine-staging/wine-staging-9.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.19.ebuild
@@ -104,7 +104,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -147,7 +147,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	dev-vcs/git
diff --git a/app-emulation/wine-staging/wine-staging-9.20.ebuild b/app-emulation/wine-staging/wine-staging-9.20.ebuild
index fb3dc75e7ce3..bb1e1d52d321 100644
--- a/app-emulation/wine-staging/wine-staging-9.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.20.ebuild
@@ -104,7 +104,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -147,7 +147,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	dev-vcs/git
diff --git a/app-emulation/wine-staging/wine-staging-9.21.ebuild b/app-emulation/wine-staging/wine-staging-9.21.ebuild
index fb3dc75e7ce3..bb1e1d52d321 100644
--- a/app-emulation/wine-staging/wine-staging-9.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.21.ebuild
@@ -104,7 +104,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -147,7 +147,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	dev-vcs/git
diff --git a/app-emulation/wine-staging/wine-staging-9.22.ebuild b/app-emulation/wine-staging/wine-staging-9.22.ebuild
index fb3dc75e7ce3..bb1e1d52d321 100644
--- a/app-emulation/wine-staging/wine-staging-9.22.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.22.ebuild
@@ -104,7 +104,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -147,7 +147,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	dev-vcs/git
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index e15b54b84f47..079299786741 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -104,7 +104,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -147,7 +147,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	dev-vcs/git
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index c71264d8ff80..6b5d3b974cd6 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -9,12 +9,12 @@ DIST wine-9.19.tar.xz 30812468 BLAKE2B 24bdcd8d06c9f6b480dbb92469b41ff21b4174fce
 DIST wine-9.20.tar.xz 31807848 BLAKE2B f2fef5c941284a5f89f92696cb242641ad88ea8a4388dd6d72977d9696ab63c1632b91b678567525527c80e30ad5ef2971e5bcf700e4f2d7db9bf3357488ed34 SHA512 65d229cfa1c4daffd0b1cec4480bdc4f8a2bbdeb08a7885efea403b0533beda6a22616e57f8e55038fe9e033137cf2718148e38076409a8c0341b29127bbefa3
 DIST wine-9.21.tar.xz 31888916 BLAKE2B 2d9b08263d2d3d174cf42ef8cb23d47c4516a394b44c4a2c5b1d220c4680239b84f47dfeea8b28c763593c725289cf7c257ad3f9fe0ee407b725391a2e956e90 SHA512 9dc64eb49755342f9a3f5fbb5665d1b3b4fafeb9b2723c198b04bb6f5d486f8feb00198e32e519d618bd87d1cf6c7e6a134bf9110b91023334e949eff00e758f
 DIST wine-9.22.tar.xz 31966312 BLAKE2B 14d75c25a317549528abefd2350790ce03b9c4088bc5f6f3bbfcc9b5b024bf0943526a1571fe1079e8fd39830e4f762960365dfdfe670db7577f4095f30131b4 SHA512 8b54aee952abd08969d3485ef12db9aabeea8627fdaf7a27cb3392477580f2b5882467cd15ba4670741b6b20cc48bb5e3585d44ee4fb95a013c513a3c04342e4
-EBUILD wine-vanilla-7.0.2.ebuild 12901 BLAKE2B c2404cd2f002199d0a44640ed70ac0532ff8a018b1ef580f32d150d7510cf205c9d284d867aedf9698537408ca29b72eac293c43e9352fe09cf97ac28896e519 SHA512 c52451ff842802ecb6fb9473a650e3b71ed8c398f150d0fdf0a9444426ddac05f69829684cfc2485ca057e9809614779ce423c868b6a3404b5c42246b6a09756
-EBUILD wine-vanilla-8.0.2.ebuild 12989 BLAKE2B 364e5407a3a51e1c76708bd7c8bac6c5ccce08f704c191b9b0873d49dcff58dc9ddba8efee7af3be811f1067532386b5694d5171c5c4e7783b60fe8357eedd2f SHA512 f1445732634459ede7e0aa51fc9aa763c861c02a50c711821dd05d61bd4acacd157062727d13ef074256c7e2bd1c686428a373522a27efa68468e45514af5776
-EBUILD wine-vanilla-9.0.ebuild 14266 BLAKE2B f1223c0bdff37d9a2930f543af31634f4506f526c7b8a31f23f0fec265d457ae7bf20e981d63cf605623347d1265d4ca9c994b7711f20cf14847d7f7522e624c SHA512 dd17665408102fb8243fc547181c352232ff9bc07da3f4ce35b6b467c1c86b0f06e3cd20198a454555a2cdedc1346e1d1e531e6e4de95d8cd6fed0acbfbf6789
-EBUILD wine-vanilla-9.19.ebuild 14490 BLAKE2B a5e2fe36065d4dfa50ea453120a67dc8e8e9ba139e07af85955f2134b8d9777d85af9d24215b585cb59149f11ac16e647d6238a2f4cccae822b76c87232aec6c SHA512 8dcc642644e129aed6f5f031c74a0cabb5d38a29ac4205fa68fc00c13801f0e2375daa06c45a3ea4f5dc241b8795b022b4e2b8d0c0e12c43fd937642dd39f42a
-EBUILD wine-vanilla-9.20.ebuild 14494 BLAKE2B c3fe419dba1ca93bdbd92beb0521cd836bd7335bae52445ce159d336762672a437c6b4efab354c6eb90d1b81d96857873c1dd28129d880cecfce9495ed3fb821 SHA512 651c8af50aacb059d4340467e73ceeff929163b2f9e4ff33dea6c2303531a6c32d38ae9772e508691a457639d1d00d1cc6041de5bf7ad73123ef8a2bae24e1ad
-EBUILD wine-vanilla-9.21.ebuild 14494 BLAKE2B c3fe419dba1ca93bdbd92beb0521cd836bd7335bae52445ce159d336762672a437c6b4efab354c6eb90d1b81d96857873c1dd28129d880cecfce9495ed3fb821 SHA512 651c8af50aacb059d4340467e73ceeff929163b2f9e4ff33dea6c2303531a6c32d38ae9772e508691a457639d1d00d1cc6041de5bf7ad73123ef8a2bae24e1ad
-EBUILD wine-vanilla-9.22.ebuild 14494 BLAKE2B c3fe419dba1ca93bdbd92beb0521cd836bd7335bae52445ce159d336762672a437c6b4efab354c6eb90d1b81d96857873c1dd28129d880cecfce9495ed3fb821 SHA512 651c8af50aacb059d4340467e73ceeff929163b2f9e4ff33dea6c2303531a6c32d38ae9772e508691a457639d1d00d1cc6041de5bf7ad73123ef8a2bae24e1ad
-EBUILD wine-vanilla-9999.ebuild 14494 BLAKE2B a16bc0e19c1fca5ce9b720d3ca441f2e3920f18c7f894ad940449f63bcca2efc37f727e84da6391ed4b5cc00cff04f6b69bf5df5ea509e5131c9dac325f47a2b SHA512 40483a0e5b99154fd1ab79e2e1ae1eebe3427e2f5853be7881595686bc77bc0144bf801faaeef7486641def2fc90bc14dcaa8542c96b304c4757a0c682a68fea
+EBUILD wine-vanilla-7.0.2.ebuild 12901 BLAKE2B c56de298278ea1f64164156da06828db82b418a5e1041b816635cf21a30b93127bdacd35caca340518a446d4a1cefaccb3095285882d1cc5b89c4de565ed5128 SHA512 5fe2e8c635e0625ae9abc418110498250db8fef4b45484c2c2b147f492f90043fcd251d14072bee2cbe4558c9d7672ea3a114174fff66ac0205c3c6256dd6906
+EBUILD wine-vanilla-8.0.2.ebuild 12989 BLAKE2B 38ec6d327ee3fe44fb3857615ceccd38ab8552d3c90ea7a5e3ca03eaa8b2c489ca02789c88f593bbb429304f62cd92a46f6af72b4cb63920cc0fb8a0338cdb57 SHA512 a39c6e6caa21abfe2a2a43119d4507769004fcc489c66af615d0761cbec02732a35e5bef7c7a2d8422e80311078167695d8d4fbf580aa7290dd06b25cdbe2a30
+EBUILD wine-vanilla-9.0.ebuild 14266 BLAKE2B 7eb89a6784065bdd547d3a4e768e57603a41dc8d5879006ef0e9cb630968000c00169b16bd77b7b2fc42296bb8bcbe3407020becf893b09b73c6c5ee798818cc SHA512 cf52d3b7a90152636c887c7576c17c540896dfd0195912829a49259f1506f84c35daf22f86ecbf9020951332ab32f846ca6cc251ef8ef13ca501566e0a9b0cbc
+EBUILD wine-vanilla-9.19.ebuild 14490 BLAKE2B 2195dc5bc368cef12785a1edc56d6bedb57504e5ddd53dc4dc5e8cb2613eefadb9607571b05e7f47ba1db81d411b64f71e95100871d4d479eca21a6cc6ef3e64 SHA512 504676a48086ad88d94b7f51aa2b185a16bc90773e112fdf87dc1d8526a2235653baa0f116ec2af262f9058af8cb242fccebae0a33d77e9b68b4b84c63f76b48
+EBUILD wine-vanilla-9.20.ebuild 14494 BLAKE2B f0d5caece080751846858e5f28d2df26b4d6606760131f80331143e0af72d4eb61115686d080569d0a8e4682ef2dc5b68f9569b4dcecf537066898ac2370b844 SHA512 2377bc9c3156e542610f47dd5ea8daab227ec8ce4a192e9ec677ee7678698b016dad4ea8a4cbb35bff3b58ac80da614ad95094c2955ab1e5172f6e27ef40bcf4
+EBUILD wine-vanilla-9.21.ebuild 14494 BLAKE2B f0d5caece080751846858e5f28d2df26b4d6606760131f80331143e0af72d4eb61115686d080569d0a8e4682ef2dc5b68f9569b4dcecf537066898ac2370b844 SHA512 2377bc9c3156e542610f47dd5ea8daab227ec8ce4a192e9ec677ee7678698b016dad4ea8a4cbb35bff3b58ac80da614ad95094c2955ab1e5172f6e27ef40bcf4
+EBUILD wine-vanilla-9.22.ebuild 14494 BLAKE2B f0d5caece080751846858e5f28d2df26b4d6606760131f80331143e0af72d4eb61115686d080569d0a8e4682ef2dc5b68f9569b4dcecf537066898ac2370b844 SHA512 2377bc9c3156e542610f47dd5ea8daab227ec8ce4a192e9ec677ee7678698b016dad4ea8a4cbb35bff3b58ac80da614ad95094c2955ab1e5172f6e27ef40bcf4
+EBUILD wine-vanilla-9999.ebuild 14494 BLAKE2B 4d06d529dc848c809041b80fa5b2abdb81e2cbc2b268e9c39aec3b8f0587b4059c872368c6c9c75f76d69a965fc6c874b26396af415ecfc975ff527c1f031870 SHA512 cccaf07d1df55481fdaa0ca1185b01b606f2eccc401e126ed84f25bdcb080b7c8528e4d77b0b3365e612a62a7f772e29dcbd6ebd586a0335e13706473608d043
 MISC metadata.xml 2726 BLAKE2B 7dc7490fabcda06a27061726225890ee203fe7d22209697c3997f0ccdb4699bfaa09f983c22c4919ce75d2eab6ebdb1add9d9af04f24aee63bae81116fc04094 SHA512 5cdbb062462ae791ff9727d184935af3af147c0bd1e49846731941513301b720313b3356f56a8295780ab822e3117146c9a669d2d96efba6f072d84adba770e6
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 dfb613e944ad..9cc201c4e78e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -96,7 +96,7 @@ WINE_COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
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 1f1319815791..95f7ef5d7382 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -92,7 +92,7 @@ WINE_COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index 977ede6ca160..0ee385cb279a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -96,7 +96,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -136,7 +136,7 @@ DEPEND="
 BDEPEND="
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	sys-devel/bison
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild
index 9c6db6a38766..f5955867daaf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild
@@ -98,7 +98,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -138,7 +138,7 @@ DEPEND="
 BDEPEND="
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	sys-devel/bison
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild
index 28fa6e38456c..708818e7568c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild
@@ -98,7 +98,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -138,7 +138,7 @@ DEPEND="
 BDEPEND="
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	sys-devel/bison
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild
index 28fa6e38456c..708818e7568c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild
@@ -98,7 +98,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -138,7 +138,7 @@ DEPEND="
 BDEPEND="
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	sys-devel/bison
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.22.ebuild
index 28fa6e38456c..708818e7568c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.22.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.22.ebuild
@@ -98,7 +98,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -138,7 +138,7 @@ DEPEND="
 BDEPEND="
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	sys-devel/bison
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 49dd31b80782..d653eed512f5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -98,7 +98,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
@@ -138,7 +138,7 @@ DEPEND="
 BDEPEND="
 	|| (
 		sys-devel/binutils
-		sys-devel/lld
+		llvm-core/lld
 	)
 	dev-lang/perl
 	sys-devel/bison
author	V3n3RiX <venerix@koprulu.sector>	2024-12-12 02:01:24 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-12-12 02:01:24 +0000
commit	39c32f4d5dca9f6293fccb69e9d50baf494c8de4 (patch)
tree	ec772fdf23a7279a60e9063b01c2dc909741a197 /app-emulation
parent	494ca58c9f5243dd4b56557aa8c41bce76e95ec3 (diff)