From 7f7b99a450b6e8a8a3d88cae5812910a8c43cd81 Mon Sep 17 00:00:00 2001
From: Ronald Farrer <canutethegreat@gmail.com>
Date: Mon, 2 Aug 2021 14:50:10 -0700
Subject: [PATCH] Continued patch testing (43).

---
 .../gentoo-surface-sources-5.13.7.ebuild      | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 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 3467f18..4eef92d 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,26 +30,23 @@ 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_unpack() {
+src_prepare {
 	unpack_set_extraversion
-}
-
-#src_prepare {
-#	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
-#	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
+	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
+	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
 #	S="${WORKDIR}/linux-${KV_FULL}-surface"
-#}
+}
 
 pkg_setup() {
 	ewarn ""