net-wireless/spectools: bump to 2016.01.1

Package-Manager: portage-2.2.27

3 files changed, 89 insertions, 3 deletions

diff --git a/net-wireless/spectools/Manifest b/net-wireless/spectools/Manifest
index f63672baaeca..3bcdc994180a 100644
--- a/net-wireless/spectools/Manifest
+++ b/net-wireless/spectools/Manifest
@@ -1,2 +1,3 @@
 DIST spectools-2011-08-R1.tar.gz 196001 SHA256 ce981cd2b86c6246dc7cb9c0166b85e586e5f5835d3ed147e8901ef18f00220e SHA512 92c80b34049055cec6d677db165fb2d06d75fbff9f04d41ab81fa57900f639936e6a9a01f06165aea863b35760964016f0984f17816859d054bc9d14353e847b WHIRLPOOL 89af3aa1f1e4033de3051bc6dd5b2d6f013c1270d588768fcfc08830a420f3ab3507494b0f5575b830a9d88abc885600e551ad78bc9931ab5bd061e74d7d27c8
 DIST spectools-2011-08-R1_p20140618.tar.xz 143644 SHA256 a4c22bc1be0b66dfeaeff37004e08ef4927d443a7e67bc893627d0569f6f3a2f SHA512 bf39953dc94815af1b670f079f7660d46cc8449adb379d0fc2755de5785c936730114aa66127f9cbd86f9a08b506382f5ec56f863d50d7d39f2597ba9b122330 WHIRLPOOL 7be4b1209b0a72a67b102f75ede813c3680d1222478bb507755af836b9ede6a2db4bf93ce2b5300d1aa16d0c422865924164fb021015651f750711a055e4700d
+DIST spectools-2016-01-R1.tar.xz 120732 SHA256 8d70daaf3b4b71196ca63bbd5df0ef14b82c3b496f63b5cfa434fa637dc08d57 SHA512 59da488e08114018cd756d45f48541a26f643a3618bfbaec0e72c434c80e6cbc8b4f930476206c66af84ee574807e011489f884e96c7291c626b1b4e69619fad WHIRLPOOL 203bd4bc3861bb9d228df2d5342d3b357589e10bf94d0a373a71a87d6d0f5060a73b8ce7f868637ad2392c6305d0349109ce9fe51646e46e7ae512d347f52290
diff --git a/net-wireless/spectools/spectools-2016.01.1.ebuild b/net-wireless/spectools/spectools-2016.01.1.ebuild
new file mode 100644
index 000000000000..3454f625e4e5
--- /dev/null
+++ b/net-wireless/spectools/spectools-2016.01.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs udev
+
+MY_PN=${PN}
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+MY_P="${MY_PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}
+
+if [[ ${PV} == "9999" ]] ; then
+		EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
+		inherit git-r3
+		KEYWORDS=""
+else
+		SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.xz"
+		KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware"
+HOMEPAGE="http://www.kismetwireless.net/spectools/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +ncurses +gtk"
+
+RDEPEND="
+	virtual/libusb:0
+	ncurses? ( sys-libs/ncurses:0= )
+	gtk? ( x11-libs/gtk+:2
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/pango
+		dev-libs/glib:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream has still not migrated to the libusb-1 line.
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2011.08.1_p20140618-tinfo.patch
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+# Please note that upstream removed the --with-gtk-version option
+# and GTK is now automagical. GTK1 support was also removed.
+src_compile() {
+	emake depend
+
+	emake spectool_net
+
+	use debug && emake spectool_raw
+
+	use ncurses && emake spectool_curses
+
+	use gtk && emake spectool_gtk
+
+	#if use maemo; then
+	#	emake spectool_hildon usbcontrol \
+	#		|| die "emake spectool_hildon usbcontrol failed"
+	#fi
+}
+
+src_install() {
+	dobin spectool_net
+	use debug && dobin spectool_raw
+	use ncurses && dobin spectool_curses
+	use gtk && dobin spectool_gtk
+
+	udev_dorules 99-wispy.rules
+	dodoc README
+
+	#if use maemo; then
+	#	dobin spectool_hildon
+	#	dosbin usbcontrol
+	#fi
+}
diff --git a/net-wireless/spectools/spectools-9999.ebuild b/net-wireless/spectools/spectools-9999.ebuild
index 51faefe40a31..82824102624e 100644
--- a/net-wireless/spectools/spectools-9999.ebuild
+++ b/net-wireless/spectools/spectools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 		inherit git-r3
 		KEYWORDS=""
 else
-		SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
+		SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.xz"
 		KEYWORDS="~amd64 ~arm ~ppc ~x86"
 fi
 
@@ -31,7 +31,11 @@ IUSE="debug +ncurses +gtk"
 RDEPEND="
 	virtual/libusb:0
 	ncurses? ( sys-libs/ncurses:0= )
-	gtk? ( x11-libs/gtk+:2 )"
+	gtk? ( x11-libs/gtk+:2
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/pango
+		dev-libs/glib:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 # Upstream has still not migrated to the libusb-1 line.