Version bump and clean-up.

6 files changed, 112 insertions, 24 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 07dcf3cdb7e8..7bc0bb986900 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.39 2004/10/18 14:56:51 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.40 2004/10/26 09:49:12 brix Exp $
+
+*kismet-2004.10.1 (26 Oct 2004)
+
+  26 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> files/rc-conf-3,
+  files/rc-script-3, +kismet-2004.10.1.ebuild:
+  Version bump. Cleaned up the ebuild and removed no-longer needed USE flags.
+  Updated dependencies to reflect reality. Fixed typos in init.d/conf.d scripts.
 
 *kismet-2004.04.1-r1 (18 Oct 2004)
 
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 52a50b0e16f0..a200e7f4025f 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,28 +1,30 @@
-MD5 ec0e6b5e444bfae7cb0ed2591667bbbb kismet-2.8.0.ebuild 1777
-MD5 051f6a5bc088b872cb3960c1380b5b16 kismet-2.8.1-r1.ebuild 2123
-MD5 b3ffb381cc3e13c90105a61966fbaf07 ChangeLog 5585
-MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
-MD5 55a9df5376df8d2ecbec3602552c550e kismet-3.0.1.ebuild 2173
-MD5 dd5dcf003a8102463b918a92a85d9fa7 kismet-2004.04.1-r1.ebuild 2453
 MD5 21e7369e6da736ef68ce288791ef46c0 kismet-2.6.2-r1.ebuild 1884
-MD5 6701c84a371ed9c02a0832f5e7ae0ff1 kismet-3.0.1-r1.ebuild 2292
-MD5 420236c784145e4cdea28efb45f5155a kismet-2.8.0a.ebuild 1779
-MD5 e5bcc0048c76e9118b91ab2bcaa72f4f kismet-2.8.0b-r1.ebuild 1981
+MD5 dd5dcf003a8102463b918a92a85d9fa7 kismet-2004.04.1-r1.ebuild 2453
+MD5 6955d15acc68e02245562fae97f4deaa kismet-2004.10.1.ebuild 1855
 MD5 87617e9aad3041909e1151fb6fcdf9cb kismet-2.8.1.ebuild 1977
 MD5 1ebdb6d82948a242cffd87a8822ed012 kismet-2004.02.01.ebuild 2205
+MD5 e5bcc0048c76e9118b91ab2bcaa72f4f kismet-2.8.0b-r1.ebuild 1981
+MD5 55a9df5376df8d2ecbec3602552c550e kismet-3.0.1.ebuild 2173
 MD5 04e0debcef2c8a2696717cd35ac9822d kismet-2004.04.1.ebuild 2430
-MD5 6c6ba4e2b2af51630273719aa775a393 files/kismet_gcc34.gz 607
-MD5 a2a209af1409814bed3299f119d163a8 files/digest-kismet-2004.04.1-r1 138
-MD5 c63dd4e1f9460ee0e5f5a2d0d884a6ea files/kismet_amd64.patch 6545
-MD5 6c76e2449a2259febd33acaeff2366a3 files/digest-kismet-3.0.1-r1 133
+MD5 420236c784145e4cdea28efb45f5155a kismet-2.8.0a.ebuild 1779
+MD5 051f6a5bc088b872cb3960c1380b5b16 kismet-2.8.1-r1.ebuild 2123
+MD5 ec0e6b5e444bfae7cb0ed2591667bbbb kismet-2.8.0.ebuild 1777
+MD5 f163292501f7a23b30624584883e3bf0 ChangeLog 5896
+MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
+MD5 6701c84a371ed9c02a0832f5e7ae0ff1 kismet-3.0.1-r1.ebuild 2292
 MD5 ac454f5a5ad0a364c677157a511e534d files/digest-kismet-2.8.0a 133
-MD5 51ee9832a194be859c3e76f998c75f2d files/digest-kismet-2.8.1 200
-MD5 5d50e3232c94daf63372a5a74d8b39dc files/digest-kismet-2004.02.01 68
-MD5 63dd3cb4247737ee77391240518ec850 files/digest-kismet-2.8.0b-r1 202
 MD5 a73efbda3289e9413549c220b046ef23 files/digest-kismet-2.8.0 131
+MD5 51ee9832a194be859c3e76f998c75f2d files/digest-kismet-2.8.1 200
+MD5 7571e627220475fa712fd8a43970db6c files/digest-kismet-3.0.1 64
+MD5 33bc62cec214531b12ad05724d06596b files/rc-conf-3 710
 MD5 8dfc64a8a4100cc38d8f00a3475bba9a files/digest-kismet-2.6.2-r1 131
 MD5 51ee9832a194be859c3e76f998c75f2d files/digest-kismet-2.8.1-r1 200
+MD5 63dd3cb4247737ee77391240518ec850 files/digest-kismet-2.8.0b-r1 202
+MD5 4b2881a089c55b854918c67917a8c678 files/rc-script-3 1036
+MD5 a2a209af1409814bed3299f119d163a8 files/digest-kismet-2004.04.1-r1 138
 MD5 752e77b324cb8708cb1c39301b1a552f files/digest-kismet-2004.04.1 138
-MD5 7571e627220475fa712fd8a43970db6c files/digest-kismet-3.0.1 64
-MD5 58a8e5159f8d082deb63d27ad60b8d25 files/rc-conf-3 809
-MD5 4f429a351ffe6567eb2a8bd1dfedbce1 files/rc-script-3 1137
+MD5 284f64e13016d089f3c844a367a8e0ca files/digest-kismet-2004.10.1 138
+MD5 c63dd4e1f9460ee0e5f5a2d0d884a6ea files/kismet_amd64.patch 6545
+MD5 6c6ba4e2b2af51630273719aa775a393 files/kismet_gcc34.gz 607
+MD5 6c76e2449a2259febd33acaeff2366a3 files/digest-kismet-3.0.1-r1 133
+MD5 5d50e3232c94daf63372a5a74d8b39dc files/digest-kismet-2004.02.01 68
diff --git a/net-wireless/kismet/files/digest-kismet-2004.10.1 b/net-wireless/kismet/files/digest-kismet-2004.10.1
new file mode 100644
index 000000000000..443e64cb0ffd
--- /dev/null
+++ b/net-wireless/kismet/files/digest-kismet-2004.10.1
@@ -0,0 +1,2 @@
+MD5 e9cf06f6bb41b150ebdf7cd0c01afb34 kismet-2004-10-R1.tar.gz 870862
+MD5 722a2529c3a19b5b81c825bca444baea ethereal-0.10.6.tar.bz2 5046796
diff --git a/net-wireless/kismet/files/rc-conf-3 b/net-wireless/kismet/files/rc-conf-3
index 9497557e6949..53b225e43090 100644
--- a/net-wireless/kismet/files/rc-conf-3
+++ b/net-wireless/kismet/files/rc-conf-3
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/rc-conf-3,v 1.3 2004/07/15 00:23:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/rc-conf-3,v 1.4 2004/10/26 09:49:12 brix Exp $
 
-# Config file for kimset server
+# Config file for kismet server
 
 # ATTENTION: most of the kismet configuration is still done in
 # /etc/kismet/kismet.conf
diff --git a/net-wireless/kismet/files/rc-script-3 b/net-wireless/kismet/files/rc-script-3
index 0681cea4b275..ce6ff5b6f738 100644
--- a/net-wireless/kismet/files/rc-script-3
+++ b/net-wireless/kismet/files/rc-script-3
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/rc-script-3,v 1.3 2004/07/15 00:23:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/rc-script-3,v 1.4 2004/10/26 09:49:12 brix Exp $
 
 # If you use this init script, you only need to run `kismet_client` to connect
 
 checkconfig() {
 	if [ ! -e /etc/kismet/kismet.conf ] ; then
-		eerror "You need an /etc/kimset/kismet.conf to run kimset_server."
+		eerror "You need an /etc/kismet/kismet.conf to run kismet_server."
 		return 1
 	elif [ -z "${WIFI_DEV}" ]; then
 		eerror "You must define WIFI_DEV in /etc/conf.d/kismet."
diff --git a/net-wireless/kismet/kismet-2004.10.1.ebuild b/net-wireless/kismet/kismet-2004.10.1.ebuild
new file mode 100644
index 000000000000..d08492e22ea1
--- /dev/null
+++ b/net-wireless/kismet/kismet-2004.10.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2004.10.1.ebuild,v 1.1 2004/10/26 09:49:12 brix Exp $
+
+inherit gnuconfig
+
+MY_P=${P/\./-}
+MY_P=${MY_P/./-R}
+S=${WORKDIR}/${MY_P}
+
+ETHEREAL_VERSION="0.10.6"
+
+DESCRIPTION="Kismet is a 802.11b wireless network sniffer."
+HOMEPAGE="http://www.kismetwireless.net"
+SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz
+		ethereal? http://www.ethereal.com/distribution/ethereal-${ETHEREAL_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="ethereal gps"
+
+DEPEND=">=sys-devel/autoconf-2.58
+		sys-apps/sed"
+RDEPEND="virtual/libc
+		net-wireless/wireless-tools
+		sys-libs/ncurses
+		ethereal? ( =dev-libs/glib-1.2*
+				=net-analyzer/ethereal-${ETHEREAL_VERSION}
+				sys-libs/zlib )
+		gps? ( app-misc/gpsdrive
+				>=dev-libs/expat-1.95.4
+				dev-libs/gmp
+				>=media-gfx/imagemagick-5.4.7
+				dev-perl/libwww-perl )"
+		# Note: gps support is automatically enabled based on the
+		# above libs - 2004-10-R1 doesn't honor the --disable-gps flag
+		# brix@gentoo.org
+
+src_unpack() {
+	unpack ${A}
+
+	# make sure we compile against installed linux-sources if available
+	sed -i "s:-I/lib/modules/.*/build/include/:-I/usr/src/linux/include/:g" \
+		${S}/configure
+
+	gnuconfig_update ${S}
+}
+
+src_compile() {
+	if use ethereal
+	then
+		cd ${WORKDIR}/ethereal-${ETHEREAL_VERSION}/wiretap
+		econf || die "wiretap econf failed"
+		emake || die "wiretap emake failed"
+		cd ${S}
+	fi
+
+	econf \
+		`use_with ethereal ethereal=${WORKDIR}/ethereal-${ETHEREAL_VERSION}` \
+		|| die "econf failed"
+
+	emake dep || die "emake dep failed"
+	emake || die "make failed"
+}
+
+src_install () {
+	emake DESTDIR=${D} install || die "emake install failed"
+
+	dodoc CHANGELOG README TODO docs/*
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/rc-script-3 kismet
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/rc-conf-3 kismet
+}