commit: bf067039d6f74e08f8d627391d2daa0823b01277
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 6 01:56:29 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Nov 6 01:56:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf067039
net-wireless/kismet: live ebuild update
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/kismet/files/fix-setuptools2.patch | 65 +++++++++++++++++++++++++
net-wireless/kismet/kismet-9999.ebuild | 4 +-
2 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/net-wireless/kismet/files/fix-setuptools2.patch
b/net-wireless/kismet/files/fix-setuptools2.patch
new file mode 100644
index 00000000000..2f72b258af9
--- /dev/null
+++ b/net-wireless/kismet/files/fix-setuptools2.patch
@@ -0,0 +1,65 @@
+diff --git a/capture_freaklabs_zigbee/Makefile.in
b/capture_freaklabs_zigbee/Makefile.in
+index 97fb50b7..492f6a90 100644
+--- a/capture_freaklabs_zigbee/Makefile.in
++++ b/capture_freaklabs_zigbee/Makefile.in
+@@ -6,7 +6,7 @@ all:
+ $(PYTHON3) ./setup.py build
+
+ install:
+- $(PYTHON3) ./setup.py install
++ $(PYTHON3) ./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 2e82ac5f..fa4314b2 100644
+--- a/capture_sdr_rtl433/Makefile.in
++++ b/capture_sdr_rtl433/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ $(PYTHON3) ./setup.py build
+
+ install:
+- $(PYTHON3) ./setup.py install
++ $(PYTHON3) ./setup.py install --root=$(DESTDIR)
+ # These are now part of the setup.py install
+ # $(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 4dc83d11..4bf912b3 100644
+--- a/python_modules/KismetExternal/Makefile
++++ b/python_modules/KismetExternal/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON3) ./setup.py build
+
+ install:
+- $(PYTHON3) ./setup.py install
++ $(PYTHON3) ./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 910ca9d9..cafd3902 100644
+--- a/python_modules/KismetLog/Makefile
++++ b/python_modules/KismetLog/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON3) ./setup.py build
+
+ install:
+- $(PYTHON3) ./setup.py install
++ $(PYTHON3) ./setup.py install --root=$(DESTDIR)
+
+ clean:
+ @-$(PYTHON3) ./setup.py clean
+diff --git a/python_modules/KismetRest/Makefile
b/python_modules/KismetRest/Makefile
+index 910ca9d9..cafd3902 100644
+--- a/python_modules/KismetRest/Makefile
++++ b/python_modules/KismetRest/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON3) ./setup.py build
+
+ install:
+- $(PYTHON3) ./setup.py install
++ $(PYTHON3) ./setup.py install --root=$(DESTDIR)
+
+ clean:
+ @-$(PYTHON3) ./setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild
b/net-wireless/kismet/kismet-9999.ebuild
index 1964da67d1e..4ef4ac444dd 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
inherit autotools eutils multilib user python-single-r1
@@ -66,7 +66,7 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in
- epatch "${FILESDIR}"/fix-setuptools.patch
+ epatch "${FILESDIR}"/fix-setuptools2.patch
eapply_user
if [[ ${PV} == "9999" ]] ; then
