Version bump. Update API usage, translation updates. Clean up old revisions.

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

4 files changed, 31 insertions, 76 deletions

diff --git a/net-analyzer/gnome-nettool/ChangeLog b/net-analyzer/gnome-nettool/ChangeLog
index f6d4b5f27596..83f3376bc195 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.107 2010/10/17 15:48:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.108 2010/10/22 21:31:14 eva Exp $
+
+*gnome-nettool-2.32.0 (22 Oct 2010)
+
+  22 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-nettool-2.26.2.ebuild, -gnome-nettool-2.28.0.ebuild,
+  +gnome-nettool-2.32.0.ebuild:
+  Version bump. Update API usage, translation updates. Clean up old
+  revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   gnome-nettool-2.30.0.ebuild:
diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index 8b58e2eb7398..5cfe42a50d1e 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.26.2.tar.bz2 631631 RMD160 20b2145d8d616fbbac0c6081a0d508439a9b31f7 SHA1 dcb026f358a5797793391e5a90ae74c8401a8fec SHA256 ac71ed4ba64e551f9905e69aa4472a9486030702e3712dd7e34b978ba582edc7
-DIST gnome-nettool-2.28.0.tar.bz2 641475 RMD160 0c466faf79137022b19cac21d3231ca7805d58e9 SHA1 5f734227e4cccbfd3d9bb29193b862eaa4e47ccf SHA256 ecce19920e2bf5b7cac8ffd26d8592adff7b895d1ee219b18a84a46313f36dd5
 DIST gnome-nettool-2.30.0.tar.bz2 651732 RMD160 1bd652dd7ec7c56d452a7a386c2453f7f927d361 SHA1 1513505509d44bfd1b2105a84be2d12f3499e043 SHA256 42fdc867d26b31145986fd99e06509229b118430f2d666070c5dac7cff1dd000
-EBUILD gnome-nettool-2.26.2.ebuild 1569 RMD160 0f08d9153c99cd976971bb7c0862b82902707971 SHA1 cfbcf9eadae0c47abcf0108aebd00572cab15bf7 SHA256 c2cf32bb3fa595801b77e43a169b87e8e070a4aed69840134ff944dd10b75cef
-EBUILD gnome-nettool-2.28.0.ebuild 1403 RMD160 1968461543f4ef747408f86cf9c26101f1921184 SHA1 5642fb205a8051618da258af77af61cddc91f367 SHA256 ae56817e3dadd3c20cac78be3c873dbd39eac95aa6e6b153c34d3880c3ddc62b
+DIST gnome-nettool-2.32.0.tar.bz2 647036 RMD160 17530c5e808338bfa197cfe3aafe04d18e4830bf SHA1 43e7bd780ac3d5700be8b4cfec7f85278ec8f54a SHA256 8c70f85952760170114b2fa4be3ccaa3fc6298f802bacda2503ed482b8a0539c
 EBUILD gnome-nettool-2.30.0.ebuild 1225 RMD160 2919ae0bc57cf36a19a23756e6b4dad9b89b2411 SHA1 70264ae79e6cf443e2f9abc3b6e08c3425f36280 SHA256 2e6f5724b2033ecf37c5f8d43e9f496c2c2e94aaef9b17806ec1fca97a262194
-MISC ChangeLog 13933 RMD160 2a2b411037faa54537cbb39150aa1a830d57a0c2 SHA1 1731987f4132224cb09ae94e8adb9d0b6924f43b SHA256 514f81de662b01dcb4c8e01f755237080f717ee191c42de88316e82d661311b1
+EBUILD gnome-nettool-2.32.0.ebuild 1266 RMD160 7dd872a32fbe109fce40de5957cb058d6285291f SHA1 662c53fc29d5799707b7fd3dc79491fa683f7c2d SHA256 9edf04d4cdf67cfa21f249562046647a2408a71125a6f4a8a72ff304dd51a4c5
+MISC ChangeLog 14196 RMD160 65502a905568ed2b939040278d702a43570fd725 SHA1 b7c2069681562b6ab104c85f71e49fd219bf1002 SHA256 cc9011eacf8ad713794766b643e92136b3f9c375115e0c7591962f988ff56a74
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzCAq0ACgkQ1fmVwcYIWAa6FACgpwNWX4BsF5E28xEsv6yavUrf
+F1sAnRADfwz+gAAu9Mw0R2IDAr6asTgE
+=1Z+A
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-2.26.2.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.26.2.ebuild
deleted file mode 100644
index 9f15faad24b0..000000000000
--- a/net-analyzer/gnome-nettool/gnome-nettool-2.26.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 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.26.2.ebuild,v 1.10 2010/07/20 02:26:54 jer Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Collection of network tools"
-HOMEPAGE="http://www.gnome.org/projects/gnome-network/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# FIXME: Dropped ~x86-fbsd (see epatch below)
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug"
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.6.0:2
-	>=gnome-base/libglade-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 <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="${G2CONF}
-		$(use_enable debug)
-		--disable-scrollkeeper"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Doesn't apply, non-trivial to fix => remove fbsd keyword
-	#epatch "${FILESDIR}"/${PN}-2.18.0-fbsd.patch
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-2.28.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild
index 72eeea829030..e7a227b1f76a 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-2.28.0.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2010 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.28.0.ebuild,v 1.6 2010/08/18 22:30:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild,v 1.1 2010/10/22 21:31:14 eva Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
 
-inherit gnome2 eutils
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug"
 
-COMMON_DEPEND=">=x11-libs/gtk+-2.12:2
+COMMON_DEPEND=">=x11-libs/gtk+-2.19.7:2
 	>=gnome-base/gconf-2
 	gnome-base/libgtop:2"
 RDEPEND="${COMMON_DEPEND}
@@ -30,21 +31,14 @@ RDEPEND="${COMMON_DEPEND}
 # app-admin/gnome-system-tools
 
 DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
+	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9
 	app-text/gnome-doc-utils"
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		$(use_enable debug)
+		--with-gtk=2.0
 		--disable-scrollkeeper"
 }
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}