gentoo resync : 28.04.2019

5 files changed, 32 insertions, 196 deletions

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 16f505e12906..ee0f3ce346ea 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,13 +1,11 @@
-AUX fix-setuptools.patch 2415 BLAKE2B 880353193f8ba3285b3e91c60a2938b2c67d0b91fd6cfb47504f5bfdba75a29e4c8f3d7b47d5ef2a7b2fdbc2f0587002f7ec58fa80b68919c949ad01498416ad SHA512 fa73125ad86b98513e6112efc5bf8a78a41aa804dc526d304eb89f1f3b53b2298bba2025860f12f74523dffc623a8f68027de48e19fd83afba0f39b6d720179d
-AUX fix-setuptools4.patch 3328 BLAKE2B 5af5c05b74b332455fccc891fd254317c57f0d126cbfa60aef1ac7cbadab28ecb48bd1b6e31510d117f29a0d4e2807beb4fea756147f1fe26d88bb4c8ce225f6 SHA512 f4c68953a9a1880d7294bedba3c645e40de48b5cf9159cb99287a2147de4bbee2a808ad29041acd8d2a0e6a488549c315ea678addce8fd6f37ade33d30615234
 AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27eaf48f292fc1a926c5f36031b9f93154e453fe1a1ca85e3988eac625334ee1fb75433de289413a0347ed2f92624d061e4fed SHA512 4bc4832e1f15c3917b67ff80d8b054b6a8aca9a8b03cf3f78cfb2a9b45fdb1f2f2785c2864cfb31bb05cf4da9adca3f96b6df47667107430a7020814ed07549b
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
-DIST kismet-2018-08-BETA1.tar.xz 2043136 BLAKE2B f24af4250bb0238073380514413d9501e449cf40507d7a96ac868d76acb34af81b9bf4a49c9b6197b6b903ab33e2318bb5efa22876cc2070e3878ebf030d592c SHA512 09eab9d648f011c95b8632c666990d79f9998465b051a65357f53af19a135a5d58df3025ec60f9ef9a7b7d9b5622d2332bb2defbffd21ca0e25e2e4090ceae2f
-DIST kismet-2019-01-BETA2.tar.xz 3096084 BLAKE2B 77f0497721bb1a6c2af2dd91b5d2a895fae0012ccb7a9cf03a700c96562a5ae62530b1138f509df5f0af91362a9658eae7916a9c643cef6e1630fe616d949017 SHA512 1384630ea0ba12c157928696aab502406c5e521765e420459ab049e3205e7d7bfb472c6a1a88c1268fd8235b24b615a03ce4b91f0974adc24f47d00709ef9d4b
+DIST kismet-2019-04-R1.tar.xz 3038632 BLAKE2B e304085806d5e0b77c8421969b1c3dea608b70124559dcd5f133c1823f0228e6caeddf3cf775a6ccea7604265b2227df045cefcfdf803a4f69bf682b9b531f9d SHA512 26f3ab038e76ab06d461dc73e44cde6944f6f550a615081588a238154c95ab4684adec5436c31761a716e081f994435840b7f4e7e95b75d83c9da89114b33ab4
+DIST kismet-2019.04.1_p20190416.tar.gz 4154154 BLAKE2B 86ce5057f62004269ab00a5a1619a1961d79fee506fa67aa065c18c7ce75d8fbe85a64e5b3861754acb802e03a599efb516f947b9e9192030ecbff0d779efb54 SHA512 fded3cf80bdd1eac2b57e8dc37e4995500ea8b1e6b32e665356b6172f2cd1986efd043ada8e04e62393943c815a3197e72408308c7294f6f26aa495ca8d9f9d3
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
-EBUILD kismet-2018.08_beta1-r4.ebuild 3007 BLAKE2B 09460af93a5ee5d50b628f8dcf4a9ad466d30c4cb7e617bc60d5fa89a7d1c4fdb169e48c9a4ca1fa01ca92396cf99a86e1f1597b7dd1943e3a90078ce3ee84d8 SHA512 19131fd383d48f4e394b01e180fded41767b64b57ee63a0e046334c143fc63472ba0f4c71bcd21419a270a7f7fd558c5c2d700c9f91c71fd7fe099b48733fce7
-EBUILD kismet-2019.01_beta2.ebuild 2921 BLAKE2B 11169d4d133617c1e5cbeb39b47c030c67a16ae3548d01dd68d00e5f7817a5304e282942efb104f29b0d8c511aad9ae2490c324f8dec9c4bd8f1c9f6da53216c SHA512 68da40db9264a6c65d44bfa3445b7fd1bcf05766aef78dd0e6a9a68c14a6405ad304c232aa9e2b6a5905008bf5223ce2beffe181ffdabecd68e4347bae2a04a9
+EBUILD kismet-2019.04.1.ebuild 3126 BLAKE2B bb5b7def4fd86634f978d0e7f5cdd0965d93c37fabfad7a8422c338929a7c84adc265c52629362951edd35c5b5d1a704a92c12b9e5949bdf992c849d54362b4b SHA512 34cbbe6efd9a375ca7bad1c245a0e55bfe27e1cd6a2fa21bff01eba3833c5548792c14f0243ff5bed7dce270f1ea4927c1af96e505b74577641306f1c6671fa0
+EBUILD kismet-2019.04.1_p20190416.ebuild 3378 BLAKE2B 121ca9b0d386b957b39ed78ddb20cbea178fe8da02fc2aa88b87e1ad0e2ec971baf039310e3b87018e2bed92eace51dda68c0ac6114ee969ad0c8dd668f04fb5 SHA512 771081680da06947eac0fd27b6665684b10fef3a42220b56dfb0ca52501f0e91bda0d2f81a96a8b67b928a2ee74e6fd14dc5cdf680ed500034cdb11c5c03d17b
 EBUILD kismet-9999.ebuild 3126 BLAKE2B bb5b7def4fd86634f978d0e7f5cdd0965d93c37fabfad7a8422c338929a7c84adc265c52629362951edd35c5b5d1a704a92c12b9e5949bdf992c849d54362b4b SHA512 34cbbe6efd9a375ca7bad1c245a0e55bfe27e1cd6a2fa21bff01eba3833c5548792c14f0243ff5bed7dce270f1ea4927c1af96e505b74577641306f1c6671fa0
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch
deleted file mode 100644
index a86f66b4447c..000000000000
--- 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/files/fix-setuptools4.patch b/net-wireless/kismet/files/fix-setuptools4.patch
deleted file mode 100644
index c2db673529ea..000000000000
--- a/net-wireless/kismet/files/fix-setuptools4.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
-index cfbf99b0..c2e68453 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 e33f7de5..e1be587d 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)
- 	# 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/capture_sdr_rtladsb/Makefile.in b/capture_sdr_rtladsb/Makefile.in
-index 8a4f7647..8239f434 100644
---- a/capture_sdr_rtladsb/Makefile.in
-+++ b/capture_sdr_rtladsb/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) aircraft_db.csv $(ETC)/kismet_aircraft_db.csv
- 	# These are now part of the setup.py install
- 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
-diff --git a/capture_sdr_rtlamr/Makefile.in b/capture_sdr_rtlamr/Makefile.in
-index 1b780be1..3548adc5 100644
---- a/capture_sdr_rtlamr/Makefile.in
-+++ b/capture_sdr_rtlamr/Makefile.in
-@@ -7,7 +7,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./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 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-2019.01_beta2.ebuild b/net-wireless/kismet/kismet-2019.04.1.ebuild
index 2e5fd9c3d052..ad9c0fbeb6cb 100644
--- a/net-wireless/kismet/kismet-2019.01_beta2.ebuild
+++ b/net-wireless/kismet/kismet-2019.04.1.ebuild
@@ -64,9 +64,12 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
-	eapply "${FILESDIR}"/fix-setuptools4.patch
 	eapply_user
 
+	#just use set to fix setup.py
+	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+
 	if [ "${PV}" = "9999" ]; then
 		eautoreconf
 	fi
@@ -86,7 +89,7 @@ src_install() {
 	emake DESTDIR="${D}" forceconfigs
 
 	insinto /usr/share/${PN}
-	doins -r log_tools
+	doins Makefile.inc
 
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
 	dodoc CHANGELOG README*
diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild b/net-wireless/kismet/kismet-2019.04.1_p20190416.ebuild
index 69055f3a8ae8..871bee91427e 100644
--- a/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild
+++ b/net-wireless/kismet/kismet-2019.04.1_p20190416.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,19 +7,21 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit autotools eutils multilib user python-single-r1
 
-MY_P=${P/\./-}
-MY_P=${MY_P/_beta/-BETA}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
-	SRC_URI=""
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
 	inherit git-r3
-	KEYWORDS=""
 	RESTRICT="strip"
 else
-	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+	MY_P=${P/\./-}
+	MY_P=${MY_P/_beta/-BETA}
+	MY_P=${MY_P/./-R}
+	S=${WORKDIR}/${MY_P/BETA/beta}
+	#normally we want an official release
+	#SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+	#but sometimes we want a git commit
+	COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
+	SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 fi
 
@@ -28,7 +30,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="lm_sensors networkmanager +pcre selinux +suid"
+IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -42,6 +44,7 @@ CDEPEND="
 			dev-libs/libnl:3
 			net-libs/libpcap
 			)
+	mousejack? ( dev-libs/libusb:= )
 	dev-libs/protobuf-c:=
 	dev-libs/protobuf:=
 	sys-libs/ncurses:=
@@ -66,27 +69,23 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
-	epatch "${FILESDIR}"/fix-setuptools.patch
 	eapply_user
 
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-
-	if ! use lm_sensors; then
-		sed -i "s#sensors.h#totally-not-sensors.h#" configure
-	fi
+	#just use set to fix setup.py
+	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
 
-	if use networkmanager; then
-		sed -i "s#havelibnm\=no#havelibnm\=yes#" configure
-	else
-		sed -i "s#havelibnm\=yes#havelibnm\=no#" configure
+	if [ "${PV}" = "9999" ]; then
+		eautoreconf
 	fi
 }
 
 src_configure() {
 	econf \
 		$(use_enable pcre) \
+		$(use_enable lm_sensors lmsensors) \
+		$(use_enable mousejack libusb) \
+		$(use_enable networkmanager libnm) \
 		--disable-optimization
 }
 
@@ -95,7 +94,7 @@ src_install() {
 	emake DESTDIR="${D}" forceconfigs
 
 	insinto /usr/share/${PN}
-	doins -r log_tools
+	doins Makefile.inc
 
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
 	dodoc CHANGELOG README*