cleanup, add live ebuild for crazies

(Portage version: 2.1.10.65/cvs/Linux x86_64)

4 files changed, 84 insertions, 10 deletions

diff --git a/net-wireless/spectools/ChangeLog b/net-wireless/spectools/ChangeLog
index 48c187a7b191..75ab981c5f75 100644
--- a/net-wireless/spectools/ChangeLog
+++ b/net-wireless/spectools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/spectools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/ChangeLog,v 1.8 2012/06/13 02:12:14 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/ChangeLog,v 1.9 2012/06/13 03:10:50 zerochaos Exp $
+
+*spectools-9999 (13 Jun 2012)
+
+  13 Jun 2012; Rick Farina <zerochaos@gentoo.org> +spectools-9999.ebuild,
+  metadata.xml, spectools-2011.08.1-r1.ebuild:
+  cleanup, add live ebuild for crazies
 
   13 Jun 2012; Rick Farina <zerochaos@gentoo.org> spectools-2011.08.1-r1.ebuild:
   clean inherit line
diff --git a/net-wireless/spectools/metadata.xml b/net-wireless/spectools/metadata.xml
index c8380d3ec172..a83d150859d4 100644
--- a/net-wireless/spectools/metadata.xml
+++ b/net-wireless/spectools/metadata.xml
@@ -18,7 +18,7 @@
 		<description>Maintainer, has 1st gen WiSpy hardware for testing</description>
 	</maintainer>
 <use>
-	<flag name="debug">Build the raw output client for spectools.</flag>
+	<flag name="debug">Build the raw output client for spectools. (for developers)</flag>
 	<flag name="ncurses">Build the ncurses based client for spectools</flag>
 	<flag name="gtk">Build the gtk-2 based client for spectools</flag>
 </use>
diff --git a/net-wireless/spectools/spectools-2011.08.1-r1.ebuild b/net-wireless/spectools/spectools-2011.08.1-r1.ebuild
index 30d4ff1688d0..c1f12aa9f94a 100644
--- a/net-wireless/spectools/spectools-2011.08.1-r1.ebuild
+++ b/net-wireless/spectools/spectools-2011.08.1-r1.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r1.ebuild,v 1.3 2012/06/13 02:12:14 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r1.ebuild,v 1.4 2012/06/13 03:10:50 zerochaos Exp $
 
 EAPI=4
 
-inherit eutils
-
 MY_PN=${PN}
 MY_PV=${PV/\./-}
 MY_PV=${MY_PV/./-R}
 MY_P="${MY_PN}-${MY_PV}"
 S=${WORKDIR}/${MY_P}
 
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer for MetaGeek Wi-Spy spectrum analyzer hardware"
+DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware"
 HOMEPAGE="http://www.kismetwireless.net/spectools/"
 
 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/tools/spectools"
+	ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/tools/${PN}"
 		inherit subversion
 		KEYWORDS=""
 else
@@ -31,7 +29,7 @@ IUSE="ncurses gtk"
 DEPEND="${RDEPEND}"
 RDEPEND="virtual/libusb:0
 	ncurses? ( sys-libs/ncurses )
-	gtk? ( =x11-libs/gtk+-2* )"
+	gtk? ( x11-libs/gtk+:2 )"
 # Upstream has still not migrated to the libusb-1 line.
 # Maemo: Add hildon and bbus
 
@@ -61,8 +59,8 @@ src_install() {
 	use ncurses && dobin spectool_curses
 	use gtk && dobin spectool_gtk
 
-	dodir /$(get_libdir)/udev/rules.d/
-	insinto /$(get_libdir)/udev/rules.d/
+	dodir /lib/udev/rules.d/
+	insinto /lib/udev/rules.d/
 	doins 99-wispy.rules
 	dodoc README
 
diff --git a/net-wireless/spectools/spectools-9999.ebuild b/net-wireless/spectools/spectools-9999.ebuild
new file mode 100644
index 000000000000..1c8eb2d63be5
--- /dev/null
+++ b/net-wireless/spectools/spectools-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-9999.ebuild,v 1.1 2012/06/13 03:10:50 zerochaos Exp $
+
+EAPI=4
+
+MY_PN=${PN}
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+MY_P="${MY_PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware"
+HOMEPAGE="http://www.kismetwireless.net/spectools/"
+
+if [[ ${PV} == "9999" ]] ; then
+		ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/tools/${PN}"
+		inherit subversion
+		KEYWORDS=""
+else
+		SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
+		KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug ncurses gtk"
+
+DEPEND="${RDEPEND}"
+RDEPEND="virtual/libusb:0
+	ncurses? ( sys-libs/ncurses )
+	gtk? ( x11-libs/gtk+:2 )"
+# Upstream has still not migrated to the libusb-1 line.
+# Maemo: Add hildon and bbus
+
+# 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
+
+	dodir /lib/udev/rules.d/
+	insinto /lib/udev/rules.d/
+	doins 99-wispy.rules
+	dodoc README
+
+	#if use maemo; then
+	#	dobin spectool_hildon
+	#	dosbin usbcontrol
+	#fi
+}