Fixed inverse glib dependencies, bug #98994. Removed old ebuild.

(Portage version: 2.0.51.22-r1)

5 files changed, 11 insertions, 91 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index b297d599f7be..375d03000b8b 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,10 @@
 # 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.67 2005/07/12 08:11:58 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.68 2005/07/14 12:43:10 brix Exp $
+
+  14 Jul 2005; <brix@gentoo.org> -kismet-2005.04.1-r1.ebuild,
+  kismet-2005.04.1-r2.ebuild, kismet-2005.06.1.ebuild:
+  Fixed inverse glib dependencies, bug #98994. Removed old ebuild.
 
   12 Jul 2005; <brix@gentoo.org> kismet-2005.04.1-r2.ebuild:
   Stable on x86.
diff --git a/net-wireless/kismet/files/digest-kismet-2005.04.1-r1 b/net-wireless/kismet/files/digest-kismet-2005.04.1-r1
deleted file mode 100644
index 37b24c7f2eb3..000000000000
--- a/net-wireless/kismet/files/digest-kismet-2005.04.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-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-r1.ebuild b/net-wireless/kismet/kismet-2005.04.1-r1.ebuild
deleted file mode 100644
index 16520b861aed..000000000000
--- a/net-wireless/kismet/kismet-2005.04.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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-r1.ebuild,v 1.2 2005/07/07 09:56:30 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 ncurses"
-
-RDEPEND="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-6.0
-				dev-perl/libwww-perl )"
-DEPEND="${RDEPEND}
-		>=sys-devel/autoconf-2.58
-		sys-apps/sed"
-
-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 || 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
-}
diff --git a/net-wireless/kismet/kismet-2005.04.1-r2.ebuild b/net-wireless/kismet/kismet-2005.04.1-r2.ebuild
index f3d46ad842dd..189253183b4b 100644
--- a/net-wireless/kismet/kismet-2005.04.1-r2.ebuild
+++ b/net-wireless/kismet/kismet-2005.04.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2005/07/12 08:11:58 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2005.04.1-r2.ebuild,v 1.4 2005/07/14 12:43:10 brix Exp $
 
 inherit linux-info
 
@@ -24,8 +24,8 @@ 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 ) )
+				gtk2? ( >=dev-libs/glib-2.0.4 )
+				!gtk2? ( =dev-libs/glib-1.2* ) )
 		gps? ( app-misc/gpsdrive
 				>=dev-libs/expat-1.95.4
 				dev-libs/gmp
diff --git a/net-wireless/kismet/kismet-2005.06.1.ebuild b/net-wireless/kismet/kismet-2005.06.1.ebuild
index c991293b3158..d8ef2662291c 100644
--- a/net-wireless/kismet/kismet-2005.06.1.ebuild
+++ b/net-wireless/kismet/kismet-2005.06.1.ebuild
@@ -1,6 +1,6 @@
 # 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.06.1.ebuild,v 1.2 2005/07/07 09:56:30 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2005.06.1.ebuild,v 1.3 2005/07/14 12:43:10 brix Exp $
 
 inherit linux-info
 
@@ -24,8 +24,8 @@ RDEPEND="net-wireless/wireless-tools
 		ncurses? ( 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 ) )
+				gtk2? ( >=dev-libs/glib-2.0.4 )
+				!gtk2? ( =dev-libs/glib-1.2* ) )
 		gps? ( app-misc/gpsdrive
 				>=dev-libs/expat-1.95.4
 				dev-libs/gmp