--- net-nds/yp-tools/yp-tools-2.9.ebuild	2009-04-05 10:08:24.000000000 +0200
+++ net-dns/yp-tools/yp-tools-2.9.ebuild	2009-05-22 18:50:03.430864554 +0200
@@ -1,10 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/yp-tools-2.9.ebuild,v 1.8 2008/11/02 12:10:30 jmbsvicetto Exp $
 
-IUSE="nls"
-
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Network Information Service tools"
 HOMEPAGE="http://www.linux-nis.org/nis/"
@@ -13,13 +11,20 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="nls"
 
 DEPEND="virtual/libc"
+RDEPEND="${DEPEND} \
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${FILESDIR}/${PN}-2.8-bsd.patch"
+	sed -i 's/@INSTALL_PROGRAM@ -s/@INSTALL_PROGRAM@/g' src/Makefile.am || die "sed Makefile.am failed"
+
+	eautoreconf
 }
 
 src_compile() {
@@ -38,14 +43,16 @@
 				${i}.orig > ${i}
 		done
 	fi
-	econf ${myconf} || die "econf failed"
-	make || die
+	econf ${myconf}
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc/yp ; doins etc/nicknames
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
+	insinto /etc/yp
+	doins etc/nicknames || die "doins failed"
+
 	# This messes up boot so we remove it
 	rm -d "${D}/bin/ypdomainname"
 	rm -d "${D}/bin/nisdomainname"