gentoo resync : 02.06.2018

3 files changed, 76 insertions, 1 deletions

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index d2387e763596..51e7312afc88 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,7 +1,8 @@
+AUX fix-setuptools.patch 2415 BLAKE2B 880353193f8ba3285b3e91c60a2938b2c67d0b91fd6cfb47504f5bfdba75a29e4c8f3d7b47d5ef2a7b2fdbc2f0587002f7ec58fa80b68919c949ad01498416ad SHA512 fa73125ad86b98513e6112efc5bf8a78a41aa804dc526d304eb89f1f3b53b2298bba2025860f12f74523dffc623a8f68027de48e19fd83afba0f39b6d720179d
 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
 EBUILD kismet-2016.07.1-r1.ebuild 4191 BLAKE2B 121e49130ad54fc963b011b005fa33ea6d01e71cf699232c744f7a497076b489e8913da9a0341becb21657de947204cd260e95ef46fe111716de1b1b6781b521 SHA512 ceefe51d38f6375629708be15a23a9e382578a8b4474503e2ff61bb912ab3ae313b37f417880f180094439505ea36fdbd9aeab95cbd426cc3f744985615080fc
-EBUILD kismet-9999.ebuild 4648 BLAKE2B 7494ea94656dd35db279259d7f2f56b6684eb26f089a59bbe163d4585fb5f2796c9ede6d044258ae2f723d7aed5533e690b43bd78d8ba56725a1f4049b889378 SHA512 17a4dda34d64a1b98414a752f5e134537cc2676942924d374be9314ff3cb1d596fd45fc006332e514cf86297804bb5238aecfa8e9416bece6b0867d5bb20dda2
+EBUILD kismet-9999.ebuild 4691 BLAKE2B acc21dc3fc02efd61f4073c37902bcf45b7f264296b71c6315ff800e7c44879a4d565e7286c4667e794e2a997b73c4dc5a110790715c2a7ecd82d0c759e3106a SHA512 2f50cdca13c5626c4bd2353a47c9d4009af440f7376883d42427ea3fdcb891e208aebf43aef5d5d2b1039b50f950c194816272fa9bbf0e729f6eef52c1fe5901
 MISC metadata.xml 1159 BLAKE2B 2e72c1c62f31b52445c83b6b0d7695c7f1231de69fbe865e123a18dc0030a0f57586b058a7e738d561f48413e8a6ff0e8ac73428de2c41688e5baa1e4c255af1 SHA512 cf7c0f4c38f0a5e7b9c51c9fc98f5dd49e51159986443687a81d486c8805aea069168832f406a16b36dc6342be063fdbcade74685273fcdd2111ea9a616437d7
diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch
new file mode 100644
index 000000000000..a86f66b4447c
--- /dev/null
+++ b/net-wireless/kismet/files/fix-setuptools.patch
@@ -0,0 +1,73 @@
+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/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 8005063ea995..2a6321ed5126 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -67,6 +67,7 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
+	epatch "${FILESDIR}"/fix-setuptools.patch
 	eapply_user
 	eautoreconf
 }