--- gld-1.7.ebuild.orig	2010-03-07 14:45:21.000000000 +0100
+++ gld-1.7.ebuild	2010-03-07 14:57:51.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.7.ebuild,v 1.10 2009/09/23 17:53:11 patrick Exp $
 
@@ -11,6 +11,7 @@
 KEYWORDS="amd64 ppc x86"
 IUSE="postgres"
 # Not adding a mysql USE flag. The package defaults to it, so we will too.
+
 DEPEND="sys-libs/zlib
 	>=dev-libs/openssl-0.9.6
 	postgres? ( virtual/postgresql-server )
@@ -19,37 +20,31 @@
 src_compile() {
 	# It's kind of weird. $(use_with postgres pgsql) won't work if you don't
 	# use it...
-	if use postgres ; then
+	if use postgres; then
 		myconf="${myconf} --with-pgsql"
 	fi
 
-	econf ${myconf} \
-	|| die "econf failed"
-	emake || die "emake failed"
+	econf ${myconf} || die
+	emake || die
 }
 
 src_install() {
-	dobin gld
+	dobin gld || die
 
 	insinto /etc
 	newins gld.conf gld.conf.example
-	dosed 's:^LOOPBACKONLY=.*:LOOPBACKONLY=1:' /etc/gld.conf.sample
-	dosed 's:^#USER=.*:USER=nobody:' /etc/gld.conf.sample
-	dosed 's:^#GROUP=.*:GROUP=nobody:' /etc/gld.conf.sample
 
-	dodoc HISTORY README*
+	dodoc HISTORY README* || die
 
 	insinto /usr/share/${PN}/sql
-	doins *.pgsql *-whitelist.sql "${FILESDIR}"/tables.sql
+	doins *.pgsql *-whitelist.sql "${FILESDIR}"/tables.sql || die
 
-	newinitd "${FILESDIR}"/gld.rc gld
+	newinitd "${FILESDIR}"/gld.rc gld || die
 }
 
 pkg_postinst() {
-	elog
 	elog "Please read the README file in /usr/share/doc/${PF} for"
 	elog "details on how to setup gld."
 	elog
 	elog "The sql files have been installed to /usr/share/${PN}/sql."
-	elog
 }