From 7fced07c1bb613320e7730f025d00df9128be095 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Thu, 13 Nov 2014 12:26:10 +0000 Subject: [PATCH] Drop old (#508854) Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- net-analyzer/gnome-nettool/ChangeLog | 7 +- net-analyzer/gnome-nettool/Manifest | 14 +- .../files/gnome-nettool-2.18.0-fbsd.patch | 343 ------------------ .../gnome-nettool-3.2.0-extra-path.patch | 82 ----- .../gnome-nettool/gnome-nettool-2.32.0.ebuild | 44 --- 5 files changed, 11 insertions(+), 479 deletions(-) delete mode 100644 net-analyzer/gnome-nettool/files/gnome-nettool-2.18.0-fbsd.patch delete mode 100644 net-analyzer/gnome-nettool/files/gnome-nettool-3.2.0-extra-path.patch delete mode 100644 net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild diff --git a/net-analyzer/gnome-nettool/ChangeLog b/net-analyzer/gnome-nettool/ChangeLog index ee8ab1c663c9..4f80f542e4ea 100644 --- a/net-analyzer/gnome-nettool/ChangeLog +++ b/net-analyzer/gnome-nettool/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/gnome-nettool # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.128 2014/05/31 10:26:39 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.129 2014/11/13 12:26:09 pacho Exp $ + + 13 Nov 2014; Pacho Ramos + -files/gnome-nettool-2.18.0-fbsd.patch, + -files/gnome-nettool-3.2.0-extra-path.patch, -gnome-nettool-2.32.0.ebuild: + Drop old (#508854) 31 May 2014; Pacho Ramos gnome-nettool-3.8.1.ebuild: Needs to be rebuilt with libgtop soname bumps diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest index 653803289374..32e497aade75 100644 --- a/net-analyzer/gnome-nettool/Manifest +++ b/net-analyzer/gnome-nettool/Manifest @@ -1,18 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gnome-nettool-2.18.0-fbsd.patch 9981 SHA256 42d134883b5ebae510ed945ba7929d4d3328e4ae50c9cfaab473c2d80ed8be09 SHA512 6f6a1cb1d96a18a2e04633bfdfadea73864e00340b0799ad0dda41afbdbe2050d125509f5efa44b59e4a22f76770e631fdda4f0e17742e9aeb55d12ee1ac136a WHIRLPOOL c8ee57ec692215248861b4d8f57982d96be86ef6fbacd598ca59baf3ed47c65b6bfd8171e50fa6ab98cfebb06c606d7d253a5c8b6aeab3a6843844c0afaa3e43 -AUX gnome-nettool-3.2.0-extra-path.patch 2315 SHA256 2943405287743ded1d7e5674dfee2db5a107a51afb387721a0f146a3294c8334 SHA512 22a871d34427f47a72a461cbd736819e6317e95b747b6958f5319359b9dc968ced214a0cf7d794f06eae92db51ab5f66f10ba6945e5a419a0183c8c8c93ddb43 WHIRLPOOL b95c6326a2454e446d02bacca8cea9f23f5b67f4ffda7063c99f1965d462c1488b35bd053b1cb54244c19ddf61af4509b07d02617db59d0889ba6fee12491003 -DIST gnome-nettool-2.32.0.tar.bz2 647036 SHA256 8c70f85952760170114b2fa4be3ccaa3fc6298f802bacda2503ed482b8a0539c DIST gnome-nettool-3.8.1.tar.xz 589024 SHA256 f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1 SHA512 c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed WHIRLPOOL fe63ac5972b04046b97bdc33a31461f939dff5bd71d1f3b9b76bbd0bc2925a6622b0a938de28b7769f1877a69ccfb77b17c71df12b86edf669e8b32dd9125560 -EBUILD gnome-nettool-2.32.0.ebuild 1252 SHA256 6f6f0072011f2e052f00c938ab4afd2ba4e6433e3add676af0c03f0459dda3fc SHA512 aebb003a715c4edfc6dfd0e755a13b16e5815b463ed4819459b3f4368016e3659fddb13eb7e92780b4299abc50fec2eaf7281224c0bf5b2e9ec296046585f335 WHIRLPOOL 8b452969754ca9cafbc47704bfb5b54785602f7e195993f39657125a5361e0de59608b602cf2c1131d11633074010e17e87f633e6e1a43b4bfd1096af9914f49 EBUILD gnome-nettool-3.8.1.ebuild 1115 SHA256 089cae1c7f6006929e05322126092ca08712f029020a1508853b69768f6a10bc SHA512 6ee4d42035829f5a4f9650e33192863c34b28a28d708a316e39b55ade296b279c5d397a241b08c479f604a54980caeb912164aa75e0462ed686f7cac1fe7c353 WHIRLPOOL 76d180945e9e9faaed6d48f9f6eb83af2374396c0fde931d323bd84a57a554c52946459f48d5bacddbacc478981143d4fed452d97bee55aa1f7f34a6ee0c0dd5 -MISC ChangeLog 17032 SHA256 bb404c795e10608419b613b3025467d9d63883a40bf41fec1e3aec28e6fb8b29 SHA512 8b63d49eae14e383037417644410d0ed8d894c738b1480ea1f13aa6dda9dbf6b7820149023f5ee2afc447ec78ff444300290d490932afd46d1a9e86f66853bc8 WHIRLPOOL d367f78114bbfcba5f0b451ffa75b8933469b1bed09938304e1471581fc2643d303523eeb3ea3c19ce7962d1e56632800f386c78c95b51e291472278f5b1aaf6 +MISC ChangeLog 17219 SHA256 a3661a0a0f0ae5692eee1070a7837bdb6e862b0908fa19959a754c902c2517d8 SHA512 7c6a6cec271323843000fbf028a15549635710ff6483ed6f22970effdc23aab35d846a09e651f79fcb19e2aec626e0dee596d59544b1ee21569101d4a435d33a WHIRLPOOL 90dbf8025e7d1a706794576f456f12608bae7592df3465fbb310237a44e856ac25b5076d8e68d3ec199a1246c739b100d821e4a902e949cfba19c5c8b3dc15ef MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlOJrmAACgkQCaWpQKGI+9RBJQCfbRgXfpjv7wwC/PfzHb+OBLtK -GjoAnAkmsPMDYqJbbFM24zuqbthabFUT -=YFbI +iEYEAREIAAYFAlRko2IACgkQCaWpQKGI+9SRBACfUSiVRW/DEoQIGB0ViCtqM2pt +220Anitx16MApluMPOs2/3snXDtifRS9 +=8fyQ -----END PGP SIGNATURE----- diff --git a/net-analyzer/gnome-nettool/files/gnome-nettool-2.18.0-fbsd.patch b/net-analyzer/gnome-nettool/files/gnome-nettool-2.18.0-fbsd.patch deleted file mode 100644 index bf6a46991868..000000000000 --- a/net-analyzer/gnome-nettool/files/gnome-nettool-2.18.0-fbsd.patch +++ /dev/null @@ -1,343 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-nettool-2.18.0.orig/src/info.c gnome-nettool-2.18.0/src/info.c ---- gnome-nettool-2.18.0.orig/src/info.c 2007-02-16 19:53:16.000000000 -0500 -+++ gnome-nettool-2.18.0/src/info.c 2007-08-06 20:28:16.000000000 -0400 -@@ -20,6 +20,10 @@ - #include - #include - #include -+#include -+#include -+#include -+#include - - #ifdef HAVE_CONFIG_H - # include -@@ -38,6 +42,11 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#include -+#include -+#endif - - #include "info.h" - #include "utils.h" -@@ -128,9 +137,42 @@ info_get_interface_from_dev_name (const - { - gint i; - gchar *path; -- -+ gchar *dev_type = NULL; -+#if defined(__FreeBSD__) -+ int s; -+ struct ifmediareq ifmr; -+ -+ if ((s = socket (AF_INET, SOCK_DGRAM, 0)) > -1) { -+ -+ (void) memset (&ifmr, 0, sizeof (ifmr)); -+ (void) strncpy (ifmr.ifm_name, dev_name, sizeof (ifmr.ifm_name)); -+ -+ if (ioctl (s, SIOCGIFMEDIA, (caddr_t) &ifmr) > -1) { -+ switch (IFM_TYPE (ifmr.ifm_active)) { -+ case IFM_ETHER: -+ dev_type = "eth"; -+ break; -+ case IFM_FDDI: -+ case IFM_TOKEN: -+#ifdef IFM_ATM -+ case IFM_ATM: -+#endif -+ dev_type = "other_type"; -+ break; -+ case IFM_IEEE80211: -+ dev_type = "wlan"; -+ break; -+ } -+ } -+ close (s); -+ } -+#endif /* defined(__FreeBSD__) */ -+ -+ if (!dev_type) -+ dev_type = (gchar *) dev_name; -+ - for (i = 0; info_iface_desc[i].name; i++) -- if (strstr (dev_name, info_iface_desc[i].prefix) == dev_name) { -+ if (strstr (dev_type, info_iface_desc[i].prefix) == dev_type) { - (*iface) = g_strdup_printf ("%s (%s)", _(info_iface_desc[i].name), dev_name); - if (info_iface_desc[i].pixbuf == NULL) { - path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL); -@@ -218,38 +260,87 @@ info_nic_update_stats (gpointer data) - gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; - */ - gchar iface[30]; /*, flags[30]; */ -- gchar rx_bytes[16], rx_pkt[10], rx_error[10], rx_drop[10], rx_fifo[10]; -- gchar frame[10], compressed[10], multicast[10]; -- gchar tx_bytes[16], tx_pkt[10], tx_error[10], tx_drop[10], tx_fifo[10]; -+ gchar rx_bytes[16], rx_pkt[10], rx_error[10]; -+ gchar tx_bytes[16], tx_pkt[10], tx_error[10]; - gchar collissions[10]; -+#if defined(__linux__) -+ gchar rx_drop[10], rx_fifo[10]; -+ gchar frame[10], compressed[10], multicast[10]; -+ gchar tx_drop[10], tx_fifo[10]; -+#elif defined(__FreeBSD__) -+ char *p; -+ gchar **tokens, **argv; -+ int i; -+ int pipe_out; -+#endif - - GIOChannel *io = NULL; - gchar *line; - gboolean title = TRUE; - const gchar *text; - gchar *text_tx_bytes, *text_rx_bytes; -- -+ - g_return_val_if_fail (info != NULL, FALSE); - - model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo)); - text = info_get_nic (info); - if (!text) - return FALSE; -- -+ - #if defined(__linux__) - io = g_io_channel_new_file ("/proc/net/dev", "r", NULL); -- -+#elif defined(__FreeBSD__) -+ if (!g_shell_parse_argv ("/usr/bin/netstat -in -b -f link", NULL, &argv, NULL)) { -+ return FALSE; -+ } -+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL, &pipe_out, NULL, NULL)) { -+ g_strfreev (argv); -+ return FALSE; -+ } -+ -+ g_strfreev (argv); -+ -+ io = g_io_channel_unix_new (pipe_out); -+#endif /* defined(__linux__) */ -+ - while (g_io_channel_read_line (io, &line, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) { - if (title) { - title = FALSE; - g_free (line); - continue; - } -+#if defined(__linux__) - line = g_strdelimit (line, ":", ' '); - sscanf (line, "%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s", iface, - rx_bytes, rx_pkt, rx_error, rx_drop, rx_fifo, frame, - compressed, multicast, - tx_bytes, tx_pkt, tx_error, tx_drop, tx_fifo, collissions); -+#elif defined(__FreeBSD__) -+ tokens = (gchar **) g_malloc0 (sizeof (gchar *) * 12); -+ p = strtok (line, " \t\n"); -+ /* We only care about 11 fields for now */ -+ for (i = 0; i < 11 && p; i++, p = strtok (NULL, " \t\n")) { -+ tokens[i] = g_strdup (p); -+ } -+ -+ if (i == 0 || i < 10) { -+ g_free (line); -+ g_strfreev (tokens); -+ continue; -+ } -+ -+ g_strlcpy (iface, tokens[0], sizeof (iface)); -+ -+ g_strlcpy (collissions, tokens[--i], sizeof (collissions)); -+ g_strlcpy (tx_bytes, tokens[--i], sizeof (tx_bytes)); -+ g_strlcpy (tx_error, tokens[--i], sizeof (tx_error)); -+ g_strlcpy (tx_pkt, tokens[--i], sizeof (tx_pkt)); -+ g_strlcpy (rx_bytes, tokens[--i], sizeof (rx_bytes)); -+ g_strlcpy (rx_error, tokens[--i], sizeof (rx_error)); -+ g_strlcpy (rx_pkt, tokens[--i], sizeof (rx_pkt)); -+ -+ g_strfreev (tokens); -+#endif /* defined(__linux__) */ - - if (g_ascii_strcasecmp (iface, text) == 0) { - /* -@@ -277,7 +368,9 @@ info_nic_update_stats (gpointer data) - } - - g_io_channel_unref (io); --#endif /* defined(__linux__) */ -+#if defined(__FreeBSD__) -+ close (pipe_out); -+#endif /* defined(__FreeBSD__) */ - - return TRUE; - } -@@ -425,8 +518,19 @@ info_get_nic_information (const gchar *n - #ifdef __linux__ - mii_data_result data; - #endif -+#ifdef __FreeBSD__ -+ gint hwmib[6]; -+ size_t hwlen; -+ gchar *hwbuf; -+ guchar *hwptr; -+ struct if_msghdr *hwifm; -+ struct sockaddr_dl *hwsinptr; -+#endif - -- getifaddrs (&ifa0); -+ if (getifaddrs (&ifa0) != 0) { -+ g_warning ("getifaddrs failed: %s", g_strerror (errno)); -+ goto fail; -+ } - - for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { - if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -510,6 +614,45 @@ info_get_nic_information (const gchar *n - (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3], - (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4], - (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]); -+#elif defined(__FreeBSD__) -+ hwmib[0] = CTL_NET; -+ hwmib[1] = AF_ROUTE; -+ hwmib[2] = 0; -+ hwmib[3] = AF_LINK; -+ hwmib[4] = NET_RT_IFLIST; -+ if ((hwmib[5] = if_nametoindex (nic)) == 0) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ if (sysctl (hwmib, 6, NULL, &hwlen, NULL, 0) < 0) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ if ((hwbuf = g_malloc (hwlen)) == NULL) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ if (sysctl (hwmib, 6, hwbuf, &hwlen, NULL, 0) < 0) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ -+ hwifm = (struct if_msghdr *) hwbuf; -+ hwsinptr = (struct sockaddr_dl *) (hwifm + 1); -+ hwptr = (guchar *) LLADDR (hwsinptr); -+ if (*hwptr != 0 || *(hwptr + 1) != 0 || -+ *(hwptr + 2) != 0 || *(hwptr + 3) != 0 || -+ *(hwptr + 4) != 0 || *(hwptr + 5) != 0) { -+ g_sprintf (dst, "%02x:%02x:%02x:%02x:%02x:%02x", -+ *hwptr, *(hwptr + 1), *(hwptr + 2), -+ *(hwptr + 3), *(hwptr + 4), *(hwptr + 5)); -+ } -+ else { -+ g_sprintf (dst, NOT_AVAILABLE); -+ } -+ g_free (hwbuf); -+ -+hwfail: - #else - g_sprintf (dst, NOT_AVAILABLE); - #endif /* SIOCGIFHWADDR */ -@@ -625,6 +768,8 @@ info_get_nic_information (const gchar *n - } - - freeifaddrs (ifa0); -+fail: -+ ; - } - - static gint * -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-nettool-2.18.0.orig/src/lookup.c gnome-nettool-2.18.0/src/lookup.c ---- gnome-nettool-2.18.0.orig/src/lookup.c 2007-02-16 19:53:16.000000000 -0500 -+++ gnome-nettool-2.18.0/src/lookup.c 2007-08-06 20:28:16.000000000 -0400 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include "lookup.h" - #include "utils.h" -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-nettool-2.18.0.orig/src/netstat.c gnome-nettool-2.18.0/src/netstat.c ---- gnome-nettool-2.18.0.orig/src/netstat.c 2007-02-16 19:53:16.000000000 -0500 -+++ gnome-nettool-2.18.0/src/netstat.c 2007-08-06 20:28:16.000000000 -0400 -@@ -110,12 +110,17 @@ netstat_get_active_option (Netinfo * net - g_return_val_if_fail (netinfo != NULL, NULL); - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) { -+#ifdef __FreeBSD__ -+ /* XXX We only support ipv4 now */ -+ option = g_strdup ("-rn -f inet"); -+#else - /* Works for Solaris and Linux */ - if (netinfo_is_ipv6_enable ()) { - option = g_strdup ("-rn -A inet -A inet6"); - } else { - option = g_strdup ("-rn -A inet"); - } -+#endif - - if (netinfo->stbar_text) - g_free (netinfo->stbar_text); -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-nettool-2.18.0.orig/src/nettool.c gnome-nettool-2.18.0/src/nettool.c ---- gnome-nettool-2.18.0.orig/src/nettool.c 2007-02-16 19:53:16.000000000 -0500 -+++ gnome-nettool-2.18.0/src/nettool.c 2007-08-06 20:28:16.000000000 -0400 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -361,6 +362,10 @@ netinfo_io_text_buffer_dialog (GIOChanne - len, NULL); - } - -+ g_free (text); -+ -+ return TRUE; -+ - } else if (status == G_IO_STATUS_AGAIN) { - char buf[1]; - -@@ -372,12 +377,13 @@ netinfo_io_text_buffer_dialog (GIOChanne - } - g_string_append_c (netinfo->command_output, buf[0]); - } -+ -+ g_free (text); -+ return TRUE; - } else if (status == G_IO_STATUS_EOF) { - } - - g_free (text); -- -- return TRUE; - } - - /* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-nettool-2.18.0.orig/src/utils.c gnome-nettool-2.18.0/src/utils.c ---- gnome-nettool-2.18.0.orig/src/utils.c 2007-02-16 19:53:16.000000000 -0500 -+++ gnome-nettool-2.18.0/src/utils.c 2007-08-06 20:28:16.000000000 -0400 -@@ -24,6 +24,8 @@ - on GNOME 2.0 */ - - #include "utils.h" -+#include -+#include - #include - #include - -@@ -240,7 +242,7 @@ util_legible_bytes (gchar *bytes) - const gchar *unit = "B"; - gchar *result; - -- sscanf (bytes, "%lld", &rx); -+ rx = strtoull (bytes, (char **)NULL, 10); - short_rx = rx * 10; - - if (rx > 1125899906842624ull) { 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 deleted file mode 100644 index 657543e7eee3..000000000000 --- a/net-analyzer/gnome-nettool/files/gnome-nettool-3.2.0-extra-path.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0bdac5ac8142cbb86297cfb25e611d21d97e6a42 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -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 - #include - -+#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-2.32.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild deleted file mode 100644 index b1a0de770cde..000000000000 --- a/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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-2.32.0.ebuild,v 1.8 2012/05/04 06:08:10 jdhore Exp $ - -EAPI="3" -GCONF_DEBUG="yes" - -inherit eutils gnome2 - -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.19.7: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 (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.40 - virtual/pkgconfig - app-text/gnome-doc-utils" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - G2CONF="${G2CONF} - $(use_enable debug) - --with-gtk=2.0 - --disable-scrollkeeper" -} -- 2.26.2