Bump, adds support for nmap and iputils. Fix launching utilities in /sbin and /usr/sbin. Drop old.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 108 insertions, 16 deletions

diff --git a/net-analyzer/gnome-nettool/ChangeLog b/net-analyzer/gnome-nettool/ChangeLog
index bb6a76666c52..93bb24be062d 100644
--- a/net-analyzer/gnome-nettool/ChangeLog
+++ b/net-analyzer/gnome-nettool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/gnome-nettool
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.116 2012/01/05 05:10:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.117 2012/04/15 06:58:30 tetromino Exp $
+
+*gnome-nettool-3.2.0 (15 Apr 2012)
+
+  15 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-nettool-3.0.0-r1.ebuild, +gnome-nettool-3.2.0.ebuild,
+  +files/gnome-nettool-3.2.0-extra-path.patch:
+  Bump, adds support for nmap and iputils. Fix launching utilities in /sbin and
+  /usr/sbin. Drop old.
 
 *gnome-nettool-3.0.1 (05 Jan 2012)
 
diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index 978ce6ab41ae..07399c345d10 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA256
 
 AUX gnome-nettool-2.18.0-fbsd.patch 9981 RMD160 f0e7e8d6fc815ea5c6a9da7176ee6b99262dba82 SHA1 466e98431aa9cbcf8467284b9c1839557de90ca5 SHA256 42d134883b5ebae510ed945ba7929d4d3328e4ae50c9cfaab473c2d80ed8be09
+AUX gnome-nettool-3.2.0-extra-path.patch 2315 RMD160 1fac9c5ca5f5f9ad50ec34429e14b3e591ccf636 SHA1 36518f64eaa74800f08e3ab853716e05e69d63bd SHA256 2943405287743ded1d7e5674dfee2db5a107a51afb387721a0f146a3294c8334
 DIST gnome-nettool-2.32.0.tar.bz2 647036 RMD160 17530c5e808338bfa197cfe3aafe04d18e4830bf SHA1 43e7bd780ac3d5700be8b4cfec7f85278ec8f54a SHA256 8c70f85952760170114b2fa4be3ccaa3fc6298f802bacda2503ed482b8a0539c
-DIST gnome-nettool-3.0.0-patches-1.tar.bz2 4031 RMD160 e8c1c7b6feb3d0f4b45868515ed2a0114bbea5d2 SHA1 b4200608498651be1dcb1a3f4ceee603a7506707 SHA256 8af74413a68be35eed7a1d914eb95462b1b9cd73c15eef604ee447f3fa407fd3
-DIST gnome-nettool-3.0.0.tar.bz2 650660 RMD160 295c5549e6e60f8ff82e0ddec4f1c7f84761156b SHA1 37ec5a49009ef3789f8c601f9f2aa638519119ff SHA256 6b75ee5de54fae67db0ba710e8b334a5b1fcd18719d38ae09b9dd05f5e2555e9
 DIST gnome-nettool-3.0.1.tar.xz 579848 RMD160 cc157e35496c1b7aa0a7c95349ccb5280a250f04 SHA1 aa7b2d59d2175a1481196c2374c8aca7e62475bc SHA256 2c21b44b351ee470226e1e5580bb9acf0326d9b6c3040deff75322f8ca132317
+DIST gnome-nettool-3.2.0.tar.xz 585556 RMD160 235df19813a8d75a32c2725509778fa006c86fa2 SHA1 9f1f53607464aa4ea16d3fa26cd71b6d869df32b SHA256 9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79
 EBUILD gnome-nettool-2.32.0.ebuild 1261 RMD160 47f63ff6c4c7c68379005511ae3ccf5ead7a5d79 SHA1 62827c60df3fce7ce75bd7c91220ea7c1979d6f6 SHA256 7d5df7570db0bedea74a95a4c8b57fe764fb235ac510b752587a7413c9ab7f82
-EBUILD gnome-nettool-3.0.0-r1.ebuild 1600 RMD160 2bae0102d08b6c7364257f8e96d4322300da4d98 SHA1 93595d99463e685ab25f2758f3997c049914045e SHA256 0aa64336fd4c0854cd5e8c65c0a7d240ab647647ec1f6be3ee71e203d4c75332
 EBUILD gnome-nettool-3.0.1.ebuild 1354 RMD160 a45bac0be7398332de2eed021f4b53c68486510d SHA1 d92e8c13e8f0d3808396975538c21de319a0ffd5 SHA256 87d572966b0bb49d9e4e2a94e569dd3137976d4048eef6c81e45266c4f296181
-MISC ChangeLog 15432 RMD160 355d0412e4c117852e3c7a12b457103b754afe9d SHA1 777e22e9143b115c630e5d60a4f5c98a7a54b121 SHA256 529d664149fb18310973780297581e0127c9de7ca667659fa43b15ea14fe1d25
+EBUILD gnome-nettool-3.2.0.ebuild 1576 RMD160 1797dd39e460f5fcb8d2dd068b2c4d5a3a4ffdde SHA1 8c337f5b6cadd67be8bd285b6ee6306adde6fa09 SHA256 a02ca3cc51ed383346ef5937905896ae13e3b4f98e054eab975b58423cd5997f
+MISC ChangeLog 15741 RMD160 e79a49009a588f90a6756d89b0a33ceac78a153d SHA1 28e8b478dbac1be1d66624398aee3761afb285b9 SHA256 10716922e597acc2b987245b1deab5163678a9819941153cf06e2f1664278b49
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk8FMMEACgkQdjK8w9WeBnDazwD/d2siZLhmULBuqPpqLfifUJjY
-zH7XiYlBI4whn8NzBx4A+wSE/kIQeVUZYfnwpZGv+bR2o4q8RIWflrlmM3AR0vkA
-=sfhY
+iF4EAREIAAYFAk+KcZsACgkQdjK8w9WeBnAJ7QD+JqL7ikOwDT0ZmMcFuUuQiYrQ
+olRTbp7IjK9zqJB8Vl4A/3HPUoh7jajIZdtL/++CAI3wdttC2GZcD0Z93wuI+ZM+
+=mQnD
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/gnome-nettool/files/gnome-nettool-3.2.0-extra-path.patch b/net-analyzer/gnome-nettool/files/gnome-nettool-3.2.0-extra-path.patch
new file mode 100644
index 000000000000..657543e7eee3
--- /dev/null
+++ b/net-analyzer/gnome-nettool/files/gnome-nettool-3.2.0-extra-path.patch
@@ -0,0 +1,82 @@
+From 0bdac5ac8142cbb86297cfb25e611d21d97e6a42 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 15 Apr 2012 02:15:14 -0400
+Subject: [PATCH] utils: append EXTRA_PATH to user's path for
+ util_find_program_in_path()
+
+Normal users generally do not have /sbin or /usr/sbin in their paths,
+and as a result, without EXTRA_PATH, util_find_program_in_path() fails
+to find certain tools on some distros.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=674126
+---
+ src/utils.c |   14 +++++++++++---
+ 1 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/utils.c b/src/utils.c
+index a97217f..eef3cbe 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -31,6 +31,8 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+ 
++#define EXTRA_PATH "/sbin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/local/sbin:/usr/ucb"
++
+ #if (GLIB_MINOR_VERSION < 2)
+ 
+ gint
+@@ -63,13 +65,14 @@ my_strchrnul (const gchar *str, gchar c)
+ }
+ 
+ /* Based on g_find_program_in_path, stolen from glib/gutils.c
+- * It allow to ask in a specific PATH, if fail then as in the user PATH. 
++ * It allow to ask in a specific PATH, if fail then as in the user PATH with
++ * EXTRA_PATH appended.
+  */
+ gchar *
+ util_find_program_in_path (const gchar * program, const gchar * path)
+ {
+ 	const gchar *p;
+-	gchar *name, *freeme;
++	gchar *name, *freeme, *user_path = NULL;
+ 	size_t len;
+ 	size_t pathlen;
+ 
+@@ -92,6 +95,10 @@ util_find_program_in_path (const gchar * program, const gchar * path)
+ 		if (path == NULL) {
+ 			path = "/bin:/usr/bin:.";
+ 		}
++
++		/* /sbin and /usr/sbin might not be in the user's path */
++		user_path = g_strconcat (path, ":", EXTRA_PATH, NULL);
++		path = user_path;
+ 	}
+ 	
+ 	len = strlen (program) + 1;
+@@ -124,12 +131,14 @@ util_find_program_in_path (const gchar * program, const gchar * path)
+ 			gchar *ret;
+ 			ret = g_strdup (startp);
+ 			g_free (freeme);
++			g_free (user_path);
+ 			return ret;
+ 		}
+ 	}
+ 	while (*p++ != '\0');
+ 
+ 	g_free (freeme);
++	g_free (user_path);
+ 
+ 	return NULL;
+ }
+@@ -202,7 +211,6 @@ util_tree_model_to_string (GtkTreeView *treeview)
+ 	return result;
+ }
+ 
+-#define EXTRA_PATH "/sbin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/local/sbin:/usr/ucb"
+ /*
+  * Find a program in PATH and EXTRA_PATH.  If fail, show a dialog box.
+  * Returns the abosulet path and program.
+-- 
+1.7.8.5
+
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-3.0.0-r1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-3.2.0.ebuild
index 3aaaa1bac31c..85db1508f785 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-3.0.0-r1.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-3.2.0.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-3.0.0-r1.ebuild,v 1.2 2012/01/05 05:10:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-3.2.0.ebuild,v 1.1 2012/04/15 06:58:30 tetromino Exp $
 
 EAPI="4"
-GNOME_TARBALL_SUFFIX="bz2"
 GCONF_DEBUG="yes"
 
 inherit eutils gnome2
 
 DESCRIPTION="Collection of network tools"
 HOMEPAGE="http://www.gnome.org/projects/gnome-network/"
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-patches-1.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,7 +23,12 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-2.90.4:3
 	x11-libs/pango"
 RDEPEND="${COMMON_DEPEND}
-	|| ( net-analyzer/traceroute sys-freebsd/freebsd-usbin )
+	|| (
+		net-misc/iputils
+		net-anaylyzer/tcptraceroute
+		net-analyzer/traceroute
+		sys-freebsd/freebsd-usbin )
+	net-analyzer/nmap
 	net-dns/bind-tools
 	userland_GNU? ( net-misc/netkit-fingerd net-misc/whois )
 	userland_BSD? ( net-misc/bsdwhois )"
@@ -52,7 +54,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Useful upstream patches
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
+	# https://bugzilla.gnome.org/show_bug.cgi?id=674126
+	epatch "${FILESDIR}/${PN}-3.2.0-extra-path.patch"
 	gnome2_src_prepare
 }