From 37ba927a91e0af776431748a86cad8a8f6e18636 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Sun, 5 Aug 2018 23:22:32 +0800
Subject: [PATCH] hcxdumptool: push 'from me' to upstream and bump

---
 net-wireless/hcxdumptool/Manifest             |  2 +-
 net-wireless/hcxdumptool/files/makefile.patch | 41 -------------------
 ...-r1.ebuild => hcxdumptool-4.2.0-r2.ebuild} |  9 +---
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 net-wireless/hcxdumptool/files/makefile.patch
 rename net-wireless/hcxdumptool/{hcxdumptool-4.2.0-r1.ebuild => hcxdumptool-4.2.0-r2.ebuild} (81%)

diff --git a/net-wireless/hcxdumptool/Manifest b/net-wireless/hcxdumptool/Manifest
index 14380e6c4..190654aab 100644
--- a/net-wireless/hcxdumptool/Manifest
+++ b/net-wireless/hcxdumptool/Manifest
@@ -1 +1 @@
-DIST hcxdumptool-4.2.0.zip 49281 BLAKE2B fdcffd0a116052c9473d0d27cd5c38d9bbaa91ae75b8b04b8d78b95986784fc0f6af045c8afe55c63d0e12499516c1a53fdd29ecbb002bf50a992837114e0589 SHA512 b3945246d2ad3e0ff40cf092694794dc3a5de3e5acef1767bc166d71bdeda999f29c0464466d5587f469323531a834b03925abd1cf9baf0065507468e7f2d12c
+DIST hcxdumptool-f27b030c15bafc0789bc405b9061b7f8009fa8da.zip 49490 BLAKE2B ccf5b8bd58a1fb29dfb91fad2a7e2483567e9f0780355acf03d0a1d7bb7c4566d3943f774d1f41b3bd817d7fd5ba8a35a957548a96bcc486da17bd9e88fe8915 SHA512 fe4553ad991e398a84157b180ce90071bf5a91a211fd45752a6d683716570e47040716cc3ed57f17c50d7c007f703491897c9008798698244e657c19a46d0487
diff --git a/net-wireless/hcxdumptool/files/makefile.patch b/net-wireless/hcxdumptool/files/makefile.patch
deleted file mode 100644
index b584a23ee..000000000
--- a/net-wireless/hcxdumptool/files/makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur hcxdumptool-ebfcdf0243604d36dfac2757d4373bd9331b8a9a/Makefile hcxdumptool-ebfcdf0243604d36dfac2757d4373bd9331b8a9a-correct/Makefile
---- hcxdumptool-ebfcdf0243604d36dfac2757d4373bd9331b8a9a/Makefile	2018-08-05 00:08:59.110263256 +0000
-+++ hcxdumptool-ebfcdf0243604d36dfac2757d4373bd9331b8a9a-correct/Makefile	2018-08-05 00:08:45.742262925 +0000
-@@ -1,11 +1,12 @@
--INSTALLDIR	= /usr/local/bin
-+PREFIX?=/usr/local
-+INSTALLDIR	= $(DESTDIR)$(PREFIX)/bin
- 
- HOSTOS := $(shell uname -s)
- GPIOSUPPORT=off
- 
- CC	= gcc
--+CFLAGS ?= -O3 -Wall -Wextra
--+CFLAGS += -std=gnu99
-+CFLAGS ?= -O3 -Wall -Wextra
-+CFLAGS += -std=gnu99
- INSTFLAGS = -m 0755
- 
- ifeq ($(HOSTOS), Linux)
-@@ -14,7 +15,7 @@
- 
- ifeq ($(GPIOSUPPORT), on)
- CFLAGS	+= -DDOGPIOSUPPORT
--LFLAGS	= -lwiringPi
-+LDFLAGS	+= -lwiringPi
- endif
- 
- 
-@@ -22,10 +23,10 @@
- 
- build:
- ifeq ($(GPIOSUPPORT), on)
--	$(CC) $(CFLAGS) -o hcxpioff hcxpioff.c $(LFLAGS)
-+	$(CC) $(CFLAGS) -o hcxpioff hcxpioff.c $(LDFLAGS)
- endif
- ifeq ($(HOSTOS), Linux)
--	$(CC) $(CFLAGS) -o hcxdumptool hcxdumptool.c -lpthread $(LFLAGS)
-+	$(CC) $(CFLAGS) -o hcxdumptool hcxdumptool.c -lpthread $(LDFLAGS)
- endif
- 
- 
diff --git a/net-wireless/hcxdumptool/hcxdumptool-4.2.0-r1.ebuild b/net-wireless/hcxdumptool/hcxdumptool-4.2.0-r2.ebuild
similarity index 81%
rename from net-wireless/hcxdumptool/hcxdumptool-4.2.0-r1.ebuild
rename to net-wireless/hcxdumptool/hcxdumptool-4.2.0-r2.ebuild
index 2922761ef..7508c38b3 100644
--- a/net-wireless/hcxdumptool/hcxdumptool-4.2.0-r1.ebuild
+++ b/net-wireless/hcxdumptool/hcxdumptool-4.2.0-r2.ebuild
@@ -7,8 +7,8 @@ inherit eutils
 
 DESCRIPTION="Small tool to capture packets from wlan devices"
 HOMEPAGE="https://github.com/ZerBea/hcxdumptool"
-MY_COMMIT="ebfcdf0243604d36dfac2757d4373bd9331b8a9a"
-SRC_URI="https://github.com/ZerBea/hcxdumptool/archive/${MY_COMMIT}.zip -> ${P}.zip"
+MY_COMMIT="f27b030c15bafc0789bc405b9061b7f8009fa8da"
+SRC_URI="https://github.com/ZerBea/hcxdumptool/archive/${MY_COMMIT}.zip -> ${PN}-${MY_COMMIT}.zip"
 
 LICENSE=""
 SLOT="0"
@@ -20,11 +20,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
-src_prepare(){
-	epatch "${FILESDIR}/makefile.patch"
-	eapply_user
-}
-
 src_configure(){
 	local GPIOSUPPORT
 	if use gpio; then