From 26db0cd02cb75a207203552918afd6c067f7b094 Mon Sep 17 00:00:00 2001
From: Ronald Farrer <canutethegreat@gmail.com>
Date: Mon, 2 Aug 2021 12:13:02 -0700
Subject: [PATCH] Continued patch testing (13).

---
 .../gentoo-surface-sources-5.10.52.ebuild                    | 4 ++--
 .../gentoo-surface-sources-5.13.7.ebuild                     | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild
index e689aee..c78b595 100644
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild
+++ b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild
@@ -29,16 +29,16 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0010-surface-sensors.patch
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0011-cameras.patch
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0012-ath10k-firmware-override.patch "
+S="${WORKDIR}/linux-${KV_FULL}-surface"
 
 src_prepare() {
 	default
 	sed "s/EXTRAVERSION = -gentoo/EXTRAVERSION = -gentoo-surface/" -i "${WORKDIR}/linux-${KV_FULL}/Makefile"
 	EPATCH_SOURCE="${DISTDIR}" EPATCH_SUFFIX="patch" \
 		EPATCH_FORCE="yes" epatch
-	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
+#	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
 	}
 
-S="${WORKDIR}/linux-${KV_FULL}-surface"
 
 pkg_setup() {
 	ewarn ""
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 81d045f..5c7e867 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
@@ -28,17 +28,16 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0009-cameras.patch
 		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"
+S="${WORKDIR}/linux-${KV_FULL}-surface"
 
 src_prepare() {
 	default
 	sed "s/EXTRAVERSION = -gentoo/EXTRAVERSION = -gentoo-surface/" -i "${WORKDIR}/linux-${KV_FULL}/Makefile"
 	EPATCH_SOURCE="${DISTDIR}" EPATCH_SUFFIX="patch" \
 		EPATCH_FORCE="yes"
-	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
+#	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
 	}
 
-S="${WORKDIR}/linux-${KV_FULL}-surface"
-
 pkg_setup() {
 	ewarn ""
 	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."