--- radvd-1.8.1.ebuild	2011-08-29 12:46:49.000000000 +0200
+++ radvd-1.8.2.ebuild	2011-10-25 23:13:04.000032507 +0200
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-1.8.1.ebuild,v 1.1 2011/08/29 10:46:49 xmw Exp $
 
-EAPI=2
+EAPI=4
+
 inherit eutils
 
 DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
@@ -18,6 +19,8 @@
 	sys-devel/flex"
 RDEPEND=""
 
+DOCS=( CHANGES README TODO radvd.conf.example )
+
 pkg_setup() {
 	enewgroup radvd
 	enewuser radvd -1 -1 /dev/null radvd
@@ -28,22 +31,20 @@
 
 src_configure() {
 	econf \
-		--with-pidfile=/var/run/radvd/radvd.pid \
-		|| die "econf failed"
+		--with-pidfile=/var/run/radvd/radvd.pid
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	default
 
-	dodoc CHANGES README TODO radvd.conf.example || die
-	dohtml INTRO.html || die
+	dohtml INTRO.html
 
-	newinitd "${FILESDIR}/${PN}".init "${PN}" || die
-	newconfd "${FILESDIR}/${PN}".conf "${PN}" || die
+	newinitd "${FILESDIR}/${PN}".init "${PN}"
+	newconfd "${FILESDIR}/${PN}".conf "${PN}"
 
 	# location of radvd.pid needs to be writeable by the radvd user
 	keepdir /var/run/radvd
-	chown -R radvd:radvd "${D}"/var/run/radvd || die
+	fowners -R radvd:radvd /var/run/radvd
 	fperms 755 /var/run/radvd
 
 	if use kernel_FreeBSD ; then