New version for GNOME 2.26. Bug fixes and translation updates.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 24 insertions, 55 deletions

diff --git a/net-analyzer/gnome-nettool/ChangeLog b/net-analyzer/gnome-nettool/ChangeLog
index 009f54a181f2..57003ecbf71f 100644
--- a/net-analyzer/gnome-nettool/ChangeLog
+++ b/net-analyzer/gnome-nettool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/gnome-nettool
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.83 2009/04/27 14:22:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.84 2009/05/17 22:24:37 eva Exp $
+
+*gnome-nettool-2.26.1 (17 May 2009)
+
+  17 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-nettool-2.20.0.ebuild, -gnome-nettool-2.22.0.ebuild,
+  +gnome-nettool-2.26.1.ebuild:
+  New version for GNOME 2.26. Bug fixes and translation updates.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gnome-nettool-2.22.1:
   Stable for HPPA (bug #260063).
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-2.20.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.20.0.ebuild
deleted file mode 100644
index 02efe873f220..000000000000
--- a/net-analyzer/gnome-nettool/gnome-nettool-2.20.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.9 2008/04/12 14:17:39 eva Exp $
-
-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 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.5.4
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2"
-RDEPEND="${COMMON_DEPEND}
-	net-analyzer/traceroute
-	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="`use_enable debug`"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}"/${PN}-2.18.0-fbsd.patch
-}
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-2.22.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.26.1.ebuild
index f3d2ae545a4f..9fbc8191db1e 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-2.22.0.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-2.26.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.8 2008/11/13 19:24:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-2.26.1.ebuild,v 1.1 2009/05/17 22:24:37 eva Exp $
+
+EAPI="1"
 
 inherit gnome2 eutils
 
@@ -9,14 +11,16 @@ HOMEPAGE="http://www.gnome.org/projects/gnome-network/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+# FIXME: Dropped ~x86-fbsd (see epatch below)
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug"
 
-COMMON_DEPEND=">=x11-libs/gtk+-2.5.4
+COMMON_DEPEND=">=x11-libs/gtk+-2.6.0:2
 	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2"
+	>=gnome-base/gconf-2
+	gnome-base/libgtop:2"
 RDEPEND="${COMMON_DEPEND}
-	net-analyzer/traceroute
+	|| ( 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 )"
@@ -30,16 +34,19 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
-	  app-text/gnome-doc-utils"
+	app-text/gnome-doc-utils"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable debug) --disable-scrollkeeper"
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		--disable-scrollkeeper"
 }
 
 src_unpack() {
 	gnome2_src_unpack
 
-	epatch "${FILESDIR}"/${PN}-2.18.0-fbsd.patch
+	# Doesn't apply, non-trivial to fix => remove fbsd keyword
+	#epatch "${FILESDIR}"/${PN}-2.18.0-fbsd.patch
 }