--- /usr/portage/net-mail/dovecot/dovecot-1.2.9.ebuild	2010-01-04 20:57:54.000000000 +0200
+++ dovecot-1.2.9.ebuild	2010-01-29 20:34:21.000000000 +0200
@@ -76,9 +76,9 @@
 	[ "${storages}" ] || storages="maildir"
 
 	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
+		--sysconfdir=${EPREFIX}/etc/dovecot \
+		--localstatedir=${EPREFIX}/var \
+		--with-moduledir="${EPREFIX}/usr/$( get_libdir )/dovecot" \
 		$( use_with berkdb db ) \
 		$( use_with bzip2 bzlib ) \
 		$( use_with caps libcap ) \
@@ -137,11 +137,11 @@
 		fperms 4750 /usr/libexec/dovecot/deliver
 	fi
 
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+	rm -f "${ED}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
 
 	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
 
-	rm -rf "${D}"/usr/share/doc/dovecot
+	rm -rf "${ED}"/usr/share/doc/dovecot
 
 	if use ssl; then
 		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
@@ -158,8 +158,8 @@
 
 	# Create the dovecot.conf file from the dovecot-example.conf file that
 	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	mv "${ED}"/etc/dovecot/dovecot-example.conf "${ED}"/etc/dovecot/dovecot.conf
 
 	# .maildir is the Gentoo default, but we need to support mbox to
 	local mail_location="maildir:~/.maildir"
@@ -195,7 +195,7 @@
 
 	# Install SQL configuration
 	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
+		cp doc/dovecot-sql-example.conf "${ED}"/etc/dovecot/dovecot-sql.conf
 		fperms 600 /etc/dovecot/dovecot-sql.conf
 		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
 			|| die "failed to update SQL settings in dovecot-sql.conf"
@@ -204,7 +204,7 @@
 
 	# Install LDAP configuration
 	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
+		cp doc/dovecot-ldap-example.conf "${ED}"/etc/dovecot/dovecot-ldap.conf
 		fperms 600 /etc/dovecot/dovecot-ldap.conf
 		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
 			|| die "failed to update LDAP settings in dovecot-ldap.conf"
@@ -213,11 +213,11 @@
 
 	if use sieve; then
 		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
+		emake DESTDIR="${ED}" install || die "make install failed (sieve)"
 
 		if use managesieve; then
 			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
+			emake DESTDIR="${ED}" install || die "make install failed (managesieve)"
 		fi
 	fi