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

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

3 files changed, 18 insertions, 71 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/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"
-}