diff -ru /usr/portage/mail-client/mutt/mutt-1.5.6-r4.ebuild /usr/portage-maildir/mail-client/mutt/mutt-1.5.6-r4.ebuild
--- /usr/portage/mail-client/mutt/mutt-1.5.6-r4.ebuild	2004-10-23 17:07:34.000000000 +0900
+++ /usr/portage-maildir/mail-client/mutt/mutt-1.5.6-r4.ebuild	2004-11-03 15:41:50.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r4.ebuild,v 1.2 2004/10/23 07:53:23 mr_bones_ Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic maildir
 IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
 
 edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2"
@@ -37,7 +37,7 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~mips ~ppc64 ~ppc-macos"
+KEYWORDS="x86 ~ppc sparc alpha hppa ia64 amd64 ~mips ~ppc64 ~macos ~ppc-macos"
 
 
 pkg_setup() {
@@ -141,7 +141,8 @@
 		newins ${FILESDIR}/Muttrc.mbox Muttrc
 	else
 		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
+		sed -e "s|\.maildir|${MAILDIR}|g" < ${FILESDIR}/Muttrc > ${WORKDIR}/Muttrc || die
+		doins ${WORKDIR}/Muttrc
 	fi
 
 	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
diff -ru /usr/portage/mail-client/nail/nail-11.1.ebuild /usr/portage-maildir/mail-client/nail/nail-11.1.ebuild
--- /usr/portage/mail-client/nail/nail-11.1.ebuild	2004-10-18 03:45:13.000000000 +0900
+++ /usr/portage-maildir/mail-client/nail/nail-11.1.ebuild	2004-11-03 14:12:08.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-11.1.ebuild,v 1.1 2004/10/17 18:45:13 ticho Exp $
 
-inherit eutils
+inherit eutils maildir
 DESCRIPTION="Nail is a mail user agent derived from Berkeley Mail 8.1 and contains builtin support for MIME messages."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://nail.sourceforge.net/"
@@ -17,7 +17,7 @@
 
 src_compile() {
 	# ./configure no longer required
-	emake PREFIX=/usr MAILSPOOL='~/.maildir' || die "emake failed"
+	emake PREFIX=/usr MAILSPOOL="~/${MAILDIR}" || die "emake failed"
 }
 
 src_install () {
@@ -42,7 +42,7 @@
 	einfo "      It is best to use nail only for outgoing mail, and"
 	einfo "      really only use it for scripts that require it."
 	echo
-	einfo "NOTE: This build has ~/.maildir compiled in as the"
+	einfo "NOTE: This build has ~/${MAILDIR} compiled in as the"
 	einfo "      mail spool directory (for incoming mail)."
 	einfo "      Nail will work for sending outgoing mail even if"
 	einfo "      the mail spool directory does not exist."
diff -ru /usr/portage/mail-filter/maildrop/maildrop-1.5.3-r1.ebuild /usr/portage-maildir/mail-filter/maildrop/maildrop-1.5.3-r1.ebuild
--- /usr/portage/mail-filter/maildrop/maildrop-1.5.3-r1.ebuild	2004-09-20 16:44:42.000000000 +0900
+++ /usr/portage-maildir/mail-filter/maildrop/maildrop-1.5.3-r1.ebuild	2004-11-03 15:42:45.000000000 +0900
@@ -4,7 +4,7 @@
 
 IUSE="mysql ldap gdbm"
 
-inherit flag-o-matic
+inherit flag-o-matic maildir
 filter-flags -funroll-loops
 filter-flags -fomit-frame-pointer
 
@@ -49,7 +49,7 @@
 		--enable-use-dotlock=1 \
 		--enable-restrict-trusted=1 \
 		--enable-trusted-users='root mail daemon postmaster qmaild mmdf vmail' \
-		--with-default-maildrop=./.maildir/ \
+		--with-default-maildrop=./${MAILDIR}/ \
 		--enable-sendmail=/usr/sbin/sendmail \
 		${myconf} || die
 
@@ -76,7 +76,8 @@
 	rm -rf ${D}/usr/share/maildrop/scripts
 
 	insinto /etc
-	doins ${FILESDIR}/maildroprc
+	sed -e "s|\.maildir|${MAILDIR}|g" < ${FILESDIR}/maildroprc > ${WORKDIR}/maildroprc || die
+	doins ${WORKDIR}/maildroprc
 
 	insinto /etc/maildrop
 	if use mysql
diff -ru /usr/portage/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild /usr/portage-maildir/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild
--- /usr/portage/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild	2004-09-20 16:44:42.000000000 +0900
+++ /usr/portage-maildir/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild	2004-11-03 15:41:09.000000000 +0900
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild,v 1.2 2004/09/20 07:40:04 ticho Exp $
 
 
-inherit eutils
+inherit eutils maildir
 IUSE="mysql ldap gdbm berkdb"
 
 DESCRIPTION="Mail delivery agent/filter"
@@ -80,7 +80,7 @@
 		--enable-use-dotlock=1 \
 		--enable-restrict-trusted=1 \
 		--enable-trusted-users='apache dspam root mail daemon postmaster qmaild mmdf vmail' \
-		--with-default-maildrop=./.maildir/ \
+		--with-default-maildrop="./${MAILDIR}/" \
 		--enable-sendmail=/usr/sbin/sendmail \
 		${myconf} || die
 
@@ -107,7 +107,8 @@
 	rm -rf ${D}/usr/share/maildrop/scripts
 
 	insinto /etc
-	doins ${FILESDIR}/maildroprc
+	sed -e "s|\.maildir|${MAILDIR}|g" < ${FILESDIR}/maildroprc > ${WORKDIR}/maildroprc || die
+	doins ${WORKDIR}/maildroprc
 
 	insinto /etc/maildrop
 	if use mysql
diff -ru /usr/portage/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild /usr/portage-maildir/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild
--- /usr/portage/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild	2004-09-23 02:14:50.000000000 +0900
+++ /usr/portage-maildir/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild	2004-11-03 15:42:53.000000000 +0900
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild,v 1.2 2004/09/22 16:55:46 ticho Exp $
 
 
-inherit eutils
+inherit eutils maildir
 IUSE="mysql ldap gdbm berkdb"
 
 DESCRIPTION="Mail delivery agent/filter"
@@ -76,7 +76,7 @@
 		--enable-use-dotlock=1 \
 		--enable-restrict-trusted=1 \
 		--enable-trusted-users='apache dspam root mail daemon postmaster qmaild mmdf vmail' \
-		--with-default-maildrop=./.maildir/ \
+		--with-default-maildrop="./${MAILDIR}/" \
 		--enable-sendmail=/usr/sbin/sendmail \
 		${myconf} || die
 
@@ -103,7 +103,8 @@
 	rm -rf ${D}/usr/share/maildrop/scripts
 
 	insinto /etc
-	doins ${FILESDIR}/maildroprc
+	sed -e "s|\.maildir|${MAILDIR}|g" < ${FILESDIR}/maildroprc > ${WORKDIR}/maildroprc || die
+	doins ${WORKDIR}/maildroprc
 
 	insinto /etc/maildrop
 	if use mysql
diff -ru /usr/portage/mail-filter/procmail/procmail-3.22-r6.ebuild /usr/portage-maildir/mail-filter/procmail/procmail-3.22-r6.ebuild
--- /usr/portage/mail-filter/procmail/procmail-3.22-r6.ebuild	2004-09-22 17:36:51.000000000 +0900
+++ /usr/portage-maildir/mail-filter/procmail/procmail-3.22-r6.ebuild	2004-11-03 15:44:15.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r6.ebuild,v 1.9 2004/09/22 08:27:22 ticho Exp $
 
-inherit eutils
+inherit eutils maildir
 
 DESCRIPTION="Mail delivery agent/filter"
 SRC_URI="http://www.procmail.org/${P}.tar.gz"
@@ -30,9 +30,10 @@
 	if ! use mbox;
 	then
 		echo "# Use maildir-style mailbox in user's home directory" > ${S}/procmailrc
-		echo 'DEFAULT=$HOME/.maildir/' >> ${S}/procmailrc
+		echo 'DEFAULT=$HOME/${MAILDIR}/' >> ${S}/procmailrc
 		cd ${S}
-		epatch ${FILESDIR}/gentoo-maildir2.diff
+		sed -e "s|\.maildir|${MAILDIR}|g" < ${FILESDIR}/gentoo-maildir2.diff > ${WORKDIR}/gentoo-maildir2.diff || die
+		epatch ${WORKDIR}/gentoo-maildir2.diff
 	else
 		echo '# Use mbox-style mailbox in /var/spool/mail' > ${S}/procmailrc
 		echo 'DEFAULT=/var/spool/mail/$LOGNAME' >> ${S}/procmailrc
diff -ru /usr/portage/mail-mta/courier/courier-0.47.ebuild /usr/portage-maildir/mail-mta/courier/courier-0.47.ebuild
--- /usr/portage/mail-mta/courier/courier-0.47.ebuild	2004-11-03 13:38:29.000000000 +0900
+++ /usr/portage-maildir/mail-mta/courier/courier-0.47.ebuild	2004-11-03 15:38:43.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.ebuild,v 1.3 2004/11/03 04:31:49 psi29a Exp $
 
-inherit eutils
+inherit eutils maildir
 
 DESCRIPTION="An MTA designed specifically for maildirs"
 #SRC_URI="http://www.courier-mta.org/beta/courier/${P}.tar.bz2" # now handled by the next line
@@ -144,7 +144,7 @@
 	local files=$*
 
 	origmaildir='Maildir'
-	newmaildir='.maildir'
+	newmaildir="${MAILDIR}"
 
 	local f
 	for f in ${files}
@@ -202,9 +202,9 @@
 	einfo "Setting up maildirs by default in the account skeleton ..."
 	diropts -m 755 -o root -g root
 	keepdir /etc/skel
-	${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
+	${D}/usr/bin/maildirmake ${D}/etc/skel/${MAILDIR}
 	keepdir /var/spool/mail
-	${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
+	${D}/usr/bin/maildirmake ${D}/var/spool/mail/${MAILDIR}
 	insinto /etc/courier
 	newins ${FILESDIR}/bofh bofh
 	newins ${FILESDIR}/locallowercase locallowercase
@@ -230,7 +230,7 @@
 	# fixes bug #25028 courier doesn't symlink sendmail to /usr/sbin
 	dosym /usr/bin/sendmail /usr/sbin/sendmail
 
-	echo "MAILDIR=\$HOME/.maildir" >> ${D}/etc/courier/courierd
+	echo "MAILDIR=\$HOME/${MAILDIR}" >> ${D}/etc/courier/courierd
 
 	# we change the names of the binaries, but webadmin is still looking
 	# for the old names
diff -ru /usr/portage/mail-mta/exim/exim-4.43.ebuild /usr/portage-maildir/mail-mta/exim/exim-4.43.ebuild
--- /usr/portage/mail-mta/exim/exim-4.43.ebuild	2004-10-19 19:12:14.000000000 +0900
+++ /usr/portage-maildir/mail-mta/exim/exim-4.43.ebuild	2004-11-03 15:45:13.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.43.ebuild,v 1.2 2004/10/19 10:10:59 absinthe Exp $
 
-inherit eutils
+inherit eutils maildir
 
 IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl wildlsearch dnsdb perl mbox X exiscan"
 
@@ -45,7 +45,8 @@
 
 	if ! use mbox; then
 		einfo "Patching maildir support into exim.conf"
-		epatch ${FILESDIR}/exim-4.20-maildir.patch
+		sed -e "s|\.maildir|${MAILDIR}|g" ${FILESDIR}/exim-4.20-maildir.patch > ${WORKDIR}/exim-4.20-maildir.patch || die
+		epatch ${WORKDIR}/exim-4.20-maildir.patch
 	fi
 
 	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" ${S}/src/configure.default
diff -ru /usr/portage/mail-mta/postfix/postfix-2.1.5-r1.ebuild /usr/portage-maildir/mail-mta/postfix/postfix-2.1.5-r1.ebuild
--- /usr/portage/mail-mta/postfix/postfix-2.1.5-r1.ebuild	2004-11-02 02:08:02.000000000 +0900
+++ /usr/portage-maildir/mail-mta/postfix/postfix-2.1.5-r1.ebuild	2004-11-03 14:22:09.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.1.5-r1.ebuild,v 1.9 2004/11/01 17:05:03 langthang Exp $
 
-inherit eutils ssl-cert toolchain-funcs
+inherit eutils ssl-cert toolchain-funcs maildir
 
 VDA_P="${PN}-2.1.5-trash"
 TLS_P="pfixtls-0.8.18-2.1.3-0.9.7d"
@@ -192,7 +192,7 @@
 	then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	else
-		mypostconf="home_mailbox=.maildir/"
+		mypostconf="home_mailbox=${MAILDIR}/"
 	fi
 	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
 		"alias_maps=hash:/etc/mail/aliases" \
diff -ru /usr/portage/mail-mta/qmail/qmail-1.03-r13.ebuild /usr/portage-maildir/mail-mta/qmail/qmail-1.03-r13.ebuild
--- /usr/portage/mail-mta/qmail/qmail-1.03-r13.ebuild	2004-10-27 07:36:27.000000000 +0900
+++ /usr/portage-maildir/mail-mta/qmail/qmail-1.03-r13.ebuild	2004-11-03 14:52:20.000000000 +0900
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r13.ebuild,v 1.6 2004/10/26 22:23:11 slarti Exp $
 
-inherit toolchain-funcs eutils fixheadtails
+inherit toolchain-funcs eutils fixheadtails maildir
 
-IUSE="ssl"
+IUSE="ssl noauthcram"
 DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
 HOMEPAGE="http://www.qmail.org/
 	http://members.elysium.pl/brush/qmail-smtpd-auth/
@@ -66,6 +66,7 @@
 	# this patch merges a few others already
 	EPATCH_SINGLE_MSG="Adding SMTP AUTH (2 way), Qregex and STARTTLS support" \
 	epatch ${DISTDIR}/qregex-starttls-2way-auth.patch
+	use noauthcram && sed -i -e 's/^#define AUTHCRAM//' ${S}/qmail-smtpd.c
 
 	# Fixes a problem when utilizing "morercpthosts"
 	epatch ${FILESDIR}/${PV}-${PR}/smtp-auth-close3.patch
@@ -243,9 +244,9 @@
 
 	einfo "Setting up the default aliases ..."
 	diropts -m 700 -o alias -g qmail
-	${MAILDIRMAKE} ${D}/var/qmail/alias/.maildir
+	${MAILDIRMAKE} ${D}/var/qmail/alias/${MAILDIR}
 	# for good measure
-	keepdir /var/qmail/alias/.maildir/{cur,new,tmp}
+	keepdir /var/qmail/alias/${MAILDIR}/{cur,new,tmp}
 
 	for i in mailer-daemon postmaster root
 	do
@@ -259,10 +260,11 @@
 	diropts -m 755 -o root -g root
 	insinto /etc/skel
 	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail.sample
+	sed -e "s|\.maildir|${MAILDIR}|g" -i ${D}/etc/skel/.qmail.sample
 	fperms 644 /etc/skel/.qmail.sample
-	${MAILDIRMAKE} ${D}/etc/skel/.maildir
+	${MAILDIRMAKE} ${D}/etc/skel/${MAILDIR}
 	# for good measure
-	keepdir /etc/skel/.maildir/{cur,new,tmp}
+	keepdir /etc/skel/${MAILDIR}/{cur,new,tmp}
 
 	einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..."
 	insopts -o root -g root -m 755
@@ -278,6 +280,7 @@
 		fperms +t /var/qmail/supervise/qmail-${i}{,/log}
 		insinto /var/qmail/supervise/qmail-${i}
 		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i} run
+		sed -e "s|\.maildir|${MAILDIR}|g" -i ${D}/var/qmail/supervise/qmail-${i}/run
 		insinto /var/qmail/supervise/qmail-${i}/log
 		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i}log run
 		insinto /etc
@@ -308,7 +311,9 @@
 	insinto /var/qmail/control
 	insopts -o root -g root -m 644
 	doins ${FILESDIR}/${PV}-${PR}/conf-*
+	sed -e "s|\.maildir|${MAILDIR}|g" -i ${D}/var/qmail/control/conf-*
 	newins ${FILESDIR}/${PV}-${PR}/dot_qmail defaultdelivery
+	sed -e "s|\.maildir|${MAILDIR}|g" -i ${D}/var/qmail/control/defaultdelivery
 	use ssl && doins ${FILESDIR}/${PV}-${PR}/servercert.cnf
 
 	einfo "Configuration sanity checker"
@@ -328,16 +333,16 @@
 
 rootmailfixup() {
 	# so you can check mail as root easily
-	local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir"
-	if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then
-		einfo "Previously the qmail ebuilds created /root/.maildir/ but not"
+	local TMPCMD="ln -sf /var/qmail/alias/${MAILDIR}/ ${ROOT}/root/${MAILDIR}"
+	if [ -d "${ROOT}/root/${MAILDIR}" ] && [ ! -L "${ROOT}/root/${MAILDIR}" ] ; then
+		einfo "Previously the qmail ebuilds created /root/${MAILDIR}/ but not"
 		einfo "mail was every delivered there. If the directory does not"
 		einfo "contain any mail, please delete it and run:"
 		einfo "${TMPCMD}"
 	else
 		${TMPCMD}
 	fi
-	chown -R alias:qmail ${ROOT}/var/qmail/alias/.maildir 2>/dev/null
+	chown -R alias:qmail ${ROOT}/var/qmail/alias/${MAILDIR} 2>/dev/null
 }
 
 buildtcprules() {
diff -ru /usr/portage/mail-mta/qmail/qmail-1.03-r15.ebuild /usr/portage-maildir/mail-mta/qmail/qmail-1.03-r15.ebuild
--- /usr/portage/mail-mta/qmail/qmail-1.03-r15.ebuild	2004-10-27 07:36:27.000000000 +0900
+++ /usr/portage-maildir/mail-mta/qmail/qmail-1.03-r15.ebuild	2004-11-03 14:52:52.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.8 2004/10/26 22:23:11 slarti Exp $
 
-inherit toolchain-funcs eutils fixheadtails
+inherit toolchain-funcs eutils fixheadtails maildir
 
 IUSE="ssl noauthcram notlsbeforeauth"
 DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
@@ -305,9 +305,9 @@
 
 	einfo "Setting up the default aliases ..."
 	diropts -m 700 -o alias -g qmail
-	${MAILDIRMAKE} ${D}/var/qmail/alias/.maildir
+	${MAILDIRMAKE} ${D}/var/qmail/alias/${MAILDIR}
 	# for good measure
-	keepdir /var/qmail/alias/.maildir/{cur,new,tmp}
+	keepdir /var/qmail/alias/${MAILDIR}/{cur,new,tmp}
 
 	for i in mailer-daemon postmaster root
 	do
@@ -321,10 +321,11 @@
 	diropts -m 755 -o root -g root
 	insinto /etc/skel
 	newins ${FILESDIR}/dot_qmail .qmail.sample
+	sed -e "s|\.maildir|${MAILDIR}|g" -i ${D}/etc/skel/.qmail.sample
 	fperms 644 /etc/skel/.qmail.sample
-	${MAILDIRMAKE} ${D}/etc/skel/.maildir
+	${MAILDIRMAKE} ${D}/etc/skel/${MAILDIR}
 	# for good measure
-	keepdir /etc/skel/.maildir/{cur,new,tmp}
+	keepdir /etc/skel/${MAILDIR}/{cur,new,tmp}
 
 	einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..."
 	insopts -o root -g root -m 755
@@ -340,6 +341,7 @@
 		fperms +t /var/qmail/supervise/qmail-${i}{,/log}
 		insinto /var/qmail/supervise/qmail-${i}
 		newins ${FILESDIR}/run-qmail${i} run
+		sed -e "s|\.maildir|${MAILDIR}|g" -i ${D}/var/qmail/supervise/qmail-${i}/run
 		insinto /var/qmail/supervise/qmail-${i}/log
 		newins ${FILESDIR}/run-qmail${i}log run
 	done
@@ -359,7 +361,9 @@
 	insinto /var/qmail/control
 	insopts -o root -g root -m 644
 	doins ${FILESDIR}/conf-*
+	sed -e "s|\.maildir|${MAILDIR}|g" -i ${D}/var/qmail/control/conf-*
 	newins ${FILESDIR}/dot_qmail defaultdelivery
+	sed -e "s|\.maildir|${MAILDIR}|g" -i ${D}/var/qmail/control/defaultdelivery
 	use ssl && doins ${FILESDIR}/servercert.cnf
 
 	einfo "Configuration sanity checker and launcher"
@@ -383,16 +387,16 @@
 
 rootmailfixup() {
 	# so you can check mail as root easily
-	local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir"
-	if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then
-		einfo "Previously the qmail ebuilds created /root/.maildir/ but not"
+	local TMPCMD="ln -sf /var/qmail/alias/${MAILDIR}/ ${ROOT}/root/${MAILDIR}"
+	if [ -d "${ROOT}/root/${MAILDIR}" ] && [ ! -L "${ROOT}/root/${MAILDIR}" ] ; then
+		einfo "Previously the qmail ebuilds created /root/${MAILDIR}/ but not"
 		einfo "mail was every delivered there. If the directory does not"
 		einfo "contain any mail, please delete it and run:"
 		einfo "${TMPCMD}"
 	else
 		${TMPCMD}
 	fi
-	chown -R alias:qmail ${ROOT}/var/qmail/alias/.maildir 2>/dev/null
+	chown -R alias:qmail ${ROOT}/var/qmail/alias/${MAILDIR} 2>/dev/null
 }
 
 buildtcprules() {
diff -ru /usr/portage/net-mail/bincimap/bincimap-1.2.10.ebuild /usr/portage-maildir/net-mail/bincimap/bincimap-1.2.10.ebuild
--- /usr/portage/net-mail/bincimap/bincimap-1.2.10.ebuild	2004-09-21 05:12:32.000000000 +0900
+++ /usr/portage-maildir/net-mail/bincimap/bincimap-1.2.10.ebuild	2004-11-03 15:46:00.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.10.ebuild,v 1.1 2004/09/20 20:12:32 nakano Exp $
 
-inherit eutils
+inherit eutils maildir
 
 DESCRIPTION="IMAP server for Maildir"
 SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}final.tar.bz2"
@@ -26,7 +26,8 @@
 
 src_compile() {
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	sed -e "s|\.maildir|${MAILDIR}|g" < ${FILESDIR}/${P}-gentoo.diff > ${WORKDIR}/${P}-gentoo.diff || die
+	epatch ${WORKDIR}/${P}-gentoo.diff
 	econf `use_enable ssl ssl` --sysconfdir=/etc/bincimap || die
 	emake localstatedir=/etc/bincimap || die
 }
@@ -62,7 +63,7 @@
 		einfo ""
 	fi
 
-	einfo "NOTE: Default Maildir path is '~/.maildir'. If you want to modify it, "
+	einfo "NOTE: Default Maildir path is '~/${MAILDIR}'. If you want to modify it, "
 	einfo "edit /etc/bincimap/bincimap.conf"
 	einfo ""
 }
diff -ru /usr/portage/net-mail/checkpw/checkpw-1.01.ebuild /usr/portage-maildir/net-mail/checkpw/checkpw-1.01.ebuild
--- /usr/portage/net-mail/checkpw/checkpw-1.01.ebuild	2004-07-02 07:36:24.000000000 +0900
+++ /usr/portage-maildir/net-mail/checkpw/checkpw-1.01.ebuild	2004-05-26 18:16:29.000000000 +0900
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/checkpw/checkpw-1.01.ebuild,v 1.3 2004/07/01 22:29:22 eradicator Exp $
+# $Header: /home/cvsroot/gentoo-x86/net-mail/checkpw/checkpw-1.01.ebuild,v 1.1 2004/03/11 15:33:14 matsuu Exp $
 
-inherit gcc
+inherit gcc maildir
 
 DESCRIPTION="an implementation of the checkpassword interface that checks a password"
 HOMEPAGE="http://checkpw.sourceforge.net/checkpw/"
@@ -14,7 +14,7 @@
 
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64"
 
-DEPEND="virtual/libc"
+DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
@@ -25,7 +25,7 @@
 	use static && LDFLAGS="${LDFLAGS} -static"
 	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc || die
 	echo "$(gcc-getCC) ${LDFLAGS}" > conf-ld || die
-	echo ".maildir" > conf-maildir || die
+	echo "${MAILDIR}" > conf-maildir || die
 
 	if [ -z "$QMAIL_HOME" ]; then
 		QMAIL_HOME="/var/qmail"
@@ -56,8 +56,8 @@
 	einfo
 	einfo "How to set password:"
 	einfo
-	einfo " % echo 'YOURPASSWORD' > ~/.maildir/.password"
-	einfo " % chmod 600 ~/.maildir/.password"
+	einfo " % echo 'YOURPASSWORD' > ~/${MAILDIR}/.password"
+	einfo " % chmod 600 ~/${MAILDIR}/.password"
 	einfo
 	einfo "Replace YOURPASSWORD with your plain password."
 	einfo
diff -ru /usr/portage/net-mail/courier-imap/courier-imap-3.0.7.ebuild /usr/portage-maildir/net-mail/courier-imap/courier-imap-3.0.7.ebuild
--- /usr/portage/net-mail/courier-imap/courier-imap-3.0.7.ebuild	2004-11-03 07:35:55.000000000 +0900
+++ /usr/portage-maildir/net-mail/courier-imap/courier-imap-3.0.7.ebuild	2004-11-03 11:49:36.000000000 +0900
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.7.ebuild,v 1.15 2004/11/02 22:21:45 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.7.ebuild,v 1.14 2004/09/27 19:00:29 vapier Exp $
 
-inherit eutils gnuconfig
+inherit eutils gnuconfig maildir
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="http://www.courier-mta.org/"
@@ -231,8 +231,8 @@
 	for service in imapd pop3d
 	do
 		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
+		echo "MAILDIR=${MAILDIR}" >> ${service}
+		echo "MAILDIRPATH=${MAILDIR}" >> ${service}
 		echo -e '#Put any program for ${PRERUN} here' >> ${service}
 		echo 'PRERUN='>> ${service}
 	done
@@ -240,7 +240,7 @@
 	for service in imapd-ssl pop3d-ssl
 	do
 		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
+		echo "MAILDIRPATH=${MAILDIR}" >> ${service}
 	done
 
 	cd ${D}/usr/sbin
diff -ru /usr/portage/net-mail/courier-imap/courier-imap-3.0.8.ebuild /usr/portage-maildir/net-mail/courier-imap/courier-imap-3.0.8.ebuild
--- /usr/portage/net-mail/courier-imap/courier-imap-3.0.8.ebuild	2004-11-03 07:35:55.000000000 +0900
+++ /usr/portage-maildir/net-mail/courier-imap/courier-imap-3.0.8.ebuild	2004-11-03 11:51:33.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.8.ebuild,v 1.6 2004/11/02 22:21:45 langthang Exp $
 
-inherit eutils gnuconfig
+inherit eutils gnuconfig maildir
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="http://www.courier-mta.org/"
@@ -231,8 +231,8 @@
 	for service in imapd pop3d
 	do
 		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
+		echo "MAILDIR=${MAILDIR}" >> ${service}
+		echo "MAILDIRPATH=${MAILDIR}" >> ${service}
 		echo -e '#Put any program for ${PRERUN} here' >> ${service}
 		echo 'PRERUN='>> ${service}
 	done
@@ -240,7 +240,7 @@
 	for service in imapd-ssl pop3d-ssl
 	do
 		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIRPATH=.maildir' >> ${service}
+		echo "MAILDIRPATH=${MAILDIR}" >> ${service}
 	done
 
 	cd ${D}/usr/sbin
diff -ru /usr/portage/net-mail/dovecot/dovecot-0.99.11-r1.ebuild /usr/portage-maildir/net-mail/dovecot/dovecot-0.99.11-r1.ebuild
--- /usr/portage/net-mail/dovecot/dovecot-0.99.11-r1.ebuild	2004-11-02 02:58:09.000000000 +0900
+++ /usr/portage-maildir/net-mail/dovecot/dovecot-0.99.11-r1.ebuild	2004-11-03 15:04:59.000000000 +0900
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.11-r1.ebuild,v 1.1 2004/11/01 17:58:09 g2boojum Exp $
 
 IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d mysql"
-inherit eutils
+inherit eutils maildir
 
 DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
 HOMEPAGE="http://dovecot.org/"
@@ -93,9 +93,9 @@
 			"s|#default_mail_env =|#default_mail_env = mbox:/var/spool/mail/%u:INDEX=${DOVECOT_INDEX_PATH}|" \
 			dovecot-example.conf > dovecot.conf
 	else
-		# $HOME/.maildir mail spool.  
+		# $HOME/${MAILDIR} mail spool.  
 		sed -e \
-			's|#default_mail_env =|default_mail_env = maildir:%h/.maildir|' \
+			's|#default_mail_env =|default_mail_env = maildir:%h/'"${MAILDIR}|" \
 			dovecot-example.conf > dovecot.conf
 	fi
 	insinto /etc
diff -ru /usr/portage/net-mail/mailfront/mailfront-0.88.ebuild /usr/portage-maildir/net-mail/mailfront/mailfront-0.88.ebuild
--- /usr/portage/net-mail/mailfront/mailfront-0.88.ebuild	2004-10-17 20:38:35.000000000 +0900
+++ /usr/portage-maildir/net-mail/mailfront/mailfront-0.88.ebuild	2004-11-03 15:43:40.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/mailfront/mailfront-0.88.ebuild,v 1.6 2004/10/17 11:29:02 dholm Exp $
 
-inherit fixheadtails gcc
+inherit fixheadtails maildir
 
 DESCRIPTION="Mail server network protocol front-ends"
 HOMEPAGE="http://untroubled.org/mailfront/"
@@ -42,7 +42,8 @@
 	exeinto /var/qmail/supervise/qmail-smtpd
 	newexe ${FILESDIR}/run-smtpfront run.mailfront
 	exeinto /var/qmail/supervise/qmail-pop3d
-	newexe ${FILESDIR}/run-pop3front run.mailfront
+	sed -e "s|\.maildir|${MAILDIR}|g" < ${FILESDIR}/run-pop3front > ${WORKDIR}/run-pop3front || die
+	newexe ${WORKDIR}/run-pop3front run.mailfront
 
 	dodoc ANNOUNCEMENT FILES NEWS README TARGETS TODO VERSION
 
diff -ru /usr/portage/net-mail/popa3d/popa3d-0.6.4.1.ebuild /usr/portage-maildir/net-mail/popa3d/popa3d-0.6.4.1.ebuild
--- /usr/portage/net-mail/popa3d/popa3d-0.6.4.1.ebuild	2004-09-07 04:11:05.000000000 +0900
+++ /usr/portage-maildir/net-mail/popa3d/popa3d-0.6.4.1.ebuild	2004-11-03 15:18:10.000000000 +0900
@@ -11,7 +11,7 @@
 # Mailbox path configuration denoted by the system USE
 # flags.
 #
-# USE flag 'maildir' denotes ~/.maildir
+# USE flag 'maildir' denotes ~/${MAILDIR}
 # USE flag 'mbox' denotes /var/mail/username
 #
 # You can overwrite this by setting the POPA3D_HOME_MAILBOX
@@ -96,7 +96,7 @@
 		einfo "Mailbox format is: MAILDIR."
 		epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff
 		if [ "${POPA3D_HOME_MAILBOX}" = "" ] ; then
-			POPA3D_HOME_MAILBOX=".maildir"
+			POPA3D_HOME_MAILBOX="${MAILDIR}"
 		fi
 	else
 		einfo "Mailbox format is: MAILBOX."
diff -ru /usr/portage/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild /usr/portage-maildir/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild
--- /usr/portage/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild	2004-08-20 09:11:15.000000000 +0900
+++ /usr/portage-maildir/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild	2004-11-03 15:26:44.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild,v 1.5 2004/08/19 23:43:02 pvdabeel Exp $
 
-inherit gnuconfig
+inherit gnuconfig maildir
 
 DESCRIPTION="A web interface for managing a qmail system with virtual domains."
 MY_PV="${PV/_rc/-rc}"
@@ -18,6 +18,7 @@
 SLOT="0"
 
 DEPEND="mail-mta/qmail
+		>sys-apps/sed-4
 		>=net-mail/vpopmail-5.3
 		net-mail/autorespond"
 
@@ -33,8 +34,9 @@
 	unpack ${A}
 	cd ${S}
 	gnuconfig_update
-	for i in alias.c auth.c autorespond.c command.c contrib/alias2forward.pl qmailadmin.c template.c user.c; do
-		sed -e 's|/Maildir|/.maildir|g' -i ${i}
+	sed -e "s|/Maildir|/${MAILDIR}|g" \
+		-i	alias.c auth.c autorespond.c command.c contrib/alias2forward.pl \
+			qmailadmin.c template.c user.c
 	done
 }
 
diff -ru /usr/portage/net-mail/vpopmail/vpopmail-5.4.0.ebuild /usr/portage-maildir/net-mail/vpopmail/vpopmail-5.4.0.ebuild
--- /usr/portage/net-mail/vpopmail/vpopmail-5.4.0.ebuild	2004-08-04 19:05:56.000000000 +0900
+++ /usr/portage-maildir/net-mail/vpopmail/vpopmail-5.4.0.ebuild	2004-11-03 15:30:18.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.0.ebuild,v 1.9 2004/08/04 09:49:12 tomk Exp $
 
-inherit eutils gnuconfig fixheadtails
+inherit eutils gnuconfig fixheadtails maildir
 
 # TODO: all ldap, sybase support
 MY_PV=${PV/_/-}
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 ~sparc ~amd64"
 IUSE="mysql ipalias clearpasswd"
 
 DEPEND_COMMON="mail-mta/qmail
@@ -58,12 +58,14 @@
 
 	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
 
+	if ! ${MAILDIR_DEFAULT}; then
 	sed -i \
-		's|Maildir|.maildir|g' \
+		"s|Maildir|${MAILDIR}|g" \
 		vchkpw.c vconvert.c vdelivermail.c \
 		vpopbull.c vpopmail.c vqmaillocal.c \
 		vuserinfo.c maildirquota.c \
-		|| die "failed to change Maildir to .maildir"
+		|| die "failed to change Maildir to ${MAILDIR}"
+	fi
 	sed -i \
 		'/printf.*vpopmail/s:vpopmail (:(:' \
 		vdelivermail.c vpopbull.c vqmaillocal.c \
@@ -134,7 +136,9 @@
 	dosed ${VPOP_HOME}/etc/lib_deps
 
 	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
+	sed -e "s|\.maildir|${MAILDIR}|g" < ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh \
+		> ${WORKDIR}/vpopmail-Maildir-dotmaildir-fix.sh
+	dobin ${WORKDIR}/vpopmail-Maildir-dotmaildir-fix.sh
 	into /usr
 
 	# Install documentation.
diff -ru /usr/portage/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild /usr/portage-maildir/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild
--- /usr/portage/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild	2004-08-25 03:14:04.000000000 +0900
+++ /usr/portage-maildir/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild	2004-11-03 15:30:00.000000000 +0900
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild,v 1.5 2004/08/24 18:11:06 robbat2 Exp $
 
-inherit eutils gnuconfig fixheadtails
+inherit eutils gnuconfig fixheadtails maildir
 
 # TODO: all ldap, sybase support
 #MY_PV=${PV/_/-}
@@ -61,11 +61,11 @@
 	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch || die "failed to patch."
 	epatch ${FILESDIR}/${P}-access.violation.patch || die "failed to patch."
 	sed -i \
-		's|Maildir|.maildir|g' \
+		"s|Maildir|${MAILDIR}|g" \
 		vchkpw.c vconvert.c vdelivermail.c \
 		vpopbull.c vpopmail.c vqmaillocal.c \
 		vuserinfo.c maildirquota.c \
-		|| die "failed to change Maildir to .maildir"
+		|| die "failed to change Maildir to ${MAILDIR}"
 	sed -i \
 		'/printf.*vpopmail/s:vpopmail (:(:' \
 		vdelivermail.c vpopbull.c vqmaillocal.c \
@@ -136,7 +136,9 @@
 	dosed ${VPOP_HOME}/etc/lib_deps
 
 	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
+	sed -e "s|\.maildir|${MAILDIR}|g" < ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh \
+		> ${WORKDIR}/vpopmail-Maildir-dotmaildir-fix.sh
+	dobin ${WORKDIR}/vpopmail-Maildir-dotmaildir-fix.sh
 	into /usr
 
 	# Install documentation.