From 7f84757b25e6c03ba865ca17fb152870e95a7377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 19 Sep 2021 18:34:19 +0700
Subject: [PATCH] EmptyEpsilon: fix cleanup

---
 srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch | 12 ++++++------
 srcpkgs/EmptyEpsilon/template                   | 11 +++++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch b/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch
index 9d377ce40f2..160c5b39d9f 100644
--- a/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch
+++ b/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch
@@ -1,9 +1,9 @@
 this fixes the serial driver on musl as well as on ppc
 
-diff --git src/hardware/serialDriver.cpp src/hardware/serialDriver.cpp
+diff --git a/EmptyEpsilon/src/hardware/serialDriver.cpp a/EmptyEpsilon/src/hardware/serialDriver.cpp
 index 0bb0228..d935c63 100644
---- a/src/hardware/serialDriver.cpp
-+++ b/src/hardware/serialDriver.cpp
+--- a/EmptyEpsilon/src/hardware/serialDriver.cpp
++++ b/EmptyEpsilon/src/hardware/serialDriver.cpp
 @@ -2,20 +2,31 @@
  #ifdef __WIN32__
      #include <windows.h>
@@ -154,10 +154,10 @@ index 0bb0228..d935c63 100644
      FILE* f = fopen(("/sys/class/tty/" + port + "/device/modalias").c_str(), "rt");
      if (!f)
          return "";
-diff --git src/hardware/serialDriver.h src/hardware/serialDriver.h
+diff --git a/EmptyEpsilon/src/hardware/serialDriver.h a/EmptyEpsilon/src/hardware/serialDriver.h
 index 29cc0b5..9513457 100644
---- a/src/hardware/serialDriver.h
-+++ b/src/hardware/serialDriver.h
+--- a/EmptyEpsilon/src/hardware/serialDriver.h
++++ b/EmptyEpsilon/src/hardware/serialDriver.h
 @@ -14,7 +14,7 @@ private:
  #ifdef __WIN32__
      HANDLE handle;
diff --git a/srcpkgs/EmptyEpsilon/template b/srcpkgs/EmptyEpsilon/template
index 3dd6c25a0a2..12b0315c505 100644
--- a/srcpkgs/EmptyEpsilon/template
+++ b/srcpkgs/EmptyEpsilon/template
@@ -6,9 +6,11 @@ _ver_major="${version%%.*}"
 _ver_minor="${version%.*}"
 _ver_minor="${_ver_minor#*.}"
 _ver_patch="${version##*.}"
-wrksrc="EmptyEpsilon-EE-${version}"
+create_wrksrc=yes
 build_style=cmake
-configure_args="-DSERIOUS_PROTON_DIR=$XBPS_BUILDDIR/SeriousProton-EE-${version}
+build_wrksrc="EmptyEpsilon"
+configure_args="
+ -DSERIOUS_PROTON_DIR=$XBPS_BUILDDIR/$pkgname-$version/SeriousProton
  -DCPACK_PACKAGE_VERSION=${version}
  -DCPACK_PACKAGE_VERSION_MAJOR=$_ver_major
  -DCPACK_PACKAGE_VERSION_MINOR=$_ver_minor
@@ -23,3 +25,8 @@ distfiles="https://github.com/daid/EmptyEpsilon/archive/EE-${version}.tar.gz
  https://github.com/daid/SeriousProton/archive/EE-${version}.tar.gz>SP-${version}.tar.gz"
 checksum="c1c4f11fefe1afac6076c795e8785c7507a297ba3f7f2be9ed30c97b1e93cb24
  62ab03dc904bd10f017fff338e55ec97c86f0bc3903a18d6c44285b86776a2d7"
+
+post_extract() {
+	mv EmptyEpsilon* EmptyEpsilon
+	mv SeriousProton* SeriousProton
+}