--- findutils-4.5.10-r1.ebuild.orig	2012-09-09 21:18:22.000000000 -0600
+++ findutils-4.5.10-r1.ebuild	2012-09-09 21:15:09.000000000 -0600
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.10-r1.ebuild,v 1.6 2012/05/22 22:29:53 vapier Exp $
 
+EAPI=4
+
 inherit eutils flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="GNU utilities for finding files"
@@ -11,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
@@ -19,9 +21,7 @@
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-gets.patch
 
 	# Don't build or install locate because it conflicts with slocate,
@@ -29,7 +29,7 @@
 	sed -i '/^SUBDIRS/s/locate//' Makefile.in
 }
 
-src_compile() {
+src_configure() {
 	use static && append-ldflags -static
 
 	local myconf
@@ -37,13 +37,10 @@
 
 	econf \
 		$(use_enable nls) \
-		--libexecdir=/usr/$(get_libdir)/find \
-		${myconf} \
-		|| die "configure failed"
-	emake AR="$(tc-getAR)" || die "make failed"
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/find \
+		${myconf}
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS README TODO ChangeLog
+src_compile(){
+	emake AR="$(tc-getAR)"
 }