Drop useless intltool fix.

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

4 files changed, 12 insertions, 62 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/Manifest b/net-analyzer/gnome-nettool/Manifest
index 51faddeb7d79..e26110da889d 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -2,20 +2,18 @@
 Hash: SHA1
 
 AUX gnome-nettool-2.18.0-fbsd.patch 9981 RMD160 f0e7e8d6fc815ea5c6a9da7176ee6b99262dba82 SHA1 466e98431aa9cbcf8467284b9c1839557de90ca5 SHA256 42d134883b5ebae510ed945ba7929d4d3328e4ae50c9cfaab473c2d80ed8be09
-DIST gnome-nettool-2.22.1.tar.bz2 600085 RMD160 43b78d53ae5805f97f031821b37b7e739ca5866a SHA1 41e66c37beb677cf5ac17a2ec6254cd24b0e18d4 SHA256 90938c337575ce0f008a46a9f89f24bc6c04f5384337475fe3d5b960594c31b1
 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.22.1.ebuild 1296 RMD160 c5fbe670b08568f4c381272317d10dcc08ad782b SHA1 422776b2e4aa0c14e8e34fad308a280d927c8a3b SHA256 d6c2eddd023b2b1c23e3bb2fad87410821b6fe0c2bfe9e6dfcf77bac6441c7b4
 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
-EBUILD gnome-nettool-2.30.0.ebuild 1406 RMD160 be43846df97b53bed934c236cf943bb50fe171e7 SHA1 c55cd5831659b7a8108ddc1c564d17ab489f66b6 SHA256 07a693be277a35bc33add8f03b3fe82bcbf67ec8d31e9d1e8fcec615b89688c1
-MISC ChangeLog 13343 RMD160 664e223bf78700712c42a63437a41a7fd3601463 SHA1 6aa181f45e2f01a9350ad26c3052def8582e047d SHA256 f4390a7ba63bea8d4b075384919ce6e4eb6afa7565f9f3661b19335cf2428982
+EBUILD gnome-nettool-2.30.0.ebuild 1227 RMD160 ad0e1a3591358c38fd6ffa1acd9caca4b5d179c3 SHA1 4583c7502831d0ce9631a8019ec5a27372f25caf SHA256 0ca6af502e6f4e57114300faa9dc91aa651fb635b5c1e14a13ec6e504b3259e4
+MISC ChangeLog 13485 RMD160 9e4a594ac631c9948494f062441be07df81e4cf7 SHA1 5e92d16d8b7d30d26980cea1b33e99b4a4009ba0 SHA256 24f51509488a238faae595a0a882d8049c5a887e2feb2acc3104d82095aa1b41
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkxsXrQACgkQkKaRLQcq0GIQrgCggoc7U6XCjXOQJgl+hTYF0wY1
-N2EAn1H0dk+p7Fq8ulmmKCHyHfnX6hkK
-=4pwZ
+iEYEARECAAYFAkxy8aEACgkQ1fmVwcYIWAboXQCfUcxmOvBV+W+XczNzHkbzTEEL
+RAkAnRv15mZ5vEmHIPo+HmMFRJAEK27q
+=5r6W
 -----END PGP SIGNATURE-----
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"
-}