commit:     a9e429d1ee38c85cddf9963d014ef874539df8ae
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 23:31:11 2022 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 23:33:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e429d1

app-emulation/wine-staging: Exodia, obliterate

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 app-emulation/wine-staging/Manifest                |   8 -
 app-emulation/wine-staging/metadata.xml            |   1 -
 .../wine-staging/wine-staging-7.12.ebuild          | 544 ---------------------
 .../wine-staging/wine-staging-7.13-r1.ebuild       | 543 --------------------
 .../wine-staging/wine-staging-7.13.ebuild          | 544 ---------------------
 .../wine-staging/wine-staging-7.14.ebuild          | 543 --------------------
 .../wine-staging/wine-staging-7.15.ebuild          | 543 --------------------
 7 files changed, 2726 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 37ab11283809..3afa8a573b85 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,13 +1,5 @@
 DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 
21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d
 SHA512 
a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
-DIST wine-7.12.tar.xz 28221024 BLAKE2B 
551f37360a6dd2c535b5b1a9896cd9c9c091d56c4d2f3d2988092d48d54aa447fc0dad18034bad7b7beaa9c6587071e8d32bd08092a9ba93acb39dac9ddfc391
 SHA512 
4746fb1c3d0ec7f20e22d821f8e88e5415b85cb60f53e9ad61b89e8321b6a6b2999eb2b70c7ac46477f633bccb6c2aba49ce2655c380cb85cd5c71dbe4af50b4
-DIST wine-7.13.tar.xz 28237664 BLAKE2B 
f65f6ab2ec159d0a25b44e6bcbc83db2c5ada6b0c39dd0e3fe86db74bb964d0b1bcba85e5300d5140e24c305b7e30a58953e7582df8a2117ce5d8127538f484b
 SHA512 
2eca3aa80afa19dd0cc3cfeb8b58b78d22d2925b8201e0b7278638084a529870c1468ffc300e6a1bb343d0f0c7e28c2b3bb6c59af15dec43b8f6c1eb78b46c1e
-DIST wine-7.14.tar.xz 28274396 BLAKE2B 
632c4c77a5b93597b8b217a04e34a4867d9e34497322cbcdf89d3bd2c98ee2ce27983582e1aa6737ec6bf5e080f64bcb4813f3e5c83b67cebd36895251a07e2f
 SHA512 
6727be4a23b1911b36c44ac8d347be1c98bb53e67101355d6ae829d14a3a0867ba83f77a52f4dbc02a35c3b513291dd4800148a31d28f50069d199fdee04b6e9
-DIST wine-7.15.tar.xz 28324772 BLAKE2B 
2ae7f693acfa3477c5b925cb6bfc6e2c3094cf56049aae9a310206dce3ef26d32af74ab414f06020dc0e9cf782b8e3cf6b65739ae10b71e783415498b7339618
 SHA512 
9edf9f6169c26fd829255d323ebdda4fd606f9cf9dfebae2c0823c32a2ca40741e10acba6938e0d49a99dd15276795506887ab582fed296beb0202f77b2db1b4
 DIST wine-7.16.tar.xz 28345428 BLAKE2B 
6540dd196639c5b3e01af801439e4ca8d3d17ce6b9832c3ab7d0263909e0a963a5901b8baad00537242c32599af92d04ad58c9f51660583e28693b4ec1bdd803
 SHA512 
5085c7c1b0e762c508f33775f7f0aa41e94cb75805bb649093addad25f90f7f57d5101ba96227f58a6f18b3ae228bd004df11ec1c033692ad130e9b5279ea19e
 DIST wine-7.17.tar.xz 28379876 BLAKE2B 
536af8f1ac9c4dd8bae2d16cba226c99c45cd64f0a9a2569022baefee61556801d3ee15f480fd18445baecb6c78dd7950f98542dc88a3282ee5d457d0e4ddfb1
 SHA512 
fd8017e6174db0047a3957db3045b2ad9024e07b1e2f81800521f0b7e7f7660add6a08e09bc60e3d140816cec70aae8324fe15643bd05e541f22f66ffda52508
-DIST wine-staging-7.12.tar.gz 9644343 BLAKE2B 
760b34abf245b8d2e5baed13db57a841bba73f9dd6652f958428fec3617000cdc00d6f3ac305f4b580cf462938a56ef9a6f0c6931306c25ce82b7fe4da314d9f
 SHA512 
0cf7554011835052b75a836fca89c6cf9b5fa1653c96a82b0dcd3cf40147602eebaf81aa6b94348432371bef9550c8dc21c9cf7d78b49a422bd113e8a6a8e3b0
-DIST wine-staging-7.13.tar.gz 9644182 BLAKE2B 
1fecdd231e93de44d4327cceef0f72759de331b507ea16cd39749be3195716883a5327804f6379ca563e635fbf317d131d6cf87e4b49f177a45116ee3be55527
 SHA512 
f0fbd0d96272e457006d0eac350905e2fd27b472943d08771b4cd1cde88afefeb239e46f88979bcb7d45d525610f5d69c74bf8294b101e064ca2051494ab3127
-DIST wine-staging-7.14.tar.gz 9644603 BLAKE2B 
d923321c1562e71c7826e73aec52bd0fb451bb8ff302841f7756428c23b80ea00f815d1a6cc5e3354a83ce87137b2af7ac3389c2c018344cf80afdae50f151b1
 SHA512 
40ffa7a64780a054bdace9fd5f294a45f7648f6db933ba0a74450b5412df5cc989b7aa442dcba1f185f8d0e5a7740a9508203f1ee323f26fd77867caa9d4fcb3
-DIST wine-staging-7.15.tar.gz 9644942 BLAKE2B 
1d04730b540785d03cec919ee643cd182c09c3ad022a6b9f5111348ea82a7c3e34e2108141e544855423224db15a5d954623840b3a0d3e3709d0cd23ad1e3236
 SHA512 
57b6145b3a39a8fb5e98648072e3c1f4f1528fdcfe1f8612f41dc7e0ea4fcc09e4e78d3bbe8fa7a5c14ff0708328306cf0eb8367016f6b2fda9e34f0f1be0621
 DIST wine-staging-7.16.tar.gz 9640421 BLAKE2B 
551a282c40de44a03afd7d6ef7edefac29e6ece53bd9eff854076edab400ed58c37f2d89737354c7a9d3ac9af7c576bc0ec68c61159842e9b46ac4d95c0d07ae
 SHA512 
57003888580f3c442b9d9bc1b36c3e967bfe5b5d61b7fcd8d832a463cbea793c4bf6afce35da18ea9cee568237a0a919583e1dc6b3fea7bc09a7a13e9d9260ce
 DIST wine-staging-7.17.tar.gz 9558133 BLAKE2B 
ef56bae5168da021688766e1cfbc8bd510a18b0de670b0baab631389665d52230e4f9ecda2edff1f50cbd444098d33236fd0f685183e9074efc6d048665c6931
 SHA512 
2e9c260b56293d86a54833d128d98b2408f61a5601f0ef58db6ff02a9c5cb091d3e9acf7f6a616d7d065d9c02127936da6bdc30e6ee11b116d24aab579f512fb

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index 3193bc2e2134..d65b9b9e346e 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -20,7 +20,6 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.
                </flag>
                <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to 
run DOS applications</flag>
                <flag name="gecko">Enable mshtml support using 
<pkg>app-emulation/wine-gecko</pkg></flag>
-               <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag>
                <flag name="mingw">Build PE files using a MinGW toolchain for 
better compatibility</flag>
                <flag name="mono">Enable .NET support using 
<pkg>app-emulation/wine-mono</pkg></flag>
                <flag name="netapi">Enable support for configuring remote 
shares using <pkg>net-fs/samba</pkg></flag>

diff --git a/app-emulation/wine-staging/wine-staging-7.12.ebuild 
b/app-emulation/wine-staging/wine-staging-7.12.ebuild
deleted file mode 100644
index fc41e0c525ab..000000000000
--- a/app-emulation/wine-staging/wine-staging-7.12.ebuild
+++ /dev/null
@@ -1,544 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale 
toolchain-funcs virtualx wrapper xdg-utils
-MY_PN="${PN%%-*}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://source.winehq.org/git/wine.git";
-       EGIT_BRANCH="master"
-       inherit git-r3
-       SRC_URI=""
-       #KEYWORDS=""
-else
-       MAJOR_V=$(ver_cut 1)
-       MINOR_V=$(ver_cut 2)
-       if [[ ${MINOR_V} != "0" ]] ; then
-               MINOR_V="x"
-       fi
-       
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz";
-       KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${MY_PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20211122"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="https://www.winehq.org/";
-SRC_URI="${SRC_URI}
-       
https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-       STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git";
-else
-       SRC_URI="${SRC_URI}
-       staging? ( 
https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> 
${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos 
+fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 
netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight 
pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test 
+threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       crossdev-mingw? ( mingw )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       pipelight? ( staging )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-BDEPEND="sys-devel/flex
-       virtual/yacc
-       virtual/pkgconfig
-       mingw? ( !crossdev-mingw? ( 
dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
-
-COMMON_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? (
-               media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
-               media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
-       )
-       gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-       )
-       kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       >app-eselect/eselect-wine-0.3
-       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-       gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:7.3.0 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       samba? ( >=net-fs/samba-3.0.25[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       ${BDEPEND}
-       >=sys-kernel/linux-headers-2.6
-       X? ( x11-base/xorg-proto )
-       staging? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-       # Ensure compiler support
-       # (No checks here as of 2022)
-       return 0
-}
-
-wine_build_environment_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> 
/dev/null)" == "intel" ]]; then
-               eerror "You cannot build wine with USE=opencl because 
intel-ocl-sdk is 64-bit only."
-               eerror "See https://bugs.gentoo.org/487864 for more details."
-               eerror
-               return 1
-       fi
-}
-
-wine_env_vcs_vars() {
-       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-       local pn_live_val="${pn_live_var}"
-       eval pn_live_val='$'${pn_live_val}
-       if [[ ! -z ${pn_live_val} ]]; then
-               if use staging; then
-                       eerror "Because of the multi-repo nature of ${MY_PN}, 
${pn_live_var}"
-                       eerror "cannot be used to set the commit. Instead, you 
may use the"
-                       eerror "environment variables:"
-                       eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-                       eerror "  
EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-                       eerror
-                       return 1
-               fi
-       fi
-       if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environment 
variables:"
-               eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-               eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-               eerror
-               return 1
-       fi
-}
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]] ; then
-               wine_build_environment_check || die
-
-               # Verify OSS support
-               if use oss; then
-                       if ! has_version ">=media-sound/oss-4"; then
-                               eerror "You cannot build wine with USE=oss 
without having support from"
-                               eerror ">=media-sound/oss-4 (only available 
through external repos)"
-                               eerror
-                               die
-                       fi
-               fi
-
-               if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-                       local mingw=-w64-mingw32
-                       for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev 
abi_x86_32 i686${mingw}); do
-                               type -P ${mingw}-gcc && continue
-                               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"
-                       done
-               fi
-       fi
-}
-
-pkg_setup() {
-       wine_build_environment_check || die
-       wine_env_vcs_vars || die
-
-       WINE_VARIANT="${PN#wine}-${MY_PV}"
-       WINE_VARIANT="${WINE_VARIANT#-}"
-
-       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-       MY_DATADIR="${MY_DATAROOTDIR}"
-       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-       MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-       if [[ ${MY_PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-               if use staging; then
-                       local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-                       EGIT_CHECKOUT_DIR="${STAGING_DIR}" 
EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-                       local 
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" 
--upstream-commit) || die
-
-                       if [[ "${CURRENT_WINE_COMMIT}" != 
"${COMPAT_WINE_COMMIT}" ]]; then
-                               einfo "The current Staging patchset is not 
guaranteed to apply on this WINE commit."
-                               einfo "If src_prepare fails, try emerging with 
the env var WINE_COMMIT."
-                               einfo "Example: 
EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-                       fi
-               fi
-       fi
-
-       default
-
-       plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       if use staging; then
-               ewarn "Applying the Wine-Staging patchset. Any bug reports to 
the"
-               ewarn "Wine bugzilla should explicitly state that staging was 
used."
-
-               local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" 
#652176
-               use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
Pipelight"
-
-               # Launch wine-staging patcher in a subshell, using eapply as a 
backend, and gitapply.sh as a backend for binary patches
-               ebegin "Running Wine-Staging patch installer"
-               (
-                       set -- DESTDIR="${S}" --backend=eapply --no-autoconf 
--all ${STAGING_EXCLUDE}
-                       cd "${STAGING_DIR}/patches"
-                       source "${STAGING_DIR}/patches/patchinstall.sh"
-               )
-               eend $? || die "Failed to apply Wine-Staging patches"
-       fi
-
-       default
-       eapply_bin
-       eautoreconf
-
-       # Modification of the server protocol requires regenerating the server 
requests
-       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-               einfo "server/protocol.def was patched; running 
tools/make_requests"
-               tools/make_requests || die #432348
-       fi
-       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-       if ! use run-exes; then
-               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-       fi
-
-       # Edit wine.desktop to work for specific variant
-       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop 
|| die
-
-       # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
-
-       # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-       # Duplicate manpages input files for wine64
-       local f
-       for f in loader/*.man.in; do
-               cp ${f} ${f/wine/wine64} || die
-       done
-       # Add wine64 manpages to Makefile
-       if use abi_x86_64; then
-               sed -i "/wine.man.in/i \
-                       \\\twine64.man.in \\\\" loader/Makefile.in || die
-               sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-       fi
-
-       rm_man_file(){
-               local file="${1}"
-               loc=${2}
-               sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-       }
-
-       while read f; do
-               plocale_for_each_disabled_locale rm_man_file "${f}"
-       done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
-}
-
-src_configure() {
-       wine_compiler_check || die
-
-       export LDCONFIG=/bin/true
-       use custom-cflags || strip-flags
-       if use mingw; then
-               use crossdev-mingw || 
PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
-
-               # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
-               local mingwcc=${CROSSCC:-$(usex x86 i686 
x86_64)-w64-mingw32-gcc}
-               : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC 
${CFLAGS:--O2})}"
-               : "${CROSSLDFLAGS:=$(
-                       filter-flags '-fuse-ld=*'
-                       CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
-               export CROSS{C,LD}FLAGS
-       fi
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --prefix="${MY_PREFIX}"
-               --datarootdir="${MY_DATAROOTDIR}"
-               --datadir="${MY_DATADIR}"
-               --docdir="${MY_DOCDIR}"
-               --includedir="${MY_INCLUDEDIR}"
-               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-               --libexecdir="${MY_LIBEXECDIR}"
-               --localstatedir="${MY_LOCALSTATEDIR}"
-               --mandir="${MY_MANDIR}"
-               --sysconfdir="${EPREFIX}/etc/wine"
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with cups)
-               $(use_with udisks dbus)
-               $(use_with fontconfig)
-               $(use_with ssl gnutls)
-               $(use_enable gecko mshtml)
-               $(use_with gphoto2 gphoto)
-               $(use_with gssapi)
-               $(use_with gstreamer)
-               --enable-hal
-               $(use_with kerberos krb5)
-               $(use_with ldap)
-               # TODO: Will bug 685172 still need special handling?
-               $(use_with mingw)
-               $(use_enable mono mscoree)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with openal)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               $(use_with oss)
-               $(use_with pcap)
-               $(use_with pulseaudio pulse)
-               $(use_with threads pthread)
-               $(use_with scanner sane)
-               $(use_with sdl)
-               $(use_enable test tests)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with unwind)
-               $(use_with usb)
-               $(use_with v4l v4l2)
-               $(use_with vulkan)
-               $(use_with X x)
-               $(use_with X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-       )
-
-       use staging && myconf+=(
-               --with-xattr
-       )
-
-       local PKG_CONFIG
-       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on 
amd64; #472038
-       tc-export PKG_CONFIG
-
-       if use amd64; then
-               if [[ ${ABI} == amd64 ]]; then
-                       myconf+=( --enable-win64 )
-               else
-                       myconf+=( --disable-win64 )
-               fi
-
-               # Note: using --with-wine64 results in problems with 
multilib.eclass
-               # CC/LD hackery. We're using separate tools instead.
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf "${myconf[@]}"
-       emake depend
-}
-
-multilib_src_test() {
-       # FIXME: win32-only; wine64 tests fail with "could not find the Wine 
loader"
-       if [[ ${ABI} == x86 ]]; then
-               if [[ $(id -u) == 0 ]]; then
-                       ewarn "Skipping tests since they cannot be run under 
the root user."
-                       ewarn "To run the test ${MY_PN} suite, add userpriv to 
FEATURES in make.conf"
-                       return
-               fi
-
-               WINEPREFIX="${T}/.wine-${ABI}" \
-               virtx emake test
-       fi
-}
-
-multilib_src_install_all() {
-       local DOCS=( ANNOUNCE AUTHORS README )
-       add_locale_docs() {
-               local locale_doc="documentation/README.$1"
-               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-       }
-       plocale_for_each_locale add_locale_docs
-
-       einstalldocs
-       find "${ED}" -name *.la -delete || die
-
-       if ! use perl ; then # winedump calls function_grep.pl, and winemaker 
is a perl script
-               rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-                       "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-       fi
-
-       use abi_x86_32 && pax-mark psmr 
"${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-       use abi_x86_64 && pax-mark psmr 
"${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-       # Avoid double prefix from dosym and make_wrapper
-       MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-       if use abi_x86_64 && ! use abi_x86_32; then
-               dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-       fi
-
-       # Failglob for binloops, shouldn't be necessary, but including to stay 
safe
-       eshopts_push -s failglob #615218
-       # Make wrappers for binaries for handling multiple variants
-       # Note: wrappers instead of symlinks because some are shell which use 
basename
-       local b
-       for b in "${ED%}${MY_PREFIX}"/bin/*; do
-               make_wrapper "${b##*/}-${WINE_VARIANT}" 
"${MY_PREFIX}/bin/${b##*/}"
-       done
-       eshopts_pop
-}
-
-pkg_postinst() {
-       eselect wine register ${PN}-${MY_PV}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine register --vanilla ${PN}-${MY_PV} || die
-       else
-               if use staging; then
-                       eselect wine register --staging ${PN}-${MY_PV} || die
-               fi
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_desktop_database_update
-
-       if ! use gecko; then
-               ewarn "Without Wine Gecko, wine prefixes will not have a 
default"
-               ewarn "implementation of iexplore.  Many older windows 
applications"
-               ewarn "rely upon the existence of an iexplore implementation, 
so"
-               ewarn "you will likely need to install an external one, like 
via winetricks"
-       fi
-       if ! use mono; then
-               ewarn "Without Wine Mono, wine prefixes will not have a default"
-               ewarn "implementation of .NET.  Many windows applications rely 
upon"
-               ewarn "the existence of a .NET implementation, so you will 
likely need"
-               ewarn "to install an external one, like via winetricks"
-       fi
-}
-
-pkg_prerm() {
-       eselect wine deregister ${PN}-${MY_PV}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine deregister --vanilla ${PN}-${MY_PV} || die
-       else
-               if use staging; then
-                       eselect wine deregister --staging  ${PN}-${MY_PV}|| die
-               fi
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}

diff --git a/app-emulation/wine-staging/wine-staging-7.13-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-7.13-r1.ebuild
deleted file mode 100644
index b9684696efbb..000000000000
--- a/app-emulation/wine-staging/wine-staging-7.13-r1.ebuild
+++ /dev/null
@@ -1,543 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale 
toolchain-funcs virtualx wrapper xdg-utils
-MY_PN="${PN%%-*}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://source.winehq.org/git/wine.git";
-       EGIT_BRANCH="master"
-       inherit git-r3
-       SRC_URI=""
-       #KEYWORDS=""
-else
-       MAJOR_V=$(ver_cut 1)
-       MINOR_V=$(ver_cut 2)
-       if [[ ${MINOR_V} != "0" ]] ; then
-               MINOR_V="x"
-       fi
-       
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz";
-       KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${MY_PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20211122"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="https://www.winehq.org/";
-SRC_URI="${SRC_URI}
-       
https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-       STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git";
-else
-       SRC_URI="${SRC_URI}
-       staging? ( 
https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> 
${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos 
+fontconfig +gecko gphoto2 gstreamer kerberos ldap mingw +mono mp3 netapi nls 
odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime 
+run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev 
+udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       crossdev-mingw? ( mingw )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       pipelight? ( staging )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-BDEPEND="sys-devel/flex
-       virtual/yacc
-       virtual/pkgconfig
-       mingw? ( !crossdev-mingw? ( 
dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
-
-COMMON_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? (
-               media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
-               media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
-       )
-       gstreamer? (
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-       )
-       kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       >app-eselect/eselect-wine-0.3
-       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-       gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:7.3.0 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       samba? ( >=net-fs/samba-3.0.25[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       ${BDEPEND}
-       >=sys-kernel/linux-headers-2.6
-       X? ( x11-base/xorg-proto )
-       staging? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-       # Ensure compiler support
-       # (No checks here as of 2022)
-       return 0
-}
-
-wine_build_environment_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> 
/dev/null)" == "intel" ]]; then
-               eerror "You cannot build wine with USE=opencl because 
intel-ocl-sdk is 64-bit only."
-               eerror "See https://bugs.gentoo.org/487864 for more details."
-               eerror
-               return 1
-       fi
-}
-
-wine_env_vcs_vars() {
-       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-       local pn_live_val="${pn_live_var}"
-       eval pn_live_val='$'${pn_live_val}
-       if [[ ! -z ${pn_live_val} ]]; then
-               if use staging; then
-                       eerror "Because of the multi-repo nature of ${MY_PN}, 
${pn_live_var}"
-                       eerror "cannot be used to set the commit. Instead, you 
may use the"
-                       eerror "environment variables:"
-                       eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-                       eerror "  
EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-                       eerror
-                       return 1
-               fi
-       fi
-       if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environment 
variables:"
-               eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-               eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-               eerror
-               return 1
-       fi
-}
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]] ; then
-               wine_build_environment_check || die
-
-               # Verify OSS support
-               if use oss; then
-                       if ! has_version ">=media-sound/oss-4"; then
-                               eerror "You cannot build wine with USE=oss 
without having support from"
-                               eerror ">=media-sound/oss-4 (only available 
through external repos)"
-                               eerror
-                               die
-                       fi
-               fi
-
-               if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-                       local mingw=-w64-mingw32
-                       for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev 
abi_x86_32 i686${mingw}); do
-                               type -P ${mingw}-gcc && continue
-                               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"
-                       done
-               fi
-       fi
-}
-
-pkg_setup() {
-       wine_build_environment_check || die
-       wine_env_vcs_vars || die
-
-       WINE_VARIANT="${PN#wine}-${MY_PV}"
-       WINE_VARIANT="${WINE_VARIANT#-}"
-
-       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-       MY_DATADIR="${MY_DATAROOTDIR}"
-       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-       MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-       if [[ ${MY_PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-               if use staging; then
-                       local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-                       EGIT_CHECKOUT_DIR="${STAGING_DIR}" 
EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-                       local 
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" 
--upstream-commit) || die
-
-                       if [[ "${CURRENT_WINE_COMMIT}" != 
"${COMPAT_WINE_COMMIT}" ]]; then
-                               einfo "The current Staging patchset is not 
guaranteed to apply on this WINE commit."
-                               einfo "If src_prepare fails, try emerging with 
the env var WINE_COMMIT."
-                               einfo "Example: 
EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-                       fi
-               fi
-       fi
-
-       default
-
-       plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       if use staging; then
-               ewarn "Applying the Wine-Staging patchset. Any bug reports to 
the"
-               ewarn "Wine bugzilla should explicitly state that staging was 
used."
-
-               local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" 
#652176
-               use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
Pipelight"
-
-               # Launch wine-staging patcher in a subshell, using eapply as a 
backend, and gitapply.sh as a backend for binary patches
-               ebegin "Running Wine-Staging patch installer"
-               (
-                       set -- DESTDIR="${S}" --backend=eapply --no-autoconf 
--all ${STAGING_EXCLUDE}
-                       cd "${STAGING_DIR}/patches"
-                       source "${STAGING_DIR}/patches/patchinstall.sh"
-               )
-               eend $? || die "Failed to apply Wine-Staging patches"
-       fi
-
-       default
-       eapply_bin
-       eautoreconf
-
-       # Modification of the server protocol requires regenerating the server 
requests
-       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-               einfo "server/protocol.def was patched; running 
tools/make_requests"
-               tools/make_requests || die #432348
-       fi
-       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-       if ! use run-exes; then
-               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-       fi
-
-       # Edit wine.desktop to work for specific variant
-       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop 
|| die
-
-       # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
-
-       # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-       # Duplicate manpages input files for wine64
-       local f
-       for f in loader/*.man.in; do
-               cp ${f} ${f/wine/wine64} || die
-       done
-       # Add wine64 manpages to Makefile
-       if use abi_x86_64; then
-               sed -i "/wine.man.in/i \
-                       \\\twine64.man.in \\\\" loader/Makefile.in || die
-               sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-       fi
-
-       rm_man_file(){
-               local file="${1}"
-               loc=${2}
-               sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-       }
-
-       while read f; do
-               plocale_for_each_disabled_locale rm_man_file "${f}"
-       done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
-}
-
-src_configure() {
-       wine_compiler_check || die
-
-       export LDCONFIG=/bin/true
-       use custom-cflags || strip-flags
-       if use mingw; then
-               use crossdev-mingw || 
PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
-
-               # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
-               local mingwcc=${CROSSCC:-$(usex x86 i686 
x86_64)-w64-mingw32-gcc}
-               : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC 
${CFLAGS:--O2})}"
-               : "${CROSSLDFLAGS:=$(
-                       filter-flags '-fuse-ld=*'
-                       CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
-               export CROSS{C,LD}FLAGS
-       fi
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --prefix="${MY_PREFIX}"
-               --datarootdir="${MY_DATAROOTDIR}"
-               --datadir="${MY_DATADIR}"
-               --docdir="${MY_DOCDIR}"
-               --includedir="${MY_INCLUDEDIR}"
-               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-               --libexecdir="${MY_LIBEXECDIR}"
-               --localstatedir="${MY_LOCALSTATEDIR}"
-               --mandir="${MY_MANDIR}"
-               --sysconfdir="${EPREFIX}/etc/wine"
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with cups)
-               $(use_with udisks dbus)
-               $(use_with fontconfig)
-               $(use_with ssl gnutls)
-               $(use_enable gecko mshtml)
-               $(use_with gphoto2 gphoto)
-               $(use_with gstreamer)
-               --enable-hal
-               $(use_with kerberos gssapi)
-               $(use_with kerberos krb5)
-               $(use_with ldap)
-               # TODO: Will bug 685172 still need special handling?
-               $(use_with mingw)
-               $(use_enable mono mscoree)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with openal)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               $(use_with oss)
-               $(use_with pcap)
-               $(use_with pulseaudio pulse)
-               $(use_with threads pthread)
-               $(use_with scanner sane)
-               $(use_with sdl)
-               $(use_enable test tests)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with unwind)
-               $(use_with usb)
-               $(use_with v4l v4l2)
-               $(use_with vulkan)
-               $(use_with X x)
-               $(use_with X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-       )
-
-       use staging && myconf+=(
-               --with-xattr
-       )
-
-       local PKG_CONFIG
-       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on 
amd64; #472038
-       tc-export PKG_CONFIG
-
-       if use amd64; then
-               if [[ ${ABI} == amd64 ]]; then
-                       myconf+=( --enable-win64 )
-               else
-                       myconf+=( --disable-win64 )
-               fi
-
-               # Note: using --with-wine64 results in problems with 
multilib.eclass
-               # CC/LD hackery. We're using separate tools instead.
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf "${myconf[@]}"
-       emake depend
-}
-
-multilib_src_test() {
-       # FIXME: win32-only; wine64 tests fail with "could not find the Wine 
loader"
-       if [[ ${ABI} == x86 ]]; then
-               if [[ $(id -u) == 0 ]]; then
-                       ewarn "Skipping tests since they cannot be run under 
the root user."
-                       ewarn "To run the test ${MY_PN} suite, add userpriv to 
FEATURES in make.conf"
-                       return
-               fi
-
-               WINEPREFIX="${T}/.wine-${ABI}" \
-               virtx emake test
-       fi
-}
-
-multilib_src_install_all() {
-       local DOCS=( ANNOUNCE AUTHORS README )
-       add_locale_docs() {
-               local locale_doc="documentation/README.$1"
-               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-       }
-       plocale_for_each_locale add_locale_docs
-
-       einstalldocs
-       find "${ED}" -name *.la -delete || die
-
-       if ! use perl ; then # winedump calls function_grep.pl, and winemaker 
is a perl script
-               rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-                       "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-       fi
-
-       use abi_x86_32 && pax-mark psmr 
"${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-       use abi_x86_64 && pax-mark psmr 
"${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-       # Avoid double prefix from dosym and make_wrapper
-       MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-       if use abi_x86_64 && ! use abi_x86_32; then
-               dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-       fi
-
-       # Failglob for binloops, shouldn't be necessary, but including to stay 
safe
-       eshopts_push -s failglob #615218
-       # Make wrappers for binaries for handling multiple variants
-       # Note: wrappers instead of symlinks because some are shell which use 
basename
-       local b
-       for b in "${ED%}${MY_PREFIX}"/bin/*; do
-               make_wrapper "${b##*/}-${WINE_VARIANT}" 
"${MY_PREFIX}/bin/${b##*/}"
-       done
-       eshopts_pop
-}
-
-pkg_postinst() {
-       eselect wine register ${PN}-${MY_PV}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine register --vanilla ${PN}-${MY_PV} || die
-       else
-               if use staging; then
-                       eselect wine register --staging ${PN}-${MY_PV} || die
-               fi
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_desktop_database_update
-
-       if ! use gecko; then
-               ewarn "Without Wine Gecko, wine prefixes will not have a 
default"
-               ewarn "implementation of iexplore.  Many older windows 
applications"
-               ewarn "rely upon the existence of an iexplore implementation, 
so"
-               ewarn "you will likely need to install an external one, like 
via winetricks"
-       fi
-       if ! use mono; then
-               ewarn "Without Wine Mono, wine prefixes will not have a default"
-               ewarn "implementation of .NET.  Many windows applications rely 
upon"
-               ewarn "the existence of a .NET implementation, so you will 
likely need"
-               ewarn "to install an external one, like via winetricks"
-       fi
-}
-
-pkg_prerm() {
-       eselect wine deregister ${PN}-${MY_PV}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine deregister --vanilla ${PN}-${MY_PV} || die
-       else
-               if use staging; then
-                       eselect wine deregister --staging  ${PN}-${MY_PV}|| die
-               fi
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}

diff --git a/app-emulation/wine-staging/wine-staging-7.13.ebuild 
b/app-emulation/wine-staging/wine-staging-7.13.ebuild
deleted file mode 100644
index fc41e0c525ab..000000000000
--- a/app-emulation/wine-staging/wine-staging-7.13.ebuild
+++ /dev/null
@@ -1,544 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale 
toolchain-funcs virtualx wrapper xdg-utils
-MY_PN="${PN%%-*}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://source.winehq.org/git/wine.git";
-       EGIT_BRANCH="master"
-       inherit git-r3
-       SRC_URI=""
-       #KEYWORDS=""
-else
-       MAJOR_V=$(ver_cut 1)
-       MINOR_V=$(ver_cut 2)
-       if [[ ${MINOR_V} != "0" ]] ; then
-               MINOR_V="x"
-       fi
-       
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz";
-       KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${MY_PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20211122"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="https://www.winehq.org/";
-SRC_URI="${SRC_URI}
-       
https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-       STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git";
-else
-       SRC_URI="${SRC_URI}
-       staging? ( 
https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> 
${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos 
+fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 
netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight 
pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test 
+threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       crossdev-mingw? ( mingw )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       pipelight? ( staging )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-BDEPEND="sys-devel/flex
-       virtual/yacc
-       virtual/pkgconfig
-       mingw? ( !crossdev-mingw? ( 
dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
-
-COMMON_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? (
-               media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
-               media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
-       )
-       gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-       )
-       kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       >app-eselect/eselect-wine-0.3
-       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-       gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:7.3.0 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       samba? ( >=net-fs/samba-3.0.25[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       ${BDEPEND}
-       >=sys-kernel/linux-headers-2.6
-       X? ( x11-base/xorg-proto )
-       staging? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-       # Ensure compiler support
-       # (No checks here as of 2022)
-       return 0
-}
-
-wine_build_environment_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> 
/dev/null)" == "intel" ]]; then
-               eerror "You cannot build wine with USE=opencl because 
intel-ocl-sdk is 64-bit only."
-               eerror "See https://bugs.gentoo.org/487864 for more details."
-               eerror
-               return 1
-       fi
-}
-
-wine_env_vcs_vars() {
-       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-       local pn_live_val="${pn_live_var}"
-       eval pn_live_val='$'${pn_live_val}
-       if [[ ! -z ${pn_live_val} ]]; then
-               if use staging; then
-                       eerror "Because of the multi-repo nature of ${MY_PN}, 
${pn_live_var}"
-                       eerror "cannot be used to set the commit. Instead, you 
may use the"
-                       eerror "environment variables:"
-                       eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-                       eerror "  
EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-                       eerror
-                       return 1
-               fi
-       fi
-       if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environment 
variables:"
-               eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-               eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-               eerror
-               return 1
-       fi
-}
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]] ; then
-               wine_build_environment_check || die
-
-               # Verify OSS support
-               if use oss; then
-                       if ! has_version ">=media-sound/oss-4"; then
-                               eerror "You cannot build wine with USE=oss 
without having support from"
-                               eerror ">=media-sound/oss-4 (only available 
through external repos)"
-                               eerror
-                               die
-                       fi
-               fi
-
-               if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-                       local mingw=-w64-mingw32
-                       for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev 
abi_x86_32 i686${mingw}); do
-                               type -P ${mingw}-gcc && continue
-                               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"
-                       done
-               fi
-       fi
-}
-
-pkg_setup() {
-       wine_build_environment_check || die
-       wine_env_vcs_vars || die
-
-       WINE_VARIANT="${PN#wine}-${MY_PV}"
-       WINE_VARIANT="${WINE_VARIANT#-}"
-
-       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-       MY_DATADIR="${MY_DATAROOTDIR}"
-       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-       MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-       if [[ ${MY_PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-               if use staging; then
-                       local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-                       EGIT_CHECKOUT_DIR="${STAGING_DIR}" 
EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-                       local 
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" 
--upstream-commit) || die
-
-                       if [[ "${CURRENT_WINE_COMMIT}" != 
"${COMPAT_WINE_COMMIT}" ]]; then
-                               einfo "The current Staging patchset is not 
guaranteed to apply on this WINE commit."
-                               einfo "If src_prepare fails, try emerging with 
the env var WINE_COMMIT."
-                               einfo "Example: 
EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-                       fi
-               fi
-       fi
-
-       default
-
-       plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       if use staging; then
-               ewarn "Applying the Wine-Staging patchset. Any bug reports to 
the"
-               ewarn "Wine bugzilla should explicitly state that staging was 
used."
-
-               local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" 
#652176
-               use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
Pipelight"
-
-               # Launch wine-staging patcher in a subshell, using eapply as a 
backend, and gitapply.sh as a backend for binary patches
-               ebegin "Running Wine-Staging patch installer"
-               (
-                       set -- DESTDIR="${S}" --backend=eapply --no-autoconf 
--all ${STAGING_EXCLUDE}
-                       cd "${STAGING_DIR}/patches"
-                       source "${STAGING_DIR}/patches/patchinstall.sh"
-               )
-               eend $? || die "Failed to apply Wine-Staging patches"
-       fi
-
-       default
-       eapply_bin
-       eautoreconf
-
-       # Modification of the server protocol requires regenerating the server 
requests
-       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-               einfo "server/protocol.def was patched; running 
tools/make_requests"
-               tools/make_requests || die #432348
-       fi
-       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-       if ! use run-exes; then
-               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-       fi
-
-       # Edit wine.desktop to work for specific variant
-       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop 
|| die
-
-       # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
-
-       # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-       # Duplicate manpages input files for wine64
-       local f
-       for f in loader/*.man.in; do
-               cp ${f} ${f/wine/wine64} || die
-       done
-       # Add wine64 manpages to Makefile
-       if use abi_x86_64; then
-               sed -i "/wine.man.in/i \
-                       \\\twine64.man.in \\\\" loader/Makefile.in || die
-               sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-       fi
-
-       rm_man_file(){
-               local file="${1}"
-               loc=${2}
-               sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-       }
-
-       while read f; do
-               plocale_for_each_disabled_locale rm_man_file "${f}"
-       done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
-}
-
-src_configure() {
-       wine_compiler_check || die
-
-       export LDCONFIG=/bin/true
-       use custom-cflags || strip-flags
-       if use mingw; then
-               use crossdev-mingw || 
PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
-
-               # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
-               local mingwcc=${CROSSCC:-$(usex x86 i686 
x86_64)-w64-mingw32-gcc}
-               : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC 
${CFLAGS:--O2})}"
-               : "${CROSSLDFLAGS:=$(
-                       filter-flags '-fuse-ld=*'
-                       CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
-               export CROSS{C,LD}FLAGS
-       fi
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --prefix="${MY_PREFIX}"
-               --datarootdir="${MY_DATAROOTDIR}"
-               --datadir="${MY_DATADIR}"
-               --docdir="${MY_DOCDIR}"
-               --includedir="${MY_INCLUDEDIR}"
-               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-               --libexecdir="${MY_LIBEXECDIR}"
-               --localstatedir="${MY_LOCALSTATEDIR}"
-               --mandir="${MY_MANDIR}"
-               --sysconfdir="${EPREFIX}/etc/wine"
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with cups)
-               $(use_with udisks dbus)
-               $(use_with fontconfig)
-               $(use_with ssl gnutls)
-               $(use_enable gecko mshtml)
-               $(use_with gphoto2 gphoto)
-               $(use_with gssapi)
-               $(use_with gstreamer)
-               --enable-hal
-               $(use_with kerberos krb5)
-               $(use_with ldap)
-               # TODO: Will bug 685172 still need special handling?
-               $(use_with mingw)
-               $(use_enable mono mscoree)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with openal)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               $(use_with oss)
-               $(use_with pcap)
-               $(use_with pulseaudio pulse)
-               $(use_with threads pthread)
-               $(use_with scanner sane)
-               $(use_with sdl)
-               $(use_enable test tests)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with unwind)
-               $(use_with usb)
-               $(use_with v4l v4l2)
-               $(use_with vulkan)
-               $(use_with X x)
-               $(use_with X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-       )
-
-       use staging && myconf+=(
-               --with-xattr
-       )
-
-       local PKG_CONFIG
-       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on 
amd64; #472038
-       tc-export PKG_CONFIG
-
-       if use amd64; then
-               if [[ ${ABI} == amd64 ]]; then
-                       myconf+=( --enable-win64 )
-               else
-                       myconf+=( --disable-win64 )
-               fi
-
-               # Note: using --with-wine64 results in problems with 
multilib.eclass
-               # CC/LD hackery. We're using separate tools instead.
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf "${myconf[@]}"
-       emake depend
-}
-
-multilib_src_test() {
-       # FIXME: win32-only; wine64 tests fail with "could not find the Wine 
loader"
-       if [[ ${ABI} == x86 ]]; then
-               if [[ $(id -u) == 0 ]]; then
-                       ewarn "Skipping tests since they cannot be run under 
the root user."
-                       ewarn "To run the test ${MY_PN} suite, add userpriv to 
FEATURES in make.conf"
-                       return
-               fi
-
-               WINEPREFIX="${T}/.wine-${ABI}" \
-               virtx emake test
-       fi
-}
-
-multilib_src_install_all() {
-       local DOCS=( ANNOUNCE AUTHORS README )
-       add_locale_docs() {
-               local locale_doc="documentation/README.$1"
-               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-       }
-       plocale_for_each_locale add_locale_docs
-
-       einstalldocs
-       find "${ED}" -name *.la -delete || die
-
-       if ! use perl ; then # winedump calls function_grep.pl, and winemaker 
is a perl script
-               rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-                       "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-       fi
-
-       use abi_x86_32 && pax-mark psmr 
"${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-       use abi_x86_64 && pax-mark psmr 
"${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-       # Avoid double prefix from dosym and make_wrapper
-       MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-       if use abi_x86_64 && ! use abi_x86_32; then
-               dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-       fi
-
-       # Failglob for binloops, shouldn't be necessary, but including to stay 
safe
-       eshopts_push -s failglob #615218
-       # Make wrappers for binaries for handling multiple variants
-       # Note: wrappers instead of symlinks because some are shell which use 
basename
-       local b
-       for b in "${ED%}${MY_PREFIX}"/bin/*; do
-               make_wrapper "${b##*/}-${WINE_VARIANT}" 
"${MY_PREFIX}/bin/${b##*/}"
-       done
-       eshopts_pop
-}
-
-pkg_postinst() {
-       eselect wine register ${PN}-${MY_PV}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine register --vanilla ${PN}-${MY_PV} || die
-       else
-               if use staging; then
-                       eselect wine register --staging ${PN}-${MY_PV} || die
-               fi
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_desktop_database_update
-
-       if ! use gecko; then
-               ewarn "Without Wine Gecko, wine prefixes will not have a 
default"
-               ewarn "implementation of iexplore.  Many older windows 
applications"
-               ewarn "rely upon the existence of an iexplore implementation, 
so"
-               ewarn "you will likely need to install an external one, like 
via winetricks"
-       fi
-       if ! use mono; then
-               ewarn "Without Wine Mono, wine prefixes will not have a default"
-               ewarn "implementation of .NET.  Many windows applications rely 
upon"
-               ewarn "the existence of a .NET implementation, so you will 
likely need"
-               ewarn "to install an external one, like via winetricks"
-       fi
-}
-
-pkg_prerm() {
-       eselect wine deregister ${PN}-${MY_PV}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine deregister --vanilla ${PN}-${MY_PV} || die
-       else
-               if use staging; then
-                       eselect wine deregister --staging  ${PN}-${MY_PV}|| die
-               fi
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}

diff --git a/app-emulation/wine-staging/wine-staging-7.14.ebuild 
b/app-emulation/wine-staging/wine-staging-7.14.ebuild
deleted file mode 100644
index b9684696efbb..000000000000
--- a/app-emulation/wine-staging/wine-staging-7.14.ebuild
+++ /dev/null
@@ -1,543 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale 
toolchain-funcs virtualx wrapper xdg-utils
-MY_PN="${PN%%-*}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://source.winehq.org/git/wine.git";
-       EGIT_BRANCH="master"
-       inherit git-r3
-       SRC_URI=""
-       #KEYWORDS=""
-else
-       MAJOR_V=$(ver_cut 1)
-       MINOR_V=$(ver_cut 2)
-       if [[ ${MINOR_V} != "0" ]] ; then
-               MINOR_V="x"
-       fi
-       
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz";
-       KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${MY_PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20211122"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="https://www.winehq.org/";
-SRC_URI="${SRC_URI}
-       
https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-       STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git";
-else
-       SRC_URI="${SRC_URI}
-       staging? ( 
https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> 
${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos 
+fontconfig +gecko gphoto2 gstreamer kerberos ldap mingw +mono mp3 netapi nls 
odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime 
+run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev 
+udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       crossdev-mingw? ( mingw )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       pipelight? ( staging )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-BDEPEND="sys-devel/flex
-       virtual/yacc
-       virtual/pkgconfig
-       mingw? ( !crossdev-mingw? ( 
dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
-
-COMMON_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? (
-               media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
-               media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
-       )
-       gstreamer? (
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-       )
-       kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       >app-eselect/eselect-wine-0.3
-       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-       gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:7.3.0 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       samba? ( >=net-fs/samba-3.0.25[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       ${BDEPEND}
-       >=sys-kernel/linux-headers-2.6
-       X? ( x11-base/xorg-proto )
-       staging? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-       # Ensure compiler support
-       # (No checks here as of 2022)
-       return 0
-}
-
-wine_build_environment_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> 
/dev/null)" == "intel" ]]; then
-               eerror "You cannot build wine with USE=opencl because 
intel-ocl-sdk is 64-bit only."
-               eerror "See https://bugs.gentoo.org/487864 for more details."
-               eerror
-               return 1
-       fi
-}
-
-wine_env_vcs_vars() {
-       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-       local pn_live_val="${pn_live_var}"
-       eval pn_live_val='$'${pn_live_val}
-       if [[ ! -z ${pn_live_val} ]]; then
-               if use staging; then
-                       eerror "Because of the multi-repo nature of ${MY_PN}, 
${pn_live_var}"
-                       eerror "cannot be used to set the commit. Instead, you 
may use the"
-                       eerror "environment variables:"
-                       eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-                       eerror "  
EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-                       eerror
-                       return 1
-               fi
-       fi
-       if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environment 
variables:"
-               eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-               eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-               eerror
-               return 1
-       fi
-}
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]] ; then
-               wine_build_environment_check || die
-
-               # Verify OSS support
-               if use oss; then
-                       if ! has_version ">=media-sound/oss-4"; then
-                               eerror "You cannot build wine with USE=oss 
without having support from"
-                               eerror ">=media-sound/oss-4 (only available 
through external repos)"
-                               eerror
-                               die
-                       fi
-               fi
-
-               if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-                       local mingw=-w64-mingw32
-                       for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev 
abi_x86_32 i686${mingw}); do
-                               type -P ${mingw}-gcc && continue
-                               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"
-                       done
-               fi
-       fi
-}
-
-pkg_setup() {
-       wine_build_environment_check || die
-       wine_env_vcs_vars || die
-
-       WINE_VARIANT="${PN#wine}-${MY_PV}"
-       WINE_VARIANT="${WINE_VARIANT#-}"
-
-       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-       MY_DATADIR="${MY_DATAROOTDIR}"
-       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-       MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-       if [[ ${MY_PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-               if use staging; then
-                       local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-                       EGIT_CHECKOUT_DIR="${STAGING_DIR}" 
EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-                       local 
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" 
--upstream-commit) || die
-
-                       if [[ "${CURRENT_WINE_COMMIT}" != 
"${COMPAT_WINE_COMMIT}" ]]; then
-                               einfo "The current Staging patchset is not 
guaranteed to apply on this WINE commit."
-                               einfo "If src_prepare fails, try emerging with 
the env var WINE_COMMIT."
-                               einfo "Example: 
EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-                       fi
-               fi
-       fi
-
-       default
-
-       plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       if use staging; then
-               ewarn "Applying the Wine-Staging patchset. Any bug reports to 
the"
-               ewarn "Wine bugzilla should explicitly state that staging was 
used."
-
-               local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" 
#652176
-               use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
Pipelight"
-
-               # Launch wine-staging patcher in a subshell, using eapply as a 
backend, and gitapply.sh as a backend for binary patches
-               ebegin "Running Wine-Staging patch installer"
-               (
-                       set -- DESTDIR="${S}" --backend=eapply --no-autoconf 
--all ${STAGING_EXCLUDE}
-                       cd "${STAGING_DIR}/patches"
-                       source "${STAGING_DIR}/patches/patchinstall.sh"
-               )
-               eend $? || die "Failed to apply Wine-Staging patches"
-       fi
-
-       default
-       eapply_bin
-       eautoreconf
-
-       # Modification of the server protocol requires regenerating the server 
requests
-       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-               einfo "server/protocol.def was patched; running 
tools/make_requests"
-               tools/make_requests || die #432348
-       fi
-       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-       if ! use run-exes; then
-               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-       fi
-
-       # Edit wine.desktop to work for specific variant
-       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop 
|| die
-
-       # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
-
-       # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-       # Duplicate manpages input files for wine64
-       local f
-       for f in loader/*.man.in; do
-               cp ${f} ${f/wine/wine64} || die
-       done
-       # Add wine64 manpages to Makefile
-       if use abi_x86_64; then
-               sed -i "/wine.man.in/i \
-                       \\\twine64.man.in \\\\" loader/Makefile.in || die
-               sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-       fi
-
-       rm_man_file(){
-               local file="${1}"
-               loc=${2}
-               sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-       }
-
-       while read f; do
-               plocale_for_each_disabled_locale rm_man_file "${f}"
-       done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
-}
-
-src_configure() {
-       wine_compiler_check || die
-
-       export LDCONFIG=/bin/true
-       use custom-cflags || strip-flags
-       if use mingw; then
-               use crossdev-mingw || 
PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
-
-               # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
-               local mingwcc=${CROSSCC:-$(usex x86 i686 
x86_64)-w64-mingw32-gcc}
-               : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC 
${CFLAGS:--O2})}"
-               : "${CROSSLDFLAGS:=$(
-                       filter-flags '-fuse-ld=*'
-                       CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
-               export CROSS{C,LD}FLAGS
-       fi
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --prefix="${MY_PREFIX}"
-               --datarootdir="${MY_DATAROOTDIR}"
-               --datadir="${MY_DATADIR}"
-               --docdir="${MY_DOCDIR}"
-               --includedir="${MY_INCLUDEDIR}"
-               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-               --libexecdir="${MY_LIBEXECDIR}"
-               --localstatedir="${MY_LOCALSTATEDIR}"
-               --mandir="${MY_MANDIR}"
-               --sysconfdir="${EPREFIX}/etc/wine"
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with cups)
-               $(use_with udisks dbus)
-               $(use_with fontconfig)
-               $(use_with ssl gnutls)
-               $(use_enable gecko mshtml)
-               $(use_with gphoto2 gphoto)
-               $(use_with gstreamer)
-               --enable-hal
-               $(use_with kerberos gssapi)
-               $(use_with kerberos krb5)
-               $(use_with ldap)
-               # TODO: Will bug 685172 still need special handling?
-               $(use_with mingw)
-               $(use_enable mono mscoree)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with openal)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               $(use_with oss)
-               $(use_with pcap)
-               $(use_with pulseaudio pulse)
-               $(use_with threads pthread)
-               $(use_with scanner sane)
-               $(use_with sdl)
-               $(use_enable test tests)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with unwind)
-               $(use_with usb)
-               $(use_with v4l v4l2)
-               $(use_with vulkan)
-               $(use_with X x)
-               $(use_with X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-       )
-
-       use staging && myconf+=(
-               --with-xattr
-       )
-
-       local PKG_CONFIG
-       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on 
amd64; #472038
-       tc-export PKG_CONFIG
-
-       if use amd64; then
-               if [[ ${ABI} == amd64 ]]; then
-                       myconf+=( --enable-win64 )
-               else
-                       myconf+=( --disable-win64 )
-               fi
-
-               # Note: using --with-wine64 results in problems with 
multilib.eclass
-               # CC/LD hackery. We're using separate tools instead.
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf "${myconf[@]}"
-       emake depend
-}
-
-multilib_src_test() {
-       # FIXME: win32-only; wine64 tests fail with "could not find the Wine 
loader"
-       if [[ ${ABI} == x86 ]]; then
-               if [[ $(id -u) == 0 ]]; then
-                       ewarn "Skipping tests since they cannot be run under 
the root user."
-                       ewarn "To run the test ${MY_PN} suite, add userpriv to 
FEATURES in make.conf"
-                       return
-               fi
-
-               WINEPREFIX="${T}/.wine-${ABI}" \
-               virtx emake test
-       fi
-}
-
-multilib_src_install_all() {
-       local DOCS=( ANNOUNCE AUTHORS README )
-       add_locale_docs() {
-               local locale_doc="documentation/README.$1"
-               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-       }
-       plocale_for_each_locale add_locale_docs
-
-       einstalldocs
-       find "${ED}" -name *.la -delete || die
-
-       if ! use perl ; then # winedump calls function_grep.pl, and winemaker 
is a perl script
-               rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-                       "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-       fi
-
-       use abi_x86_32 && pax-mark psmr 
"${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-       use abi_x86_64 && pax-mark psmr 
"${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-       # Avoid double prefix from dosym and make_wrapper
-       MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-       if use abi_x86_64 && ! use abi_x86_32; then
-               dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-       fi
-
-       # Failglob for binloops, shouldn't be necessary, but including to stay 
safe
-       eshopts_push -s failglob #615218
-       # Make wrappers for binaries for handling multiple variants
-       # Note: wrappers instead of symlinks because some are shell which use 
basename
-       local b
-       for b in "${ED%}${MY_PREFIX}"/bin/*; do
-               make_wrapper "${b##*/}-${WINE_VARIANT}" 
"${MY_PREFIX}/bin/${b##*/}"
-       done
-       eshopts_pop
-}
-
-pkg_postinst() {
-       eselect wine register ${PN}-${MY_PV}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine register --vanilla ${PN}-${MY_PV} || die
-       else
-               if use staging; then
-                       eselect wine register --staging ${PN}-${MY_PV} || die
-               fi
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_desktop_database_update
-
-       if ! use gecko; then
-               ewarn "Without Wine Gecko, wine prefixes will not have a 
default"
-               ewarn "implementation of iexplore.  Many older windows 
applications"
-               ewarn "rely upon the existence of an iexplore implementation, 
so"
-               ewarn "you will likely need to install an external one, like 
via winetricks"
-       fi
-       if ! use mono; then
-               ewarn "Without Wine Mono, wine prefixes will not have a default"
-               ewarn "implementation of .NET.  Many windows applications rely 
upon"
-               ewarn "the existence of a .NET implementation, so you will 
likely need"
-               ewarn "to install an external one, like via winetricks"
-       fi
-}
-
-pkg_prerm() {
-       eselect wine deregister ${PN}-${MY_PV}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine deregister --vanilla ${PN}-${MY_PV} || die
-       else
-               if use staging; then
-                       eselect wine deregister --staging  ${PN}-${MY_PV}|| die
-               fi
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}

diff --git a/app-emulation/wine-staging/wine-staging-7.15.ebuild 
b/app-emulation/wine-staging/wine-staging-7.15.ebuild
deleted file mode 100644
index b9684696efbb..000000000000
--- a/app-emulation/wine-staging/wine-staging-7.15.ebuild
+++ /dev/null
@@ -1,543 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale 
toolchain-funcs virtualx wrapper xdg-utils
-MY_PN="${PN%%-*}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://source.winehq.org/git/wine.git";
-       EGIT_BRANCH="master"
-       inherit git-r3
-       SRC_URI=""
-       #KEYWORDS=""
-else
-       MAJOR_V=$(ver_cut 1)
-       MINOR_V=$(ver_cut 2)
-       if [[ ${MINOR_V} != "0" ]] ; then
-               MINOR_V="x"
-       fi
-       
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz";
-       KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${MY_PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20211122"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="https://www.winehq.org/";
-SRC_URI="${SRC_URI}
-       
https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-       STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git";
-else
-       SRC_URI="${SRC_URI}
-       staging? ( 
https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> 
${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos 
+fontconfig +gecko gphoto2 gstreamer kerberos ldap mingw +mono mp3 netapi nls 
odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime 
+run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev 
+udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       crossdev-mingw? ( mingw )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       pipelight? ( staging )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-BDEPEND="sys-devel/flex
-       virtual/yacc
-       virtual/pkgconfig
-       mingw? ( !crossdev-mingw? ( 
dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
-
-COMMON_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? (
-               media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
-               media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
-       )
-       gstreamer? (
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-       )
-       kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       >app-eselect/eselect-wine-0.3
-       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-       gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:7.3.0 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       samba? ( >=net-fs/samba-3.0.25[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       ${BDEPEND}
-       >=sys-kernel/linux-headers-2.6
-       X? ( x11-base/xorg-proto )
-       staging? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-       # Ensure compiler support
-       # (No checks here as of 2022)
-       return 0
-}
-
-wine_build_environment_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> 
/dev/null)" == "intel" ]]; then
-               eerror "You cannot build wine with USE=opencl because 
intel-ocl-sdk is 64-bit only."
-               eerror "See https://bugs.gentoo.org/487864 for more details."
-               eerror
-               return 1
-       fi
-}
-
-wine_env_vcs_vars() {
-       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-       local pn_live_val="${pn_live_var}"
-       eval pn_live_val='$'${pn_live_val}
-       if [[ ! -z ${pn_live_val} ]]; then
-               if use staging; then
-                       eerror "Because of the multi-repo nature of ${MY_PN}, 
${pn_live_var}"
-                       eerror "cannot be used to set the commit. Instead, you 
may use the"
-                       eerror "environment variables:"
-                       eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-                       eerror "  
EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-                       eerror
-                       return 1
-               fi
-       fi
-       if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environment 
variables:"
-               eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-               eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-               eerror
-               return 1
-       fi
-}
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]] ; then
-               wine_build_environment_check || die
-
-               # Verify OSS support
-               if use oss; then
-                       if ! has_version ">=media-sound/oss-4"; then
-                               eerror "You cannot build wine with USE=oss 
without having support from"
-                               eerror ">=media-sound/oss-4 (only available 
through external repos)"
-                               eerror
-                               die
-                       fi
-               fi
-
-               if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-                       local mingw=-w64-mingw32
-                       for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev 
abi_x86_32 i686${mingw}); do
-                               type -P ${mingw}-gcc && continue
-                               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"
-                       done
-               fi
-       fi
-}
-
-pkg_setup() {
-       wine_build_environment_check || die
-       wine_env_vcs_vars || die
-
-       WINE_VARIANT="${PN#wine}-${MY_PV}"
-       WINE_VARIANT="${WINE_VARIANT#-}"
-
-       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-       MY_DATADIR="${MY_DATAROOTDIR}"
-       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-       MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-       if [[ ${MY_PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-               if use staging; then
-                       local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-                       EGIT_CHECKOUT_DIR="${STAGING_DIR}" 
EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-                       local 
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" 
--upstream-commit) || die
-
-                       if [[ "${CURRENT_WINE_COMMIT}" != 
"${COMPAT_WINE_COMMIT}" ]]; then
-                               einfo "The current Staging patchset is not 
guaranteed to apply on this WINE commit."
-                               einfo "If src_prepare fails, try emerging with 
the env var WINE_COMMIT."
-                               einfo "Example: 
EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-                       fi
-               fi
-       fi
-
-       default
-
-       plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       if use staging; then
-               ewarn "Applying the Wine-Staging patchset. Any bug reports to 
the"
-               ewarn "Wine bugzilla should explicitly state that staging was 
used."
-
-               local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" 
#652176
-               use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
Pipelight"
-
-               # Launch wine-staging patcher in a subshell, using eapply as a 
backend, and gitapply.sh as a backend for binary patches
-               ebegin "Running Wine-Staging patch installer"
-               (
-                       set -- DESTDIR="${S}" --backend=eapply --no-autoconf 
--all ${STAGING_EXCLUDE}
-                       cd "${STAGING_DIR}/patches"
-                       source "${STAGING_DIR}/patches/patchinstall.sh"
-               )
-               eend $? || die "Failed to apply Wine-Staging patches"
-       fi
-
-       default
-       eapply_bin
-       eautoreconf
-
-       # Modification of the server protocol requires regenerating the server 
requests
-       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-               einfo "server/protocol.def was patched; running 
tools/make_requests"
-               tools/make_requests || die #432348
-       fi
-       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-       if ! use run-exes; then
-               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-       fi
-
-       # Edit wine.desktop to work for specific variant
-       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop 
|| die
-
-       # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
-
-       # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-       # Duplicate manpages input files for wine64
-       local f
-       for f in loader/*.man.in; do
-               cp ${f} ${f/wine/wine64} || die
-       done
-       # Add wine64 manpages to Makefile
-       if use abi_x86_64; then
-               sed -i "/wine.man.in/i \
-                       \\\twine64.man.in \\\\" loader/Makefile.in || die
-               sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-       fi
-
-       rm_man_file(){
-               local file="${1}"
-               loc=${2}
-               sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-       }
-
-       while read f; do
-               plocale_for_each_disabled_locale rm_man_file "${f}"
-       done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
-}
-
-src_configure() {
-       wine_compiler_check || die
-
-       export LDCONFIG=/bin/true
-       use custom-cflags || strip-flags
-       if use mingw; then
-               use crossdev-mingw || 
PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
-
-               # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
-               local mingwcc=${CROSSCC:-$(usex x86 i686 
x86_64)-w64-mingw32-gcc}
-               : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC 
${CFLAGS:--O2})}"
-               : "${CROSSLDFLAGS:=$(
-                       filter-flags '-fuse-ld=*'
-                       CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
-               export CROSS{C,LD}FLAGS
-       fi
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --prefix="${MY_PREFIX}"
-               --datarootdir="${MY_DATAROOTDIR}"
-               --datadir="${MY_DATADIR}"
-               --docdir="${MY_DOCDIR}"
-               --includedir="${MY_INCLUDEDIR}"
-               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-               --libexecdir="${MY_LIBEXECDIR}"
-               --localstatedir="${MY_LOCALSTATEDIR}"
-               --mandir="${MY_MANDIR}"
-               --sysconfdir="${EPREFIX}/etc/wine"
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with cups)
-               $(use_with udisks dbus)
-               $(use_with fontconfig)
-               $(use_with ssl gnutls)
-               $(use_enable gecko mshtml)
-               $(use_with gphoto2 gphoto)
-               $(use_with gstreamer)
-               --enable-hal
-               $(use_with kerberos gssapi)
-               $(use_with kerberos krb5)
-               $(use_with ldap)
-               # TODO: Will bug 685172 still need special handling?
-               $(use_with mingw)
-               $(use_enable mono mscoree)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with openal)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               $(use_with oss)
-               $(use_with pcap)
-               $(use_with pulseaudio pulse)
-               $(use_with threads pthread)
-               $(use_with scanner sane)
-               $(use_with sdl)
-               $(use_enable test tests)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with unwind)
-               $(use_with usb)
-               $(use_with v4l v4l2)
-               $(use_with vulkan)
-               $(use_with X x)
-               $(use_with X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-       )
-
-       use staging && myconf+=(
-               --with-xattr
-       )
-
-       local PKG_CONFIG
-       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on 
amd64; #472038
-       tc-export PKG_CONFIG
-
-       if use amd64; then
-               if [[ ${ABI} == amd64 ]]; then
-                       myconf+=( --enable-win64 )
-               else
-                       myconf+=( --disable-win64 )
-               fi
-
-               # Note: using --with-wine64 results in problems with 
multilib.eclass
-               # CC/LD hackery. We're using separate tools instead.
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf "${myconf[@]}"
-       emake depend
-}
-
-multilib_src_test() {
-       # FIXME: win32-only; wine64 tests fail with "could not find the Wine 
loader"
-       if [[ ${ABI} == x86 ]]; then
-               if [[ $(id -u) == 0 ]]; then
-                       ewarn "Skipping tests since they cannot be run under 
the root user."
-                       ewarn "To run the test ${MY_PN} suite, add userpriv to 
FEATURES in make.conf"
-                       return
-               fi
-
-               WINEPREFIX="${T}/.wine-${ABI}" \
-               virtx emake test
-       fi
-}
-
-multilib_src_install_all() {
-       local DOCS=( ANNOUNCE AUTHORS README )
-       add_locale_docs() {
-               local locale_doc="documentation/README.$1"
-               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-       }
-       plocale_for_each_locale add_locale_docs
-
-       einstalldocs
-       find "${ED}" -name *.la -delete || die
-
-       if ! use perl ; then # winedump calls function_grep.pl, and winemaker 
is a perl script
-               rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-                       "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-       fi
-
-       use abi_x86_32 && pax-mark psmr 
"${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-       use abi_x86_64 && pax-mark psmr 
"${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-       # Avoid double prefix from dosym and make_wrapper
-       MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-       if use abi_x86_64 && ! use abi_x86_32; then
-               dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-       fi
-
-       # Failglob for binloops, shouldn't be necessary, but including to stay 
safe
-       eshopts_push -s failglob #615218
-       # Make wrappers for binaries for handling multiple variants
-       # Note: wrappers instead of symlinks because some are shell which use 
basename
-       local b
-       for b in "${ED%}${MY_PREFIX}"/bin/*; do
-               make_wrapper "${b##*/}-${WINE_VARIANT}" 
"${MY_PREFIX}/bin/${b##*/}"
-       done
-       eshopts_pop
-}
-
-pkg_postinst() {
-       eselect wine register ${PN}-${MY_PV}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine register --vanilla ${PN}-${MY_PV} || die
-       else
-               if use staging; then
-                       eselect wine register --staging ${PN}-${MY_PV} || die
-               fi
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_desktop_database_update
-
-       if ! use gecko; then
-               ewarn "Without Wine Gecko, wine prefixes will not have a 
default"
-               ewarn "implementation of iexplore.  Many older windows 
applications"
-               ewarn "rely upon the existence of an iexplore implementation, 
so"
-               ewarn "you will likely need to install an external one, like 
via winetricks"
-       fi
-       if ! use mono; then
-               ewarn "Without Wine Mono, wine prefixes will not have a default"
-               ewarn "implementation of .NET.  Many windows applications rely 
upon"
-               ewarn "the existence of a .NET implementation, so you will 
likely need"
-               ewarn "to install an external one, like via winetricks"
-       fi
-}
-
-pkg_prerm() {
-       eselect wine deregister ${PN}-${MY_PV}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine deregister --vanilla ${PN}-${MY_PV} || die
-       else
-               if use staging; then
-                       eselect wine deregister --staging  ${PN}-${MY_PV}|| die
-               fi
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}

Reply via email to