[gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet-ubertooth/

[Rick Farina]

commit:     91d41702f81de7aa12a59feeeb3a7fddfc751a0c
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  3 16:24:23 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Dec  3 16:24:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d41702

net-wireless/kismet-ubertooth: bug #666838

remove old
fix kismet deps, this plug only works with newcore not newnewcore

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-wireless/kismet-ubertooth/Manifest             |  2 -
 .../kismet-ubertooth-2015.09.2.ebuild              | 53 ----------------------
 .../kismet-ubertooth-2015.10.1.ebuild              | 53 ----------------------
 .../kismet-ubertooth-2017.03.2.ebuild              |  9 ++--
 .../kismet-ubertooth/kismet-ubertooth-9999.ebuild  |  9 ++--
 5 files changed, 10 insertions(+), 116 deletions(-)

diff --git a/net-wireless/kismet-ubertooth/Manifest b/net-wireless/kismet-ubertooth/Manifest
index 6293a539182..a40079b50ab 100644
--- a/net-wireless/kismet-ubertooth/Manifest
+++ b/net-wireless/kismet-ubertooth/Manifest
@@ -1,3 +1 @@
-DIST ubertooth-2015-09-R2.tar.xz 1706712 BLAKE2B 406a0d1548006168116034b94bde4849b79e314a66bf7efac3c3941899e336e3b8aa02255dcc8a5dac3953191992d456657209cde0db5b4fb4cde8912de8c179 SHA512 240f6d682fe0addc05bb8ccf7eec931534449adfa9c1369b484aeac73d9bcaf75c211aeede21c6c219e363773ce3d63e4aa0ee6b662acc83409587bd7ac7e4da
-DIST ubertooth-2015-10-R1.tar.xz 1716840 BLAKE2B 53b02ce7548da7133762ff40e2c4422ae52f13ee0647ee714950d060a5846f82c3de07fdb99b28ed9b406ef17d565e47da3d31a8e2f08d00fbd485f8c09b9ead SHA512 ad7229c9509db4b4230ec28d1c16200f0780dd7ce55224528ced6d8969f342a79b7317b69e7b9e49d03e93f973203801f4f703dd80dc115400366b0984c965b1
 DIST ubertooth-2017-03-R2.tar.xz 676124 BLAKE2B 1f82c9a6b4b2fcec84d5f69862f843ee4920eb0e17e61940aba48e118fe290f67777eed4bd9826c420e218ab433b94630abaf8793c845d2e68ff5587e8b73fbc SHA512 4806a6ac664ec9b78964caeb47f87a60db8f664c529e6e58bc1e5db4d858eaaa1ae51f0293f4a5227a102e556caf1611e97f6675147af4bc34e23646049e8571

diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.09.2.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.09.2.ebuild
deleted file mode 100644
index 5f3e212e2e6..00000000000
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.09.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S="${WORKDIR}/ubertooth-${MY_PV}"
-	SRC_URI="https://github.com/greatscottgadgets/ubertooth/releases/download/${MY_PV}/ubertooth-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Provides basic bluetooth support in kismet"
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
-	>=net-wireless/ubertooth-${PV}:= \
-	>=net-libs/libbtbb-${PV}:= \
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake KIS_SRC_DIR="/usr/include/kismet/"
-}
-
-src_install() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
-}
-
-pkg_postinst() {
-	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
-}

diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.10.1.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.10.1.ebuild
deleted file mode 100644
index 5f3e212e2e6..00000000000
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.10.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S="${WORKDIR}/ubertooth-${MY_PV}"
-	SRC_URI="https://github.com/greatscottgadgets/ubertooth/releases/download/${MY_PV}/ubertooth-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Provides basic bluetooth support in kismet"
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
-	>=net-wireless/ubertooth-${PV}:= \
-	>=net-libs/libbtbb-${PV}:= \
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake KIS_SRC_DIR="/usr/include/kismet/"
-}
-
-src_install() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
-}
-
-pkg_postinst() {
-	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
-}

diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2017.03.2.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2017.03.2.ebuild
index 1ed24b3efdb..c0ebcd76347 100644
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-2017.03.2.ebuild
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-2017.03.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,9 +24,10 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 IUSE=""
 
-DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
-	>=net-wireless/ubertooth-${PV}:= \
-	>=net-libs/libbtbb-${PV}:= \
+DEPEND=">=net-wireless/kismet-2011.03.2-r1:=
+	<net-wireless/kismet-2017.0.0
+	>=net-wireless/ubertooth-${PV}:=
+	>=net-libs/libbtbb-${PV}:=
 	virtual/libusb:1"
 RDEPEND="${DEPEND}"
 

diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
index 1ed24b3efdb..c0ebcd76347 100644
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,9 +24,10 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 IUSE=""
 
-DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
-	>=net-wireless/ubertooth-${PV}:= \
-	>=net-libs/libbtbb-${PV}:= \
+DEPEND=">=net-wireless/kismet-2011.03.2-r1:=
+	<net-wireless/kismet-2017.0.0
+	>=net-wireless/ubertooth-${PV}:=
+	>=net-libs/libbtbb-${PV}:=
 	virtual/libusb:1"
 RDEPEND="${DEPEND}"