--- /usr/portage/net-mail/courier-imap/courier-imap-3.0.7.ebuild	2004-08-31 05:15:21.000000000 +0200
+++ courier-imap-3.0.7.ebuild	2004-09-22 09:07:27.000000000 +0200
@@ -11,7 +11,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc ~mips ~alpha hppa amd64 ppc64"
-IUSE="fam berkdb gdbm debug ipv6 ldap mysql nls pam postgres selinux"
+IUSE="fam berkdb gdbm debug ipv6 ldap mysql nls pam postgres selinux courierpasswd"
 #userpriv breaks linking against vpopmail
 RESTRICT="nouserpriv"
 
@@ -136,6 +136,7 @@
 	fi
 
 	use debug && myconf="${myconf} debug=true"
+	use courierpasswd && myconf="${myconf} --with-authchangepwdir=/usr/lib/courier-imap/authlib"
 
 	local cachefile
 	cachefile=${WORKDIR}/config.cache
@@ -282,6 +283,7 @@
 	use postgres && authmods="${authmods} authpgsql"
 	use pam && authmods="${authmods} authpam"
 	use ldap && authmods="${authmods} authldap"
+	use courierpasswd && authmods="${authmods} authdaemon.passwd"
 	[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
 	exeinto /usr/lib/courier-imap/authlib
 	for i in ${authmods}; do
@@ -291,6 +293,21 @@
 	dodir /usr/bin
 	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
 
+	if use courierpasswd; then
+		insinto /usr/lib/courier-imap/header
+
+		moreheader="authlib/auth.h authlib/authmod.h authlib/authsasl.h authlib/authstaticlist.h authlib/libauth1.dep"
+		for i in ${moreheader}; do
+			[ -f ${S}/${i} ] && doins ${S}/${i}
+		done;
+
+		insinto /usr/lib/courier-imap/libs
+		morelibs="authlib/libauth.a authlib/libauthmod.a gdbmobj/libgdbmobj.a libhmac/libhmac.a md5/libmd5.a"
+		morelibs="${morelibs} numlib/libnumlib.a sha1/libsha1.a soxwrap/libsoxwrap.a userdb/libuserdb.a"
+		for i in ${morelibs}; do
+			[ -f ${S}/${i} ] && doins ${S}/${i}
+		done;
+	fi
 
 	keepdir /var/lib/courier-imap/authdaemon