4 files changed, 99 insertions, 2 deletions
diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 8f1688e289d3..89d3030e1a4a 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.62 2005/06/13 10:38:41 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.63 2005/06/14 15:16:34 brix Exp $
+
+*kismet-2005.04.1-r2 (14 Jun 2005)
+
+  14 Jun 2005; <brix@gentoo.org> +kismet-2005.04.1-r2.ebuild:
+  Determine which glib version to use for ethereal wiretap based on USE="gtk",
+  fixes bug #94289.
 
 *kismet-2005.04.1-r1 (13 Jun 2005)
 
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 23ce5911a561..8cf45f6c2ef5 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,8 +1,10 @@
+MD5 78a180860d44c30eb9842ad57dc53f91 kismet-2005.04.1-r2.ebuild 2065
 MD5 09e59b9e7dabbe17bb86bdcffb37fc4c kismet-2005.04.1.ebuild 1820
 MD5 6d0c1d708b4064fb795112ecb1ff2368 kismet-2005.04.1-r1.ebuild 2063
-MD5 7f6b4adb80ee4f41a641dae70c48cf23 ChangeLog 9657
+MD5 6c3a37f363780b6bda0b25f2128f4216 ChangeLog 9855
 MD5 ffabe8240a5956794f085602c98e8598 metadata.xml 348
 MD5 b9db2fb07ec892c2d70eaa84614e4a32 files/digest-kismet-2005.04.1-r1 139
+MD5 b9db2fb07ec892c2d70eaa84614e4a32 files/digest-kismet-2005.04.1-r2 139
 MD5 1d4ef399dadbbdaefd1dd27172065ff7 files/digest-kismet-2005.04.1 139
 MD5 cf5f0c66c55e2cf0ab7e7e5d6adb4926 files/kismet-2005.04.1-conf.d 567
 MD5 9e1fd0520b69bf5d6c72b898a6270c50 files/kismet-2005.04.1-init.d 750
diff --git a/net-wireless/kismet/files/digest-kismet-2005.04.1-r2 b/net-wireless/kismet/files/digest-kismet-2005.04.1-r2
new file mode 100644
index 000000000000..37b24c7f2eb3
--- /dev/null
+++ b/net-wireless/kismet/files/digest-kismet-2005.04.1-r2
@@ -0,0 +1,2 @@
+MD5 19b4f192eb11a418ed3f6bf65c1226af kismet-2005-04-R1.tar.gz 871165
+MD5 03aa7fe2cbef9aa0654637cdc60e0458 ethereal-0.10.11.tar.bz2 5964016
diff --git a/net-wireless/kismet/kismet-2005.04.1-r2.ebuild b/net-wireless/kismet/kismet-2005.04.1-r2.ebuild
new file mode 100644
index 000000000000..948cadde7193
--- /dev/null
+++ b/net-wireless/kismet/kismet-2005.04.1-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2005.04.1-r2.ebuild,v 1.1 2005/06/14 15:16:34 brix Exp $
+
+inherit linux-info
+
+MY_P=${P/\./-}
+MY_P=${MY_P/./-R}
+S=${WORKDIR}/${MY_P}
+
+ETHEREAL_VERSION="0.10.11"
+
+DESCRIPTION="IEEE 802.11 wireless LAN 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 gtk2 ncurses"
+
+DEPEND=">=sys-devel/autoconf-2.58
+		sys-apps/sed"
+RDEPEND="net-wireless/wireless-tools
+		sys-libs/ncurses
+		ethereal? ( >=net-analyzer/ethereal-${ETHEREAL_VERSION}
+				sys-libs/zlib
+				gtk2? ( =dev-libs/glib-1.2* )
+				!gtk2? ( >=dev-libs/glib-2.0.4 ) )
+		gps? ( app-misc/gpsdrive
+				>=dev-libs/expat-1.95.4
+				dev-libs/gmp
+				>=media-gfx/imagemagick-6.0
+				dev-perl/libwww-perl )"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		${S}/conf/kismet.conf.in
+}
+
+src_compile() {
+	# the configure script only honors '--disable-foo'
+	local config=""
+
+	if ! use ncurses; then
+		config="${config} --disable-curses --disable-panel"
+	fi
+
+	if ! use gps; then
+		# Note: gps support is automatically enabled based on the
+		# libs in RDEPEND - 2005-04-R1 doesn't honor the --disable-gps flag
+		config="${config} --disable-gps"
+	fi
+
+	if use ethereal; then
+		cd ${WORKDIR}/ethereal-${ETHEREAL_VERSION}/wiretap
+
+		econf \
+			$(use_enable gtk2) \
+			--disable-usr-local \
+			|| die "wiretap econf failed"
+		emake || die "wiretap emake failed"
+
+		config="${config} --with-ethereal=${WORKDIR}/ethereal-${ETHEREAL_VERSION}"
+		cd ${S}
+	fi
+
+	econf \
+		${config} \
+		--with-linuxheaders=${KV_DIR}/include \
+		|| die "econf failed"
+
+	emake dep || die "emake dep failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR=${D} install || die "emake install failed"
+
+	dodoc CHANGELOG README TODO docs/*
+
+	newinitd ${FILESDIR}/${P}-init.d kismet
+	newconfd ${FILESDIR}/${P}-conf.d kismet
+}