--- /usr/portage/dev-ml/findlib/findlib-1.3.3.ebuild	2012-09-29 13:01:10.000000000 -0600
+++ findlib-1.3.3.ebuild	2012-10-30 21:06:28.000000000 -0600
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.3.3.ebuild,v 1.6 2012/09/29 18:37:34 armin76 Exp $
 
-EAPI=2
+EAPI=4
 
 inherit multilib
 
@@ -16,27 +16,27 @@
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?,tk?]"
 RDEPEND="${DEPEND}"
 
-ocamlfind_destdir="/usr/$(get_libdir)/ocaml"
+ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
 stublibs="${ocamlfind_destdir}/stublibs"
 
 src_configure() {
 	local myconf
 	use tk && myconf="-with-toolbox"
-	./configure -bindir /usr/bin -mandir /usr/share/man \
+	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
 		-sitelib ${ocamlfind_destdir} \
 		-config ${ocamlfind_destdir}/findlib/findlib.conf \
 		${myconf} || die "configure failed"
 }
 
 src_compile() {
-	emake all || die
+	emake all
 	if use ocamlopt; then
-		emake opt || die # optimized code
+		emake opt # optimized code
 	else
 		# If using bytecode we dont want to strip the binary as it would remove the
 		# bytecode and only leave ocamlrun...
@@ -45,11 +45,9 @@
 }
 
 src_install() {
-	dodir `ocamlc -where`
+	emake prefix="${D}" install
 
-	emake prefix="${D}" install || die
-
-	dodir "${stublibs}"
+	dodir "${stublibs#${EPREFIX}}"
 
 	cd "${S}/doc"
 	dodoc QUICKSTART README DOCINFO