Drop useless intltool fix.

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

3 files changed, 6 insertions, 54 deletions

diff --git a/net-analyzer/gnome-nettool/ChangeLog b/net-analyzer/gnome-nettool/ChangeLog
index 1a32da3c1a4c..b4f59b56ba08 100644
--- a/net-analyzer/gnome-nettool/ChangeLog
+++ b/net-analyzer/gnome-nettool/ChangeLog
@@ -1,6 +1,10 @@
 # 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.102 2010/08/18 22:30:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.103 2010/08/23 22:09:31 eva Exp $
+
+  23 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-nettool-2.22.1.ebuild, gnome-nettool-2.30.0.ebuild:
+  Drop useless intltool fix.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org> gnome-nettool-2.28.0.ebuild:
   arm stable, bug #314899
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-2.22.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.22.1.ebuild
deleted file mode 100644
index 60a0d133e28c..000000000000
--- a/net-analyzer/gnome-nettool/gnome-nettool-2.22.1.ebuild
+++ /dev/null
@@ -1,45 +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.22.1.ebuild,v 1.11 2010/07/20 02:26:54 jer 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 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 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_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}"/${PN}-2.18.0-fbsd.patch
-}
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-2.30.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-2.30.0.ebuild
index 7f82c42acbfe..e2a7ca59d311 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-2.30.0.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-2.30.0.ebuild
@@ -1,6 +1,6 @@
 # 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.30.0.ebuild,v 1.4 2010/08/01 12:08:28 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-2.30.0.ebuild,v 1.5 2010/08/23 22:09:31 eva Exp $
 
 EAPI="2"
 
@@ -41,10 +41,3 @@ pkg_setup() {
 		$(use_enable debug)
 		--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"
-}