From be018544fa05e553a569ed02e14ae7ddd1d087b1 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sun, 19 Aug 2018 02:44:41 +0000
Subject: [PATCH] ec2drv: fix PROVIDES, add SOURCE_FILENAME.

---
 dev-embedded/ec2drv/ec2drv-20180812.recipe | 39 +++++++++++++---------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/dev-embedded/ec2drv/ec2drv-20180812.recipe b/dev-embedded/ec2drv/ec2drv-20180812.recipe
index d25532c1a..8e83964b8 100644
--- a/dev-embedded/ec2drv/ec2drv-20180812.recipe
+++ b/dev-embedded/ec2drv/ec2drv-20180812.recipe
@@ -4,24 +4,33 @@ EC2, EC3, EC5, EC6 debug adapters."
 HOMEPAGE="https://github.com/paragonRobotics/ec2-new"
 COPYRIGHT="2006 Ricky White"
 LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://github.com/paragonRobotics/ec2-new/archive/e8848813272fb8c85cc497c57d8fb643a6dd169e.tar.gz"
-SOURCE_DIR="ec2-new-e8848813272fb8c85cc497c57d8fb643a6dd169e"
-PATCHES="ec2drv-$portVersion.patchset"
+REVISION="2"
+srcGitRev="e8848813272fb8c85cc497c57d8fb643a6dd169e"
+SOURCE_URI="https://github.com/paragonRobotics/ec2-new/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="9c5552a3140a43159de3ce4cf3abfe119cc58e3eafcfacd1564a496b1cf2ffb8"
+SOURCE_FILENAME="ec2-new-$portVersion-$srcGitRev.tar.gz"
+SOURCE_DIR="ec2-new-$srcGitRev"
+PATCHES="ec2drv-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
-	ec2drv = $portVersion
-	cmd:ec2_update_fw
-	cmd:ec2adapters
-	cmd:ec2device
-	cmd:ec2readflash
-	cmd:ec2readfw
-	cmd:ec2test_any
-	cmd:ec2writeflash
+	ec2drv$secondaryArchSuffix = $portVersion
+	cmd:ec2_update_fw$commandSuffix
+	cmd:ec2adapters$commandSuffix
+	cmd:ec2device$commandSuffix
+	cmd:ec2readflash$commandSuffix
+	cmd:ec2readfw$commandSuffix
+	cmd:ec2test_any$commandSuffix
+	cmd:ec2writeflash$commandSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -34,8 +43,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:ninja
 	cmd:gcc$secondaryArchSuffix
+	cmd:ninja
 	cmd:python
 	"
 
@@ -49,6 +58,6 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p $prefix/bin
-	cp build/bin/* $prefix/bin
+	mkdir -p "$commandBinDir"
+	cp build/bin/* "$commandBinDir"
 }