--- /usr/portage/net-analyzer/nsat/nsat-1.5.ebuild	2010-03-30 22:36:03.000000000 -0400
+++ /usr/portage/net-analyzer/nsat/nsat-1.5.ebuild	2010-09-04 13:58:21.000000000 -0400
@@ -2,6 +2,8 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5.ebuild,v 1.18 2009/01/15 07:08:09 jer Exp $
 
+EAPI=2
+
 inherit eutils autotools
 
 WANT_AUTOCONF=2.5
@@ -12,7 +14,7 @@ 
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc sparc x86"
+KEYWORDS="~ppc sparc x86 amd64"
 IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11
@@ -26,27 +28,32 @@ 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	cp -va configure.in{,.orig}
+}
+
+src_prepare(){
+	eautoreconf
+}
+
+src_configure(){
 	epatch "${FILESDIR}"/${P}-configure.patch
 	# bug 128204
 	epatch "${FILESDIR}"/${P}-lvalue-gcc4.patch
 	epatch "${FILESDIR}"/${P}-strip.patch
-
-	sed -i "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
-		nsat.conf
-	sed -i "s:/usr/local:/usr:g" Makefile.in
-	sed -i "s:/usr/local:/usr:g" tools/xnsat
+	sed -i -e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
+		nsat.conf || die "sed nsat.conf failed"
+	sed -i "s:/usr/local:/usr:g" Makefile.in || die "sed Makefile.in failed"
+	sed -i configure.in -e "s:LFLAGS=\":LFLAGS=\"${LDFLAGS} :" || die "sed configure.in failed"
+	sed -i "s:/usr/local:/usr:g" tools/xnsat ||die "sed xnsat failed"
 	sed -i -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
 		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
-		src/lang.h
+		src/lang.h || die "sed lang.h failed"
 
-	eautoreconf
 }
 
 src_compile() {
 	econf $( use_with X x ) || die
 
-	make|| die "compile problem"
+	emake|| die "compile problem"
 }
 
 src_install () {