--- /usr/portage/net-misc/iputils/iputils-20071127-r2.ebuild	2010-01-07 11:06:27.000000000 -0500
+++ /usr/local/portage/net-misc/iputils/iputils-20100214.ebuild	2010-02-20 14:16:37.653087720 -0500
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20071127-r2.ebuild,v 1.2 2010/01/07 15:52:15 fauli Exp $
+# $Header:
 
 inherit flag-o-matic eutils toolchain-funcs
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
 HOMEPAGE="http://www.linux-foundation.org/en/Net:Iputils"
 SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
-	mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
+	 mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -29,12 +29,12 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc34.patch
+#	epatch "${FILESDIR}"/${P}-gcc34.patch
 	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
 	epatch "${FILESDIR}"/${PN}-20070202-makefile.patch
-	epatch "${FILESDIR}"/${P}-kernel-ifaddr.patch
-	epatch "${FILESDIR}"/${PN}-20060512-linux-headers.patch
-	epatch "${FILESDIR}"/${PN}-20070202-no-open-max.patch #195861
+	epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch
+#	epatch "${FILESDIR}"/${PN}-20060512-linux-headers.patch
+#	epatch "${FILESDIR}"/${PN}-20070202-no-open-max.patch #195861
 	epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638
 	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
 	use static && append-ldflags -static
@@ -62,7 +62,7 @@
 	into /usr
 	dosbin tracepath || die "tracepath"
 	use ipv6 && dosbin trace{path,route}6
-	dosbin clockdiff rarpd rdisc ipg tftpd || die "misc sbin"
+	dosbin clockdiff rarpd rdisc tftpd || die "misc sbin"
 
 	fperms 4711 /bin/ping
 	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6