[gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/

["Richard Farina" <zerochaos@gentoo.org>]

commit:     2fe3f3b61d88db7871e6f265e0af6172adcef7ff
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 14:28:53 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 14:28:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe3f3b6

net-wireless/kismet: upstream fixed setuptools

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-wireless/kismet/files/fix-setuptools.patch | 73 --------------------------
 net-wireless/kismet/kismet-9999.ebuild         |  1 -
 2 files changed, 74 deletions(-)

diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch
deleted file mode 100644
index a86f66b4447..00000000000
--- a/net-wireless/kismet/files/fix-setuptools.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit e31263b50acd960f7bb0c34c0396383319d7da30
-Author: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
-Date:   Tue Apr 24 11:38:17 2018 -0400
-
-    make setuptools respect DESTDIR
-    
-    thanks to mgorny for pointint it out
-
-diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
-index 75c85da9..980c417a 100644
---- a/capture_freaklabs_zigbee/Makefile.in
-+++ b/capture_freaklabs_zigbee/Makefile.in
-@@ -6,7 +6,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
- 
- clean:
-diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
-index 23446edc..babc63f4 100644
---- a/capture_sdr_rtl433/Makefile.in
-+++ b/capture_sdr_rtl433/Makefile.in
-@@ -7,7 +7,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
- 	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
- 
-diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
-index 036541a0..fc660dfe 100644
---- a/python_modules/KismetExternal/Makefile
-+++ b/python_modules/KismetExternal/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 	
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 
- protobuf:
- 	$(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
-diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
-index d0d6f784..60e1eac1 100644
---- a/python_modules/KismetLog/Makefile
-+++ b/python_modules/KismetLog/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 	
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 
- clean:
- 	@-$(PYTHON2) ./setup.py clean
-diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
-index d0d6f784..60e1eac1 100644
---- a/python_modules/KismetRest/Makefile
-+++ b/python_modules/KismetRest/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 	
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 
- clean:
- 	@-$(PYTHON2) ./setup.py clean

diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 60b19468d9e..3579b817443 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -67,7 +67,6 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
-	eapply "${FILESDIR}/fix-setuptools.patch"
 	eapply_user
 	eautoreconf
 }