Remove gnome-system-tools 2.14 from RDEPEND to all because it is starting to cause more headache to keep it than to mask it. Support is autodetected at runtime anyway.

Package-Manager: portage-2.1.5_rc2

4 files changed, 29 insertions, 13 deletions

diff --git a/net-analyzer/gnome-nettool/ChangeLog b/net-analyzer/gnome-nettool/ChangeLog
index 81e3302683fd..2ace60e2f50a 100644
--- a/net-analyzer/gnome-nettool/ChangeLog
+++ b/net-analyzer/gnome-nettool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/gnome-nettool
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.66 2008/03/24 00:11:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.67 2008/04/12 14:17:39 eva Exp $
+
+  12 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-nettool-2.20.0.ebuild, gnome-nettool-2.22.0.ebuild:
+  Remove gnome-system-tools 2.14 from RDEPEND to all because it is starting
+  to cause more headache to keep it than to mask it. Support is autodetected
+  at runtime anyway.
 
 *gnome-nettool-2.22.0 (24 Mar 2008)
 
diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index 138ef12621fa..db392ff13f2e 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 AUX gnome-nettool-2.18.0-fbsd.patch 9981 RMD160 f0e7e8d6fc815ea5c6a9da7176ee6b99262dba82 SHA1 466e98431aa9cbcf8467284b9c1839557de90ca5 SHA256 42d134883b5ebae510ed945ba7929d4d3328e4ae50c9cfaab473c2d80ed8be09
 DIST gnome-nettool-2.20.0.tar.bz2 572137 RMD160 817f19a6a03b9dbdab89d51f423b850aeb9b9fc6 SHA1 7931bc885fda5f4dc7c88a2fbfcea2566ea256ee SHA256 8668dfa5b7d97245ffe5d53630b891d17f22e86c237ca9b8345774b20d745c15
 DIST gnome-nettool-2.22.0.tar.bz2 617193 RMD160 f5a6d558304374eebeeaaab60116a09e007fad9d SHA1 1f8dd3329cb1d5d026d57afc5dacd8c93d8b7998 SHA256 ddf6de5d2df6515423ef8aad12750a69a553584685854fa47073126b89fc25a3
-EBUILD gnome-nettool-2.20.0.ebuild 1027 RMD160 934832268569ad77b2e12076d6107507884e4a12 SHA1 67d17c1130d361ee23a1eff5efed1097d348a092 SHA256 085c45f8809472c55d9b14b4a3000a5738834febd6ed4507ed9a8fd8fed5bb39
-EBUILD gnome-nettool-2.22.0.ebuild 1044 RMD160 57f2a8deab94374472e3a427bbc9e2836d47ff1e SHA1 0f96db7577c7a9f99474b099ba7979afc5b70e57 SHA256 b658fb5924c54772de248e546807cd7a04afedcf4aad1cde748b643319861f76
-MISC ChangeLog 8565 RMD160 5315a7a0c4277ca02ce1573ad7905d06cfc85338 SHA1 7b4fe222055fb5599f70ee69c8be33949a0c618f SHA256 b293092fa2c07e33a202d1edfb66cba40d9916ea7fd07fc70b423b1060a5ed5c
+EBUILD gnome-nettool-2.20.0.ebuild 1233 RMD160 f0b07ea052e6c04aeecd6fd85a5845bdbd8b783f SHA1 c390fa20500a7c3ca6bef5536216bc16fbc4d9f5 SHA256 dfd05bcb7ca2a93a96841dd9261b73687ee529f13c09c1143734a75a3bf6ea38
+EBUILD gnome-nettool-2.22.0.ebuild 1276 RMD160 911fbd5c50cd1d251de8468cb9e2f8ac689345f5 SHA1 de8bd4f51f7e1e9b67c6855b22d60f74a0106a43 SHA256 06703b97ef025133b24bb52094ac9e8f6a0d5ebe0aed163f6e22459de44f5e18
+MISC ChangeLog 8854 RMD160 8c9b775d34028ce7c5976d28d83b605cca356ae9 SHA1 c7b63be71f7ff866633df4a3c7db979796dc9a98 SHA256 25ce92c0e8eedeb6b0227cbc5c2303967a00b10b4b4303b24b3d934642217baa
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH5vHO1fmVwcYIWAYRAqZIAKDUih9ofGJZDsjYitF9FGODB4EpAACfQO/D
-H1xvG+jpktofwPIQkbh05nk=
-=tGTW
+iEYEARECAAYFAkgAxIkACgkQ1fmVwcYIWAbz/ACgiwBynce4VAqrSZpPn9GJWIyV
+s2QAnRebY2zL4hDE+btp7DPhEfYjPYAD
+=hX9Q
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-2.20.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.20.0.ebuild
index 637cf83ad113..02efe873f220 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-2.20.0.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-2.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.20.0.ebuild,v 1.8 2008/01/10 09:12:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-2.20.0.ebuild,v 1.9 2008/04/12 14:17:39 eva Exp $
 
 inherit gnome2 eutils
 
@@ -17,11 +17,16 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.5.4
 	>=gnome-base/gconf-2"
 RDEPEND="${COMMON_DEPEND}
 	net-analyzer/traceroute
-	app-admin/gnome-system-tools
 	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
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-2.22.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.22.0.ebuild
index 3258f30bb03d..68e00a4e4b29 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-2.22.0.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.22.0.ebuild,v 1.1 2008/03/24 00:11:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-2.22.0.ebuild,v 1.2 2008/04/12 14:17:39 eva Exp $
 
 inherit gnome2 eutils
 
@@ -17,11 +17,16 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.5.4
 	>=gnome-base/gconf-2"
 RDEPEND="${COMMON_DEPEND}
 	net-analyzer/traceroute
-	app-admin/gnome-system-tools
 	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
@@ -30,7 +35,7 @@ DEPEND="${COMMON_DEPEND}
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable debug)"
+	G2CONF="${G2CONF} $(use_enable debug) --disable-scrollkeeper"
 }
 
 src_unpack() {