--- /home/flame/devel/gentoo-x86/sys-apps/acl/acl-2.2.39-r1.ebuild	2006-09-24 05:48:51.000000000 +0200
+++ acl-2.2.39-r1.ebuild	2006-12-27 02:35:22.040644330 +0100
@@ -3,6 +3,8 @@
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.39-r1.ebuild,v 1.2 2006/09/24 03:48:51 vapier Exp $
 
 WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
 inherit eutils autotools toolchain-funcs
 
 MY_P="${PN}_${PV}-1"
@@ -17,8 +19,10 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nfs nls"
 
-DEPEND=">=sys-apps/attr-2.4
-	nfs? ( net-libs/libnfsidmap )
+RDEPEND=">=sys-apps/attr-2.4
+	nfs? ( net-libs/libnfsidmap )"
+
+DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -31,10 +35,16 @@
 			acl-2.2.29-CITI_NFS4_ALL-3.dif
 	fi
 	epatch "${FILESDIR}"/${PN}-2.2.32-only-symlink-when-needed.patch
+	epatch "${FILESDIR}"/attr-2.4.32-libtool.patch
+	epatch "${FILESDIR}"/${P}-leave-las-to-libtool.patch
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
 		include/builddefs.in \
 		|| die "failed to update builddefs"
+
+	AT_M4DIR="m4" eaclocal
+	_elibtoolize --copy --force
+	AT_M4DIR="m4" eaclocal
 	eautoconf
 }