| 1 |
commit: 6fb408c56cf0aec0187cef4534b0974e6e140d7a |
| 2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 29 19:14:20 2018 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 29 19:14:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb408c5 |
| 7 |
|
| 8 |
net-wireless/kismet: upstream re-broke setuptools |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.38, Repoman-2.3.9 |
| 11 |
|
| 12 |
net-wireless/kismet/files/fix-setuptools.patch | 73 ++++++++++++++++++++++++++ |
| 13 |
net-wireless/kismet/kismet-9999.ebuild | 1 + |
| 14 |
2 files changed, 74 insertions(+) |
| 15 |
|
| 16 |
diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..a86f66b4447 |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-wireless/kismet/files/fix-setuptools.patch |
| 21 |
@@ -0,0 +1,73 @@ |
| 22 |
+commit e31263b50acd960f7bb0c34c0396383319d7da30 |
| 23 |
+Author: Rick Farina (Zero_Chaos) <zerochaos@g.o> |
| 24 |
+Date: Tue Apr 24 11:38:17 2018 -0400 |
| 25 |
+ |
| 26 |
+ make setuptools respect DESTDIR |
| 27 |
+ |
| 28 |
+ thanks to mgorny for pointint it out |
| 29 |
+ |
| 30 |
+diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in |
| 31 |
+index 75c85da9..980c417a 100644 |
| 32 |
+--- a/capture_freaklabs_zigbee/Makefile.in |
| 33 |
++++ b/capture_freaklabs_zigbee/Makefile.in |
| 34 |
+@@ -6,7 +6,7 @@ all: |
| 35 |
+ $(PYTHON2) ./setup.py build |
| 36 |
+ |
| 37 |
+ install: |
| 38 |
+- $(PYTHON2) ./setup.py install |
| 39 |
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR) |
| 40 |
+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN) |
| 41 |
+ |
| 42 |
+ clean: |
| 43 |
+diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in |
| 44 |
+index 23446edc..babc63f4 100644 |
| 45 |
+--- a/capture_sdr_rtl433/Makefile.in |
| 46 |
++++ b/capture_sdr_rtl433/Makefile.in |
| 47 |
+@@ -7,7 +7,7 @@ all: |
| 48 |
+ $(PYTHON2) ./setup.py build |
| 49 |
+ |
| 50 |
+ install: |
| 51 |
+- $(PYTHON2) ./setup.py install |
| 52 |
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR) |
| 53 |
+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN) |
| 54 |
+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN) |
| 55 |
+ |
| 56 |
+diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile |
| 57 |
+index 036541a0..fc660dfe 100644 |
| 58 |
+--- a/python_modules/KismetExternal/Makefile |
| 59 |
++++ b/python_modules/KismetExternal/Makefile |
| 60 |
+@@ -4,7 +4,7 @@ all: |
| 61 |
+ $(PYTHON2) ./setup.py build |
| 62 |
+ |
| 63 |
+ install: |
| 64 |
+- $(PYTHON2) ./setup.py install |
| 65 |
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR) |
| 66 |
+ |
| 67 |
+ protobuf: |
| 68 |
+ $(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto |
| 69 |
+diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile |
| 70 |
+index d0d6f784..60e1eac1 100644 |
| 71 |
+--- a/python_modules/KismetLog/Makefile |
| 72 |
++++ b/python_modules/KismetLog/Makefile |
| 73 |
+@@ -4,7 +4,7 @@ all: |
| 74 |
+ $(PYTHON2) ./setup.py build |
| 75 |
+ |
| 76 |
+ install: |
| 77 |
+- $(PYTHON2) ./setup.py install |
| 78 |
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR) |
| 79 |
+ |
| 80 |
+ clean: |
| 81 |
+ @-$(PYTHON2) ./setup.py clean |
| 82 |
+diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile |
| 83 |
+index d0d6f784..60e1eac1 100644 |
| 84 |
+--- a/python_modules/KismetRest/Makefile |
| 85 |
++++ b/python_modules/KismetRest/Makefile |
| 86 |
+@@ -4,7 +4,7 @@ all: |
| 87 |
+ $(PYTHON2) ./setup.py build |
| 88 |
+ |
| 89 |
+ install: |
| 90 |
+- $(PYTHON2) ./setup.py install |
| 91 |
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR) |
| 92 |
+ |
| 93 |
+ clean: |
| 94 |
+ @-$(PYTHON2) ./setup.py clean |
| 95 |
|
| 96 |
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild |
| 97 |
index 8005063ea99..2a6321ed512 100644 |
| 98 |
--- a/net-wireless/kismet/kismet-9999.ebuild |
| 99 |
+++ b/net-wireless/kismet/kismet-9999.ebuild |
| 100 |
@@ -67,6 +67,7 @@ src_prepare() { |
| 101 |
sed -i -e 's| -s||g' \ |
| 102 |
-e 's|@mangrp@|root|g' Makefile.in |
| 103 |
|
| 104 |
+ epatch "${FILESDIR}"/fix-setuptools.patch |
| 105 |
eapply_user |
| 106 |
eautoreconf |
| 107 |
} |
Archives