From d1bbf488256f31499d64bd8d3337eab02f4a6d9c Mon Sep 17 00:00:00 2001
From: Ronald Farrer <canutethegreat@gmail.com>
Date: Wed, 4 Aug 2021 09:57:27 -0700
Subject: [PATCH] yet more patch testing (5).

---
 .../gentoo-surface-sources-5.13.7.ebuild      | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
index 2bbf109..87f0146 100644
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
+++ b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
@@ -30,31 +30,27 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0010-amd-gpio.patch
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0011-amd-s0ix.patch"
 
-src_prepare() {
+src_unpack() {
 	default
 	unpack_set_extraversion
+}
+
+src_prepare() {
 	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
 	S="${WORKDIR}/linux-${KV_FULL}-surface"
 
 	#echo "S=$S"; pwd; ls -la ; find -name surface3-wmi.c -ls
-	local SURFACE_PATCH
-	local SURFACE_PATCHES="
-		${DISTDIR}/0001-surface3-oemb.patch
-		${DISTDIR}/0002-mwifiex.patch
-		${DISTDIR}/0003-ath10k.patch
-		${DISTDIR}/0004-ipts.patch
-		${DISTDIR}/0005-surface-sam-over-hid.patch
-		${DISTDIR}/0006-surface-sam.patch
-		${DISTDIR}/0007-surface-hotplug.patch
-		${DISTDIR}/0008-surface-typecover.patch
-		${DISTDIR}/0009-cameras.patch
-		${DISTDIR}/0010-amd-gpio.patch
-		${DISTDIR}/0011-amd-s0ix.patch"
-	local SURFACE_PATH="${WORKDIR}/linux-${KV_FULL}"
-	for SURFACE_PATCH in $SURFACE_PATCHES
-	do
-		eapply "${SURFACE_PATH}/${SURFACE_PATCH}"
-	done
+	eapply "${DISTDIR}/0001-surface3-oemb.patch"
+	eapply "${DISTDIR}/0002-mwifiex.patch"
+	eapply "${DISTDIR}/0003-ath10k.patch"
+	eapply "${DISTDIR}/0004-ipts.patch"
+	eapply "${DISTDIR}/0005-surface-sam-over-hid.patch"
+	eapply "${DISTDIR}/0006-surface-sam.patch"
+	eapply "${DISTDIR}/0007-surface-hotplug.patch"
+	eapply "${DISTDIR}/0008-surface-typecover.patch"
+	eapply "${DISTDIR}/0009-cameras.patch"
+	eapply "${DISTDIR}/0010-amd-gpio.patch"
+	eapply "${DISTDIR}/0011-amd-s0ix.patch"
 	eapply_user
 }