From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 262931382C5 for ; Tue, 24 Apr 2018 15:49:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FC6AE089B; Tue, 24 Apr 2018 15:49:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D0F2E089B for ; Tue, 24 Apr 2018 15:49:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B482335C02 for ; Tue, 24 Apr 2018 15:49:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80A5528D for ; Tue, 24 Apr 2018 15:49:03 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1524584934.3d4a17a9afd328cbd49998124cb919409263060b.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/files/, net-wireless/kismet/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/kismet/files/fix-setuptools.patch net-wireless/kismet/kismet-9999.ebuild X-VCS-Directories: net-wireless/kismet/files/ net-wireless/kismet/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 3d4a17a9afd328cbd49998124cb919409263060b X-VCS-Branch: master Date: Tue, 24 Apr 2018 15:49:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 503a90db-6c6f-4d29-b653-50787d33b2d1 X-Archives-Hash: 2977772d4b0d382e55cb9ee39d2a088a commit: 3d4a17a9afd328cbd49998124cb919409263060b Author: Zero_Chaos gentoo org> AuthorDate: Tue Apr 24 15:48:37 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Apr 24 15:48:54 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4a17a9 net-wireless/kismet: add mostly required python support Package-Manager: Portage-2.3.31, Repoman-2.3.9 net-wireless/kismet/files/fix-setuptools.patch | 73 ++++++++++++++++++++++++++ net-wireless/kismet/kismet-9999.ebuild | 12 +++-- 2 files changed, 81 insertions(+), 4 deletions(-) diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch new file mode 100644 index 00000000000..a86f66b4447 --- /dev/null +++ b/net-wireless/kismet/files/fix-setuptools.patch @@ -0,0 +1,73 @@ +commit e31263b50acd960f7bb0c34c0396383319d7da30 +Author: Rick Farina (Zero_Chaos) +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 2b1292aff57..60b19468d9e 100644 --- a/net-wireless/kismet/kismet-9999.ebuild +++ b/net-wireless/kismet/kismet-9999.ebuild @@ -3,7 +3,9 @@ EAPI=6 -inherit autotools eutils multilib user +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils multilib user python-single-r1 MY_P=${P/\./-} MY_P=${MY_P/./-R} @@ -28,6 +30,7 @@ SLOT="0/${PV}" IUSE="+pcre speech selinux +suid" CDEPEND=" + ${PYTHON_DEPS} net-misc/networkmanager:= dev-libs/glib:= dev-libs/elfutils:= @@ -64,14 +67,15 @@ src_prepare() { sed -i -e 's| -s||g' \ -e 's|@mangrp@|root|g' Makefile.in + eapply "${FILESDIR}/fix-setuptools.patch" eapply_user eautoreconf } src_configure() { econf \ - $(use_enable pcre) \ - --disable-python-tools + $(use_enable pcre) + #--disable-python-tools } src_compile() { @@ -133,7 +137,7 @@ src_install() { # dobin *.rb #fi - cd "${S}" + #cd "${S}" emake DESTDIR="${D}" commoninstall emake DESTDIR="${D}" forceconfigs