From a7fbd44eb028eeee2090e501e8ef3e41b61fdf76 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 31 Oct 2004 01:27:41 +0000
Subject: [PATCH] arm/ia64 stable #58633

---
 sys-apps/net-tools/Manifest                 | 22 ++++++++++-----------
 sys-apps/net-tools/net-tools-1.60-r9.ebuild | 14 ++++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index be7ac9a6156f..d9b0bc13e601 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 0925a68b9bc396c4a46a405b2b710443 ChangeLog 7217
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 64d8b101f0bab67257dae2ebbfde9d6b net-tools-1.60-r9.ebuild 3258
+MD5 1d4f0a392afcde4df39cb341235f439c net-tools-1.60-r9.ebuild 3255
 MD5 14a10c003597e5ff71b26015cec64b4d net-tools-1.60-r8.ebuild 3134
-MD5 0925a68b9bc396c4a46a405b2b710443 ChangeLog 7217
-MD5 492e3dfd36d8f80cfd73ef58dcb2082e files/net-tools-1.60-get_name.patch 1608
-MD5 e98da89f3a64d4842946223b199fd5c7 files/net-tools-1.60-cleanup-list-handling.patch 1322
-MD5 51de6eabe2d6d6dc860f72c41cee636b files/net-tools-1.60-2.6-compilefix.patch 784
-MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r9 148
+MD5 21723cf8906d7431823260022ba2bb12 files/1.60-gcc34.patch 712
 MD5 3d8683073f95e3da2c596bb09c1cbb89 files/1.60-man.patch 737
 MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r8 148
-MD5 21723cf8906d7431823260022ba2bb12 files/1.60-gcc34.patch 712
+MD5 51de6eabe2d6d6dc860f72c41cee636b files/net-tools-1.60-2.6-compilefix.patch 784
+MD5 e98da89f3a64d4842946223b199fd5c7 files/net-tools-1.60-cleanup-list-handling.patch 1322
+MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r9 148
+MD5 492e3dfd36d8f80cfd73ef58dcb2082e files/net-tools-1.60-get_name.patch 1608
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBhA3+KtJO8LeSoosRAvDgAJwPtZ+HlTuypI+OtYFJdGlP8rW3kQCgoxzG
-LOtG5zGK7OPPpBxT2NXSacs=
-=IK5h
+iD8DBQFBhD+1HTu7gpaalycRAqXeAKDBF8q3rbwjcFmGTeiyGtz+p6BQVQCgoVX7
+Gq7lM+YFVdM4O357sTgypeI=
+=rY9p
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/net-tools-1.60-r9.ebuild b/sys-apps/net-tools/net-tools-1.60-r9.ebuild
index ce33a5101ae7..7e33ca25dd0e 100644
--- a/sys-apps/net-tools/net-tools-1.60-r9.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r9.ebuild,v 1.10 2004/10/30 21:56:03 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r9.ebuild,v 1.11 2004/10/31 01:27:41 vapier Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -11,18 +11,13 @@ SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha ~arm hppa amd64 ~ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="nls build static uclibc"
 
 DEPEND="nls? ( sys-devel/gettext )
 	>=sys-apps/sed-4"
 
 src_unpack() {
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-
 	PATCHDIR=${WORKDIR}/${P}-gentoo
 
 	unpack ${A}
@@ -53,6 +48,11 @@ src_unpack() {
 	cp ${PATCHDIR}/net-tools-1.60-config.h config.h
 	cp ${PATCHDIR}/net-tools-1.60-config.make config.make
 
+	if use static ; then
+		append-flags -static
+		append-ldflags -static
+	fi
+
 	sed -i \
 		-e 's/^libdir:/libdir: version.h/' \
 		-e "s:-O2 -Wall -g:${CFLAGS}:" \
-- 
2.26.2