4 files changed, 29 insertions, 50 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/Manifest b/net-analyzer/gnome-nettool/Manifest
index a7f5ff9510ad..36bf99acea83 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -1,7 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-nettool-2.18.0-fbsd.patch 9981 RMD160 f0e7e8d6fc815ea5c6a9da7176ee6b99262dba82 SHA1 466e98431aa9cbcf8467284b9c1839557de90ca5 SHA256 42d134883b5ebae510ed945ba7929d4d3328e4ae50c9cfaab473c2d80ed8be09
-DIST gnome-nettool-2.30.0.tar.bz2 651732 RMD160 1bd652dd7ec7c56d452a7a386c2453f7f927d361 SHA1 1513505509d44bfd1b2105a84be2d12f3499e043 SHA256 42fdc867d26b31145986fd99e06509229b118430f2d666070c5dac7cff1dd000
 DIST gnome-nettool-2.32.0.tar.bz2 647036 RMD160 17530c5e808338bfa197cfe3aafe04d18e4830bf SHA1 43e7bd780ac3d5700be8b4cfec7f85278ec8f54a SHA256 8c70f85952760170114b2fa4be3ccaa3fc6298f802bacda2503ed482b8a0539c
-EBUILD gnome-nettool-2.30.0.ebuild 1225 RMD160 2919ae0bc57cf36a19a23756e6b4dad9b89b2411 SHA1 70264ae79e6cf443e2f9abc3b6e08c3425f36280 SHA256 2e6f5724b2033ecf37c5f8d43e9f496c2c2e94aaef9b17806ec1fca97a262194
-EBUILD gnome-nettool-2.32.0.ebuild 1261 RMD160 3ab043a6b15f5d67678128f27648a455d510f8c1 SHA1 78ce400560935ec6f141481e66c2e75a2b4ffeb4 SHA256 30080f443f537d92115289c445ea1224789da9df8351682150af67431e579ba0
-MISC ChangeLog 14791 RMD160 7c2b9be120db1fe5cfb23e9465db62d0c09df83d SHA1 ce6bdb60959839967e3c9d6706ffafdfdd753704 SHA256 69722cb226c8c5f6c58589091399e6752ec5d76b1daed07dd0a9e7faca840206
+EBUILD gnome-nettool-2.32.0.ebuild 1261 RMD160 47f63ff6c4c7c68379005511ae3ccf5ead7a5d79 SHA1 62827c60df3fce7ce75bd7c91220ea7c1979d6f6 SHA256 7d5df7570db0bedea74a95a4c8b57fe764fb235ac510b752587a7413c9ab7f82
+MISC ChangeLog 14951 RMD160 f6a981765a0045d89d561dec5fcafc4aa1b161f3 SHA1 914758ab08b833d8e6965e5e78a2580c82504af7 SHA256 48cb9947821ae2cc23dc0051111898df88bf7818ed2eb92f60dde0e56958b95d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNjy64AAoJEO/kOhxWD91kw9oQAIfOHJRx3J+wChRZg/hYD2vL
+oLJOlm/mMEfuFrR5y43LVVAFZbNt28apq3pr1Uu1/rNXdYO8aTv6vIVA9Z0HUh5T
+Q/hP0VyORWHfVaUt7GI0Rv5/BNonPte8Hc8QNT6RMt7QyWhsVdyCsA9TXkjzgQ0O
+n9ykXbVeXMxtoWpz5TAWB1zU0wkqvuWbby4d2zmmiPxicrIs78oY33X+xYmv+j+2
+mp47WRU5V2rJWnkhNjY1QW7VxI3eME9VNtWTzU8xIvwmkfHOUG+rje16zQ+QRymJ
+Dn4tvyY0k78JiF8Uthw8Sd9EZw8eohQKgn7z/ifkp8S6sE6nVOB3pcGab91JzO2g
+7LUmFql4IuElxIqfaUlHdF3O/gA412JPymMcRHlDjxr/K3IEeB/Hwd/+uWZJJEDP
+RHab39F6ax/jpBd+rEcYhAFmrkjFzlHo6K9Ca3dREJnoKA8C+EsG17l/HPM4NInL
+yObuvLfxPvedN8qRy65ZzGSLbu2cwHNpqo/mQ67/OgKFfolL/W2xccYI5XzX7c5J
+lJWnzjXPRdpinyOZjdMBF4f0L1wNAzs+js5eU3NIDhAiymepLVtv5DZiWOf9VH6G
+neqCp2BKDryv21IBEpFaJivsbGsMQDtnYJ9QgKUtqVM/ksiY7n4QXNxBmGJLuaNJ
+RMNDFrimNmdBL9UhZmso
+=+n5C
+-----END PGP SIGNATURE-----
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 )