--- inn-2.4.1.ebuild.orig	2006-12-25 12:04:13.000000000 +0100
+++ inn-2.4.1.ebuild	2006-12-25 12:04:32.000000000 +0100
@@ -1,8 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.4.1.ebuild,v 1.5 2005/12/26 06:56:18 mr_bones_ Exp $
+# $Header: $
 
-inherit fixheadtails ssl-cert eutils libtool flag-o-matic
+WANT_AUTOCONF="2.1"
+
+inherit fixheadtails ssl-cert eutils libtool flag-o-matic autotools
 
 DESCRIPTION="The Internet News daemon, fully featured NNTP server"
 HOMEPAGE="http://www.isc.org/products/INN"
@@ -19,24 +21,19 @@
 	ssl? ( dev-libs/openssl )
 	perl? ( dev-lang/perl )
 	python? ( dev-lang/python )
-	berkdb? ( sys-libs/db )
-	virtual/gzip"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.13
-	sys-devel/libtool
-	>=sys-apps/sed-4"
+	berkdb? ( sys-libs/db )"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/2.4.1-berkdb.patch
-	epatch ${WORKDIR}/db_patch.patch
+	epatch "${FILESDIR}"/2.4.1-berkdb.patch
+	epatch "${WORKDIR}"/db_patch.patch
 
 	ht_fix_file configure.in support/fixscript.in
 
-	export WANT_AUTOCONF="2.1"
-	autoconf || die "autoconf failed"
+	eautoconf || die "autoconf failed"
 
 	sed -i \
 		-e "s/ -B .OLD//" \
@@ -82,22 +79,22 @@
 }
 
 src_install() {
-	make DESTDIR=${D} P="" install || die "make install failed"
+	make DESTDIR="${D}" P="" install || die "make install failed"
 
-	chown -R root:0 ${D}/usr/{lib/news/{lib,include},share/{doc,man}}
-	chmod 644 ${D}/etc/news/*
+	chown -R root:0 "${D}"/usr/{lib/news/{lib,include},share/{doc,man}}
+	chmod 644 "${D}"/etc/news/*
 	for file in control.ctl expire.ctl incoming.conf nntpsend.ctl passwd.nntp readers.conf
 	do
-		chmod 640 ${D}/etc/news/${file}
+		chmod 640 "${D}"/etc/news/${file}
 	done
 
 	# Prevent old db/* files from being overwritten
 	dodir /usr/share/doc/${PF}/dbexamples
 	for db_file in active active.times distributions history newsgroups
 	do
-		if [ -f ${D}/var/spool/news/db/${db_file} ]
+		if [ -f "${D}"/var/spool/news/db/${db_file} ]
 		then
-			mv ${D}/var/spool/news/db/${db_file} ${D}/usr/share/doc/${PF}/dbexamples
+			mv "${D}"/var/spool/news/db/${db_file} "${D}"/usr/share/doc/${PF}/dbexamples
 		fi
 	done
 
@@ -113,7 +110,7 @@
 	doins include/*.h
 
 	exeinto /etc/init.d
-	doexe ${FILESDIR}/innd innd
+	doexe "${FILESDIR}"/innd innd
 
 	if use ssl
 	then
@@ -143,31 +140,31 @@
 
 	chown -R news:news ${ROOT}/var/{log,spool}/news
 
-	einfo "Do not forget to update your cron entries, and also run"
-	einfo "makedbz if you need to.  If this is a first-time installation"
-	einfo "a minimal active file has been installed.  You will need to"
-	einfo "touch history and run 'makedbz -i' to initialize the history"
-	einfo "database.  See INSTALL for more information."
-	einfo
-	einfo "You need to assign a real shell to the news user, or else"
-	einfo "starting inn will fail. You can use 'usermod -s /bin/bash news'"
-	einfo "for this."
+	elog "Do not forget to update your cron entries, and also run"
+	elog "makedbz if you need to.  If this is a first-time installation"
+	elog "a minimal active file has been installed.  You will need to"
+	elog "touch history and run 'makedbz -i' to initialize the history"
+	elog "database.  See INSTALL for more information."
+	elog
+	elog "You need to assign a real shell to the news user, or else"
+	elog "starting inn will fail. You can use 'usermod -s /bin/bash news'"
+	elog "for this."
 
 	if use ssl
 	then
-		einfo
-		einfo "You may want to start nnrpd manually for native ssl support."
-		einfo "If you choose to do so, automating this with a bootscript might"
-		einfo "also be a good choice."
-		einfo "Have a look at man nnrpd for valid parameters."
+		elog
+		elog "You may want to start nnrpd manually for native ssl support."
+		elog "If you choose to do so, automating this with a bootscript might"
+		elog "also be a good choice."
+		elog "Have a look at man nnrpd for valid parameters."
 	fi
 }
 
 pkg_postrm() {
-	einfo
-	einfo "If you want your newsspool or altered configuration files"
-	einfo "to be removed, please do so now manually."
-	einfo
+	elog
+	elog "If you want your newsspool or altered configuration files"
+	elog "to be removed, please do so now manually."
+	elog
 }
 
 pkg_config() {