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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 37 insertions, 60 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/Manifest b/net-analyzer/gnome-nettool/Manifest
index 1126e6c4e980..08588b7aa1ec 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -1,9 +1,17 @@
+-----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.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
 DIST gnome-nettool-2.22.1.tar.bz2 600085 RMD160 43b78d53ae5805f97f031821b37b7e739ca5866a SHA1 41e66c37beb677cf5ac17a2ec6254cd24b0e18d4 SHA256 90938c337575ce0f008a46a9f89f24bc6c04f5384337475fe3d5b960594c31b1
-EBUILD gnome-nettool-2.20.0.ebuild 1233 RMD160 f0b07ea052e6c04aeecd6fd85a5845bdbd8b783f SHA1 c390fa20500a7c3ca6bef5536216bc16fbc4d9f5 SHA256 dfd05bcb7ca2a93a96841dd9261b73687ee529f13c09c1143734a75a3bf6ea38
-EBUILD gnome-nettool-2.22.0.ebuild 1271 RMD160 800b91184eae55f3c8da599eb15f247358c54982 SHA1 bd46002d189bd68ecead165a4ba37697243031d7 SHA256 ccca0c2f33a20823daa83176ed6b7642237f269e3b946550e5f23e58537f59d5
+DIST gnome-nettool-2.26.1.tar.bz2 611892 RMD160 64116468c39c3813574d971f77b3d1fd7670ab14 SHA1 f7a2f606ec0cdf3576e97177c636f8f0b201647f SHA256 d8e71f2df9da5d5ba38c408f7646e92a89acc9a4a6af791cd1e9256c9b3af08f
 EBUILD gnome-nettool-2.22.1.ebuild 1301 RMD160 27cd1172d303956d93e9ca3ab802e4b257f97a65 SHA1 219b3ce74cf219afa040e1c0675116773b5f660d SHA256 28b9fc5cf4cd5c6bcafa1ef64f71b09828d2b15e4d37f8d08805a6b6de2916f2
-MISC ChangeLog 10787 RMD160 79bbb80db05912dd962a5024935176bf8642fbf6 SHA1 fc5349f5e8d71e1c4aa8ab188b4e3f5f1fbeb7fd SHA256 8e2aa1a44e5bdd84b6ce45e18e6d0099169d2dd78bc5605422c5fef6b7e64fbe
+EBUILD gnome-nettool-2.26.1.ebuild 1442 RMD160 e54e89505a0cbf6bded110c64af0832c823ea93b SHA1 da7e098cbc5348c6138144245475b8cdc539bc02 SHA256 fd26539ceff7d8b1db88c2f73f37c4672bd432abac37bf3b4b5e493999f09926
+MISC ChangeLog 11038 RMD160 9561f64909a0acbad73313d39c1a813292c6806e SHA1 02021ce397d36dd99fe54e6877b530c84f93df54 SHA256 0de352a97c898949c5b3fbced2922e7689410c815125f9cdbf52bcd8e71fc2b2
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoQjqsACgkQ1fmVwcYIWAYTrgCgpvH2LFSEoBzO/y0W47rkUOM5
+h64AoJwBh2byMW0X9UmYYyImvNdPifPe
+=EEiQ
+-----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
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
 }