Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/
Date: Thu, 02 Aug 2018 18:35:39
Message-Id: 1533234922.d9ba9843cdb7df8d267580bb4a02635dc74d01bd.zerochaos@gentoo
1 commit: d9ba9843cdb7df8d267580bb4a02635dc74d01bd
2 Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 2 18:34:57 2018 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 2 18:35:22 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9ba9843
7
8 net-wireless/kismet: beta wooooooo
9
10 Package-Manager: Portage-2.3.44, Repoman-2.3.10
11
12 net-wireless/kismet/Manifest | 1 +
13 ...met-9999.ebuild => kismet-2018.08_beta1.ebuild} | 91 +++-------------------
14 net-wireless/kismet/kismet-9999.ebuild | 91 +++-------------------
15 3 files changed, 25 insertions(+), 158 deletions(-)
16
17 diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
18 index ed814f56009..fc94567a992 100644
19 --- a/net-wireless/kismet/Manifest
20 +++ b/net-wireless/kismet/Manifest
21 @@ -1 +1,2 @@
22 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
23 +DIST kismet-2018-08-BETA1.tar.xz 2043136 BLAKE2B f24af4250bb0238073380514413d9501e449cf40507d7a96ac868d76acb34af81b9bf4a49c9b6197b6b903ab33e2318bb5efa22876cc2070e3878ebf030d592c SHA512 09eab9d648f011c95b8632c666990d79f9998465b051a65357f53af19a135a5d58df3025ec60f9ef9a7b7d9b5622d2332bb2defbffd21ca0e25e2e4090ceae2f
24
25 diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-2018.08_beta1.ebuild
26 similarity index 53%
27 copy from net-wireless/kismet/kismet-9999.ebuild
28 copy to net-wireless/kismet/kismet-2018.08_beta1.ebuild
29 index 2a6321ed512..1f6e8da8176 100644
30 --- a/net-wireless/kismet/kismet-9999.ebuild
31 +++ b/net-wireless/kismet/kismet-2018.08_beta1.ebuild
32 @@ -8,6 +8,7 @@ PYTHON_COMPAT=( python2_7 )
33 inherit autotools eutils multilib user python-single-r1
34
35 MY_P=${P/\./-}
36 +MY_P=${MY_P/_beta/-BETA}
37 MY_P=${MY_P/./-R}
38 S=${WORKDIR}/${MY_P}
39
40 @@ -27,7 +28,7 @@ HOMEPAGE="https://www.kismetwireless.net"
41
42 LICENSE="GPL-2"
43 SLOT="0/${PV}"
44 -IUSE="+pcre speech selinux +suid"
45 +IUSE="lm_sensors +pcre selinux +suid"
46
47 CDEPEND="
48 ${PYTHON_DEPS}
49 @@ -43,13 +44,10 @@ CDEPEND="
50 )
51 dev-libs/protobuf-c:=
52 sys-libs/ncurses:=
53 + lm_sensors? ( sys-apps/lm_sensors )
54 pcre? ( dev-libs/libpcre )
55 suid? ( sys-libs/libcap )
56 - !arm? ( speech? ( app-accessibility/flite ) )
57 "
58 - #plugin-btscan? ( net-wireless/bluez )
59 - #plugin-dot15d4? ( virtual/libusb:0 )
60 - #plugin-spectools? ( net-wireless/spectools )
61
62 DEPEND="${CDEPEND}
63 virtual/pkgconfig
64 @@ -69,95 +67,30 @@ src_prepare() {
65
66 epatch "${FILESDIR}"/fix-setuptools.patch
67 eapply_user
68 - eautoreconf
69 + if [[ ${PV} == "9999" ]] ; then
70 + sed -i 's#-O3##' configure.ac
71 + eautoreconf
72 + else
73 + sed -i 's#-O3##' configure
74 + fi
75 }
76
77 src_configure() {
78 + if ! use lm_sensors; then
79 + adddeny /usr/include/sensors/sensors.h
80 + fi
81 econf \
82 $(use_enable pcre)
83 - #--disable-python-tools
84 -}
85 -
86 -src_compile() {
87 - emake
88 -
89 - #if use plugin-autowep; then
90 - # cd "${S}"/restricted-plugin-autowep
91 - # KIS_SRC_DIR="${S}" emake
92 - #fi
93 - #if use plugin-btscan; then
94 - # cd "${S}"/plugin-btscan
95 - # KIS_SRC_DIR="${S}" emake
96 - #fi
97 - #if use plugin-dot15d4; then
98 - # cd "${S}"/plugin-dot15d4
99 - # KIS_SRC_DIR="${S}" emake
100 - #fi
101 - #if use plugin-ptw; then
102 - # cd "${S}"/restricted-plugin-ptw
103 - # KIS_SRC_DIR="${S}" emake
104 - #fi
105 - #if use plugin-spectools; then
106 - # cd "${S}"/plugin-spectools
107 - # KIS_SRC_DIR="${S}" emake
108 - #fi
109 - #if use plugin-syslog; then
110 - # cd "${S}"/plugin-syslog
111 - # KIS_SRC_DIR="${S}" emake
112 - #fi
113 }
114
115 src_install() {
116 - #if use plugin-autowep; then
117 - # cd "${S}"/restricted-plugin-autowep
118 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
119 - #fi
120 - #if use plugin-btscan; then
121 - # cd "${S}"/plugin-btscan
122 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
123 - #fi
124 - #if use plugin-dot15d4; then
125 - # cd "${S}"/plugin-dot15d4
126 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
127 - #fi
128 - #if use plugin-ptw; then
129 - # cd "${S}"/restricted-plugin-ptw
130 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
131 - #fi
132 - #if use plugin-spectools; then
133 - # cd "${S}"/plugin-spectools
134 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
135 - #fi
136 - #if use plugin-syslog; then
137 - # cd "${S}"/plugin-syslog
138 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
139 - #fi
140 - #if use ruby; then
141 - # cd "${S}"/ruby
142 - # dobin *.rb
143 - #fi
144 -
145 - #cd "${S}"
146 emake DESTDIR="${D}" commoninstall
147 emake DESTDIR="${D}" forceconfigs
148
149 - ##dragorn would prefer I set fire to my head than do this, but it works
150 - ##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
151 - ##is there an automatic way to force this?
152 - # install headers for external plugins
153 - insinto /usr/include/kismet
154 - doins *.h
155 - doins Makefile.inc
156 - #todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
157 -
158 #dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
159 dodoc CHANGELOG README*
160 newinitd "${FILESDIR}"/${PN}.initd kismet
161 newconfd "${FILESDIR}"/${PN}.confd kismet
162 -
163 - #if use suid; then
164 - # dobin kismet_capture
165 - #fi
166 }
167
168 pkg_preinst() {
169
170 diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
171 index 2a6321ed512..1f6e8da8176 100644
172 --- a/net-wireless/kismet/kismet-9999.ebuild
173 +++ b/net-wireless/kismet/kismet-9999.ebuild
174 @@ -8,6 +8,7 @@ PYTHON_COMPAT=( python2_7 )
175 inherit autotools eutils multilib user python-single-r1
176
177 MY_P=${P/\./-}
178 +MY_P=${MY_P/_beta/-BETA}
179 MY_P=${MY_P/./-R}
180 S=${WORKDIR}/${MY_P}
181
182 @@ -27,7 +28,7 @@ HOMEPAGE="https://www.kismetwireless.net"
183
184 LICENSE="GPL-2"
185 SLOT="0/${PV}"
186 -IUSE="+pcre speech selinux +suid"
187 +IUSE="lm_sensors +pcre selinux +suid"
188
189 CDEPEND="
190 ${PYTHON_DEPS}
191 @@ -43,13 +44,10 @@ CDEPEND="
192 )
193 dev-libs/protobuf-c:=
194 sys-libs/ncurses:=
195 + lm_sensors? ( sys-apps/lm_sensors )
196 pcre? ( dev-libs/libpcre )
197 suid? ( sys-libs/libcap )
198 - !arm? ( speech? ( app-accessibility/flite ) )
199 "
200 - #plugin-btscan? ( net-wireless/bluez )
201 - #plugin-dot15d4? ( virtual/libusb:0 )
202 - #plugin-spectools? ( net-wireless/spectools )
203
204 DEPEND="${CDEPEND}
205 virtual/pkgconfig
206 @@ -69,95 +67,30 @@ src_prepare() {
207
208 epatch "${FILESDIR}"/fix-setuptools.patch
209 eapply_user
210 - eautoreconf
211 + if [[ ${PV} == "9999" ]] ; then
212 + sed -i 's#-O3##' configure.ac
213 + eautoreconf
214 + else
215 + sed -i 's#-O3##' configure
216 + fi
217 }
218
219 src_configure() {
220 + if ! use lm_sensors; then
221 + adddeny /usr/include/sensors/sensors.h
222 + fi
223 econf \
224 $(use_enable pcre)
225 - #--disable-python-tools
226 -}
227 -
228 -src_compile() {
229 - emake
230 -
231 - #if use plugin-autowep; then
232 - # cd "${S}"/restricted-plugin-autowep
233 - # KIS_SRC_DIR="${S}" emake
234 - #fi
235 - #if use plugin-btscan; then
236 - # cd "${S}"/plugin-btscan
237 - # KIS_SRC_DIR="${S}" emake
238 - #fi
239 - #if use plugin-dot15d4; then
240 - # cd "${S}"/plugin-dot15d4
241 - # KIS_SRC_DIR="${S}" emake
242 - #fi
243 - #if use plugin-ptw; then
244 - # cd "${S}"/restricted-plugin-ptw
245 - # KIS_SRC_DIR="${S}" emake
246 - #fi
247 - #if use plugin-spectools; then
248 - # cd "${S}"/plugin-spectools
249 - # KIS_SRC_DIR="${S}" emake
250 - #fi
251 - #if use plugin-syslog; then
252 - # cd "${S}"/plugin-syslog
253 - # KIS_SRC_DIR="${S}" emake
254 - #fi
255 }
256
257 src_install() {
258 - #if use plugin-autowep; then
259 - # cd "${S}"/restricted-plugin-autowep
260 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
261 - #fi
262 - #if use plugin-btscan; then
263 - # cd "${S}"/plugin-btscan
264 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
265 - #fi
266 - #if use plugin-dot15d4; then
267 - # cd "${S}"/plugin-dot15d4
268 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
269 - #fi
270 - #if use plugin-ptw; then
271 - # cd "${S}"/restricted-plugin-ptw
272 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
273 - #fi
274 - #if use plugin-spectools; then
275 - # cd "${S}"/plugin-spectools
276 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
277 - #fi
278 - #if use plugin-syslog; then
279 - # cd "${S}"/plugin-syslog
280 - # KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
281 - #fi
282 - #if use ruby; then
283 - # cd "${S}"/ruby
284 - # dobin *.rb
285 - #fi
286 -
287 - #cd "${S}"
288 emake DESTDIR="${D}" commoninstall
289 emake DESTDIR="${D}" forceconfigs
290
291 - ##dragorn would prefer I set fire to my head than do this, but it works
292 - ##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
293 - ##is there an automatic way to force this?
294 - # install headers for external plugins
295 - insinto /usr/include/kismet
296 - doins *.h
297 - doins Makefile.inc
298 - #todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
299 -
300 #dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
301 dodoc CHANGELOG README*
302 newinitd "${FILESDIR}"/${PN}.initd kismet
303 newconfd "${FILESDIR}"/${PN}.confd kismet
304 -
305 - #if use suid; then
306 - # dobin kismet_capture
307 - #fi
308 }
309
310 pkg_preinst() {