commit:     1458e0fe058f348836c6ee5214fb90179fd11024
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 19 06:47:07 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 01:52:49 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1458e0fe

app-emulation/wine-vanilla: migrate to wine.eclass

Only for latest and >=9 stable slots.

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

 app-emulation/wine-vanilla/metadata.xml            |   2 +-
 .../wine-vanilla/wine-vanilla-10.0-r2.ebuild       | 206 +++++++++++++
 .../wine-vanilla/wine-vanilla-10.5-r1.ebuild       | 218 +++++++++++++
 .../wine-vanilla/wine-vanilla-9.0.1-r1.ebuild      | 197 ++++++++++++
 .../wine-vanilla/wine-vanilla-9999.ebuild          | 339 ++++-----------------
 5 files changed, 680 insertions(+), 282 deletions(-)

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index 8356618ad2f1..34b1aee6fe58 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -21,7 +21,7 @@ This variant of the Wine packaging does not include external 
patchsets
                </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="mingw">Build PE files using a MinGW toolchain for 
better compatibility</flag>
+               <flag name="mingw">Build PE files using 
<pkg>dev-util/mingw64-toolchain</pkg> (more tested) rather than 
<pkg>llvm-core/clang</pkg> (newer)</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>
                <flag name="pcap">Support packet capture software (e.g. 
wireshark)</flag>

diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.0-r2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-10.0-r2.ebuild
new file mode 100644
index 000000000000..48e5959838d2
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-10.0-r2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature wine
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.4.0
+
+if [[ ${PV} == 9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git";
+else
+       (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+       
SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz";
+       S=${WORKDIR}/wine-${PV}
+       KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+       https://www.winehq.org/
+       https://gitlab.winehq.org/wine/wine/
+"
+
+LICENSE="LGPL-2.1+ BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+       +X +alsa capi cups +dbus dos llvm-libunwind custom-cflags ffmpeg
+       +fontconfig +gecko gphoto2 +gstreamer kerberos +mono netapi nls
+       odbc opencl +opengl pcap perl pulseaudio samba scanner +sdl
+       selinux smartcard +ssl +truetype udev +unwind usb v4l +vulkan
+       wayland +xcomposite xinerama
+"
+REQUIRED_USE="X? ( truetype )"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+       X? (
+               x11-libs/libXcursor[${WINE_USEDEP}]
+               x11-libs/libXfixes[${WINE_USEDEP}]
+               x11-libs/libXi[${WINE_USEDEP}]
+               x11-libs/libXrandr[${WINE_USEDEP}]
+               x11-libs/libXrender[${WINE_USEDEP}]
+               x11-libs/libXxf86vm[${WINE_USEDEP}]
+               opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
+               xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
+               xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
+       )
+       cups? ( net-print/cups[${WINE_USEDEP}] )
+       dbus? ( sys-apps/dbus[${WINE_USEDEP}] )
+       fontconfig? ( media-libs/fontconfig[${WINE_USEDEP}] )
+       kerberos? ( virtual/krb5[${WINE_USEDEP}] )
+       netapi? ( net-fs/samba[${WINE_USEDEP}] )
+       odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+       sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
+       ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
+       truetype? ( media-libs/freetype[${WINE_USEDEP}] )
+       v4l? ( media-libs/libv4l[${WINE_USEDEP}] )
+       vulkan? ( media-libs/vulkan-loader[X?,wayland?,${WINE_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+       ${WINE_DLOPEN_DEPEND}
+       X? (
+               x11-libs/libX11[${WINE_USEDEP}]
+               x11-libs/libXext[${WINE_USEDEP}]
+       )
+       alsa? ( media-libs/alsa-lib[${WINE_USEDEP}] )
+       capi? ( net-libs/libcapi:=[${WINE_USEDEP}] )
+       ffmpeg? ( media-video/ffmpeg:=[${WINE_USEDEP}] )
+       gphoto2? ( media-libs/libgphoto2:=[${WINE_USEDEP}] )
+       gstreamer? (
+               dev-libs/glib:2[${WINE_USEDEP}]
+               media-libs/gst-plugins-base:1.0[${WINE_USEDEP}]
+               media-libs/gstreamer:1.0[${WINE_USEDEP}]
+       )
+       opencl? ( virtual/opencl[${WINE_USEDEP}] )
+       pcap? ( net-libs/libpcap[${WINE_USEDEP}] )
+       pulseaudio? ( media-libs/libpulse[${WINE_USEDEP}] )
+       scanner? ( media-gfx/sane-backends[${WINE_USEDEP}] )
+       smartcard? ( sys-apps/pcsc-lite[${WINE_USEDEP}] )
+       udev? ( virtual/libudev:=[${WINE_USEDEP}] )
+       unwind? (
+               llvm-libunwind? ( llvm-runtimes/libunwind[${WINE_USEDEP}] )
+               !llvm-libunwind? ( sys-libs/libunwind:=[${WINE_USEDEP}] )
+       )
+       usb? ( dev-libs/libusb:1[${WINE_USEDEP}] )
+       wayland? (
+               dev-libs/wayland[${WINE_USEDEP}]
+               x11-libs/libxkbcommon[${WINE_USEDEP}]
+       )
+"
+RDEPEND="
+       ${WINE_COMMON_DEPEND}
+       app-emulation/wine-desktop-common
+       dos? (
+               || (
+                       games-emulation/dosbox
+                       games-emulation/dosbox-staging
+               )
+       )
+       gecko? (
+               app-emulation/wine-gecko:${WINE_GECKO}[${WINE_USEDEP}]
+               wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+       )
+       gstreamer? ( media-plugins/gst-plugins-meta:1.0[${WINE_USEDEP}] )
+       mono? ( app-emulation/wine-mono:${WINE_MONO} )
+       perl? (
+               dev-lang/perl
+               dev-perl/XML-LibXML
+       )
+       samba? ( net-fs/samba[winbind] )
+       selinux? ( sec-policy/selinux-wine )
+"
+DEPEND="
+       ${WINE_COMMON_DEPEND}
+       sys-kernel/linux-headers
+       X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+       sys-devel/bison
+       sys-devel/flex
+       virtual/pkgconfig
+       nls? ( sys-devel/gettext )
+       wayland? ( dev-util/wayland-scanner )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+       __clear_cache # unused on amd64+x86 (bug #900338)
+       res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-7.0-noexecstack.patch
+       "${FILESDIR}"/${PN}-7.20-unwind.patch
+       "${FILESDIR}"/${PN}-8.13-rpath.patch
+       "${FILESDIR}"/${PN}-10.0-binutils2.44.patch
+)
+
+src_configure() {
+       local wineconfargs=(
+               $(use_enable gecko mshtml)
+               $(use_enable mono mscoree)
+               --disable-tests
+
+               $(use_with X x)
+               $(use_with alsa)
+               $(use_with capi)
+               $(use_with cups)
+               $(use_with dbus)
+               $(use_with ffmpeg)
+               $(use_with fontconfig)
+               $(use_with gphoto2 gphoto)
+               $(use_with gstreamer)
+               $(use_with kerberos gssapi)
+               $(use_with kerberos krb5)
+               $(use_with netapi)
+               $(use_with nls gettext)
+               $(use_with opencl)
+               $(use_with opengl)
+               --without-osmesa # media-libs/mesa no longer supports this
+               --without-oss # media-sound/oss is not packaged (OSSv4)
+               $(use_with pcap)
+               $(use_with pulseaudio pulse)
+               $(use_with scanner sane)
+               $(use_with sdl)
+               $(use_with smartcard pcsclite)
+               $(use_with ssl gnutls)
+               $(use_with truetype freetype)
+               $(use_with udev)
+               $(use_with unwind)
+               $(use_with usb)
+               $(use_with v4l v4l2)
+               $(use_with vulkan)
+               $(use_with wayland)
+               $(use_with xcomposite)
+               $(use_with xinerama)
+               $(usev !odbc ac_cv_lib_soname_odbc=)
+       )
+
+       wine_src_configure
+}
+
+src_install() {
+       use perl || local WINE_SKIP_INSTALL=(
+               ${WINE_DATADIR}/man/man1/wine{dump,maker}.1
+               ${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}}
+       )
+
+       wine_src_install
+
+       dodoc ANNOUNCE* AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+       wine_pkg_postinst
+
+       optfeature "/dev/hidraw* access used for *some* controllers (e.g. 
DualShock4)" \
+               games-util/game-device-udev-rules
+}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.5-r1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-10.5-r1.ebuild
new file mode 100644
index 000000000000..2b30ca2af920
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-10.5-r1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature wine
+
+WINE_GECKO=2.47.4
+WINE_MONO=10.0.0
+
+if [[ ${PV} == 9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git";
+else
+       (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+       
SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz";
+       S=${WORKDIR}/wine-${PV}
+       KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+       https://www.winehq.org/
+       https://gitlab.winehq.org/wine/wine/
+"
+
+LICENSE="
+       LGPL-2.1+
+       BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
+       || ( WTFPL-2 public-domain )
+"
+SLOT="${PV}"
+IUSE="
+       +X +alsa bluetooth capi cups +dbus dos llvm-libunwind ffmpeg
+       +fontconfig +gecko gphoto2 +gstreamer kerberos +mono netapi
+       nls odbc opencl +opengl pcap perl pulseaudio samba scanner
+       +sdl selinux smartcard +ssl +truetype udev +unwind usb v4l
+       +vulkan wayland +xcomposite xinerama
+"
+REQUIRED_USE="
+       X? ( truetype )
+       bluetooth? ( dbus )
+"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+       X? (
+               x11-libs/libXcursor[${WINE_USEDEP}]
+               x11-libs/libXfixes[${WINE_USEDEP}]
+               x11-libs/libXi[${WINE_USEDEP}]
+               x11-libs/libXrandr[${WINE_USEDEP}]
+               x11-libs/libXrender[${WINE_USEDEP}]
+               x11-libs/libXxf86vm[${WINE_USEDEP}]
+               opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
+               xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
+               xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
+       )
+       cups? ( net-print/cups[${WINE_USEDEP}] )
+       dbus? ( sys-apps/dbus[${WINE_USEDEP}] )
+       fontconfig? ( media-libs/fontconfig[${WINE_USEDEP}] )
+       kerberos? ( virtual/krb5[${WINE_USEDEP}] )
+       netapi? ( net-fs/samba[${WINE_USEDEP}] )
+       odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+       sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
+       ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
+       truetype? ( media-libs/freetype[${WINE_USEDEP}] )
+       v4l? ( media-libs/libv4l[${WINE_USEDEP}] )
+       vulkan? ( media-libs/vulkan-loader[X?,wayland?,${WINE_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+       ${WINE_DLOPEN_DEPEND}
+       X? (
+               x11-libs/libX11[${WINE_USEDEP}]
+               x11-libs/libXext[${WINE_USEDEP}]
+       )
+       alsa? ( media-libs/alsa-lib[${WINE_USEDEP}] )
+       capi? ( net-libs/libcapi:=[${WINE_USEDEP}] )
+       ffmpeg? ( media-video/ffmpeg:=[${WINE_USEDEP}] )
+       gphoto2? ( media-libs/libgphoto2:=[${WINE_USEDEP}] )
+       gstreamer? (
+               dev-libs/glib:2[${WINE_USEDEP}]
+               media-libs/gst-plugins-base:1.0[${WINE_USEDEP}]
+               media-libs/gstreamer:1.0[${WINE_USEDEP}]
+       )
+       opencl? ( virtual/opencl[${WINE_USEDEP}] )
+       pcap? ( net-libs/libpcap[${WINE_USEDEP}] )
+       pulseaudio? ( media-libs/libpulse[${WINE_USEDEP}] )
+       scanner? ( media-gfx/sane-backends[${WINE_USEDEP}] )
+       smartcard? ( sys-apps/pcsc-lite[${WINE_USEDEP}] )
+       udev? ( virtual/libudev:=[${WINE_USEDEP}] )
+       unwind? (
+               llvm-libunwind? ( llvm-runtimes/libunwind[${WINE_USEDEP}] )
+               !llvm-libunwind? ( sys-libs/libunwind:=[${WINE_USEDEP}] )
+       )
+       usb? ( dev-libs/libusb:1[${WINE_USEDEP}] )
+       wayland? (
+               dev-libs/wayland[${WINE_USEDEP}]
+               x11-libs/libxkbcommon[${WINE_USEDEP}]
+       )
+"
+RDEPEND="
+       ${WINE_COMMON_DEPEND}
+       app-emulation/wine-desktop-common
+       dos? (
+               || (
+                       games-emulation/dosbox
+                       games-emulation/dosbox-staging
+               )
+       )
+       gecko? (
+               app-emulation/wine-gecko:${WINE_GECKO}[${WINE_USEDEP}]
+               wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+       )
+       gstreamer? ( media-plugins/gst-plugins-meta:1.0[${WINE_USEDEP}] )
+       mono? ( app-emulation/wine-mono:${WINE_MONO} )
+       perl? (
+               dev-lang/perl
+               dev-perl/XML-LibXML
+       )
+       samba? ( net-fs/samba[winbind] )
+       selinux? ( sec-policy/selinux-wine )
+"
+DEPEND="
+       ${WINE_COMMON_DEPEND}
+       sys-kernel/linux-headers
+       X? ( x11-base/xorg-proto )
+       bluetooth? ( net-wireless/bluez )
+"
+BDEPEND="
+       sys-devel/bison
+       sys-devel/flex
+       virtual/pkgconfig
+       nls? ( sys-devel/gettext )
+       wayland? ( dev-util/wayland-scanner )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+       __clear_cache # unused on amd64+x86 (bug #900338)
+       res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-7.0-noexecstack.patch
+       "${FILESDIR}"/${PN}-7.20-unwind.patch
+       "${FILESDIR}"/${PN}-8.13-rpath.patch
+)
+
+src_configure() {
+       local wineconfargs=(
+               $(use_enable gecko mshtml)
+               $(use_enable mono mscoree)
+               --disable-tests
+
+               $(use_with X x)
+               $(use_with alsa)
+               $(use_with capi)
+               $(use_with cups)
+               $(use_with dbus)
+               $(use_with ffmpeg)
+               $(use_with fontconfig)
+               $(use_with gphoto2 gphoto)
+               $(use_with gstreamer)
+               $(use_with kerberos gssapi)
+               $(use_with kerberos krb5)
+               $(use_with netapi)
+               $(use_with nls gettext)
+               $(use_with opencl)
+               $(use_with opengl)
+               --without-osmesa # media-libs/mesa no longer supports this
+               --without-oss # media-sound/oss is not packaged (OSSv4)
+               $(use_with pcap)
+               $(use_with pulseaudio pulse)
+               $(use_with scanner sane)
+               $(use_with sdl)
+               $(use_with smartcard pcsclite)
+               $(use_with ssl gnutls)
+               $(use_with truetype freetype)
+               $(use_with udev)
+               $(use_with unwind)
+               $(use_with usb)
+               $(use_with v4l v4l2)
+               $(use_with vulkan)
+               $(use_with wayland)
+               $(use_with xcomposite)
+               $(use_with xinerama)
+
+               $(usev !bluetooth '
+                       ac_cv_header_bluetooth_bluetooth_h=no
+                       ac_cv_header_bluetooth_rfcomm_h=no
+               ')
+               $(usev !odbc ac_cv_lib_soname_odbc=)
+       )
+
+       wine_src_configure
+}
+
+src_install() {
+       use perl || local WINE_SKIP_INSTALL=(
+               ${WINE_DATADIR}/man/man1/wine{dump,maker}.1
+               ${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}}
+       )
+
+       wine_src_install
+
+       dodoc ANNOUNCE* AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+       wine_pkg_postinst
+
+       optfeature "/dev/hidraw* access used for *some* controllers (e.g. 
DualShock4)" \
+               games-util/game-device-udev-rules
+}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.1-r1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.0.1-r1.ebuild
new file mode 100644
index 000000000000..f803137c996e
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.1-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit wine
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.1.0
+
+if [[ ${PV} == 9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git";
+else
+       (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+       
SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz";
+       S=${WORKDIR}/wine-${PV}
+       KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+       https://www.winehq.org/
+       https://gitlab.winehq.org/wine/wine/
+"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+       +X +alsa capi cups +dbus dos llvm-libunwind +fontconfig +gecko
+       gphoto2 +gstreamer kerberos +mono netapi nls odbc opencl +opengl
+       pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+       +truetype udev +unwind usb v4l +vulkan wayland +xcomposite
+       xinerama
+"
+REQUIRED_USE="X? ( truetype )"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+       X? (
+               x11-libs/libXcursor[${WINE_USEDEP}]
+               x11-libs/libXfixes[${WINE_USEDEP}]
+               x11-libs/libXi[${WINE_USEDEP}]
+               x11-libs/libXrandr[${WINE_USEDEP}]
+               x11-libs/libXrender[${WINE_USEDEP}]
+               x11-libs/libXxf86vm[${WINE_USEDEP}]
+               opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
+               xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
+               xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
+       )
+       cups? ( net-print/cups[${WINE_USEDEP}] )
+       dbus? ( sys-apps/dbus[${WINE_USEDEP}] )
+       fontconfig? ( media-libs/fontconfig[${WINE_USEDEP}] )
+       kerberos? ( virtual/krb5[${WINE_USEDEP}] )
+       netapi? ( net-fs/samba[${WINE_USEDEP}] )
+       odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+       sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
+       ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
+       truetype? ( media-libs/freetype[${WINE_USEDEP}] )
+       v4l? ( media-libs/libv4l[${WINE_USEDEP}] )
+       vulkan? ( media-libs/vulkan-loader[X?,${WINE_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+       ${WINE_DLOPEN_DEPEND}
+       X? (
+               x11-libs/libX11[${WINE_USEDEP}]
+               x11-libs/libXext[${WINE_USEDEP}]
+       )
+       alsa? ( media-libs/alsa-lib[${WINE_USEDEP}] )
+       capi? ( net-libs/libcapi:=[${WINE_USEDEP}] )
+       gphoto2? ( media-libs/libgphoto2:=[${WINE_USEDEP}] )
+       gstreamer? (
+               dev-libs/glib:2[${WINE_USEDEP}]
+               media-libs/gst-plugins-base:1.0[${WINE_USEDEP}]
+               media-libs/gstreamer:1.0[${WINE_USEDEP}]
+       )
+       opencl? ( virtual/opencl[${WINE_USEDEP}] )
+       pcap? ( net-libs/libpcap[${WINE_USEDEP}] )
+       pulseaudio? ( media-libs/libpulse[${WINE_USEDEP}] )
+       scanner? ( media-gfx/sane-backends[${WINE_USEDEP}] )
+       smartcard? ( sys-apps/pcsc-lite[${WINE_USEDEP}] )
+       udev? ( virtual/libudev:=[${WINE_USEDEP}] )
+       unwind? (
+               llvm-libunwind? ( llvm-runtimes/libunwind[${WINE_USEDEP}] )
+               !llvm-libunwind? ( sys-libs/libunwind:=[${WINE_USEDEP}] )
+       )
+       usb? ( dev-libs/libusb:1[${WINE_USEDEP}] )
+       wayland? (
+               dev-libs/wayland[${WINE_USEDEP}]
+               x11-libs/libxkbcommon[${WINE_USEDEP}]
+       )
+"
+RDEPEND="
+       ${WINE_COMMON_DEPEND}
+       app-emulation/wine-desktop-common
+       dos? (
+               || (
+                       games-emulation/dosbox
+                       games-emulation/dosbox-staging
+               )
+       )
+       gecko? (
+               app-emulation/wine-gecko:${WINE_GECKO}[${WINE_USEDEP}]
+               wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+       )
+       gstreamer? ( media-plugins/gst-plugins-meta:1.0[${WINE_USEDEP}] )
+       mono? ( app-emulation/wine-mono:${WINE_MONO} )
+       perl? (
+               dev-lang/perl
+               dev-perl/XML-LibXML
+       )
+       samba? ( net-fs/samba[winbind] )
+       selinux? ( sec-policy/selinux-wine )
+"
+DEPEND="
+       ${WINE_COMMON_DEPEND}
+       sys-kernel/linux-headers
+       X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+       sys-devel/bison
+       sys-devel/flex
+       virtual/pkgconfig
+       nls? ( sys-devel/gettext )
+       wayland? ( dev-util/wayland-scanner )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+       __clear_cache # unused on amd64+x86 (bug #900338)
+       res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-7.0-noexecstack.patch
+       "${FILESDIR}"/${PN}-7.20-unwind.patch
+       "${FILESDIR}"/${PN}-8.13-rpath.patch
+       "${FILESDIR}"/${PN}-10.0-binutils2.44.patch
+)
+
+src_configure() {
+       local wineconfargs=(
+               $(use_enable gecko mshtml)
+               $(use_enable mono mscoree)
+               --disable-tests
+
+               $(use_with X x)
+               $(use_with alsa)
+               $(use_with capi)
+               $(use_with cups)
+               $(use_with dbus)
+               $(use_with fontconfig)
+               $(use_with gphoto2 gphoto)
+               $(use_with gstreamer)
+               $(use_with kerberos gssapi)
+               $(use_with kerberos krb5)
+               $(use_with netapi)
+               $(use_with nls gettext)
+               $(use_with opencl)
+               $(use_with opengl)
+               --without-osmesa # media-libs/mesa no longer supports this
+               --without-oss # media-sound/oss is not packaged (OSSv4)
+               $(use_with pcap)
+               $(use_with pulseaudio pulse)
+               $(use_with scanner sane)
+               $(use_with sdl)
+               $(use_with smartcard pcsclite)
+               $(use_with ssl gnutls)
+               $(use_with truetype freetype)
+               $(use_with udev)
+               $(use_with unwind)
+               $(use_with usb)
+               $(use_with v4l v4l2)
+               $(use_with vulkan)
+               $(use_with wayland)
+               $(use_with xcomposite)
+               $(use_with xinerama)
+               $(usev !odbc ac_cv_lib_soname_odbc=)
+       )
+
+       wine_src_configure
+}
+
+src_install() {
+       use perl || local WINE_SKIP_INSTALL=(
+               ${WINE_DATADIR}/man/man1/wine{dump,maker}.1
+               ${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}}
+       )
+
+       wine_src_install
+
+       dodoc ANNOUNCE* AUTHORS README* documentation/README*
+}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 46f1ec88f6fc..2b30ca2af920 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -3,20 +3,18 @@
 
 EAPI=8
 
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build optfeature
-inherit prefix toolchain-funcs wrapper
+inherit optfeature wine
 
 WINE_GECKO=2.47.4
 WINE_MONO=10.0.0
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git";
 else
        (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
        
SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz";
-       S="${WORKDIR}/wine-${PV}"
+       S=${WORKDIR}/wine-${PV}
        KEYWORDS="-* ~amd64 ~x86"
 fi
 
@@ -33,20 +31,15 @@ LICENSE="
 "
 SLOT="${PV}"
 IUSE="
-       +X +abi_x86_32 +abi_x86_64 +alsa bluetooth capi crossdev-mingw cups
-       +dbus dos llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko
-       gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl
-       +opengl pcap perl pulseaudio samba scanner +sdl selinux smartcard
-       +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64
-       +xcomposite xinerama
+       +X +alsa bluetooth capi cups +dbus dos llvm-libunwind ffmpeg
+       +fontconfig +gecko gphoto2 +gstreamer kerberos +mono netapi
+       nls odbc opencl +opengl pcap perl pulseaudio samba scanner
+       +sdl selinux smartcard +ssl +truetype udev +unwind usb v4l
+       +vulkan wayland +xcomposite xinerama
 "
-# bug #551124 for truetype
-# TODO?: wow64 can be done without mingw if using clang (needs bug #912237)
 REQUIRED_USE="
        X? ( truetype )
        bluetooth? ( dbus )
-       crossdev-mingw? ( mingw )
-       wow64? ( abi_x86_64 !abi_x86_32 mingw )
 "
 
 # tests are non-trivial to run, can hang easily, don't play well with
@@ -56,57 +49,57 @@ RESTRICT="test"
 # `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
 WINE_DLOPEN_DEPEND="
        X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXrender[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-               opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
-               xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-               xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+               x11-libs/libXcursor[${WINE_USEDEP}]
+               x11-libs/libXfixes[${WINE_USEDEP}]
+               x11-libs/libXi[${WINE_USEDEP}]
+               x11-libs/libXrandr[${WINE_USEDEP}]
+               x11-libs/libXrender[${WINE_USEDEP}]
+               x11-libs/libXxf86vm[${WINE_USEDEP}]
+               opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
+               xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
+               xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
        )
-       cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-       dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
+       cups? ( net-print/cups[${WINE_USEDEP}] )
+       dbus? ( sys-apps/dbus[${WINE_USEDEP}] )
+       fontconfig? ( media-libs/fontconfig[${WINE_USEDEP}] )
+       kerberos? ( virtual/krb5[${WINE_USEDEP}] )
+       netapi? ( net-fs/samba[${WINE_USEDEP}] )
+       odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+       sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
+       ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
+       truetype? ( media-libs/freetype[${WINE_USEDEP}] )
+       v4l? ( media-libs/libv4l[${WINE_USEDEP}] )
+       vulkan? ( media-libs/vulkan-loader[X?,wayland?,${WINE_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
        ${WINE_DLOPEN_DEPEND}
        X? (
-               x11-libs/libX11[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
+               x11-libs/libX11[${WINE_USEDEP}]
+               x11-libs/libXext[${WINE_USEDEP}]
        )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-       ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+       alsa? ( media-libs/alsa-lib[${WINE_USEDEP}] )
+       capi? ( net-libs/libcapi:=[${WINE_USEDEP}] )
+       ffmpeg? ( media-video/ffmpeg:=[${WINE_USEDEP}] )
+       gphoto2? ( media-libs/libgphoto2:=[${WINE_USEDEP}] )
        gstreamer? (
-               dev-libs/glib:2[${MULTILIB_USEDEP}]
-               media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+               dev-libs/glib:2[${WINE_USEDEP}]
+               media-libs/gst-plugins-base:1.0[${WINE_USEDEP}]
+               media-libs/gstreamer:1.0[${WINE_USEDEP}]
        )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-       smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+       opencl? ( virtual/opencl[${WINE_USEDEP}] )
+       pcap? ( net-libs/libpcap[${WINE_USEDEP}] )
+       pulseaudio? ( media-libs/libpulse[${WINE_USEDEP}] )
+       scanner? ( media-gfx/sane-backends[${WINE_USEDEP}] )
+       smartcard? ( sys-apps/pcsc-lite[${WINE_USEDEP}] )
+       udev? ( virtual/libudev:=[${WINE_USEDEP}] )
        unwind? (
-               llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
-               !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+               llvm-libunwind? ( llvm-runtimes/libunwind[${WINE_USEDEP}] )
+               !llvm-libunwind? ( sys-libs/libunwind:=[${WINE_USEDEP}] )
        )
-       usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+       usb? ( dev-libs/libusb:1[${WINE_USEDEP}] )
        wayland? (
-               dev-libs/wayland[${MULTILIB_USEDEP}]
-               x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+               dev-libs/wayland[${WINE_USEDEP}]
+               x11-libs/libxkbcommon[${WINE_USEDEP}]
        )
 "
 RDEPEND="
@@ -119,10 +112,10 @@ RDEPEND="
                )
        )
        gecko? (
-               app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+               app-emulation/wine-gecko:${WINE_GECKO}[${WINE_USEDEP}]
                wow64? ( app-emulation/wine-gecko[abi_x86_32] )
        )
-       gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+       gstreamer? ( media-plugins/gst-plugins-meta:1.0[${WINE_USEDEP}] )
        mono? ( app-emulation/wine-mono:${WINE_MONO} )
        perl? (
                dev-lang/perl
@@ -138,22 +131,12 @@ DEPEND="
        bluetooth? ( net-wireless/bluez )
 "
 BDEPEND="
-       || (
-               sys-devel/binutils
-               llvm-core/lld
-       )
-       dev-lang/perl
        sys-devel/bison
        sys-devel/flex
        virtual/pkgconfig
-       mingw? ( !crossdev-mingw? (
-               >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-               wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-       ) )
        nls? ( sys-devel/gettext )
        wayland? ( dev-util/wayland-scanner )
 "
-IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
        __clear_cache # unused on amd64+x86 (bug #900338)
@@ -167,81 +150,8 @@ PATCHES=(
        "${FILESDIR}"/${PN}-8.13-rpath.patch
 )
 
-pkg_pretend() {
-       [[ ${MERGE_TYPE} == binary ]] && return
-
-       if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-               local mingw=-w64-mingw32
-               for mingw in $(usev abi_x86_64 x86_64${mingw}) \
-                       $(use abi_x86_32 || use wow64 && echo i686${mingw}); do
-                       if ! type -P ${mingw}-gcc >/dev/null; then
-                               eerror "With USE=crossdev-mingw, you must 
prepare the MinGW toolchain"
-                               eerror "yourself by installing 
sys-devel/crossdev then running:"
-                               eerror
-                               eerror "    crossdev --target ${mingw}"
-                               eerror
-                               eerror "For more information, please see: 
https://wiki.gentoo.org/wiki/Mingw";
-                               die "USE=crossdev-mingw is enabled, but 
${mingw}-gcc was not found"
-                       fi
-               done
-       fi
-}
-
-src_prepare() {
-       # sanity check, bumping these has a history of oversights
-       local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-               dlls/appwiz.cpl/addons.c || die)
-       if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-               local gmfatal=
-               [[ ${PV} == *9999 ]] && gmfatal=nonfatal
-               ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " 
${geckomono} " (please file a bug)"
-       fi
-
-       default
-
-       if tc-is-clang; then
-               if use mingw; then
-                       # -mabi=ms was ignored by <clang:16 then turned error 
in :17
-                       # if used without --target *-windows, then gets used in 
install
-                       # phase despite USE=mingw, drop as a quick fix for now
-                       sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-               else
-                       # fails in ./configure unless --enable-archs is passed, 
allow to
-                       # bypass with EXTRA_ECONF but is currently considered 
unsupported
-                       # (by Gentoo) as additional work is needed for (proper) 
support
-                       # note: also fails w/ :17, but unsure if safe to drop 
w/o mingw
-                       [[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-                               die "building ${PN} with clang is only 
supported with USE=mingw"
-               fi
-       fi
-
-       # ensure .desktop calls this variant + slot
-       sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-       # datadir is not where wine-mono is installed, so prefixy alternate 
paths
-       hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-       # always update for patches (including user's wrt #432348)
-       eautoreconf
-       tools/make_requests || die # perl
-       # tip: if need more for user patches, with portage can e.g. do
-       # echo "post_src_prepare() { tools/make_specfiles || die; }" \
-       #     > /etc/portage/env/app-emulation/wine-vanilla
-}
-
 src_configure() {
-       WINE_PREFIX=/usr/lib/${P}
-       WINE_DATADIR=/usr/share/${P}
-
-       local conf=(
-               --prefix="${EPREFIX}"${WINE_PREFIX}
-               --datadir="${EPREFIX}"${WINE_DATADIR}
-               --includedir="${EPREFIX}"/usr/include/${P}
-               --libdir="${EPREFIX}"${WINE_PREFIX}
-               --mandir="${EPREFIX}"${WINE_DATADIR}/man
-
-               $(usev wow64 --enable-archs=x86_64,i386)
-
+       local wineconfargs=(
                $(use_enable gecko mshtml)
                $(use_enable mono mscoree)
                --disable-tests
@@ -257,7 +167,6 @@ src_configure() {
                $(use_with gstreamer)
                $(use_with kerberos gssapi)
                $(use_with kerberos krb5)
-               $(use_with mingw)
                $(use_with netapi)
                $(use_with nls gettext)
                $(use_with opencl)
@@ -287,155 +196,23 @@ src_configure() {
                $(usev !odbc ac_cv_lib_soname_odbc=)
        )
 
-       filter-lto # build failure
-       filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
-       use custom-cflags || strip-flags # can break in obscure ways at runtime
-
-       # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug 
#943849)
-       append-cflags -std=gnu17
-
-       # wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)
-       # (do self test until https://github.com/gentoo/gentoo/pull/28355)
-       if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != 
@(LLD|GNU\ ld)* ]]
-       then
-               has_version -b sys-devel/binutils &&
-                       append-ldflags -fuse-ld=bfd ||
-                       append-ldflags -fuse-ld=lld
-               strip-unsupported-flags
-       fi
-
-       if use mingw; then
-               use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-               # CROSSCC was formerly recognized by wine, thus been using 
similar
-               # variables (subject to change, esp. if ever make a 
mingw.eclass).
-               local 
mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-               local 
mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-               local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-               conf+=(
-                       ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-                       ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-                       CROSSCFLAGS="${CROSSCFLAGS:-$(
-                               filter-flags '-fstack-protector*' #870136
-                               filter-flags '-mfunction-return=thunk*' #878849
-
-                               # some bashrc-mv users tend to do 
CFLAGS="${LDFLAGS}" and then
-                               # strip-unsupported-flags miss these during 
compile-only tests
-                               # (primarily done for 23.0 profiles' -z, not 
full coverage)
-                               filter-flags '-Wl,-z,*'
-
-                               # -mavx with mingw-gcc has a history of issues 
and still see
-                               # users have problems despite 
-mpreferred-stack-boundary=2
-                               append-cflags -mno-avx
-
-                               CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-                       )}"
-
-                       CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-                               filter-flags '-fuse-ld=*'
-
-                               CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-                       )}"
-               )
-       fi
-
-       # order matters with multilib: configure+compile 64->32, install 32->64
-       local -i bits
-       for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-       (
-               einfo "Configuring ${PN} for ${bits}bits in 
${WORKDIR}/build${bits} ..."
-
-               mkdir ../build${bits} || die
-               cd ../build${bits} || die
-
-               if (( bits == 64 )); then
-                       conf+=( --enable-win64 )
-               elif use amd64; then
-                       conf+=(
-                               $(usev abi_x86_64 --with-wine64=../build64)
-                               TARGETFLAGS=-m32 # for widl
-                       )
-                       # _setup is optional, but use over Wine's auto-detect 
(+#472038)
-                       multilib_toolchain_setup x86
-               fi
-
-               ECONF_SOURCE=${S} econf "${conf[@]}"
-       )
-       done
-}
-
-src_compile() {
-       use abi_x86_64 && emake -C ../build64 # do first
-       use abi_x86_32 && emake -C ../build32
+       wine_src_configure
 }
 
 src_install() {
-       use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-       use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-       # "wine64" is no longer provided, but a keep symlink for old scripts
-       # TODO: remove the guard later, only useful for bisecting -9999
-       if [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 ]]; then
-               use abi_x86_64 && dosym wine ${WINE_PREFIX}/bin/wine64
-       fi
-
-       use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-               "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} 
|| die
-
-       # create variant wrappers for eselect-wine
-       local bin
-       for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-               make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-       done
-
-       if use mingw; then
-               # don't let portage try to strip PE files with the wrong
-               # strip executable and instead handle it here (saves ~120MB)
-               dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+       use perl || local WINE_SKIP_INSTALL=(
+               ${WINE_DATADIR}/man/man1/wine{dump,maker}.1
+               ${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}}
+       )
 
-               if use strip; then
-                       ebegin "Stripping Windows (PE) binaries"
-                       find "${ED}"${WINE_PREFIX}/wine/*-windows -regex 
'.*\.\(a\|dll\|exe\)' \
-                               -exec $(usex abi_x86_64 x86_64 
i686)-w64-mingw32-strip --strip-unneeded {} +
-                       eend ${?} || die
-               fi
-       fi
+       wine_src_install
 
        dodoc ANNOUNCE* AUTHORS README* documentation/README*
 }
 
 pkg_postinst() {
-       if use !abi_x86_32 && use !wow64; then
-               ewarn "32bit support is disabled. While 64bit applications 
themselves will"
-               ewarn "work, be warned that it is not unusual that installers 
or other helpers"
-               ewarn "will attempt to use 32bit and fail. If do not want full 
USE=abi_x86_32,"
-               ewarn "note the experimental/WIP USE=wow64 can allow 32bit 
without multilib."
-       elif use abi_x86_32 && { use opengl || use vulkan; }; then
-               # difficult to tell what is needed from here, but try to warn
-               if has_version 'x11-drivers/nvidia-drivers'; then
-                       if has_version 
'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
-                               ewarn "x11-drivers/nvidia-drivers is installed 
but is built without"
-                               ewarn "USE=abi_x86_32 (ABI_X86=32), hardware 
acceleration with 32bit"
-                               ewarn "applications under ${PN} will likely not 
be usable."
-                               ewarn "Multi-card setups may need this on 
media-libs/mesa as well."
-                       fi
-               elif has_version 'media-libs/mesa[-abi_x86_32]'; then
-                       ewarn "media-libs/mesa seems to be in use but is built 
without"
-                       ewarn "USE=abi_x86_32 (ABI_X86=32), hardware 
acceleration with 32bit"
-                       ewarn "applications under ${PN} will likely not be 
usable."
-               fi
-       fi
+       wine_pkg_postinst
 
        optfeature "/dev/hidraw* access used for *some* controllers (e.g. 
DualShock4)" \
                games-util/game-device-udev-rules
-
-       eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-       if has_version -b app-eselect/eselect-wine; then
-               eselect wine update --if-unset || die
-       fi
 }


Reply via email to