Fix slot-deps on gnome libs, remove old

(Portage version: 2.1.9.44/cvs/Linux x86_64)

3 files changed, 7 insertions, 46 deletions

diff --git a/net-analyzer/gnome-nettool/ChangeLog b/net-analyzer/gnome-nettool/ChangeLog
index 374922d775f1..50cb0de81740 100644
--- a/net-analyzer/gnome-nettool/ChangeLog
+++ b/net-analyzer/gnome-nettool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/gnome-nettool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.113 2011/03/22 19:39:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.114 2011/03/27 12:33:53 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gnome-nettool-2.30.0.ebuild, gnome-nettool-2.32.0.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gnome-nettool-2.32.0.ebuild:
   Marking gnome-nettool-2.32.0 ppc stable for bug 353436
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-2.30.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.30.0.ebuild
deleted file mode 100644
index 35072138ed55..000000000000
--- a/net-analyzer/gnome-nettool/gnome-nettool-2.30.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-2.30.0.ebuild,v 1.9 2010/10/17 15:48:54 armin76 Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Collection of network tools"
-HOMEPAGE="http://www.gnome.org/projects/gnome-network/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.12:2
-	>=gnome-base/gconf-2
-	gnome-base/libgtop:2"
-RDEPEND="${COMMON_DEPEND}
-	|| ( net-analyzer/traceroute sys-freebsd/freebsd-usbin )
-	net-dns/bind-tools
-	userland_GNU? ( net-misc/netkit-fingerd net-misc/whois )
-	userland_BSD? ( net-misc/bsdwhois )"
-
-# Gilles Dartiguelongue <eva@gentoo.org> (12 Apr 2008)
-# Mask gnome-system-tools 2.14 because it is starting to cause more headache
-# to keep it than to mask it.
-# Support is autodetected at runtime anyway.
-# app-admin/gnome-system-tools
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	app-text/gnome-doc-utils"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		--disable-scrollkeeper"
-}
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild
index c2751c8658d7..5cdcb1025b25 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild,v 1.6 2011/03/22 19:39:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild,v 1.7 2011/03/27 12:33:53 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="debug"
 
 COMMON_DEPEND=">=x11-libs/gtk+-2.19.7:2
-	>=gnome-base/gconf-2
+	gnome-base/gconf:2
 	gnome-base/libgtop:2"
 RDEPEND="${COMMON_DEPEND}
 	|| ( net-analyzer/traceroute sys-freebsd/freebsd-usbin )