From 9801104e052e8680150b6cdebd9214b5fa9ef7a5 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 18 Jan 2023 22:44:30 -0500
Subject: [PATCH] app-emulation/wine-vanilla-4.0.4: Port to EAPI 8.

Some eclasses now barf on the older EAPI.  Pretty simple to convert.
---
 app-emulation/wine-vanilla/Manifest           |  2 +-
 ....4.ebuild => wine-vanilla-4.0.4-r1.ebuild} | 26 +++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)
 rename app-emulation/wine-vanilla/{wine-vanilla-4.0.4.ebuild => wine-vanilla-4.0.4-r1.ebuild} (96%)

diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index c151e53..7795cd7 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,4 +1,4 @@
 AUX 4.0.4-configure-fixes.patch 523 BLAKE2B 8cb555cdf763b734dcf27c6f6892867f597de5481ce69f975df17844518842b9f8f6f0190f8b3690eb4b7f5978f6daa508525eebb07d8349e84f314969c16d90 SHA512 5d67d43d7bcfe6497826ac1f8e2d8f1ac63bc724c31a44caa6cb91d9f5a1004be5a56d0d6f03891c9acb2530fb7f14503f7cc950ff650ebdad31868ee6b1c7b6
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-4.0.4.tar.xz 21686868 BLAKE2B 3ba9afef38a33e53eb1979aa4e7bbb120370692a8480e7bc15fc6959fb326c0c1f2151bb96355220e534858c0be56e1c35813e5e31b8a85db89c701466edac21 SHA512 21780b3c846bfa7a54572fe78939d7a2579a2b96654fc578e8e70d20b50262b4bfb43a0431f4089264cf8f83202c2fc67dd6a4c89257e951b64e7c91ee3bdf4e
-EBUILD wine-vanilla-4.0.4.ebuild 17410 BLAKE2B ade8a3c1ad7535f2a03e0a2026ef90d27142fcdcff50a431867d2cb7a47433cde40913ca2ba134fb31dbdf0c03d6ff2e8f8459cd433e42a26d7b0247b4f9aa8d SHA512 637ee8719601b97f9284c94c6cb9b09ad7d1a33580dfd88c7b2af76973c0cb806629a78dc46456ebe932194329c848017371114361a2e4ab0444973cb5db3450
+EBUILD wine-vanilla-4.0.4-r1.ebuild 17806 BLAKE2B aa97f4b8ae8baeeda110c19c7c37effb7ef578a40e53d96e1f9e4f9149636d334d90c5de810d890acfc2c317fb4d9dee49b9d46e79aede1f2d90fc453433ee7b SHA512 f06357ba053f90184561057694830e7781568942e3252bc3825099c74ebcf2355ffd44544cd53a5284110a9208fdbfc7d76a369ff09cf58885acc1ae8020bde6
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.4-r1.ebuild
similarity index 96%
rename from app-emulation/wine-vanilla/wine-vanilla-4.0.4.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-4.0.4-r1.ebuild
index c8112e6..1a5f201 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.4-r1.ebuild
@@ -1,12 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
+# This ebuild is a modified version of the work originally distributed with
+# Gentoo GNU/Linux, covered by the following copyright and permission notice:
+#
+#   Copyright 1999-2021 Gentoo Authors
+#   Distributed under the terms of the GNU General Public License v2
+#
+# The modifications are:
+#
+#   * Apply patch to build successfully with Autoconf 2.71 (2021-11)
+#   * Build with -fcommon to get compatible behaviour from GCC 10 (2022-04)
+#   * Port to EAPI 8 for compatibility with current eclasses (2022-12)
+
+EAPI=8
 
 PLOCALES="ar 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 eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -48,6 +57,10 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 # or fail due to Xvfb's opengl limitations.
 RESTRICT="test"
 
+BDEPEND="virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex"
+
 COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -123,10 +136,7 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
 	X? ( x11-base/xorg-proto )
 	prelink? ( sys-devel/prelink )
 	xinerama? ( x11-base/xorg-proto )"
-- 
2.43.2