diff -r b7f499089c8a -r ddc273350932 dev-libs/lzo/lzo-2.04.ebuild
--- a/dev-libs/lzo/lzo-2.04.ebuild	Thu Mar 24 00:15:44 2011 -0400
+++ b/dev-libs/lzo/lzo-2.04.ebuild	Fri Mar 25 01:31:11 2011 -0400
@@ -5,4 +5,8 @@
 EAPI=2
 
+WANT_AUTOCONF=2.5
+
+inherit autotools eutils
+
 DESCRIPTION="An extremely fast compression and decompression library"
 HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
@@ -14,4 +18,17 @@
 IUSE="examples static-libs"
 
+RDEPEND=""
+DEPEND=">=sys-devel/autoconf-2.67"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asm-makefile.patch
+
+	# lzo has some weird sort of mfx_* set of autoconf macros which may
+	# only be distributed with lzo itself? Rescue them and place them
+	# into acinclude.m4 because there doesn't seem to be an m4/...
+	sed -n -e '/^AC_DEFUN.*mfx_/,/^])#$/p' aclocal.m4 > acinclude.m4 || die "Unable to rescue mfx_* autoconf macros."
+	eautoreconf
+}
+
 src_configure() {
 	econf \