--- net-libs/gnutls/gnutls-2.7.4.ebuild
+++ net-libs/gnutls/gnutls-2.7.5.ebuild
@@ -3,7 +3,8 @@
 # $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.7.4.ebuild,v 1.1 2009/01/10 22:45:35 dragonheart Exp $
 
 EAPI="2"
-inherit eutils libtool autotools
+
+inherit autotools libtool
 
 DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
@@ -47,13 +48,17 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	for dir in gl/m4 m4 lib/gl/m4 lib/m4 libextra/gl/m4 libextra/m4 ; do
+	local dir
+	for dir in m4 lib/m4 libextra/m4 ; do
 		rm -f ${dir}/lt* ${dir}/libtool.m4
 	done
 	find . -name ltmain.sh -exec rm {} \;
+	for dir in . lib libextra ; do
+		pushd ${dir} > /dev/null
+		eautoreconf
+		popd > /dev/null
+	done
 
-	# the below patch is in 2.7.* as per
-	# https://savannah.gnu.org/support/?106542
 	elibtoolize # for sane .so versioning on FreeBSD
 }
 
@@ -61,11 +66,11 @@
 	local myconf
 	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
 	econf  \
-		$(use_with zlib) \
-		$(use_enable nls) \
-		$(use_enable guile) \
 		$(use_enable cxx) \
 		$(use_enable doc gtk-doc) \
+		$(use_enable guile) \
+		$(use_enable nls) \
+		$(use_with zlib) \
 		${myconf}
 }