removed cruft, and bloody tonnes of it

21 files changed, 2 insertions, 1048 deletions

diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index c94d01b4058e..05b9f700df36 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,30 +1,16 @@
 MD5 3f81216b8fbe549b9c885473bfab579d cyrus-sasl-1.5.27-r6.ebuild 2774
 MD5 d78a79a5a68744d17bbd6fc13cb679ee cyrus-sasl-2.1.10-r2.ebuild 3301
-MD5 c4e880dcb7d2f8679475398cdf81e0ff cyrus-sasl-2.1.7-r1.ebuild 2463
-MD5 d60aa8ec08ed6683c00cdca2fa90bf01 cyrus-sasl-2.1.13.ebuild 3294
-MD5 1db741b5018ea1107a49eeae3f245814 cyrus-sasl-2.1.5-r2.ebuild 2037
+MD5 1db16d3513871817a8b4efcb16bf6f51 cyrus-sasl-2.1.13.ebuild 3292
 MD5 8a92327ff3e70b717596aebe1c87ad59 cyrus-sasl-2.1.7-r3.ebuild 3001
 MD5 ea6ea07ae111539aa580d35a09bf2afe cyrus-sasl-1.5.27-r5.ebuild 2699
-MD5 99dd77b1e254cd23ba82c875ff69b40b cyrus-sasl-2.1.10.ebuild 3123
-MD5 5f916ae424e35bdd452b0c81f12a6426 cyrus-sasl-2.1.7.ebuild 1976
-MD5 5bcfd89895270267a066c1d3a9b28923 cyrus-sasl-2.1.10-r1.ebuild 3208
-MD5 72f59bb22937f65913dc0e50e80ad541 cyrus-sasl-2.1.12.ebuild 3268
-MD5 d7e1a7368647506a27283f307b9638e6 cyrus-sasl-2.1.9.ebuild 2803
-MD5 ddebad3ab49453cdec1b900bb7af4788 cyrus-sasl-2.1.9-r1.ebuild 3126
 MD5 48500eedaf288a4df6a93732e118a554 cyrus-sasl-2.1.10-r3.ebuild 3369
-MD5 f2aaec4d6e68ebcee0ba066641ff909e cyrus-sasl-2.1.7-r2.ebuild 2790
-MD5 b1e9974990d241c05f9cd91942d7a6ef cyrus-sasl-1.5.27-r4.ebuild 2540
-MD5 96417367b06551275dd6534390c5a1c6 ChangeLog 7332
+MD5 32234693ffdfcb41da592a74a6d7a664 ChangeLog 7489
 MD5 6d3c58ecd8d6d3da231db3e44d345bbe files/cyrus-sasl-2.1.6-iovec.diff 1405
 MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
-MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10-r1 70
 MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10-r2 70
 MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10-r3 70
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r4 69
 MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
 MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
-MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7 69
-MD5 110e3bc4f49c0b2b791b9bca087b66a5 files/digest-cyrus-sasl-2.1.9 69
 MD5 5cae6fb7465603cab6243e14d0382543 files/saslauthd.confd 909
 MD5 2bdbac1797e21ecbd4f8f95475470e80 files/cyrus-sasl-2.1.10-db4.patch 1375
 MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
@@ -39,15 +25,9 @@ MD5 a302e1b2ed33b7965de1a307cd25a32d files/cyrus-sasl-2.1.12-db4.patch 1902
 MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
 MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
 MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
-MD5 db12b1e88db9041a08cce7987e6e5183 files/digest-cyrus-sasl-2.1.5-r2 69
-MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7-r1 69
-MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7-r2 69
 MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7-r3 69
-MD5 110e3bc4f49c0b2b791b9bca087b66a5 files/digest-cyrus-sasl-2.1.9-r1 69
 MD5 c1e3be15214652c1d1036f7cb84fe8fe files/cyrus-sasl2-heimdal-deps.patch 1478
 MD5 e13f74e7ff91c036fa377c50fefe223b files/digestmd5.patch 2839
 MD5 0a6a28252ab81d3b3765967b11517fa8 files/cyrus-sasl-iovec.diff 1405
-MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10 70
-MD5 dbedf561a9c3b5295a76a31225d3dfcf files/digest-cyrus-sasl-2.1.12 70
 MD5 1d5bc32d69dbcb3c053f0f336086218e files/digest-cyrus-sasl-2.1.13 70
 MD5 38fca8679fe76370d26c76b9063c25b8 files/gssapi-sefault.patch 1311
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild
deleted file mode 100644
index 04247099f478..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# 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-r4.ebuild,v 1.8 2003/02/13 10:35:58 vapier Exp $
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=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
-
-	# 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 \
-		--disable-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.confd 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.10-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.10-r1.ebuild
deleted file mode 100644
index 4c8402e77d14..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.10-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.10-r1.ebuild,v 1.2 2003/02/13 10:36:12 vapier Exp $
-
-S=${WORKDIR}/${P}
-
-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 "
-
-IUSE="gdbm berkdb ldap mysql kerberos"
-
-inherit eutils
-
-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? ( virtual/krb5 )"
-	
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/autoconf
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	
-	# Fix depends for heimdal needed in saslv2 too
-	epatch ${FILESDIR}/${PN}2-heimdal-deps.patch
-
-	# Fix for gssapi seg faulting problem?
-	epatch ${FILESDIR}/gssapi-sefault.patch
-}
-
-src_compile() {
-
-	local myconf
-
-	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
-
-	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 static && myconf="${myconf} --enable-static --with-staticsasl" \
-		|| myconf="${myconf} --disable-static --without-staticsasl"
-
-	use kerberos && myconf="${myconf} --enable-gssapi=/usr" \
-		|| myconf="${myconf} --disable-gssapi"
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-openssl \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		--with-des \
-		--with-rc4 \
-		--disable-krb4 \
-		--with-gnu-ld \
-		--enable-shared \
-		--disable-sample \
-		--enable-login \
-		${myconf} || die "bad ./configure"
-
-	make MAKE=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.confd 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.10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.10.ebuild
deleted file mode 100644
index 9101b9585be2..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.10.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.10.ebuild,v 1.4 2003/02/13 10:36:20 vapier Exp $
-
-S=${WORKDIR}/${P}
-
-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 "
-
-IUSE="gdbm berkdb ldap mysql kerberos"
-
-inherit eutils
-
-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? ( virtual/krb5 )"
-	
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/autoconf
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	
-	# Fix depends for heimdal needed in saslv2 too
-	epatch ${FILESDIR}/${PN}2-heimdal-deps.patch
-}
-
-src_compile() {
-
-	local myconf
-
-	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
-
-	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 static && myconf="${myconf} --enable-static --with-staticsasl" \
-		|| myconf="${myconf} --disable-static --without-staticsasl"
-
-	use kerberos && myconf="${myconf} --enable-gssapi=/usr" \
-		|| myconf="${myconf} --disable-gssapi"
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-openssl \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		--with-des \
-		--with-rc4 \
-		--disable-krb4 \
-		--with-gnu-ld \
-		--enable-shared \
-		--disable-sample \
-		--enable-login \
-		${myconf} || die "bad ./configure"
-
-	make MAKE=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.confd 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.12.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.12.ebuild
deleted file mode 100644
index e68872523908..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.12.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.12.ebuild,v 1.3 2003/05/28 11:34:58 pauldv Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-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 "
-IUSE="gdbm berkdb ldap mysql kerberos static ssl"
-
-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? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/autoconf
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-	epatch ${FILESDIR}/${P}-kerberos.patch
-	epatch ${FILESDIR}/${P}-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 [ "$ENABLE_KRB4" = "yes" ]; then
-	#	myconf="${myconf} --enable-krb4=/usr/athena"
-	#else
-		myconf="${myconf} --disable-krb4"
-	#fi
-
-	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}
-
-	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.confd 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.5-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5-r2.ebuild
deleted file mode 100644
index a96f043a53c1..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5-r2.ebuild,v 1.7 2003/02/13 10:36:29 vapier Exp $
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/sasl/"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/openssl-0.9.6d"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/cyrus-sasl-iovec.diff
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var/state/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-dbpath=/var/lib/sasl2/sasl2.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 \
-		--disable-gssapi \
-		--disable-sample \
-		--with-dblib=berkeley \
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--target=${CHOST} \
-		--with-openssl=/usr ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install problem"
-
-	dodoc AUTHORS ChangeLog COPYING NEWS README doc/*.txt
-	docinto examples ; dodoc sample/{*.[ch],Makefile}
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
-}
-
-pkg_postinst() {
-	# empty directories..
-	install -d -m0755 ${ROOT}/var/lib/sasl2
-	install -d -m0755 ${ROOT}/etc/sasl
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r1.ebuild
deleted file mode 100644
index 4260dc90c232..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r1.ebuild,v 1.11 2003/06/06 23:58:22 rphillips Exp $
-
-IUSE="static mysql ldap gdbm kerberos berkdb"
-
-S=${WORKDIR}/${P}
-
-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="0"
-KEYWORDS="x86 -ppc -sparc "
-
-DEPEND=">=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.5 )"
-	
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/cyrus-sasl-iovec.diff || die
-	patch -p1 < ${FILESDIR}/crypt.diff || die
-
-}
-
-src_compile() {
-
-	local myconf
-
-	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 static && myconf="${myconf} --enable-static --with-staticsasl" \
-		|| myconf="${myconf} --disable-static --without-staticsasl"
-
-	use kerberos && myconf="${myconf} --enable-krb4" \
-		|| myconf="${myconf} --disable-krb4"	
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-openssl=/usr \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		--with-des \
-		--with-rc4 \
-		--with-gnu-ld \
-		--enable-shared \
-		--disable-sample \
-		--enable-login \
-		${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install problem"
-
-	dodoc AUTHORS ChangeLog COPYING NEWS README doc/*.txt
-	docinto examples ; dodoc sample/{*.[ch],Makefile}
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
-}
-
-pkg_postinst() {
-
-	# empty directories..
-	dodir /var/lib/sasl2
-	dodir /etc/sasl2
-
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r2.ebuild
deleted file mode 100644
index bdaea69d61a8..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r2.ebuild,v 1.7 2003/06/06 23:58:22 rphillips Exp $
-
-IUSE="static mysql ldap gdbm kerberos berkdb"
-
-S=${WORKDIR}/${P}
-
-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 "
-
-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.5 )"
-	
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/autoconf
-	sys-devel/automake"
-
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/cyrus-sasl-iovec.diff || die
-	patch -p1 < ${FILESDIR}/crypt.diff || die
-	patch -p0 < ${FILESDIR}/cyrus-sasl-gcc32.patch || die
-
-}
-
-src_compile() {
-
-	local myconf
-
-	libtoolize --copy --force
-	aclocal -I config -I cmulocal
-	autoheader
-	autoconf
-	automake -a --foreign
-
-	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 static && myconf="${myconf} --enable-static --with-staticsasl" \
-		|| myconf="${myconf} --disable-static --without-staticsasl"
-
-	#use kerberos && myconf="${myconf} --enable-krb4" \
-	#	|| myconf="${myconf} --disable-krb4"	
-	#Ya this seems wierd, but I'm guessing we'd rather prefer GSSAPI auth.
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-openssl \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		--with-des \
-		--with-rc4 \
-		--disable-krb4 \
-		--with-gnu-ld \
-		--enable-shared \
-		--disable-sample \
-		--enable-login \
-		${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install problem"
-
-	dodoc AUTHORS ChangeLog COPYING NEWS README doc/*.txt
-	docinto examples ; dodoc sample/{*.[ch],Makefile}
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
-}
-
-pkg_postinst() {
-
-	# empty directories..
-	dodir /var/lib/sasl2
-	dodir /etc/sasl2
-
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7.ebuild
deleted file mode 100644
index fc9353fd56fe..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7.ebuild,v 1.8 2003/02/13 10:36:46 vapier Exp $
-
-IUSE="gdbm"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/sasl/"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc "
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/openssl-0.9.6d
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/cyrus-sasl-2.1.6-iovec.diff
-}
-
-src_compile() {
-
-	use gdbm && myconf="${myconf} --with-gdbm=/usr" \
-		|| myconf="${myconf} --without-gdbm"
-	
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-openssl=/usr \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		--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 \
-		--disable-gssapi \
-		--disable-sample \
-		--with-dblib=berkeley \
-		${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install problem"
-
-	dodoc AUTHORS ChangeLog COPYING NEWS README doc/*.txt
-	docinto examples ; dodoc sample/{*.[ch],Makefile}
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
-}
-
-pkg_postinst() {
-	# empty directories..
-	install -d -m0755 ${ROOT}/var/lib/sasl2
-	install -d -m0755 ${ROOT}/etc/sasl2
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9-r1.ebuild
deleted file mode 100644
index b58435596833..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9-r1.ebuild,v 1.4 2003/02/13 10:36:50 vapier Exp $
-
-S=${WORKDIR}/${P}
-
-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 "
-
-IUSE="gdbm berkdb ldap mysql kerberos"
-
-inherit eutils
-
-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? ( virtual/krb5 )"
-	
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/autoconf
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	
-	# Fix depends for heimdal needed in saslv2 too
-	epatch ${FILESDIR}/${PN}2-heimdal-deps.patch
-}
-
-src_compile() {
-
-	local myconf
-
-	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
-
-	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 static && myconf="${myconf} --enable-static --with-staticsasl" \
-		|| myconf="${myconf} --disable-static --without-staticsasl"
-
-	use kerberos && myconf="${myconf} --enable-gssapi=/usr" \
-		|| myconf="${myconf} --disable-gssapi"
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-openssl \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		--with-des \
-		--with-rc4 \
-		--disable-krb4 \
-		--with-gnu-ld \
-		--enable-shared \
-		--disable-sample \
-		--enable-login \
-		${myconf} || die "bad ./configure"
-
-	make MAKE=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.confd 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.9.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9.ebuild
deleted file mode 100644
index 95a3c28eadb1..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9.ebuild,v 1.5 2003/06/06 23:58:22 rphillips Exp $
-
-S=${WORKDIR}/${P}
-
-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 "
-
-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.5 )"
-	
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/autoconf
-	sys-devel/automake"
-
-src_compile() {
-
-	local myconf
-
-	libtoolize --copy --force
-	aclocal -I config -I cmulocal
-	autoheader
-	autoconf
-	automake -a --foreign
-
-	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 static && myconf="${myconf} --enable-static --with-staticsasl" \
-		|| myconf="${myconf} --disable-static --without-staticsasl"
-
-	use kerberos && myconf="${myconf} --enable-gssapi" \
-		|| myconf="${myconf} --disable-gssapi"
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-openssl \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		--with-des \
-		--with-rc4 \
-		--disable-krb4 \
-		--with-gnu-ld \
-		--enable-shared \
-		--disable-sample \
-		--enable-login \
-		${myconf} || die "bad ./configure"
-
-	make || 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.confd 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/files/digest-cyrus-sasl-1.5.27-r4 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r4
deleted file mode 100644
index 477dd8cc141c..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r4
+++ /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.10 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.10
deleted file mode 100644
index bc95eab8e136..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ac2a696c091a76ce6c7db27e5d859d4 cyrus-sasl-2.1.10.tar.gz 1325286
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.10-r1 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.10-r1
deleted file mode 100644
index bc95eab8e136..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ac2a696c091a76ce6c7db27e5d859d4 cyrus-sasl-2.1.10.tar.gz 1325286
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.12 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.12
deleted file mode 100644
index bed7358c717a..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42cdb218959eb46c3ea70728c9da4385 cyrus-sasl-2.1.12.tar.gz 1343963
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.5-r2 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.5-r2
deleted file mode 100644
index 2d8b91047128..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 736784dd26a694e83d7e7a2fbe624711 cyrus-sasl-2.1.5.tar.gz 1249094
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.7 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.7
deleted file mode 100644
index f63f2f378471..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a73e12bea77e96300103aaf511c6bfc4 cyrus-sasl-2.1.7.tar.gz 1266804
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.7-r1 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.7-r1
deleted file mode 100644
index f63f2f378471..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a73e12bea77e96300103aaf511c6bfc4 cyrus-sasl-2.1.7.tar.gz 1266804
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.7-r2 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.7-r2
deleted file mode 100644
index f63f2f378471..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.7-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a73e12bea77e96300103aaf511c6bfc4 cyrus-sasl-2.1.7.tar.gz 1266804
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.9 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.9
deleted file mode 100644
index 0db58593d207..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19ac851b291a6631b8f8c2a2bebb7843 cyrus-sasl-2.1.9.tar.gz 1274451
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.9-r1 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.9-r1
deleted file mode 100644
index 0db58593d207..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19ac851b291a6631b8f8c2a2bebb7843 cyrus-sasl-2.1.9.tar.gz 1274451