commit:     83cbaf0e5e894de967231d9ad221d6f860ceac66
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 13:50:40 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 14:11:32 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83cbaf0e

app-emulation/wine-staging: drop 9.19, 9.20, 9.21, 9.22

Old development versions, 9.22 is almost identical to 10.0
bare some bugfixes so there should be no reason not to use
that one isntead.

Note wine-staging-9.0 won't be kept for much longer given that
is not a version with extended support (wine-vanilla-9.0.x is).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/wine-staging/Manifest                |   8 -
 .../wine-staging/wine-staging-9.19.ebuild          | 482 ---------------------
 .../wine-staging/wine-staging-9.20.ebuild          | 482 ---------------------
 .../wine-staging/wine-staging-9.21.ebuild          | 482 ---------------------
 .../wine-staging/wine-staging-9.22.ebuild          | 482 ---------------------
 5 files changed, 1936 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 6fa560295471..fa5facbee1ba 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,12 +1,4 @@
 DIST wine-10.0.tar.xz 32011244 BLAKE2B 
92178cf484cf33e9f3b8340429ee8e68c36e0d25eee4a892f059ab73f103cfcb9eb15e1883bc9fd8c8fe311d4ccbb56582d1f780da7b1406a7839a13addd29ae
 SHA512 
effb41c5641993e2e52eaa825cc19b7d9846e084992c5a5b066ead2339b24384d320898a9cee347a9a87106bcb3b0f54c8cd2c8d4de3a887a658052ddd5168d6
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
-DIST wine-9.19.tar.xz 30812468 BLAKE2B 
24bdcd8d06c9f6b480dbb92469b41ff21b4174fcea6eaccf2359616f018d1c0a1305b5ae8acfcb2f7161b285963f26cc16530d1518db3d1bda7cdbb9807860d5
 SHA512 
530219c6a337f2996eac92d644ab603528b82cc6136cc37c1e6aa736d418f33c6f4b0d54f3537b04bceaf4487d84abcf926a2f5e9536ed4e966c4fe63c5b6ddd
-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
 DIST wine-staging-10.0.tar.gz 9490601 BLAKE2B 
2843d6fbeca285a258dbb7505e2451d183b175a9d0b95a03551d635ca8a81c5ba5702d634f45be8d8574435a0fc77b84ca289350e4e74e97b9d5c7b1b8706fbe
 SHA512 
1340473c0ede35450d9cb91bdca2fb237dd2c19e7cde7a05f3c2c70b741f4321e54a1cc4042a48dc83e07dc6967c904fae6c22233ce28fbc6dfa836cef281250
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
-DIST wine-staging-9.19.tar.gz 9460757 BLAKE2B 
20b5cb89b73409bb45129cc59ed776271cb45347bb344a3f5b4b8075d783dd6f6ff03b14ab0bc4237b67020b909f6235c0fb8822331f171915dbf2c4417cb78e
 SHA512 
c2504af047125e2bf29e4c1d9d7bef275a7bc236bc85344977448a8c4a2bd32cdb813db4ebe26de1b91d04371751ffe3498b9d9c96793d3d3d236fe6be9903dd
-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

diff --git a/app-emulation/wine-staging/wine-staging-9.19.ebuild 
b/app-emulation/wine-staging/wine-staging-9.19.ebuild
deleted file mode 100644
index dc7cc79a6db5..000000000000
--- a/app-emulation/wine-staging/wine-staging-9.19.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# 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 edo flag-o-matic multilib multilib-build optfeature
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.3.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == *9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git";
-       WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git";
-else
-       (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
-       SRC_URI="
-               https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-               
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="
-       https://wiki.winehq.org/Wine-Staging
-       https://gitlab.winehq.org/wine/wine-staging/
-"
-
-S="${WORKDIR}/${WINE_P}"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-       +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-       llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
-       +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-       osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-       +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland
-       wow64 +xcomposite xinerama
-"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-       X? ( truetype )
-       crossdev-mingw? ( mingw )
-       wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXrender[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-               opengl? (
-                       media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-                       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-               )
-               xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-               xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-       )
-       cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-       ${WINE_DLOPEN_DEPEND}
-       X? (
-               x11-libs/libX11[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-       ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               dev-libs/glib:2[${MULTILIB_USEDEP}]
-               media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-       )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-       smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       unwind? (
-               llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
-               !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-       )
-       usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-       wayland? (
-               dev-libs/wayland[${MULTILIB_USEDEP}]
-               x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-       )
-"
-RDEPEND="
-       ${WINE_COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       dos? (
-               || (
-                       games-emulation/dosbox
-                       games-emulation/dosbox-staging
-               )
-       )
-       gecko? (
-               app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-               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
-       )
-       samba? ( net-fs/samba[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-       ${WINE_COMMON_DEPEND}
-       sys-kernel/linux-headers
-       X? ( x11-base/xorg-proto )
-"
-# gitapply.sh "can" work without git but that is hardly tested
-# and known failing with some versions, so force real git
-BDEPEND="
-       ${PYTHON_DEPS}
-       || (
-               sys-devel/binutils
-               llvm-core/lld
-       )
-       dev-lang/perl
-       dev-vcs/git
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       mingw? ( !crossdev-mingw? (
-               >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-               wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-       ) )
-       nls? ( sys-devel/gettext )
-       wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-       __clear_cache # unused on amd64+x86 (bug #900334)
-       res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-7.17-noexecstack.patch
-       "${FILESDIR}"/${PN}-7.20-unwind.patch
-       "${FILESDIR}"/${PN}-8.13-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";
-                               die "USE=crossdev-mingw is enabled, but 
${mingw}-gcc was not found"
-                       fi
-               done
-       fi
-}
-
-src_unpack() {
-       if [[ ${PV} == *9999 ]]; then
-               EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-               git-r3_src_unpack
-
-               # hack: use subshell to preserve state (including what git-r3 
unpack
-               # sets) for smart-live-rebuild as this is not the repo to look 
at
-               (
-                       
EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-                       EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-                       EGIT_CHECKOUT_DIR=${S}
-                       einfo "Fetching Wine commit matching the current 
patchset by default (${EGIT_COMMIT})"
-                       git-r3_src_unpack
-               )
-       else
-               default
-       fi
-}
-
-src_prepare() {
-       local patchinstallargs=(
-               --all
-               --no-autoconf
-               ${MY_WINE_STAGING_CONF}
-       )
-
-       edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-       # sanity check, bumping these has a history of oversights
-       local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-               dlls/appwiz.cpl/addons.c || die)
-       if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-               local gmfatal=
-               [[ ${PV} == *9999 ]] && gmfatal=nonfatal
-               ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " 
${geckomono} " (please file a bug)"
-       fi
-
-       default
-
-       if tc-is-clang; then
-               if use mingw; then
-                       # -mabi=ms was ignored by <clang:16 then turned error 
in :17
-                       # if used without --target *-windows, then gets used in 
install
-                       # phase despite USE=mingw, drop as a quick fix for now
-                       sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-               else
-                       # fails in ./configure unless --enable-archs is passed, 
allow to
-                       # bypass with EXTRA_ECONF but is currently considered 
unsupported
-                       # (by Gentoo) as additional work is needed for (proper) 
support
-                       # note: also fails w/ :17, but unsure if safe to drop 
w/o mingw
-                       [[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-                               die "building ${PN} with clang is only 
supported with USE=mingw"
-               fi
-       fi
-
-       # ensure .desktop calls this variant + slot
-       sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || 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
-       # 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-staging
-}
-
-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)
-
-               $(use_enable gecko mshtml)
-               $(use_enable mono mscoree)
-               --disable-tests
-
-               $(use_with X x)
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with cups)
-               $(use_with ffmpeg)
-               $(use_with fontconfig)
-               $(use_with gphoto2 gphoto)
-               $(use_with gstreamer)
-               $(use_with kerberos gssapi)
-               $(use_with kerberos krb5)
-               $(use_with mingw)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               --without-oss # media-sound/oss is not packaged (OSSv4)
-               $(use_with pcap)
-               $(use_with pulseaudio pulse)
-               $(use_with scanner sane)
-               $(use_with sdl)
-               $(use_with smartcard pcsclite)
-               $(use_with ssl gnutls)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with udisks dbus) # dbus is only used for udisks
-               $(use_with unwind)
-               $(use_with usb)
-               $(use_with v4l v4l2)
-               $(use_with vulkan)
-               $(use_with wayland)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(usev !odbc ac_cv_lib_soname_odbc=)
-       )
-
-       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
-
-       if use mingw; then
-               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}
-                       )}"
-               )
-       fi
-
-       # 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
-
-       if use mingw; then
-               # 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
-       fi
-
-       dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-       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 && { use opengl || use vulkan; }; 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
-
-       optfeature "/dev/hidraw* access used for *some* controllers (e.g. 
DualShock4)" \
-               games-util/game-device-udev-rules
-
-       eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-       eselect wine update --if-unset || die
-}

diff --git a/app-emulation/wine-staging/wine-staging-9.20.ebuild 
b/app-emulation/wine-staging/wine-staging-9.20.ebuild
deleted file mode 100644
index bb1e1d52d321..000000000000
--- a/app-emulation/wine-staging/wine-staging-9.20.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# 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 edo flag-o-matic multilib multilib-build optfeature
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.3.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == *9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git";
-       WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git";
-else
-       (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
-       SRC_URI="
-               https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-               
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="
-       https://wiki.winehq.org/Wine-Staging
-       https://gitlab.winehq.org/wine/wine-staging/
-"
-
-S="${WORKDIR}/${WINE_P}"
-
-LICENSE="LGPL-2.1+ BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-       +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-       llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
-       +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-       osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-       +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland
-       wow64 +xcomposite xinerama
-"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-       X? ( truetype )
-       crossdev-mingw? ( mingw )
-       wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXrender[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-               opengl? (
-                       media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-                       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-               )
-               xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-               xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-       )
-       cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-       ${WINE_DLOPEN_DEPEND}
-       X? (
-               x11-libs/libX11[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-       ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               dev-libs/glib:2[${MULTILIB_USEDEP}]
-               media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-       )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-       smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       unwind? (
-               llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
-               !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-       )
-       usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-       wayland? (
-               dev-libs/wayland[${MULTILIB_USEDEP}]
-               x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-       )
-"
-RDEPEND="
-       ${WINE_COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       dos? (
-               || (
-                       games-emulation/dosbox
-                       games-emulation/dosbox-staging
-               )
-       )
-       gecko? (
-               app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-               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
-       )
-       samba? ( net-fs/samba[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-       ${WINE_COMMON_DEPEND}
-       sys-kernel/linux-headers
-       X? ( x11-base/xorg-proto )
-"
-# gitapply.sh "can" work without git but that is hardly tested
-# and known failing with some versions, so force real git
-BDEPEND="
-       ${PYTHON_DEPS}
-       || (
-               sys-devel/binutils
-               llvm-core/lld
-       )
-       dev-lang/perl
-       dev-vcs/git
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       mingw? ( !crossdev-mingw? (
-               >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-               wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-       ) )
-       nls? ( sys-devel/gettext )
-       wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-       __clear_cache # unused on amd64+x86 (bug #900334)
-       res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-7.17-noexecstack.patch
-       "${FILESDIR}"/${PN}-7.20-unwind.patch
-       "${FILESDIR}"/${PN}-8.13-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";
-                               die "USE=crossdev-mingw is enabled, but 
${mingw}-gcc was not found"
-                       fi
-               done
-       fi
-}
-
-src_unpack() {
-       if [[ ${PV} == *9999 ]]; then
-               EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-               git-r3_src_unpack
-
-               # hack: use subshell to preserve state (including what git-r3 
unpack
-               # sets) for smart-live-rebuild as this is not the repo to look 
at
-               (
-                       
EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-                       EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-                       EGIT_CHECKOUT_DIR=${S}
-                       einfo "Fetching Wine commit matching the current 
patchset by default (${EGIT_COMMIT})"
-                       git-r3_src_unpack
-               )
-       else
-               default
-       fi
-}
-
-src_prepare() {
-       local patchinstallargs=(
-               --all
-               --no-autoconf
-               ${MY_WINE_STAGING_CONF}
-       )
-
-       edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-       # sanity check, bumping these has a history of oversights
-       local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-               dlls/appwiz.cpl/addons.c || die)
-       if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-               local gmfatal=
-               [[ ${PV} == *9999 ]] && gmfatal=nonfatal
-               ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " 
${geckomono} " (please file a bug)"
-       fi
-
-       default
-
-       if tc-is-clang; then
-               if use mingw; then
-                       # -mabi=ms was ignored by <clang:16 then turned error 
in :17
-                       # if used without --target *-windows, then gets used in 
install
-                       # phase despite USE=mingw, drop as a quick fix for now
-                       sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-               else
-                       # fails in ./configure unless --enable-archs is passed, 
allow to
-                       # bypass with EXTRA_ECONF but is currently considered 
unsupported
-                       # (by Gentoo) as additional work is needed for (proper) 
support
-                       # note: also fails w/ :17, but unsure if safe to drop 
w/o mingw
-                       [[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-                               die "building ${PN} with clang is only 
supported with USE=mingw"
-               fi
-       fi
-
-       # ensure .desktop calls this variant + slot
-       sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || 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
-       # 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-staging
-}
-
-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)
-
-               $(use_enable gecko mshtml)
-               $(use_enable mono mscoree)
-               --disable-tests
-
-               $(use_with X x)
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with cups)
-               $(use_with ffmpeg)
-               $(use_with fontconfig)
-               $(use_with gphoto2 gphoto)
-               $(use_with gstreamer)
-               $(use_with kerberos gssapi)
-               $(use_with kerberos krb5)
-               $(use_with mingw)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               --without-oss # media-sound/oss is not packaged (OSSv4)
-               $(use_with pcap)
-               $(use_with pulseaudio pulse)
-               $(use_with scanner sane)
-               $(use_with sdl)
-               $(use_with smartcard pcsclite)
-               $(use_with ssl gnutls)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with udisks dbus) # dbus is only used for udisks
-               $(use_with unwind)
-               $(use_with usb)
-               $(use_with v4l v4l2)
-               $(use_with vulkan)
-               $(use_with wayland)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(usev !odbc ac_cv_lib_soname_odbc=)
-       )
-
-       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
-
-       if use mingw; then
-               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}
-                       )}"
-               )
-       fi
-
-       # 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
-
-       if use mingw; then
-               # 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
-       fi
-
-       dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-       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 && { use opengl || use vulkan; }; 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
-
-       optfeature "/dev/hidraw* access used for *some* controllers (e.g. 
DualShock4)" \
-               games-util/game-device-udev-rules
-
-       eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-       eselect wine update --if-unset || die
-}

diff --git a/app-emulation/wine-staging/wine-staging-9.21.ebuild 
b/app-emulation/wine-staging/wine-staging-9.21.ebuild
deleted file mode 100644
index bb1e1d52d321..000000000000
--- a/app-emulation/wine-staging/wine-staging-9.21.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# 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 edo flag-o-matic multilib multilib-build optfeature
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.3.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == *9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git";
-       WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git";
-else
-       (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
-       SRC_URI="
-               https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-               
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="
-       https://wiki.winehq.org/Wine-Staging
-       https://gitlab.winehq.org/wine/wine-staging/
-"
-
-S="${WORKDIR}/${WINE_P}"
-
-LICENSE="LGPL-2.1+ BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-       +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-       llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
-       +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-       osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-       +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland
-       wow64 +xcomposite xinerama
-"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-       X? ( truetype )
-       crossdev-mingw? ( mingw )
-       wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXrender[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-               opengl? (
-                       media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-                       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-               )
-               xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-               xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-       )
-       cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-       ${WINE_DLOPEN_DEPEND}
-       X? (
-               x11-libs/libX11[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-       ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               dev-libs/glib:2[${MULTILIB_USEDEP}]
-               media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-       )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-       smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       unwind? (
-               llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
-               !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-       )
-       usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-       wayland? (
-               dev-libs/wayland[${MULTILIB_USEDEP}]
-               x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-       )
-"
-RDEPEND="
-       ${WINE_COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       dos? (
-               || (
-                       games-emulation/dosbox
-                       games-emulation/dosbox-staging
-               )
-       )
-       gecko? (
-               app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-               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
-       )
-       samba? ( net-fs/samba[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-       ${WINE_COMMON_DEPEND}
-       sys-kernel/linux-headers
-       X? ( x11-base/xorg-proto )
-"
-# gitapply.sh "can" work without git but that is hardly tested
-# and known failing with some versions, so force real git
-BDEPEND="
-       ${PYTHON_DEPS}
-       || (
-               sys-devel/binutils
-               llvm-core/lld
-       )
-       dev-lang/perl
-       dev-vcs/git
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       mingw? ( !crossdev-mingw? (
-               >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-               wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-       ) )
-       nls? ( sys-devel/gettext )
-       wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-       __clear_cache # unused on amd64+x86 (bug #900334)
-       res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-7.17-noexecstack.patch
-       "${FILESDIR}"/${PN}-7.20-unwind.patch
-       "${FILESDIR}"/${PN}-8.13-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";
-                               die "USE=crossdev-mingw is enabled, but 
${mingw}-gcc was not found"
-                       fi
-               done
-       fi
-}
-
-src_unpack() {
-       if [[ ${PV} == *9999 ]]; then
-               EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-               git-r3_src_unpack
-
-               # hack: use subshell to preserve state (including what git-r3 
unpack
-               # sets) for smart-live-rebuild as this is not the repo to look 
at
-               (
-                       
EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-                       EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-                       EGIT_CHECKOUT_DIR=${S}
-                       einfo "Fetching Wine commit matching the current 
patchset by default (${EGIT_COMMIT})"
-                       git-r3_src_unpack
-               )
-       else
-               default
-       fi
-}
-
-src_prepare() {
-       local patchinstallargs=(
-               --all
-               --no-autoconf
-               ${MY_WINE_STAGING_CONF}
-       )
-
-       edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-       # sanity check, bumping these has a history of oversights
-       local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-               dlls/appwiz.cpl/addons.c || die)
-       if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-               local gmfatal=
-               [[ ${PV} == *9999 ]] && gmfatal=nonfatal
-               ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " 
${geckomono} " (please file a bug)"
-       fi
-
-       default
-
-       if tc-is-clang; then
-               if use mingw; then
-                       # -mabi=ms was ignored by <clang:16 then turned error 
in :17
-                       # if used without --target *-windows, then gets used in 
install
-                       # phase despite USE=mingw, drop as a quick fix for now
-                       sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-               else
-                       # fails in ./configure unless --enable-archs is passed, 
allow to
-                       # bypass with EXTRA_ECONF but is currently considered 
unsupported
-                       # (by Gentoo) as additional work is needed for (proper) 
support
-                       # note: also fails w/ :17, but unsure if safe to drop 
w/o mingw
-                       [[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-                               die "building ${PN} with clang is only 
supported with USE=mingw"
-               fi
-       fi
-
-       # ensure .desktop calls this variant + slot
-       sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || 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
-       # 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-staging
-}
-
-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)
-
-               $(use_enable gecko mshtml)
-               $(use_enable mono mscoree)
-               --disable-tests
-
-               $(use_with X x)
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with cups)
-               $(use_with ffmpeg)
-               $(use_with fontconfig)
-               $(use_with gphoto2 gphoto)
-               $(use_with gstreamer)
-               $(use_with kerberos gssapi)
-               $(use_with kerberos krb5)
-               $(use_with mingw)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               --without-oss # media-sound/oss is not packaged (OSSv4)
-               $(use_with pcap)
-               $(use_with pulseaudio pulse)
-               $(use_with scanner sane)
-               $(use_with sdl)
-               $(use_with smartcard pcsclite)
-               $(use_with ssl gnutls)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with udisks dbus) # dbus is only used for udisks
-               $(use_with unwind)
-               $(use_with usb)
-               $(use_with v4l v4l2)
-               $(use_with vulkan)
-               $(use_with wayland)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(usev !odbc ac_cv_lib_soname_odbc=)
-       )
-
-       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
-
-       if use mingw; then
-               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}
-                       )}"
-               )
-       fi
-
-       # 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
-
-       if use mingw; then
-               # 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
-       fi
-
-       dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-       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 && { use opengl || use vulkan; }; 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
-
-       optfeature "/dev/hidraw* access used for *some* controllers (e.g. 
DualShock4)" \
-               games-util/game-device-udev-rules
-
-       eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-       eselect wine update --if-unset || die
-}

diff --git a/app-emulation/wine-staging/wine-staging-9.22.ebuild 
b/app-emulation/wine-staging/wine-staging-9.22.ebuild
deleted file mode 100644
index bb1e1d52d321..000000000000
--- a/app-emulation/wine-staging/wine-staging-9.22.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# 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 edo flag-o-matic multilib multilib-build optfeature
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.3.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == *9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git";
-       WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git";
-else
-       (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
-       SRC_URI="
-               https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-               
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="
-       https://wiki.winehq.org/Wine-Staging
-       https://gitlab.winehq.org/wine/wine-staging/
-"
-
-S="${WORKDIR}/${WINE_P}"
-
-LICENSE="LGPL-2.1+ BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-       +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-       llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
-       +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-       osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-       +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland
-       wow64 +xcomposite xinerama
-"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-       X? ( truetype )
-       crossdev-mingw? ( mingw )
-       wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXrender[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-               opengl? (
-                       media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-                       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-               )
-               xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-               xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-       )
-       cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-       ${WINE_DLOPEN_DEPEND}
-       X? (
-               x11-libs/libX11[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-       ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               dev-libs/glib:2[${MULTILIB_USEDEP}]
-               media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-       )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-       smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       unwind? (
-               llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
-               !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-       )
-       usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-       wayland? (
-               dev-libs/wayland[${MULTILIB_USEDEP}]
-               x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-       )
-"
-RDEPEND="
-       ${WINE_COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       dos? (
-               || (
-                       games-emulation/dosbox
-                       games-emulation/dosbox-staging
-               )
-       )
-       gecko? (
-               app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-               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
-       )
-       samba? ( net-fs/samba[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-       ${WINE_COMMON_DEPEND}
-       sys-kernel/linux-headers
-       X? ( x11-base/xorg-proto )
-"
-# gitapply.sh "can" work without git but that is hardly tested
-# and known failing with some versions, so force real git
-BDEPEND="
-       ${PYTHON_DEPS}
-       || (
-               sys-devel/binutils
-               llvm-core/lld
-       )
-       dev-lang/perl
-       dev-vcs/git
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       mingw? ( !crossdev-mingw? (
-               >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-               wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-       ) )
-       nls? ( sys-devel/gettext )
-       wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-       __clear_cache # unused on amd64+x86 (bug #900334)
-       res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-7.17-noexecstack.patch
-       "${FILESDIR}"/${PN}-7.20-unwind.patch
-       "${FILESDIR}"/${PN}-8.13-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";
-                               die "USE=crossdev-mingw is enabled, but 
${mingw}-gcc was not found"
-                       fi
-               done
-       fi
-}
-
-src_unpack() {
-       if [[ ${PV} == *9999 ]]; then
-               EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-               git-r3_src_unpack
-
-               # hack: use subshell to preserve state (including what git-r3 
unpack
-               # sets) for smart-live-rebuild as this is not the repo to look 
at
-               (
-                       
EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-                       EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-                       EGIT_CHECKOUT_DIR=${S}
-                       einfo "Fetching Wine commit matching the current 
patchset by default (${EGIT_COMMIT})"
-                       git-r3_src_unpack
-               )
-       else
-               default
-       fi
-}
-
-src_prepare() {
-       local patchinstallargs=(
-               --all
-               --no-autoconf
-               ${MY_WINE_STAGING_CONF}
-       )
-
-       edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-       # sanity check, bumping these has a history of oversights
-       local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-               dlls/appwiz.cpl/addons.c || die)
-       if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-               local gmfatal=
-               [[ ${PV} == *9999 ]] && gmfatal=nonfatal
-               ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " 
${geckomono} " (please file a bug)"
-       fi
-
-       default
-
-       if tc-is-clang; then
-               if use mingw; then
-                       # -mabi=ms was ignored by <clang:16 then turned error 
in :17
-                       # if used without --target *-windows, then gets used in 
install
-                       # phase despite USE=mingw, drop as a quick fix for now
-                       sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-               else
-                       # fails in ./configure unless --enable-archs is passed, 
allow to
-                       # bypass with EXTRA_ECONF but is currently considered 
unsupported
-                       # (by Gentoo) as additional work is needed for (proper) 
support
-                       # note: also fails w/ :17, but unsure if safe to drop 
w/o mingw
-                       [[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-                               die "building ${PN} with clang is only 
supported with USE=mingw"
-               fi
-       fi
-
-       # ensure .desktop calls this variant + slot
-       sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || 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
-       # 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-staging
-}
-
-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)
-
-               $(use_enable gecko mshtml)
-               $(use_enable mono mscoree)
-               --disable-tests
-
-               $(use_with X x)
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with cups)
-               $(use_with ffmpeg)
-               $(use_with fontconfig)
-               $(use_with gphoto2 gphoto)
-               $(use_with gstreamer)
-               $(use_with kerberos gssapi)
-               $(use_with kerberos krb5)
-               $(use_with mingw)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               --without-oss # media-sound/oss is not packaged (OSSv4)
-               $(use_with pcap)
-               $(use_with pulseaudio pulse)
-               $(use_with scanner sane)
-               $(use_with sdl)
-               $(use_with smartcard pcsclite)
-               $(use_with ssl gnutls)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with udisks dbus) # dbus is only used for udisks
-               $(use_with unwind)
-               $(use_with usb)
-               $(use_with v4l v4l2)
-               $(use_with vulkan)
-               $(use_with wayland)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(usev !odbc ac_cv_lib_soname_odbc=)
-       )
-
-       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
-
-       if use mingw; then
-               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}
-                       )}"
-               )
-       fi
-
-       # 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
-
-       if use mingw; then
-               # 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
-       fi
-
-       dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-       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 && { use opengl || use vulkan; }; 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
-
-       optfeature "/dev/hidraw* access used for *some* controllers (e.g. 
DualShock4)" \
-               games-util/game-device-udev-rules
-
-       eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-       eselect wine update --if-unset || die
-}

Reply via email to