cleanup, add live ebuild for crazies

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 101 insertions, 26 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/Manifest b/net-wireless/spectools/Manifest
index 07187dac9dac..46678daf9e76 100644
--- a/net-wireless/spectools/Manifest
+++ b/net-wireless/spectools/Manifest
@@ -10,24 +10,25 @@ DIST wispy-tools-2006-09-R1.tar.gz 135474 RMD160 13ec3cf3821e304a070fed9aa97a3a9
 EBUILD spectools-2006.03.1.ebuild 1200 RMD160 deb7d7f102142ce8aed51a34c690768a07e29cad SHA1 ffab68fa639e45b4a8a5f67c29f401dde2f14406 SHA256 d733418f162cbc56be0e2c84bf8bccd060c4b6179c8c1bb425c05cb7e57533e2
 EBUILD spectools-2006.09.1.ebuild 1204 RMD160 16309bfa1f61215d2af92e50dc764a7fee58d055 SHA1 111e8cf96812950510ec26a31a22a54e89005520 SHA256 ee40e1a609bbfe89672dd8252001fd11841d8d8d5b17eee2ef4a573fb67549fc
 EBUILD spectools-2009.02.1.ebuild 1658 RMD160 d21d0be591179915fc8e8dcc9a563d3481a9fae7 SHA1 9d804f8250b77fad65963ce0d335c2b72cf5b6d6 SHA256 aa9cfb3fede2e213e7863125dd376064a3eff20a5da9702b2bd29507fefc6314
-EBUILD spectools-2011.08.1-r1.ebuild 1698 RMD160 7a104da15429a0bfc92e34ccbf137ed2c43530d6 SHA1 64fd5a5e0e46905d4c81f8115c4608a5f97d72d4 SHA256 54299c896174dd78b46fcfa831ce0add00e9ec732135c7d6b24fbd4138e0b667
+EBUILD spectools-2011.08.1-r1.ebuild 1642 RMD160 24f8da6bd727507b16dbbf0ae5d730e2fb555927 SHA1 594079e40a617b477fb750942dd83aaaacbc7551 SHA256 cdbe60e1e62716f4ead24a68ceb2c6b3c8b8de77e305f02da6a43022a016aec9
 EBUILD spectools-2011.08.1.ebuild 1281 RMD160 15d1bc3f70ecef137d8e50a2538c73af4207fa18 SHA1 ee7a896eb4f582086653359d88a81c32ff14e36a SHA256 63bc15d36105a30e78ac60056ae58b78a833b9be81e2a4565823483e46839d86
-MISC ChangeLog 1820 RMD160 9a861f95fd18e2b996516def71a2d0670c3951a5 SHA1 17f3c90c585a5ae1e7ac0fbef0ba92087e251893 SHA256 9772c4eabc255d543bcf621c49438cb85879589f7ce87464836b76f0cfef0f37
-MISC metadata.xml 890 RMD160 93f5a3be4bc734b9dadcd5c2dcc54996daf451d0 SHA1 375562ec410fc167aa0d44d1b04d723309f423c2 SHA256 1a351740a3641c3937f2ca202241ebc3a68a0e18baad03b2451e9d125440ae7c
+EBUILD spectools-9999.ebuild 1659 RMD160 8ac35eb850f28ca3c4b8f3541e503e70f5a72576 SHA1 54d0926ad554e4f06798d1b02b65690b4e96f5e5 SHA256 de0fe0c82ea69a4bcd405cb53beba2d373fbf7b344d43a49ab65ac05251e0538
+MISC ChangeLog 2012 RMD160 96db9bb5d23a26224dc313b2b694b77d360bdbea SHA1 16186fe6ff97785e590e9d4354fd72865703fe5d SHA256 b77e56f1013a38ed83761282220c61b65066d613c79c8fa801a3a189522b8711
+MISC metadata.xml 907 RMD160 faf3c98569708748bb2ea075f4439fc908f1d23d SHA1 a0036e66221ccfb674bb629e85dd48a7238f1e84 SHA256 2dff6e0a8e306576f4e97d877d44aaf1d09e3033c153553414dba94451505411
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP1/clAAoJEKXdFCfdEflKLuYP/jhz0BLukQZN3dELTOTY7wxr
-HowfLQP5OAcg83Q6R69rLGRSQdO93Kgu52CY2Q7pIkTiWIobMsJncvXdnv2g5MbV
-fzIEhW0JwiAgqg2TSyGUCkaEJlkMOW8xbMH+qy4nng8aeVwluMkMdH2F7F/HlhEi
-ymKt/vwEUy88dyqjBUAKBH45uv5E60IiNCMQyejK2iddEdpZ08n4aS6uaEw+tRgd
-etZsPdnx6WV+qvIyyGBfD2v2Gucm555zFj5YG2ObKl57VuRmzKCczUii9Adz4fS6
-1UYMVzbbm5FRg/4lLE5vtTVT1ZPJ00XoCbXAvDfs9fWhGL5oacLLOt1XZargaVy2
-zvsYWEnHN9pH30GYJMRn08Xm4dI2JBNSW9ayUd3Wqvn+uwm7n6pPLiUmxLUUhtoa
-DZuotVReW0PFJxdFgEKK4EYB7ynImi/N2Y+Aq5YW6p0ikcrTOcFZ5CANXC+uKv9k
-MpO+FYi3NUVY5VU3BB8I/sgF7M4De+mlSEqvhgxEBghHcjHtqWkf3tlEDAWZb9T5
-KKJRsZw6vDTHAOp/gToYONogqgKMEpOx2nHRDCZeCF/p3M6rHR2Drq6C7445JxGe
-6EIKI/BqUvUQzk8+YODhldgv3xZkLw0TE53QRVa4dMsUkqqdgnh1Ofp3RHIku2Mz
-GaOo/nLzRhPq6pJq5sfX
-=l11t
+iQIcBAEBAgAGBQJP2AThAAoJEKXdFCfdEflKhzAP/jFTnPQY+u66j8/M2q2eeZBZ
+oBWG4FWfoA04kM7E1AzNaSzME/p3QcLbbBNSvAQbVJ+5G+xRo4ActTOryQ0M2JLT
+CbM13EYuYcKYZ4v1GD+ETJ/Q5MwNXbFjR197lUQlKObWoic0w/XlHIi1VynSFL0i
+E+L1aZbsrY3wK19Z0xBKexeDuidDU4dK7IX9/wzOFwCQFxXPd3hNIUoUttSSfHAb
+pkt5TT7tF1N6CRFaZXM98OKmauVAi4pHPf9foQgUsg5U6ytrhMYY28mFtECZV84p
+WNCuIbrhpzLB48+UHV7WaiV2HvykhLKqb/B1qMp1dgYiBztwarkSYryT8g2lBR1w
+niCdgnBopcPD6Is1DUXvE5bam1PpNJRrgnlORyWyPp/aU9YXMf2RQbVi1eenvsO1
+7Tem1JF6UN7L3XENv1UgpIRwwssgyXKK3/QyHn/JRydDlT8uE/bAPcQuGRUAby3s
+kZqKX9ZJW4l051VQu93IKrTQOGCIXrBsIcBOTND4o1epPWglBcQAyWvtP9r2FfW6
+Yq6iG5tEhiiuqJfoFUX9jtmVSIf3wbDZqoW7tBcsHlHLizXO42OW9E9jbpdKrejb
+SnlP4EH0gHeWtGgvThDHfCxkHVZMQipkgqouZxQ7tPk6OHD/bvt1pcphvrSpaaWQ
++s7bQ1SygW0Uo4zvtFdc
+=M3pE
 -----END PGP SIGNATURE-----
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
+}