add die, add missing file. remove old ebuilds

14 files changed, 70 insertions, 664 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 0ff670ce3ffa..b8a826fddd4c 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.101 2004/10/28 00:54:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.102 2004/10/31 06:13:48 langthang Exp $
+
+  30 Oct 2004; Tuan Van <langthang@gentoo.org> +files/saslauthd-2.1.20.conf,
+  -cyrus-sasl-1.5.27-r5.ebuild, -cyrus-sasl-1.5.27-r6.ebuild,
+  -cyrus-sasl-2.1.14.ebuild, -cyrus-sasl-2.1.17.ebuild,
+  -cyrus-sasl-2.1.18.ebuild, cyrus-sasl-2.1.20.ebuild:
+  add die, add missing file, remove old ebuilds.
 
   27 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   +files/cyrus-sasl-2.1.20-gcc4.patch, cyrus-sasl-2.1.20.ebuild:
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 34ea7674a765..91c97f33fd37 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,57 +1,48 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9bb8e865ec9daca3bb753aab38ecc638 ChangeLog 18347
-MD5 fca787b36b2303a6d2e8b93aa4dfe018 cyrus-sasl-1.5.27-r5.ebuild 2672
-MD5 0c36a223623cafbd54654c586cc4792e cyrus-sasl-1.5.27-r6.ebuild 2745
-MD5 7249a88df4e8bf01818b639cd5eddf5e cyrus-sasl-2.1.14.ebuild 3899
-MD5 7db01e4010eada66fa127b5d10731a0f cyrus-sasl-2.1.20.ebuild 7255
-MD5 118563c3516cf8075300c454145fe383 cyrus-sasl-2.1.17.ebuild 4234
-MD5 b61513de5e687711b55cba7fb5f33b7b cyrus-sasl-2.1.18.ebuild 4222
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 04ab88578310e66a55032b38819541a1 cyrus-sasl-2.1.18-r2.ebuild 5427
 MD5 8914d9b1401d4f9d61c1d206f08a9957 cyrus-sasl-2.1.19-r1.ebuild 7160
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
-MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
-MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
-MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
+MD5 46b1b8a889ab3b089e87b9190d5d02db ChangeLog 18646
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 1179cefef2e04fabe22a36a4ba2d230b cyrus-sasl-2.1.20.ebuild 7423
 MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
+MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.20-configdir.patch 8231
+MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
+MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70
+MD5 d6d8b3c7c3a2aacf656f970a043d3158 files/digest-cyrus-sasl-2.1.19-r1 70
+MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
+MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752
+MD5 f8ad054201be2531b337375299c4c39b files/cyrus-sasl-2.1.20-gcc4.patch 462
+MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
 MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
-MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
+MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
+MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
+MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
 MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
-MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
-MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
-MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
-MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
-MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
-MD5 6ba386a4eb5f9addf367d41093ba369e files/digest-cyrus-sasl-2.1.14 70
-MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934
-MD5 960ffd4d83e165ccaa68cf43937ff63d files/digest-cyrus-sasl-2.1.17 70
-MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18 70
-MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540
-MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890
+MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906
+MD5 41c1024f02bc0725406a23eeff93edd5 files/saslauthd-2.1.20.conf 906
+MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
 MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
 MD5 c38995773eff23cf7f05b23fe7fba6d3 files/saslauthd.rc6 525
-MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752
-MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
-MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
-MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
-MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
-MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
-MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70
 MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.19-configdir.patch 8231
+MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934
+MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
+MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540
 MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529
+MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
+MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890
+MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
+MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
+MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
+MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
 MD5 c355c365d74408c00cdaa25beea6d4f7 files/digest-cyrus-sasl-2.1.20 70
-MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906
-MD5 d6d8b3c7c3a2aacf656f970a043d3158 files/digest-cyrus-sasl-2.1.19-r1 70
-MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.20-configdir.patch 8231
-MD5 f8ad054201be2531b337375299c4c39b files/cyrus-sasl-2.1.20-gcc4.patch 462
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBgERwArHZZzCEUG0RAuGvAJ4g2LKGXukxl5w93Z7R6qZXk/G75QCeOBKM
-xn6gr6Kwd9wYARgaJhoXiyI=
-=HHPQ
+iD8DBQFBhIMa5FrxP71izLARAv7KAJ4uNNMqHTBO8X3spldaohMg+UUrhQCdEldP
+LOyl/v+hocuA9zqyaIu/yI8=
+=s8Wf
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r5.ebuild
deleted file mode 100644
index 64a2dd2167ce..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r5.ebuild,v 1.12 2004/07/14 14:15:42 agriffis Exp $
-
-IUSE="kerberos"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
-
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="x86 sparc ppc"
-
-RDEPEND="virtual/libc
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.6.1-r2"
-# need automake for fixed automake-1.5 support.
-
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# some nice patches...  thanks mandrake ;-)
-	patch -p1 < ${FILESDIR}/${PN}-1.5.21-des.patch || die
-	patch -p1 < ${FILESDIR}/${PN}-configdir.patch || die
-	patch -p1 < ${FILESDIR}/${PN}-saslauthd.patch || die
-	patch -p1 < ${FILESDIR}/${PN}-1.5.24-rpath.patch || die
-	patch -p0 < ${FILESDIR}/${PN}-1.5.27-scram.patch || die
-
-	# fix gcc3.2 brokenness
-	patch -p0 < ${FILESDIR}/${PN}-gcc32.patch || die
-
-	# this script distributed with the package is too
-	# old, so remove it, as "automake --add-missing"
-	# will install the new one if its not found.
-	rm -f ${S}/config/missing
-
-	libtoolize --copy --force
-	export WANT_AUTOMAKE_1_5=1
-	aclocal -I cmulocal || die
-	automake --add-missing || die
-	autoconf || die
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--with-configdir=/etc/sasl \
-		--with-pwcheck=/var/lib/sasl \
-		--with-plugindir=/usr/lib/sasl \
-		--with-saslauthd=/var/lib/sasl \
-		--with-dbpath=/var/lib/sasl/sasl.db \
-		--with-des \
-		--with-rc4 \
-		--enable-pam \
-		--enable-anon \
-		--enable-cram \
-		--with-gnu-ld \
-		--enable-scram \
-		--enable-plain \
-		--enable-login \
-		--disable-krb4 \
-		--enable-static \
-		--enable-shared \
-		--without-mysql \
-		--enable-digest \
-		--enable-gssapi \
-		--disable-sample \
-		--with-dblib=berkeley \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING AUTHORS INSTALL NEWS README* TODO \
-		ChangeLog testing.txt doc/*.txt
-	docinto examples ; dodoc sample/{*.[ch],Makefile}
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.conf saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd.rc6 saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
-}
-
-pkg_postinst() {
-	# empty directories..
-	install -d -m0755 ${ROOT}/var/lib/sasl
-	install -d -m0755 ${ROOT}/etc/sasl
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild
deleted file mode 100644
index 15faba38570f..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild,v 1.11 2004/07/14 14:15:42 agriffis Exp $
-
-inherit eutils
-
-IUSE="kerberos"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
-
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="x86 ppc ~sparc"
-
-RDEPEND="virtual/libc
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.6.1-r2"
-# need automake for fixed automake-1.5 support.
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# some nice patches...  thanks mandrake ;-)
-	epatch ${FILESDIR}/${PN}-1.5.21-des.patch
-	epatch ${FILESDIR}/${PN}-configdir.patch
-	epatch ${FILESDIR}/${PN}-saslauthd.patch
-	epatch ${FILESDIR}/${PN}-1.5.24-rpath.patch
-	epatch ${FILESDIR}/${PN}-1.5.27-scram.patch
-
-	# fix gcc3.2 brokenness
-	epatch ${FILESDIR}/${PN}-gcc32.patch
-
-	# fix dependencies for heimdal.  We have a /usr/lib/libgssapi.la, so
-	# we may as well use it.
-	epatch ${FILESDIR}/${PN}-heimdal-deps.patch
-
-	# this script distributed with the package is too
-	# old, so remove it, as "automake --add-missing"
-	# will install the new one if its not found.
-	rm -f ${S}/config/missing
-
-	libtoolize --copy --force
-	export WANT_AUTOMAKE_1_5=1
-	aclocal -I cmulocal || die
-	automake --add-missing || die
-	autoconf || die
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--with-configdir=/etc/sasl \
-		--with-pwcheck=/var/lib/sasl \
-		--with-plugindir=/usr/lib/sasl \
-		--with-saslauthd=/var/lib/sasl \
-		--with-dbpath=/var/lib/sasl/sasl.db \
-		--with-des \
-		--with-rc4 \
-		--enable-pam \
-		--enable-anon \
-		--enable-cram \
-		--with-gnu-ld \
-		--enable-scram \
-		--enable-plain \
-		--enable-login \
-		--disable-krb4 \
-		--enable-static \
-		--enable-shared \
-		--without-mysql \
-		--enable-digest \
-		--enable-gssapi \
-		--disable-sample \
-		--with-dblib=berkeley \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING AUTHORS INSTALL NEWS README* TODO \
-		ChangeLog testing.txt doc/*.txt
-	docinto examples ; dodoc sample/{*.[ch],Makefile}
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.conf saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd.rc6 saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
-}
-
-pkg_postinst() {
-	# empty directories..
-	install -d -m0755 ${ROOT}/var/lib/sasl
-	install -d -m0755 ${ROOT}/etc/sasl
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild
deleted file mode 100644
index 3aad7ef2764c..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.14.ebuild,v 1.17 2004/07/14 14:15:42 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/sasl/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="x86 ppc sparc ~hppa amd64 "
-IUSE="gdbm berkdb ldap mysql kerberos static ssl java pam" # otp krb4
-
-RDEPEND=">=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/openssl-0.9.6d
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3.2.9 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
-	java? ( virtual/jdk )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/autoconf
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-
-	# Fix for compiling with kerberos enabled
-	# http://asg.web.cmu.edu/archive/message.php?mailbox=archive.cyrus-sasl&msg=3912
-	epatch ${FILESDIR}/2.1.14-kerberos.patch
-
-	# Fix for compatibility with MySQL 4.x
-	# http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/plugins/mysql.c.diff?r1=1.10&r2=1.11
-	epatch ${FILESDIR}/2.1.14-mysql.patch
-
-	# Updated the cyrus-sasl-2.1.14-db4.patch
-	epatch ${FILESDIR}/2.1.14-db4.patch
-}
-
-src_compile() {
-	libtoolize --copy --force
-	aclocal -I config -I cmulocal || die
-	autoheader || die
-	automake -a --foreign || die
-	autoconf || die
-	autoconf saslauthd/configure.in > saslauthd/configure || die
-	chmod +x saslauthd/configure || die
-
-	local myconf
-	myconf="--with-gnu-ld --enable-login --enable-ntlm"
-
-	use static && myconf="${myconf} --enable-static"
-
-	use ssl && myconf="${myconf} --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	use ldap && myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-
-	use mysql && myconf="${myconf} --with-mysql" \
-		|| myconf="${myconf} --without-mysql"
-
-	if use berkdb; then
-		myconf="${myconf} --with-dblib=berkeley"
-	elif use gdbm; then
-		myconf="${myconf} --with-dblib=gdbm --with-gdbm=/usr"
-	else
-		myconf="${myconf} --with-dblib=berkeley"
-	fi
-
-	use kerberos && myconf="${myconf} --enable-gssapi" \
-		|| myconf="${myconf} --disable-gssapi"
-
-	# Kerberos 4 support doesn't compile.. and i'm not sure why
-	# If you want to test/fix for me, emerge kth-krb
-	# and have at it. :) -raker 02/07/2003
-	#
-	#if use krb4; then
-	#	myconf="${myconf} --enable-krb4=/usr/athena"
-	#else
-		myconf="${myconf} --disable-krb4"
-	#fi
-
-	use java && myconf="${myconf} --enable-java --with-javabase=${JAVA_HOME}"
-
-	use pam || myconf="${myconf} --without-pam"
-
-	# opie is not in portage yet so no otp support
-	myconf="${myconf} --disable-otp"
-	# use otp && myconf="${myconf} --with-opie=/usr"
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-
-	einstall || die "install problem"
-
-	dodoc AUTHORS ChangeLog COPYING NEWS README doc/*.txt
-	docinto examples ; dodoc sample/{*.[ch],Makefile}
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*
-
-	dodir /var/lib/sasl2
-	dodir /etc/sasl2
-	# generate an empty sasldb2 with correct permissions
-	LD_OLD=${LD_LIBRARY_PATH}
-	export LD_LIBRARY_PATH=${S}/lib/.libs
-	echo "gentoo" | ${D}usr/sbin/saslpasswd2 -f ${D}etc/sasl2/sasldb2 -p cyrus
-	${D}usr/sbin/saslpasswd2 -f ${D}etc/sasl2/sasldb2 -d cyrus
-	export LD_LIBRARY_PATH=${LD_OLD}
-	chown root:mail ${D}etc/sasl2/sasldb2
-	chmod 0640 ${D}etc/sasl2/sasldb2
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.conf saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
deleted file mode 100644
index 57834e782a5b..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild,v 1.23 2004/07/14 14:15:42 agriffis Exp $
-
-inherit eutils flag-o-matic gnuconfig
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/sasl/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 alpha ia64 hppa mips"
-IUSE="gdbm ldap mysql postgres kerberos static ssl java pam"
-
-RDEPEND="virtual/libc
-	>=sys-libs/db-3.2
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	pam? ( >=sys-libs/pam-0.75 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kerberos? ( virtual/krb5 )
-	java? ( virtual/jdk )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	sys-devel/libtool
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# Fix broken include.
-	sed -e 's:sasl/sasl.h:sasl.h:' \
-		-i saslauthd/lak.c || die "sed failed"
-
-	# Fix default port name for rimap auth mechanism.
-	sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
-		-i saslauthd/auth_rimap.c || die "sed failed"
-
-	# DB4 detection and versioned symbols.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-db4.patch"
-
-	# Add configdir support.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-configdir.patch"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -f configure config.h.in saslauthd/configure
-	ebegin "Recreating configure"
-	aclocal -I cmulocal -I config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	cd "${S}/saslauthd"
-	ebegin "Recreating saslauthd/configure"
-	aclocal -I ../cmulocal -I ../config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-}
-
-src_compile() {
-	local myconf="--enable-login --enable-ntlm --disable-krb4 --disable-otp"
-	myconf="${myconf} `use_enable static`"
-	myconf="${myconf} `use_with ssl openssl`"
-	myconf="${myconf} `use_with pam`"
-	myconf="${myconf} `use_with ldap`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-	myconf="${myconf} `use_with mysql` `use_enable mysql sql`"
-	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres sql`"
-	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-	if use gdbm ; then
-		myconf="${myconf} --with-dblib=gdbm"
-	else
-		myconf="${myconf} --with-dblib=berkeley"
-	fi
-
-	# Compaq-sdk checks for -D_REENTRANT and -pthread takes care the cpp stuff.
-	# taviso #24998 (17 Aug 03)
-	use alpha && append-flags -D_REENTRANT -pthread
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		${myconf} || die "econf failed"
-
-	# Parallel build doesn't work.
-	emake -j1 || die "compile problem"
-}
-
-src_install () {
-	einstall
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Generate an empty sasldb2 with correct permissions.
-	LD_OLD="${LD_LIBRARY_PATH}"
-	export LD_LIBRARY_PATH="${D}/usr/lib" SASL_PATH="${D}/usr/lib/sasl2"
-	echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login
-	"${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login
-	export LD_LIBRARY_PATH="${LD_OLD}"
-	chown root:mail "${D}/etc/sasl2/sasldb2"
-	chmod 0640 "${D}/etc/sasl2/sasldb2"
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto examples
-	dodoc sample/{*.[ch],Makefile}
-
-	docinto saslauthd
-	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/saslauthd.pam" saslauthd
-	fi
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/pwcheck.rc6" pwcheck
-	newexe "${FILESDIR}/saslauthd2.rc6" saslauthd
-	insinto /etc/conf.d
-	newins "${FILESDIR}/saslauthd2.conf" saslauthd
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild
deleted file mode 100644
index 979a5c30155c..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild,v 1.17 2004/07/14 14:15:42 agriffis Exp $
-
-inherit eutils flag-o-matic gnuconfig
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/sasl/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="~x86 ~ppc sparc ~mips ~alpha arm hppa amd64 ~ia64 s390 ppc64"
-IUSE="gdbm ldap mysql postgres kerberos static ssl java pam"
-
-RDEPEND="virtual/libc
-	>=sys-libs/db-3.2
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	pam? ( >=sys-libs/pam-0.75 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kerberos? ( virtual/krb5 )
-	java? ( virtual/jdk )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# Fix broken include.
-	sed -e 's:sasl/sasl.h:sasl.h:' \
-		-i saslauthd/lak.c || die "sed failed"
-
-	# Fix default port name for rimap auth mechanism.
-	sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
-		-i saslauthd/auth_rimap.c || die "sed failed"
-
-	# DB4 detection and versioned symbols.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.18-db4.patch"
-
-	# Add configdir support.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-configdir.patch"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -f configure config.h.in saslauthd/configure
-	ebegin "Recreating configure"
-	aclocal -I cmulocal -I config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	cd "${S}/saslauthd"
-	ebegin "Recreating saslauthd/configure"
-	aclocal -I ../cmulocal -I ../config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-}
-
-src_compile() {
-	local myconf="--enable-login --enable-ntlm --disable-krb4 --disable-otp"
-	myconf="${myconf} `use_enable static`"
-	myconf="${myconf} `use_with ssl openssl`"
-	myconf="${myconf} `use_with pam`"
-	myconf="${myconf} `use_with ldap`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-	myconf="${myconf} `use_with mysql` `use_enable mysql sql`"
-	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres sql`"
-	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-	if use gdbm ; then
-		myconf="${myconf} --with-dblib=gdbm"
-	else
-		myconf="${myconf} --with-dblib=berkeley"
-	fi
-
-	# Compaq-sdk checks for -D_REENTRANT and -pthread takes care the cpp stuff.
-	use alpha && append-flags -D_REENTRANT -pthread
-
-	# Detect mips systems properly.
-	gnuconfig_update
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		${myconf} || die "econf failed"
-
-	# Parallel build doesn't work.
-	emake -j1 || die "compile problem"
-}
-
-src_install () {
-	einstall
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Generate an empty sasldb2 with correct permissions.
-	LD_OLD="${LD_LIBRARY_PATH}"
-	export LD_LIBRARY_PATH="${D}/usr/lib" SASL_PATH="${D}/usr/lib/sasl2"
-	echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login
-	"${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login
-	export LD_LIBRARY_PATH="${LD_OLD}"
-	chown root:mail "${D}/etc/sasl2/sasldb2"
-	chmod 0640 "${D}/etc/sasl2/sasldb2"
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto examples
-	dodoc sample/{*.[ch],Makefile}
-
-	docinto saslauthd
-	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/saslauthd.pam" saslauthd
-	fi
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/pwcheck.rc6" pwcheck
-	newexe "${FILESDIR}/saslauthd2.rc6" saslauthd
-	insinto /etc/conf.d
-	newins "${FILESDIR}/saslauthd2.conf" saslauthd
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
index 1b2646a08312..5181acfcd6b7 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild,v 1.2 2004/10/28 00:54:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild,v 1.3 2004/10/31 06:13:48 langthang Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
@@ -215,10 +215,13 @@ src_install () {
 	fi
 
 	exeinto /etc/init.d
-	newexe "${FILESDIR}/pwcheck.rc6" pwcheck
-	newexe "${FILESDIR}/saslauthd2.rc6" saslauthd
+	newexe "${FILESDIR}/pwcheck.rc6" pwcheck || \
+		die "failed to \"newexe\" pwdcheck to /etc/init.d"
+	newexe "${FILESDIR}/saslauthd2.rc6" saslauthd || \
+		die "failed to \"newexe\" saslauthd to /etc/init.d"
 	insinto /etc/conf.d
-	newins "${FILESDIR}/saslauthd-${PV}.conf" saslauthd
+	newins "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \
+		die "failed to install /etc/conf/saslauthd."
 	exeinto ${ROOT}/usr/sbin
 	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
 		die "failed to install testsaslauthd."
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r5 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r5
deleted file mode 100644
index 477dd8cc141c..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76ea426e2e2da3b8d2e3a43af5488f3b cyrus-sasl-1.5.27.tar.gz 528252
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r6 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r6
deleted file mode 100644
index 477dd8cc141c..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76ea426e2e2da3b8d2e3a43af5488f3b cyrus-sasl-1.5.27.tar.gz 528252
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.14 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.14
deleted file mode 100644
index 8f19004aa6d3..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f2c5adf17029fc103903a3c801d95107 cyrus-sasl-2.1.14.tar.gz 1375758
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17
deleted file mode 100644
index 954839a230d0..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4add6be2f194dc51aafc64193a1dd77b cyrus-sasl-2.1.17.tar.gz 1499725
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18
deleted file mode 100644
index 2993b6dbb3ed..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1eafae95f0289c10f187d8b2bc4032cf cyrus-sasl-2.1.18.tar.gz 1522578
diff --git a/dev-libs/cyrus-sasl/files/saslauthd-2.1.20.conf b/dev-libs/cyrus-sasl/files/saslauthd-2.1.20.conf
new file mode 100644
index 000000000000..988f4ec66371
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/saslauthd-2.1.20.conf
@@ -0,0 +1,25 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.20.conf,v 1.1 2004/10/31 06:13:48 langthang Exp $
+
+# Config file for /etc/init.d/saslauthd
+
+# Initial (empty) options.
+SASLAUTHD_OPTS=""
+
+# Specify the authentications mechanism.
+# *NOTE* For list see: saslauthd -v
+# From 2.1.19, add "-r" to options for old behavior
+# ie. reassemble user and realm to user@realm form.
+# SASLAUTHD_OPTS="${SASLAUTH_MECH} -a pam -r"
+SASLAUTHD_OPTS="${SASLAUTH_MECH} -a pam"
+
+# Specify the hostname for remote IMAP server.
+# *NOTE* Only needed if rimap auth mech is used.
+#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O localhost"
+
+# Specify the number of worker processes to create.
+#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -n 5"
+
+# Enable credential cache, cache size, and timeout.
+# *NOTE* Size is measured in kilobytes 
+#        Timeout is measured in seconds
+#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -c -s 128 -t 30"