--- /usr/portage/dev-libs/fcgi/fcgi-2.4.1_pre0910052249.ebuild	2012-07-29 18:01:09.000000000 -0600
+++ fcgi-2.4.1_pre0910052249.ebuild	2012-10-28 17:10:04.000000000 -0600
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/fcgi-2.4.1_pre0910052249.ebuild,v 1.9 2012/07/29 23:56:22 blueness Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils autotools multilib
 
@@ -12,7 +12,7 @@
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="html"
 
 DEPEND=""
@@ -31,7 +31,7 @@
 }
 
 src_install() {
-	emake DESTDIR="${D}" install LIBRARY_PATH="${D}/usr/$(get_libdir)" || die
+	emake DESTDIR="${D}" install LIBRARY_PATH="${ED}/usr/$(get_libdir)"
 
 	dodoc README