--- /usr/portage/dev-libs/apr/apr-1.4.4.ebuild	2011-05-14 21:31:08.000000000 +0200
+++ apr-1.4.4.ebuild	2011-10-05 21:44:09.000000000 +0200
@@ -21,10 +21,6 @@
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	# Ensure that system libtool is used.
-	sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed"
-	sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed"
-
 	AT_M4DIR="build" eautoreconf
 	elibtoolize
 
@@ -63,15 +59,22 @@
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake \
+		LIBTOOL="${ROOT}usr/bin/libtool" \
+		|| die "emake failed"
 
 	if use doc; then
-		emake dox || die "emake dox failed"
+		emake \
+			LIBTOOL="${ROOT}usr/bin/libtool" \
+			dox || die "emake dox failed"
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake \
+		DESTDIR="${D}" \
+		LIBTOOL="${ROOT}usr/bin/libtool" \
+		install || die "emake install failed"
 
 	find "${ED}" -name "*.la" -print0 | xargs -0 rm -f