Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/
Date: Tue, 23 Apr 2019 09:55:37
Message-Id: 1556013281.5210c5a00c7171462bea17ed689a220d507d636c.soap@gentoo
1 commit: 5210c5a00c7171462bea17ed689a220d507d636c
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Apr 22 07:43:12 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 23 09:54:41 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5210c5a0
7
8 net-wireless/kismet: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/11773
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 net-wireless/kismet/files/fix-setuptools.patch | 73 --------------------
15 net-wireless/kismet/files/fix-setuptools4.patch | 91 -------------------------
16 2 files changed, 164 deletions(-)
17
18 diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch
19 deleted file mode 100644
20 index a86f66b4447..00000000000
21 --- a/net-wireless/kismet/files/fix-setuptools.patch
22 +++ /dev/null
23 @@ -1,73 +0,0 @@
24 -commit e31263b50acd960f7bb0c34c0396383319d7da30
25 -Author: Rick Farina (Zero_Chaos) <zerochaos@g.o>
26 -Date: Tue Apr 24 11:38:17 2018 -0400
27 -
28 - make setuptools respect DESTDIR
29 -
30 - thanks to mgorny for pointint it out
31 -
32 -diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
33 -index 75c85da9..980c417a 100644
34 ---- a/capture_freaklabs_zigbee/Makefile.in
35 -+++ b/capture_freaklabs_zigbee/Makefile.in
36 -@@ -6,7 +6,7 @@ all:
37 - $(PYTHON2) ./setup.py build
38 -
39 - install:
40 -- $(PYTHON2) ./setup.py install
41 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
42 - $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
43 -
44 - clean:
45 -diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
46 -index 23446edc..babc63f4 100644
47 ---- a/capture_sdr_rtl433/Makefile.in
48 -+++ b/capture_sdr_rtl433/Makefile.in
49 -@@ -7,7 +7,7 @@ all:
50 - $(PYTHON2) ./setup.py build
51 -
52 - install:
53 -- $(PYTHON2) ./setup.py install
54 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
55 - $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
56 - $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
57 -
58 -diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
59 -index 036541a0..fc660dfe 100644
60 ---- a/python_modules/KismetExternal/Makefile
61 -+++ b/python_modules/KismetExternal/Makefile
62 -@@ -4,7 +4,7 @@ all:
63 - $(PYTHON2) ./setup.py build
64 -
65 - install:
66 -- $(PYTHON2) ./setup.py install
67 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
68 -
69 - protobuf:
70 - $(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
71 -diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
72 -index d0d6f784..60e1eac1 100644
73 ---- a/python_modules/KismetLog/Makefile
74 -+++ b/python_modules/KismetLog/Makefile
75 -@@ -4,7 +4,7 @@ all:
76 - $(PYTHON2) ./setup.py build
77 -
78 - install:
79 -- $(PYTHON2) ./setup.py install
80 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
81 -
82 - clean:
83 - @-$(PYTHON2) ./setup.py clean
84 -diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
85 -index d0d6f784..60e1eac1 100644
86 ---- a/python_modules/KismetRest/Makefile
87 -+++ b/python_modules/KismetRest/Makefile
88 -@@ -4,7 +4,7 @@ all:
89 - $(PYTHON2) ./setup.py build
90 -
91 - install:
92 -- $(PYTHON2) ./setup.py install
93 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
94 -
95 - clean:
96 - @-$(PYTHON2) ./setup.py clean
97
98 diff --git a/net-wireless/kismet/files/fix-setuptools4.patch b/net-wireless/kismet/files/fix-setuptools4.patch
99 deleted file mode 100644
100 index c2db673529e..00000000000
101 --- a/net-wireless/kismet/files/fix-setuptools4.patch
102 +++ /dev/null
103 @@ -1,91 +0,0 @@
104 -diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
105 -index cfbf99b0..c2e68453 100644
106 ---- a/capture_freaklabs_zigbee/Makefile.in
107 -+++ b/capture_freaklabs_zigbee/Makefile.in
108 -@@ -6,7 +6,7 @@ all:
109 - $(PYTHON2) ./setup.py build
110 -
111 - install:
112 -- $(PYTHON2) ./setup.py install
113 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
114 - # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
115 -
116 - clean:
117 -diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
118 -index e33f7de5..e1be587d 100644
119 ---- a/capture_sdr_rtl433/Makefile.in
120 -+++ b/capture_sdr_rtl433/Makefile.in
121 -@@ -7,7 +7,7 @@ all:
122 - $(PYTHON2) ./setup.py build
123 -
124 - install:
125 -- $(PYTHON2) ./setup.py install
126 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
127 - # These are now part of the setup.py install
128 - # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
129 - # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
130 -diff --git a/capture_sdr_rtladsb/Makefile.in b/capture_sdr_rtladsb/Makefile.in
131 -index 8a4f7647..8239f434 100644
132 ---- a/capture_sdr_rtladsb/Makefile.in
133 -+++ b/capture_sdr_rtladsb/Makefile.in
134 -@@ -7,7 +7,7 @@ all:
135 - $(PYTHON2) ./setup.py build
136 -
137 - install:
138 -- $(PYTHON2) ./setup.py install
139 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
140 - $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) aircraft_db.csv $(ETC)/kismet_aircraft_db.csv
141 - # These are now part of the setup.py install
142 - # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
143 -diff --git a/capture_sdr_rtlamr/Makefile.in b/capture_sdr_rtlamr/Makefile.in
144 -index 1b780be1..3548adc5 100644
145 ---- a/capture_sdr_rtlamr/Makefile.in
146 -+++ b/capture_sdr_rtlamr/Makefile.in
147 -@@ -7,7 +7,7 @@ all:
148 - $(PYTHON2) ./setup.py build
149 -
150 - install:
151 -- $(PYTHON2) ./setup.py install
152 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
153 - # These are now part of the setup.py install
154 - # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
155 - # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
156 -diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
157 -index 036541a0..fc660dfe 100644
158 ---- a/python_modules/KismetExternal/Makefile
159 -+++ b/python_modules/KismetExternal/Makefile
160 -@@ -4,7 +4,7 @@ all:
161 - $(PYTHON2) ./setup.py build
162 -
163 - install:
164 -- $(PYTHON2) ./setup.py install
165 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
166 -
167 - protobuf:
168 - $(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
169 -diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
170 -index d0d6f784..60e1eac1 100644
171 ---- a/python_modules/KismetLog/Makefile
172 -+++ b/python_modules/KismetLog/Makefile
173 -@@ -4,7 +4,7 @@ all:
174 - $(PYTHON2) ./setup.py build
175 -
176 - install:
177 -- $(PYTHON2) ./setup.py install
178 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
179 -
180 - clean:
181 - @-$(PYTHON2) ./setup.py clean
182 -diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
183 -index d0d6f784..60e1eac1 100644
184 ---- a/python_modules/KismetRest/Makefile
185 -+++ b/python_modules/KismetRest/Makefile
186 -@@ -4,7 +4,7 @@ all:
187 - $(PYTHON2) ./setup.py build
188 -
189 - install:
190 -- $(PYTHON2) ./setup.py install
191 -+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
192 -
193 - clean:
194 - @-$(PYTHON2) ./setup.py clean