app-emulation/wine-staging: hard-require git to apply patches

Seen a report on the forums that staging's patches were failing since
(at least) 9.15, I couldn't reproduce until I unmerged git.

The ebuild currently allowed git to be optional given gitapply.sh
has a fallback using several common tools (awk, cut, dd, du, grep,
hexdump, patch, sha1sum...), but that feels incredibly messy, don't
think anyone really tests it (me included), and seems like it broke
at some point.

Don't believe it's worth worrying about over skipping git even if it
got fixed, so let's just require it.

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

4 files changed, 12 insertions, 32 deletions

diff --git a/app-emulation/wine-staging/wine-staging-9.15.ebuild b/app-emulation/wine-staging/wine-staging-9.15.ebuild
index 701e686b693b..1c210171a3b2 100644
--- a/app-emulation/wine-staging/wine-staging-9.15.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.15.ebuild
@@ -140,21 +140,16 @@ DEPEND="
 	sys-kernel/linux-headers
 	X? ( x11-base/xorg-proto )
 "
-# gitapply.sh prefers git but can fallback to patch+extras
+# gitapply.sh "can" work without git but that is hardly tested
+# and known failing with some versions, so force real git
 BDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	|| (
 		sys-devel/binutils
 		sys-devel/lld
 	)
 	dev-lang/perl
+	dev-vcs/git
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/app-emulation/wine-staging/wine-staging-9.16.ebuild b/app-emulation/wine-staging/wine-staging-9.16.ebuild
index 992a6503e0ea..f5608d82cb73 100644
--- a/app-emulation/wine-staging/wine-staging-9.16.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.16.ebuild
@@ -140,21 +140,16 @@ DEPEND="
 	sys-kernel/linux-headers
 	X? ( x11-base/xorg-proto )
 "
-# gitapply.sh prefers git but can fallback to patch+extras
+# gitapply.sh "can" work without git but that is hardly tested
+# and known failing with some versions, so force real git
 BDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	|| (
 		sys-devel/binutils
 		sys-devel/lld
 	)
 	dev-lang/perl
+	dev-vcs/git
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/app-emulation/wine-staging/wine-staging-9.17.ebuild b/app-emulation/wine-staging/wine-staging-9.17.ebuild
index 52de71bd6897..79e21a4a3b45 100644
--- a/app-emulation/wine-staging/wine-staging-9.17.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.17.ebuild
@@ -140,21 +140,16 @@ DEPEND="
 	sys-kernel/linux-headers
 	X? ( x11-base/xorg-proto )
 "
-# gitapply.sh prefers git but can fallback to patch+extras
+# gitapply.sh "can" work without git but that is hardly tested
+# and known failing with some versions, so force real git
 BDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	|| (
 		sys-devel/binutils
 		sys-devel/lld
 	)
 	dev-lang/perl
+	dev-vcs/git
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index f01c88936d1c..69c45f1c51f2 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -141,21 +141,16 @@ DEPEND="
 	sys-kernel/linux-headers
 	X? ( x11-base/xorg-proto )
 "
-# gitapply.sh prefers git but can fallback to patch+extras
+# gitapply.sh "can" work without git but that is hardly tested
+# and known failing with some versions, so force real git
 BDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	|| (
 		sys-devel/binutils
 		sys-devel/lld
 	)
 	dev-lang/perl
+	dev-vcs/git
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig