Removing USE=gps, removing the DEPEND on app-misc/gpsdrive, which is going to get punted.

(Portage version: 2.1.2_pre3)

2 files changed, 14 insertions, 20 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index cfad9a0fa6d7..6cbbab86cc61 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.87 2006/06/28 15:25:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.88 2006/10/14 18:02:46 phreak Exp $
+
+  14 Oct 2006; Christian Heim <phreak@gentoo.org> kismet-2006.04.1.ebuild:
+  Removing USE=gps, removing the DEPEND on app-misc/gpsdrive, which is going
+  to get punted.
 
   28 Jun 2006; Daniel Gryniewicz <dang@gentoo.org> kismet-2006.04.1.ebuild:
   Marked stable on amd64 per bug#137976
diff --git a/net-wireless/kismet/kismet-2006.04.1.ebuild b/net-wireless/kismet/kismet-2006.04.1.ebuild
index f4071640e46e..61fc9e622962 100644
--- a/net-wireless/kismet/kismet-2006.04.1.ebuild
+++ b/net-wireless/kismet/kismet-2006.04.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2006.04.1.ebuild,v 1.5 2006/06/28 15:25:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2006.04.1.ebuild,v 1.6 2006/10/14 18:02:46 phreak Exp $
 
 inherit toolchain-funcs linux-info
 
@@ -15,15 +15,10 @@ SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="gps ncurses"
+IUSE="ncurses"
 
 RDEPEND="net-wireless/wireless-tools
-		ncurses? ( sys-libs/ncurses )
-		gps? ( app-misc/gpsdrive
-				>=dev-libs/expat-1.95.4
-				dev-libs/gmp
-				>=media-gfx/imagemagick-6.0
-				dev-perl/libwww-perl )"
+		ncurses? ( sys-libs/ncurses )"
 DEPEND="${RDEPEND}
 		>=sys-devel/autoconf-2.58
 		sys-apps/sed"
@@ -32,27 +27,22 @@ src_unpack() {
 	unpack ${A}
 
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		${S}/conf/kismet.conf.in
+		"${S}"/conf/kismet.conf.in
 }
 
 src_compile() {
 	# the configure script only honors '--disable-foo'
-	local config=""
+	local config="--disable-gpsmap"
 
 	if ! use ncurses; then
 		config="${config} --disable-curses --disable-panel"
 	fi
 
-	if ! use gps; then
-		config="${config} --disable-gpsmap"
-	fi
-
 	# need to set CC and CXX for FEATURES=confcache, bug #129479
 	CC=$(tc-getCC) CXX=$(tc-getCXX) \
 		econf \
 		${config} \
-		--with-linuxheaders=${KV_DIR}/include \
-		|| die "econf failed"
+		--with-linuxheaders="${KV_DIR}"/include || die "econf failed"
 
 	einfo "You may safely ignore the warning about the missing .depend file"
 	emake dep || die "emake dep failed"
@@ -60,10 +50,10 @@ src_compile() {
 }
 
 src_install () {
-	emake DESTDIR=${D} install || die "emake install failed"
+	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
+	newinitd "${FILESDIR}"/${P}-init.d kismet
+	newconfd "${FILESDIR}"/${P}-conf.d kismet
 }