--- lighttpd-1.4.30.ebuild	2011-12-19 23:00:18.000000000 +0100
+++ lighttpd-1.4.30-r1.ebuild	2011-12-24 21:29:04.689688971 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.30.ebuild,v 1.1 2011/12/19 22:00:18 hwoarang Exp $
 
-EAPI="4"
+EAPI=4
 
 inherit base autotools eutils depend.php
 
@@ -126,12 +126,12 @@
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	if use doc ; then
 		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
+		cd doc || die
+		emake html
 	fi
 }
 
@@ -144,13 +144,13 @@
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 
 	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
 	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
+		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
 
 	# configs
 	insinto /etc/lighttpd
@@ -173,7 +173,7 @@
 	use doc && dohtml -r doc/*
 
 	docinto txt
-	dodoc doc/outdated/*.txt || die
+	dodoc doc/outdated/*.txt
 
 	# logrotate
 	insinto /etc/logrotate.d