Security cleanup. Bug #140514

(Portage version: 2.1.1_pre2-r6)
 (Signed Manifest commit)

15 files changed, 7 insertions, 1846 deletions

diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 6a5c516c9de1..c34410bd67d2 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -141,86 +141,34 @@ AUX saslauthd2.rc6 527 RMD160 d7862bf389349b6cf9248f8dc7ed69fb0a7f5ca8 SHA1 eeea
 MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
 RMD160 d7862bf389349b6cf9248f8dc7ed69fb0a7f5ca8 files/saslauthd2.rc6 527
 SHA256 55e59c02dcfeab84b777b9a4f1d1bb79645aab43538e1ba593c61dcb82a9e1f7 files/saslauthd2.rc6 527
-DIST cyrus-sasl-2.1.18.tar.gz 1522578 RMD160 772a1413ca68a8b91fa93d51630984acc7209136 SHA256 384279adfd582ad6f905197c46a5157f855462718530148fdbab3328cf621eb7
-DIST cyrus-sasl-2.1.19.tar.gz 1537350 RMD160 c74ca8685e9bdf12fe1f64137de931d79a4384ab SHA256 0ee2d5d04972a15c3154730f328467a5cf5c7e69766a73bab06664263666bfeb
 DIST cyrus-sasl-2.1.20.tar.gz 1775163 RMD160 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c SHA256 f0b97118e3e014a185c17777672a93300ca561cf5f2beeac2d4aa6abec09534d
 DIST cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465 RMD160 acf1d479c4559acdda66ab66da999ffc2f68d029 SHA1 46cc3664004bb33bf9a5642e47e401e43555fb46 SHA256 b02b97bbc3968248c4f04d3d67a9aac4baa4aa4f8388eefec548475784a2d968
 DIST cyrus-sasl-2.1.21.tar.gz 1584931 RMD160 93e0e1868453c5781602b5cce23e746b8823a26b SHA1 6449f730c963d29d43600a95373a6e2db52d6d66 SHA256 fa37bcc8b855597aa1e6b72915b38985991b4abd4e7bc116c3e88fd4e86fb0fb
 DIST cyrus-sasl-2.1.22-ntlm_impl-spnego.patch.gz 7466 RMD160 70e498d2ca27289bd729563793dcdabe650ffac4 SHA1 2f944004dbd828ca9bbd53bc7619d79c8b8714ab SHA256 a696dddc27d46ab1950b546fcf49efc1a03a8380ecc4537d085d8daacb88ccf0
 DIST cyrus-sasl-2.1.22.tar.gz 1609278 RMD160 086e20d01588cb86decad001244b72a37223354c SHA1 d23454ab12054714ab97d229c86cb934ce63fbb1 SHA256 c69e3853f35b14ee2c3f6e876e42d880927258ff4678aa052e5f0853db209962
-DIST cyrus-sasl-ntlm_impl-spnego.patch.gz 7430 RMD160 e5de01ff94f62e4bf83c44416e90112a212b26bc SHA1 941a16a3af803c5c4d85dd2b5a7a873230669352 SHA256 b6ecd6dc5c1c4a6341d9f663db2c0d79932b0b0844d4409ca8daa902c659108d
-EBUILD cyrus-sasl-2.1.18-r2.ebuild 5431 RMD160 9ccb9da8a5c3922c0a69007f25fda9a368bc9b12 SHA1 22edf8fc2a5abdcbdb89e3b94c0e5b24f3e2e7fd SHA256 9fd30b4aa6a35865db4931ca01393e87d4b72ec9ae5930b2bf7bcb9a410a1060
-MD5 a14bf6d5cc101c31d97280ad9c48785e cyrus-sasl-2.1.18-r2.ebuild 5431
-RMD160 9ccb9da8a5c3922c0a69007f25fda9a368bc9b12 cyrus-sasl-2.1.18-r2.ebuild 5431
-SHA256 9fd30b4aa6a35865db4931ca01393e87d4b72ec9ae5930b2bf7bcb9a410a1060 cyrus-sasl-2.1.18-r2.ebuild 5431
-EBUILD cyrus-sasl-2.1.19-r1.ebuild 7161 RMD160 1697bbd2bc9e38a5c695a3676426f6324ac457ef SHA1 780cc66a9b1a72bba49e9143670ddf0132feca4e SHA256 ee6ef3cf356190167e12743d6bc8ac0c9d342ab735f604a9fc1752b767970e5a
-MD5 54f2bd76be47e4beec9b53b237d0e44f cyrus-sasl-2.1.19-r1.ebuild 7161
-RMD160 1697bbd2bc9e38a5c695a3676426f6324ac457ef cyrus-sasl-2.1.19-r1.ebuild 7161
-SHA256 ee6ef3cf356190167e12743d6bc8ac0c9d342ab735f604a9fc1752b767970e5a cyrus-sasl-2.1.19-r1.ebuild 7161
-EBUILD cyrus-sasl-2.1.20-r1.ebuild 8558 RMD160 33df3a21145abe1387b18f7c219b7440cdc0a252 SHA1 01fd41596a135378d599e554d53c0887bfc1ad4d SHA256 71d2558deb2e7ed8d1955cf59c8553caeff66d623aacadb63643955a25c2dad1
-MD5 62922ef59be6add5b73bc4f12b9041ea cyrus-sasl-2.1.20-r1.ebuild 8558
-RMD160 33df3a21145abe1387b18f7c219b7440cdc0a252 cyrus-sasl-2.1.20-r1.ebuild 8558
-SHA256 71d2558deb2e7ed8d1955cf59c8553caeff66d623aacadb63643955a25c2dad1 cyrus-sasl-2.1.20-r1.ebuild 8558
-EBUILD cyrus-sasl-2.1.20-r2.ebuild 9524 RMD160 92afc0d9ecf4df2c40e5f82de3621e4f77569e04 SHA1 6148b81bfc553ccde68174f87e92e9d2767d067d SHA256 fefea75176799dd9bf89300ab35fb0dcc254c3a02349cbceb1886e7c2bed18f6
-MD5 267cd40a5fb6cc0d346ff563ff1d9aca cyrus-sasl-2.1.20-r2.ebuild 9524
-RMD160 92afc0d9ecf4df2c40e5f82de3621e4f77569e04 cyrus-sasl-2.1.20-r2.ebuild 9524
-SHA256 fefea75176799dd9bf89300ab35fb0dcc254c3a02349cbceb1886e7c2bed18f6 cyrus-sasl-2.1.20-r2.ebuild 9524
-EBUILD cyrus-sasl-2.1.20-r3.ebuild 9191 RMD160 d01537481f1a5d6b4e901b2a8497cacc100b62ed SHA1 ab20a9fe18639fe9c66651343cf954f4c0b460c3 SHA256 ea5305e796b98fe18f0ff777e6a6be41bc73e051a6999b335bf4ff969d46ffe5
-MD5 d9fda6c54c37d9a72b5ec222a0f942cb cyrus-sasl-2.1.20-r3.ebuild 9191
-RMD160 d01537481f1a5d6b4e901b2a8497cacc100b62ed cyrus-sasl-2.1.20-r3.ebuild 9191
-SHA256 ea5305e796b98fe18f0ff777e6a6be41bc73e051a6999b335bf4ff969d46ffe5 cyrus-sasl-2.1.20-r3.ebuild 9191
 EBUILD cyrus-sasl-2.1.20.ebuild 7352 RMD160 f413208cc4849a826a4d6a62868918c2a83c13b7 SHA1 1ee100ed13d5985bc58309988e582d5c254b8eee SHA256 3c9b3b3d83c0d590b8841fe66dcef8e5b7ae2cbab119a1b8c1445f754b721973
 MD5 97de45d37a62d1c1e7e52740007637b7 cyrus-sasl-2.1.20.ebuild 7352
 RMD160 f413208cc4849a826a4d6a62868918c2a83c13b7 cyrus-sasl-2.1.20.ebuild 7352
 SHA256 3c9b3b3d83c0d590b8841fe66dcef8e5b7ae2cbab119a1b8c1445f754b721973 cyrus-sasl-2.1.20.ebuild 7352
-EBUILD cyrus-sasl-2.1.21-r1.ebuild 9579 RMD160 6de126cb56d8816864640fea0f54009b9897b357 SHA1 ed7334fbff8401cef2d145cdef91d352a8a13d3b SHA256 d5c2ec54a169d8f15789b323c2a0d75865495a7cab8c51ea5f7848617f61ea29
-MD5 3d105c5c251003e1df07df4c5f426d14 cyrus-sasl-2.1.21-r1.ebuild 9579
-RMD160 6de126cb56d8816864640fea0f54009b9897b357 cyrus-sasl-2.1.21-r1.ebuild 9579
-SHA256 d5c2ec54a169d8f15789b323c2a0d75865495a7cab8c51ea5f7848617f61ea29 cyrus-sasl-2.1.21-r1.ebuild 9579
 EBUILD cyrus-sasl-2.1.21-r2.ebuild 9281 RMD160 68d8ae4ac6a3358a4a74a50b811e07547e9fceae SHA1 8718af5779a0f9733df424fb4b795af1b85290cd SHA256 cc5caec0f547c03b8b5143a43c1d4288f4ee60b1c45d1a71dce2872700c94252
 MD5 b06ccf8a3b8cb647e91f14babcd0a61d cyrus-sasl-2.1.21-r2.ebuild 9281
 RMD160 68d8ae4ac6a3358a4a74a50b811e07547e9fceae cyrus-sasl-2.1.21-r2.ebuild 9281
 SHA256 cc5caec0f547c03b8b5143a43c1d4288f4ee60b1c45d1a71dce2872700c94252 cyrus-sasl-2.1.21-r2.ebuild 9281
-EBUILD cyrus-sasl-2.1.21.ebuild 9199 RMD160 15dfa13c9c9ad89431959033341b57310d83bc3d SHA1 2ec0a41117b73dc1cb2d36ca8754e90b347ec04a SHA256 fba7a4b5a1c1d149324ddb0d80a4efdd975f3a4c7b7ab654d75b5d8a4a1a0160
-MD5 80e82039d1535646788bd0866629b1df cyrus-sasl-2.1.21.ebuild 9199
-RMD160 15dfa13c9c9ad89431959033341b57310d83bc3d cyrus-sasl-2.1.21.ebuild 9199
-SHA256 fba7a4b5a1c1d149324ddb0d80a4efdd975f3a4c7b7ab654d75b5d8a4a1a0160 cyrus-sasl-2.1.21.ebuild 9199
 EBUILD cyrus-sasl-2.1.22.ebuild 9495 RMD160 6e9414a09325b29aa943ec2033c9bbac68ca5449 SHA1 90111a8e3adc2e208572c9830d1c33ba53cb8f6d SHA256 1c9c1a6165c473222a61beef49a5fc349139540314b65019dbcbc7b448d52a9a
 MD5 159f0692adab9edaa621977139d91202 cyrus-sasl-2.1.22.ebuild 9495
 RMD160 6e9414a09325b29aa943ec2033c9bbac68ca5449 cyrus-sasl-2.1.22.ebuild 9495
 SHA256 1c9c1a6165c473222a61beef49a5fc349139540314b65019dbcbc7b448d52a9a cyrus-sasl-2.1.22.ebuild 9495
-MISC ChangeLog 25370 RMD160 ae2d70827af19bd834876f84c9a7cd75f39ccce9 SHA1 e2c4ef6944214ae210f0b1222a5952284cd4f1bb SHA256 912f23fd83be65879e36b88c6628794afb49eb1b554d7ec3c2147e43f8bb7035
-MD5 e1ccfdb8af08989f6cdac77f9f11580a ChangeLog 25370
-RMD160 ae2d70827af19bd834876f84c9a7cd75f39ccce9 ChangeLog 25370
-SHA256 912f23fd83be65879e36b88c6628794afb49eb1b554d7ec3c2147e43f8bb7035 ChangeLog 25370
+MISC ChangeLog 25668 RMD160 e004422f49700c13e89960ad7437f55fcac73921 SHA1 88dc63c3387b19f78cc8b72e74a664a799277e24 SHA256 09c06d6830ede776284b38ab6c2d35b9460a9ad257b72c9f943428108300d315
+MD5 3cfefae55d64dba580bb599c97162ffa ChangeLog 25668
+RMD160 e004422f49700c13e89960ad7437f55fcac73921 ChangeLog 25668
+SHA256 09c06d6830ede776284b38ab6c2d35b9460a9ad257b72c9f943428108300d315 ChangeLog 25668
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 6c3678bbc612c4ac4bd11bf1447a3596 files/digest-cyrus-sasl-2.1.18-r2 256
-RMD160 2959d6819ffedfdab31bf8a448ea568a103534e3 files/digest-cyrus-sasl-2.1.18-r2 256
-SHA256 a0055e4db8cb34c685ef69dacb0de7e64361904d80518d4baf731c2808dfc984 files/digest-cyrus-sasl-2.1.18-r2 256
-MD5 6b410c9ef58fffbb76b06a45dfb5b4cc files/digest-cyrus-sasl-2.1.19-r1 256
-RMD160 05e37694798d0a8ac19c0ed21b72594883c812b0 files/digest-cyrus-sasl-2.1.19-r1 256
-SHA256 6b99adbdb30465c19e6f8865b1a27bcc96cd9337ff2576d5056a9d0293633e76 files/digest-cyrus-sasl-2.1.19-r1 256
 MD5 395f130dc8a34f1b77ab6c371980825e files/digest-cyrus-sasl-2.1.20 256
 RMD160 8851e2882852ed4389d1f1e6d2bfe01c973c84fc files/digest-cyrus-sasl-2.1.20 256
 SHA256 5e117803c82ca33b50a8c87db9a761e762662fe0c75ac28ed93855fc88901f72 files/digest-cyrus-sasl-2.1.20 256
-MD5 395f130dc8a34f1b77ab6c371980825e files/digest-cyrus-sasl-2.1.20-r1 256
-RMD160 8851e2882852ed4389d1f1e6d2bfe01c973c84fc files/digest-cyrus-sasl-2.1.20-r1 256
-SHA256 5e117803c82ca33b50a8c87db9a761e762662fe0c75ac28ed93855fc88901f72 files/digest-cyrus-sasl-2.1.20-r1 256
-MD5 df4f823438d862f915941d5717ff7481 files/digest-cyrus-sasl-2.1.20-r2 539
-RMD160 11ebad9c1ed929d9b59f81bf0462e60d74855dd7 files/digest-cyrus-sasl-2.1.20-r2 539
-SHA256 75e72e3ea841284a8aef35d8e36ab30240918ab9d2912efb3e1360647b05c6fb files/digest-cyrus-sasl-2.1.20-r2 539
-MD5 df4f823438d862f915941d5717ff7481 files/digest-cyrus-sasl-2.1.20-r3 539
-RMD160 11ebad9c1ed929d9b59f81bf0462e60d74855dd7 files/digest-cyrus-sasl-2.1.20-r3 539
-SHA256 75e72e3ea841284a8aef35d8e36ab30240918ab9d2912efb3e1360647b05c6fb files/digest-cyrus-sasl-2.1.20-r3 539
-MD5 f834cac9cb71cbdb5f80b22f6f79d1d3 files/digest-cyrus-sasl-2.1.21 560
-RMD160 dfa902833d1cefe847969ccef5b54be841b96bc5 files/digest-cyrus-sasl-2.1.21 560
-SHA256 b32d41e1a514f5363d5747eedf3f52e1a01e44ec21faf8f885fa752ffb2193a4 files/digest-cyrus-sasl-2.1.21 560
-MD5 f834cac9cb71cbdb5f80b22f6f79d1d3 files/digest-cyrus-sasl-2.1.21-r1 560
-RMD160 dfa902833d1cefe847969ccef5b54be841b96bc5 files/digest-cyrus-sasl-2.1.21-r1 560
-SHA256 b32d41e1a514f5363d5747eedf3f52e1a01e44ec21faf8f885fa752ffb2193a4 files/digest-cyrus-sasl-2.1.21-r1 560
 MD5 f834cac9cb71cbdb5f80b22f6f79d1d3 files/digest-cyrus-sasl-2.1.21-r2 560
 RMD160 dfa902833d1cefe847969ccef5b54be841b96bc5 files/digest-cyrus-sasl-2.1.21-r2 560
 SHA256 b32d41e1a514f5363d5747eedf3f52e1a01e44ec21faf8f885fa752ffb2193a4 files/digest-cyrus-sasl-2.1.21-r2 560
@@ -230,7 +178,7 @@ SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEdjH75FrxP71izLARAsI6AJ9TEWQqsvpwA38S4Lqx+9rN9S3DUwCfRNA7
-LqAXaBKWd3mNJIcMrQSzJZU=
-=lVqQ
+iD8DBQFEuWuw5FrxP71izLARAqm9AJ91oX5fVp8QSK78HeVhhBcCAjTR/QCfX6+o
+8iPscnVIztIKrG+E/vJ+u0I=
+=rA+q
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild
deleted file mode 100644
index 91bfc36aaa33..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2005 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-r2.ebuild,v 1.10 2005/07/02 15:32:42 flameeyes 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 pam-mysql"
-
-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"
-
-	# Bring plugins/digestmd5.c up to cvs 1.172 to fix buffer overflow
-	epatch "${FILESDIR}/cyrus-sasl-2.1.18-cvs-1.172.patch"
-
-	# Add setuid/setgid check for SASL_PATH
-	epatch "${FILESDIR}/cyrus-sasl-2.1.18-sasl-path-fix.patch"
-
-	# Support deprecated pam_mysql authentication, requested in Bug 39497
-	# Patch from: http://asg.web.cmu.edu/archive/message.php?mailbox=archive.cyrus-sasl&searchterm=patch&msg=4669
-	if use pam-mysql; then
-		epatch "${FILESDIR}/cyrus-sasl-2.1.18-pam_mysql.patch"
-	fi
-
-	# 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}`"
-
-	# fix for bug #59634. langthang 20040810.
-	if ! use ssl; then
-		myconf="${myconf} --without-des"
-	fi
-
-	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
-}
-
-pkg_postinst() {
-	if ! use pam-mysql && use pam && has_version 'sys-auth/pam_mysql'; then
-		echo
-		ewarn
-		ewarn "Starting with version 2.1.17 of cyrus-sasl, the cyrus-sasl team has switched"
-		ewarn "to an authentication style that BREAKS pam_mysql."
-		ewarn
-		ewarn "If you are using pam_mysql, it is recommended you convert to cyrus-sasl's"
-		ewarn "auxprop sql authentication support using smtpd.conf."
-		ewarn
-		ewarn "If you do not wish to change your configuration, you may put \"pam-mysql\""
-		ewarn "in your USE flags to revert to the old (deprecated) authentication behavior."
-		ewarn
-	fi
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19-r1.ebuild
deleted file mode 100644
index 0e4331358514..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2005 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.19-r1.ebuild,v 1.10 2005/01/24 22:36:05 langthang Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-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="berkdb gdbm ldap mysql postgres kerberos static ssl java pam authdaemond"
-
-RDEPEND="virtual/libc
-	berkdb? ( >=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 )
-	authdaemond? ( >=net-mail/courier-imap-3.0.7 )
-	java? ( virtual/jdk )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
-
-pkg_setup() {
-	if use gdbm && use berkdb; then
-		echo
-		ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
-		ewarn "Will default to GNU DB as your SASLdb database backend."
-		ewarn "If you want to build with Berkeley DB support; hit Control-C now."
-		ewarn "Change your USE flag -gdbm and emerge again."
-		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`"
-		einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend."
-		)
-		echo
-		ewarn "Waiting 10 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 10
-	fi
-
-	echo
-	einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
-	einfo "realm and username into a username of "user@realm" form."
-	echo
-	einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
-	einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
-	einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\""
-	einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
-	echo
-	einfo "Pause 10 seconds before continuing."
-	epause 10
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-
-	# 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}/${P}-configdir.patch"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
-
-	# Add setuid/setgid check for SASL_PATH
-	epatch "${FILESDIR}/${P}-sasl-path-fix.patch"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache saslauthd/configure saslauthd/autom4te.cache
-	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`"
-	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres`"
-	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-	# bug #56523. add authdaemond support.
-	myconf="${myconf} `use_with authdaemond`"
-
-	# fix for bug #59634. langthang 20040810.
-	if ! use ssl; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# default to GDBM if both 'gdbm' and 'berkdb' present.
-	if use gdbm; then
-		einfo "build with GNU DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "build with Berkeley DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=berkeley"
-	else
-		einfo "build without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	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. Really? Let me try.
-	emake || die "compile problem"
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-
-	# Bug #58768. Add testsaslauthd.
-	cd "${S}/saslauthd"
-	emake testsaslauthd || die "failed to make"
-}
-
-src_install () {
-	#einstall
-	make DESTDIR=${D} install || die "failed to install."
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	if use java; then
-		java-pkg_dojar ${PN}.jar
-		#hackish, don't wanna dig though makefile
-		rm -rf ${D}/usr/lib/java
-		docinto java
-		dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/*
-		mkdir ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to create ${D}/usr/share/doc/${PF}/java/Test/"
-		cp ${S}/java/Test/*.java ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
-	fi
-
-	# 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"
-
-	docinto ""
-	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}/saslauthd-${PV}.conf" saslauthd
-	exeinto ${ROOT}/usr/sbin
-	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
-		die "failed to install testsaslauthd."
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild
deleted file mode 100644
index 5e00b1d076d1..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.4 2005/05/22 15:23:47 swegener Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-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="berkdb gdbm ldap mysql postgres kerberos static ssl java pam authdaemond sample"
-
-RDEPEND="virtual/libc
-	berkdb? ( >=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 )
-	authdaemond? (
-		|| (
-			>=net-mail/courier-imap-3.0.7
-			>=mail-mta/courier-0.46
-		)
-	)
-	java? ( virtual/jdk )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
-
-pkg_setup() {
-
-	if use gdbm && use berkdb; then
-		echo
-		ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
-		ewarn "Will default to GNU DB as your SASLdb database backend."
-		ewarn "If you want to build with Berkeley DB support; hit Control-C now."
-		ewarn "Change your USE flag -gdbm and emerge again."
-		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`"
-		einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend."
-		)
-		echo
-		ewarn "Waiting 10 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 10
-	fi
-
-	echo
-	einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
-	einfo "realm and username into a username of "user@realm" form."
-	echo
-	einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
-	einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
-	einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\""
-	einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
-	echo
-	einfo "Pause 10 seconds before continuing."
-	epause 10
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-
-	# 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.
-	# Fixed upstream.
-	# epatch "${FILESDIR}/cyrus-sasl-2.1.18-db4.patch"
-
-	# Add configdir support.
-	epatch "${FILESDIR}/${P}-configdir.patch"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
-
-	# Add setuid/setgid check for SASL_PATH
-	# Fixed upstream.
-	# epatch "${FILESDIR}/${P}-sasl-path-fix.patch"
-
-	# Fix for gcc-4.0
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache
-	ebegin "Recreating 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 sample`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-	myconf="${myconf} `use_with mysql` `use_enable mysql`"
-	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres`"
-	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-	# bug #56523. add authdaemond support.
-	myconf="${myconf} `use_with authdaemond`"
-
-	# fix for bug #59634. langthang 20040810.
-	if ! use ssl; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# default to GDBM if both 'gdbm' and 'berkdb' present.
-	if use gdbm; then
-		einfo "build with GNU DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "build with Berkeley DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=berkeley"
-	else
-		einfo "build without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# 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"
-
-	# Fix PEBCAK in make.conf. Bug #75538.
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Parallel build doesn't work.
-	# Parallel build doesn't like distcc/ccache? Bug #78643.
-	if has distcc $FEATURES || has ccache $FEATURES; then
-		einfo "You have \"distcc\" or \"ccache\" enabled"
-		einfo "build with MAKEOPTS=-j1"
-		emake -j1 || die "compile problem"
-	else
-		einfo "build with MAKEOPTS=$MAKEOPTS"
-		emake || die "compile problem"
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-
-	# Bug #58768. Add testsaslauthd.
-	cd "${S}/saslauthd"
-	emake testsaslauthd || die "failed to make"
-}
-
-src_install () {
-	#einstall
-	make DESTDIR=${D} install || die "failed to install."
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Install everything necessary so user can build sample client/server
-	# (bug #64733)
-	if use sample; then
-	        insinto /usr/share/${PN}-2/examples
-	        doins aclocal.m4 config.h config.status configure.in
-		dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
-	        exeinto /usr/share/${PN}-2/examples
-	        doexe libtool
-	        insinto /usr/share/${PN}-2/examples/sample
-	        doins sample/*.{c,h} sample/*Makefile*
-	        insinto /usr/share/${PN}-2/examples/sample/.deps
-	        doins sample/.deps/*
-		dodir /usr/share/${PN}-2/examples/lib
-	        dosym /usr/lib/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la
-		dodir /usr/share/${PN}-2/examples/lib/.libs
-	        dosym /usr/lib/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	if use java; then
-		java-pkg_dojar ${PN}.jar
-		#hackish, don't wanna dig though makefile
-		rm -rf ${D}/usr/lib/java
-		docinto java
-		dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/*
-		mkdir ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to create ${D}/usr/share/doc/${PF}/java/Test/"
-		cp ${S}/java/Test/*.java ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
-	fi
-
-	# 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"
-
-	docinto ""
-	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	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 || \
-		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 || \
-		die "failed to install /etc/conf/saslauthd."
-	exeinto ${ROOT}/usr/sbin
-	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
-		die "failed to install testsaslauthd."
-}
-
-pkg_postinst () {
-	if use sample; then
-		einfo "You have chosen to install sources for example client and server."
-		einfo "To build these, please type:"
-		einfo "\tcd /usr/share/${PN}-2/examples/sample && make"
-	fi
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r2.ebuild
deleted file mode 100644
index d9b13df019d4..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r2.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2005 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-r2.ebuild,v 1.7 2005/05/22 15:23:47 swegener Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
-
-ntlm_patch=${PN}-ntlm_impl-spnego.patch.gz
-
-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
-	ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
-
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="berkdb crypt gdbm ldap mysql postgres kerberos static ssl java pam
-		authdaemond sample urandom srp ntlm_unsupported_patch"
-
-RDEPEND="virtual/libc
-	berkdb? ( >=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 )
-	authdaemond? (
-		|| (
-			>=net-mail/courier-imap-3.0.7
-			>=mail-mta/courier-0.46
-		)
-	)
-	java? ( virtual/jdk )
-	ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
-
-pkg_setup() {
-
-	if use gdbm && use berkdb; then
-		echo
-		ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
-		ewarn "Will default to GNU DB as your SASLdb database backend."
-		ewarn "If you want to build with Berkeley DB support; hit Control-C now."
-		ewarn "Change your USE flag -gdbm and emerge again."
-		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`"
-		einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend."
-		)
-		echo
-		ewarn "Waiting 10 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 10
-	fi
-
-	echo
-	einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
-	einfo "realm and username into a username of "user@realm" form."
-	echo
-	einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
-	einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
-	einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\""
-	einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
-	echo
-	einfo "Pause 10 seconds before continuing."
-	epause 10
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-
-	# 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.
-	# Fixed upstream.
-	# epatch "${FILESDIR}/cyrus-sasl-2.1.18-db4.patch"
-
-	# Add configdir support.
-	epatch "${FILESDIR}/${P}-configdir.patch"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
-
-	# Add setuid/setgid check for SASL_PATH
-	# Fixed upstream.
-	# epatch "${FILESDIR}/${P}-sasl-path-fix.patch"
-
-	# Fix for gcc-4.0
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# UNSUPPORTED ntlm patch. Bug #81342
-	use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache
-	ebegin "Recreating configure"
-	aclocal -I cmulocal -I config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	# Sypport for crypted passwords. Bug #45181
-	use crypt && epatch "${FILESDIR}/cyrus-sasl-2.1.19-checkpw.c.patch"
-
-	# Upstream doesn't even honor their own configure options... grumble
-	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile.{am,in}
-}
-
-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 sample`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-	myconf="${myconf} `use_with mysql` `use_enable mysql`"
-	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres`"
-	# Add use srp. Bug #81970.
-	myconf="${myconf} `use_enable srp`"
-	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-	# bug #56523. add authdaemond support.
-	myconf="${myconf} `use_with authdaemond`"
-
-	# fix for bug #59634. langthang 20040810.
-	if ! use ssl; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# default to GDBM if both 'gdbm' and 'berkdb' present.
-	if use gdbm; then
-		einfo "build with GNU DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "build with Berkeley DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=berkeley"
-	else
-		einfo "build without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random. Bug #46038
-	use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
-
-	# Detect mips systems properly.
-	gnuconfig_update
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		${myconf} || die "econf failed"
-
-	# Upstream doesn't even honor their own configure options... grumble
-	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile
-
-	# Fix PEBCAK in make.conf. Bug #75538.
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Parallel build doesn't work.
-	# Parallel build doesn't like distcc/ccache? Bug #78643.
-	if has distcc $FEATURES || has ccache $FEATURES; then
-		einfo "You have \"distcc\" or \"ccache\" enabled"
-		einfo "build with MAKEOPTS=-j1"
-		emake -j1 || die "compile problem"
-	else
-		einfo "build with MAKEOPTS=$MAKEOPTS"
-		emake || die "compile problem"
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-
-	# Bug #58768. Add testsaslauthd.
-	cd "${S}/saslauthd"
-	emake testsaslauthd || die "failed to make"
-}
-
-src_install () {
-	#einstall
-	make DESTDIR=${D} install || die "failed to install."
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Install everything necessary so user can build sample client/server
-	# (bug #64733)
-	if use sample; then
-	        insinto /usr/share/${PN}-2/examples
-	        doins aclocal.m4 config.h config.status configure.in
-		dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
-	        exeinto /usr/share/${PN}-2/examples
-	        doexe libtool
-	        insinto /usr/share/${PN}-2/examples/sample
-	        doins sample/*.{c,h} sample/*Makefile*
-	        insinto /usr/share/${PN}-2/examples/sample/.deps
-	        doins sample/.deps/*
-		dodir /usr/share/${PN}-2/examples/lib
-	        dosym /usr/$(get_libdir)/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la
-		dodir /usr/share/${PN}-2/examples/lib/.libs
-	        dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	if use java; then
-		java-pkg_dojar ${PN}.jar
-		#hackish, don't wanna dig though makefile
-		rm -rf ${D}/usr/$(get_libdir)/java
-		docinto java
-		dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/*
-		mkdir ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to create ${D}/usr/share/doc/${PF}/java/Test/"
-		cp ${S}/java/Test/*.java ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
-	fi
-
-	# Generate an empty sasldb2 with correct permissions.
-	LD_OLD="${LD_LIBRARY_PATH}"
-	export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/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"
-
-	docinto ""
-	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	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 || \
-		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 || \
-		die "failed to install /etc/conf/saslauthd."
-	exeinto ${ROOT}/usr/sbin
-	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
-		die "failed to install testsaslauthd."
-}
-
-pkg_postinst () {
-	if use sample; then
-		einfo "You have chosen to install sources for example client and server."
-		einfo "To build these, please type:"
-		einfo "\tcd /usr/share/${PN}-2/examples/sample && make"
-	fi
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild
deleted file mode 100644
index a2c5cc01d122..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2005 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-r3.ebuild,v 1.5 2005/06/03 17:54:19 langthang Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
-
-ntlm_patch=${PN}-ntlm_impl-spnego.patch.gz
-
-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
-	ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
-
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="berkdb crypt gdbm ldap mysql postgres kerberos static ssl java pam
-		authdaemond sample urandom srp ntlm_unsupported_patch"
-
-RDEPEND="virtual/libc
-	berkdb? ( >=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? ( virtual/pam )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kerberos? ( virtual/krb5 )
-	authdaemond? (
-		|| (
-			>=net-mail/courier-imap-3.0.7
-			>=mail-mta/courier-0.46
-		)
-	)
-	java? ( virtual/jdk )
-	ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
-
-pkg_setup() {
-
-	if use gdbm && use berkdb; then
-		echo
-		ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
-		ewarn "Will default to GNU DB as your SASLdb database backend."
-		ewarn "If you want to build with Berkeley DB support; hit Control-C now."
-		ewarn "Change your USE flag -gdbm and emerge again."
-		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`"
-		einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend."
-		)
-		echo
-		ewarn "Waiting 10 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 10
-	fi
-
-	echo
-	einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
-	einfo "realm and username into a username of "user@realm" form."
-	echo
-	einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
-	einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
-	einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\""
-	einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
-	echo
-	einfo "Pause 10 seconds before continuing."
-	epause 10
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-
-	# 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"
-
-	# Add configdir support.
-	epatch "${FILESDIR}/${P}-configdir.patch"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
-
-	# Fix for gcc-4.0
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# UNSUPPORTED ntlm patch. Bug #81342
-	use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache
-	ebegin "Recreating configure"
-	aclocal -I cmulocal -I config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	# Sypport for crypted passwords. Bug #45181
-	use crypt && epatch "${FILESDIR}/cyrus-sasl-2.1.19-checkpw.c.patch"
-
-	# Upstream doesn't even honor their own configure options... grumble
-	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile.{am,in}
-}
-
-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 sample`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-	myconf="${myconf} `use_with mysql` `use_enable mysql`"
-	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres`"
-	# Add use srp. Bug #81970.
-	myconf="${myconf} `use_enable srp`"
-	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-	# bug #56523. add authdaemond support.
-	myconf="${myconf} `use_with authdaemond`"
-
-	# fix for bug #59634. langthang 20040810.
-	if ! use ssl; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# default to GDBM if both 'gdbm' and 'berkdb' present.
-	if use gdbm; then
-		einfo "build with GNU DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "build with Berkeley DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=berkeley"
-	else
-		einfo "build without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random. Bug #46038
-	use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
-
-	# Detect mips systems properly.
-	gnuconfig_update
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		${myconf} || die "econf failed"
-
-	# Upstream doesn't even honor their own configure options... grumble
-	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile
-
-	# Fix PEBCAK in make.conf. Bug #75538.
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Parallel build doesn't work.
-	# Parallel build doesn't like distcc/ccache? Bug #78643.
-	if has distcc $FEATURES || has ccache $FEATURES; then
-		einfo "You have \"distcc\" or \"ccache\" enabled"
-		einfo "build with MAKEOPTS=-j1"
-		emake -j1 || die "compile problem"
-	else
-		einfo "build with MAKEOPTS=$MAKEOPTS"
-		emake || die "compile problem"
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-
-	# Bug #58768. Add testsaslauthd.
-	cd "${S}/saslauthd"
-	emake testsaslauthd || die "failed to make"
-}
-
-src_install () {
-	#einstall
-	make DESTDIR=${D} install || die "failed to install."
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Install everything necessary so user can build sample client/server
-	# (bug #64733)
-	if use sample; then
-		insinto /usr/share/${PN}-2/examples
-		doins aclocal.m4 config.h config.status configure.in
-		dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
-		exeinto /usr/share/${PN}-2/examples
-		doexe libtool
-		insinto /usr/share/${PN}-2/examples/sample
-		doins sample/*.{c,h} sample/*Makefile*
-		insinto /usr/share/${PN}-2/examples/sample/.deps
-		doins sample/.deps/*
-		dodir /usr/share/${PN}-2/examples/lib
-		dosym /usr/$(get_libdir)/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la
-		dodir /usr/share/${PN}-2/examples/lib/.libs
-		dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	if use java; then
-		java-pkg_dojar ${PN}.jar
-		#hackish, don't wanna dig though makefile
-		rm -rf ${D}/usr/$(get_libdir)/java
-		docinto java
-		dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/*
-		mkdir ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to create ${D}/usr/share/doc/${PF}/java/Test/"
-		cp ${S}/java/Test/*.java ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
-	fi
-
-	# Generate an empty sasldb2 with correct permissions.
-	if use berkdb || use gdbm; then
-		LD_OLD="${LD_LIBRARY_PATH}"
-		export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/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"
-	fi
-
-	docinto ""
-	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto saslauthd
-	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || \
-		die "failed to install pwcheck to /etc/init.d"
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || \
-		die "failed to install saslauthd to /etc/init.d"
-	newconfd "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \
-		die "failed to install /etc/conf.d/saslauthd"
-
-	exeinto ${ROOT}/usr/sbin
-	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
-		die "failed to install testsaslauthd."
-}
-
-pkg_postinst () {
-	if use sample; then
-		einfo "You have chosen to install sources for example client and server."
-		einfo "To build these, please type:"
-		einfo "\tcd /usr/share/${PN}-2/examples/sample && make"
-	fi
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r1.ebuild
deleted file mode 100644
index 8437823b61e9..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r1.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2005 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.21-r1.ebuild,v 1.4 2005/11/06 11:52:50 ferdy Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
-
-ntlm_patch=${P}-ntlm_impl-spnego.patch.gz
-
-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
-	ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
-
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-# Removed 'static' USE flag because it is broken upstream, Bug #94137
-IUSE="berkdb crypt gdbm ldap mysql postgres kerberos ssl java pam
-		authdaemond sample urandom srp ntlm_unsupported_patch"
-
-RDEPEND="virtual/libc
-	berkdb? ( >=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? ( virtual/pam )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kerberos? ( virtual/krb5 )
-	authdaemond? (
-		|| (
-			>=net-mail/courier-imap-3.0.7
-			>=mail-mta/courier-0.46
-		)
-	)
-	java? ( virtual/jdk )
-	ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
-
-pkg_setup() {
-
-	if use gdbm && use berkdb; then
-		echo
-		ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
-		ewarn "Will default to GNU DB as your SASLdb database backend."
-		ewarn "If you want to build with Berkeley DB support; hit Control-C now."
-		ewarn "Change your USE flag -gdbm and emerge again."
-		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`"
-		einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend."
-		)
-		echo
-		ewarn "Waiting 10 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 10
-	fi
-
-	echo
-	einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
-	einfo "realm and username into a username of "user@realm" form."
-	echo
-	einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
-	einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
-	einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\""
-	einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
-	echo
-	einfo "Pause 10 seconds before continuing."
-	epause 10
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-
-	# 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"
-
-	# Add configdir support.
-	epatch "${FILESDIR}/${PN}-2.1.20-configdir.patch"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/${PN}-2.1.17-pgsql-include.patch"
-
-	# Fix for gcc-4.0
-	epatch "${FILESDIR}/${PN}-2.1.20-gcc4.patch"
-
-	# UNSUPPORTED ntlm patch. Bug #81342
-	use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache
-	ebegin "Recreating configure"
-	aclocal -I cmulocal -I config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	# Support for crypted passwords. Bug #45181
-	use crypt && epatch "${FILESDIR}/cyrus-sasl-2.1.19-checkpw.c.patch"
-
-	# Upstream doesn't even honor their own configure options... grumble
-	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile.{am,in}
-}
-
-src_compile() {
-	local myconf="--enable-login --enable-ntlm --disable-krb4 --disable-otp"
-#	myconf="${myconf} `use_enable static`" -- doesn't work upstream Bug #94137
-	myconf="${myconf} `use_with ssl openssl`"
-	myconf="${myconf} `use_with pam`"
-	myconf="${myconf} `use_with ldap`"
-	myconf="${myconf} `use_enable ldap ldapdb`"
-	myconf="${myconf} `use_enable sample`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-	myconf="${myconf} `use_with mysql` `use_enable mysql`"
-	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres`"
-	# Add use srp. Bug #81970.
-	myconf="${myconf} `use_enable srp`"
-	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-	# bug #56523. add authdaemond support.
-	myconf="${myconf} `use_with authdaemond`"
-
-	# fix for bug #59634. langthang 20040810.
-	if ! use ssl; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# default to GDBM if both 'gdbm' and 'berkdb' present.
-	if use gdbm; then
-		einfo "build with GNU DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "build with Berkeley DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=berkeley"
-	else
-		einfo "build without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random. Bug #46038
-	use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
-
-	# Detect mips systems properly.
-	gnuconfig_update
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		${myconf} || die "econf failed"
-
-	# Upstream doesn't even honor their own configure options... grumble
-	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile
-
-	# Fix PEBCAK in make.conf. Bug #75538.
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Parallel build doesn't work.
-	# Parallel build doesn't like distcc/ccache? Bug #78643.
-	if has distcc $FEATURES || has ccache $FEATURES; then
-		einfo "You have \"distcc\" or \"ccache\" enabled"
-		einfo "build with MAKEOPTS=-j1"
-		emake -j1 || die "compile problem"
-	else
-		einfo "build with MAKEOPTS=$MAKEOPTS"
-		emake || die "compile problem"
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-
-	# Bug #58768. Add testsaslauthd.
-	cd "${S}/saslauthd"
-	emake testsaslauthd || die "failed to make"
-}
-
-src_install () {
-	#einstall
-	make DESTDIR=${D} install || die "failed to install."
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Install everything necessary so user can build sample client/server
-	# (bug #64733)
-	if use sample; then
-		insinto /usr/share/${PN}-2/examples
-		doins aclocal.m4 config.h config.status configure.in
-		dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
-		exeinto /usr/share/${PN}-2/examples
-		doexe libtool
-		insinto /usr/share/${PN}-2/examples/sample
-		doins sample/*.{c,h} sample/*Makefile*
-		insinto /usr/share/${PN}-2/examples/sample/.deps
-		doins sample/.deps/*
-		dodir /usr/share/${PN}-2/examples/lib
-		dosym /usr/$(get_libdir)/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la
-		dodir /usr/share/${PN}-2/examples/lib/.libs
-		dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	if use java; then
-		java-pkg_dojar ${PN}.jar
-		#hackish, don't wanna dig though makefile
-		rm -rf ${D}/usr/$(get_libdir)/java
-		docinto java
-		dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/*
-		mkdir ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to create ${D}/usr/share/doc/${PF}/java/Test/"
-		cp ${S}/java/Test/*.java ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
-	fi
-
-	# Generate an empty sasldb2 with correct permissions.
-	if use berkdb || use gdbm; then
-		LD_OLD="${LD_LIBRARY_PATH}"
-		export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/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"
-	fi
-
-	docinto ""
-	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto saslauthd
-	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || \
-		die "failed to install pwcheck to /etc/init.d"
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || \
-		die "failed to install saslauthd to /etc/init.d"
-	newconfd "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \
-		die "failed to install /etc/conf.d/saslauthd"
-
-	exeinto ${ROOT}/usr/sbin
-	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
-		die "failed to install testsaslauthd."
-}
-
-pkg_postinst () {
-	if use sample; then
-		einfo "You have chosen to install sources for example client and server."
-		einfo "To build these, please type:"
-		einfo "\tcd /usr/share/${PN}-2/examples/sample && make"
-	fi
-
-	if use authdaemond; then
-		ewarn "You need to add a user running a service using Courier's"
-		ewarn "authdaemon to the 'mail' group. For example, do:"
-		echo "	gpasswd -a postfix mail"
-		ewarn "to add postfix to 'mail' group."
-	fi
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21.ebuild
deleted file mode 100644
index 8a5aa8dc2dde..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2005 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.21.ebuild,v 1.3 2005/11/06 04:35:04 matsuu Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
-
-ntlm_patch=${P}-ntlm_impl-spnego.patch.gz
-
-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
-	ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
-
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="berkdb crypt gdbm ldap mysql postgres kerberos static ssl java pam
-		authdaemond sample urandom srp ntlm_unsupported_patch"
-
-RDEPEND="virtual/libc
-	berkdb? ( >=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? ( virtual/pam )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kerberos? ( virtual/krb5 )
-	authdaemond? (
-		|| (
-			>=net-mail/courier-imap-3.0.7
-			>=mail-mta/courier-0.46
-		)
-	)
-	java? ( virtual/jdk )
-	ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
-
-pkg_setup() {
-
-	if use gdbm && use berkdb; then
-		echo
-		ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
-		ewarn "Will default to GNU DB as your SASLdb database backend."
-		ewarn "If you want to build with Berkeley DB support; hit Control-C now."
-		ewarn "Change your USE flag -gdbm and emerge again."
-		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`"
-		einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend."
-		)
-		echo
-		ewarn "Waiting 10 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 10
-	fi
-
-	echo
-	einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
-	einfo "realm and username into a username of "user@realm" form."
-	echo
-	einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
-	einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
-	einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\""
-	einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
-	echo
-	einfo "Pause 10 seconds before continuing."
-	epause 10
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-
-	# 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"
-
-	# Add configdir support.
-	epatch "${FILESDIR}/${PN}-2.1.20-configdir.patch"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/${PN}-2.1.17-pgsql-include.patch"
-
-	# Fix for gcc-4.0
-	epatch "${FILESDIR}/${PN}-2.1.20-gcc4.patch"
-
-	# UNSUPPORTED ntlm patch. Bug #81342
-	use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache
-	ebegin "Recreating configure"
-	aclocal -I cmulocal -I config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	# Sypport for crypted passwords. Bug #45181
-	use crypt && epatch "${FILESDIR}/cyrus-sasl-2.1.19-checkpw.c.patch"
-
-	# Upstream doesn't even honor their own configure options... grumble
-	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile.{am,in}
-}
-
-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 sample`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-	myconf="${myconf} `use_with mysql` `use_enable mysql`"
-	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres`"
-	# Add use srp. Bug #81970.
-	myconf="${myconf} `use_enable srp`"
-	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-	# bug #56523. add authdaemond support.
-	myconf="${myconf} `use_with authdaemond`"
-
-	# fix for bug #59634. langthang 20040810.
-	if ! use ssl; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# default to GDBM if both 'gdbm' and 'berkdb' present.
-	if use gdbm; then
-		einfo "build with GNU DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "build with Berkeley DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=berkeley"
-	else
-		einfo "build without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random. Bug #46038
-	use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
-
-	# Detect mips systems properly.
-	gnuconfig_update
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		${myconf} || die "econf failed"
-
-	# Upstream doesn't even honor their own configure options... grumble
-	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile
-
-	# Fix PEBCAK in make.conf. Bug #75538.
-	CFLAGS="$(echo ${CFLAGS} | xargs)"
-	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
-	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
-
-	# Parallel build doesn't work.
-	# Parallel build doesn't like distcc/ccache? Bug #78643.
-	if has distcc $FEATURES || has ccache $FEATURES; then
-		einfo "You have \"distcc\" or \"ccache\" enabled"
-		einfo "build with MAKEOPTS=-j1"
-		emake -j1 || die "compile problem"
-	else
-		einfo "build with MAKEOPTS=$MAKEOPTS"
-		emake || die "compile problem"
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-
-	# Bug #58768. Add testsaslauthd.
-	cd "${S}/saslauthd"
-	emake testsaslauthd || die "failed to make"
-}
-
-src_install () {
-	#einstall
-	make DESTDIR=${D} install || die "failed to install."
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Install everything necessary so user can build sample client/server
-	# (bug #64733)
-	if use sample; then
-		insinto /usr/share/${PN}-2/examples
-		doins aclocal.m4 config.h config.status configure.in
-		dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
-		exeinto /usr/share/${PN}-2/examples
-		doexe libtool
-		insinto /usr/share/${PN}-2/examples/sample
-		doins sample/*.{c,h} sample/*Makefile*
-		insinto /usr/share/${PN}-2/examples/sample/.deps
-		doins sample/.deps/*
-		dodir /usr/share/${PN}-2/examples/lib
-		dosym /usr/$(get_libdir)/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la
-		dodir /usr/share/${PN}-2/examples/lib/.libs
-		dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	if use java; then
-		java-pkg_dojar ${PN}.jar
-		#hackish, don't wanna dig though makefile
-		rm -rf ${D}/usr/$(get_libdir)/java
-		docinto java
-		dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/*
-		mkdir ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to create ${D}/usr/share/doc/${PF}/java/Test/"
-		cp ${S}/java/Test/*.java ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
-	fi
-
-	# Generate an empty sasldb2 with correct permissions.
-	if use berkdb || use gdbm; then
-		LD_OLD="${LD_LIBRARY_PATH}"
-		export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/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"
-	fi
-
-	docinto ""
-	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto saslauthd
-	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || \
-		die "failed to install pwcheck to /etc/init.d"
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || \
-		die "failed to install saslauthd to /etc/init.d"
-	newconfd "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \
-		die "failed to install /etc/conf.d/saslauthd"
-
-	exeinto ${ROOT}/usr/sbin
-	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
-		die "failed to install testsaslauthd."
-}
-
-pkg_postinst () {
-	if use sample; then
-		einfo "You have chosen to install sources for example client and server."
-		einfo "To build these, please type:"
-		einfo "\tcd /usr/share/${PN}-2/examples/sample && make"
-	fi
-}
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r2 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r2
deleted file mode 100644
index 749242762648..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1eafae95f0289c10f187d8b2bc4032cf cyrus-sasl-2.1.18.tar.gz 1522578
-RMD160 772a1413ca68a8b91fa93d51630984acc7209136 cyrus-sasl-2.1.18.tar.gz 1522578
-SHA256 384279adfd582ad6f905197c46a5157f855462718530148fdbab3328cf621eb7 cyrus-sasl-2.1.18.tar.gz 1522578
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.19-r1 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.19-r1
deleted file mode 100644
index 440fb5d8e0dc..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.19-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea76410ad88fa7b6c17a6aac424382c9 cyrus-sasl-2.1.19.tar.gz 1537350
-RMD160 c74ca8685e9bdf12fe1f64137de931d79a4384ab cyrus-sasl-2.1.19.tar.gz 1537350
-SHA256 0ee2d5d04972a15c3154730f328467a5cf5c7e69766a73bab06664263666bfeb cyrus-sasl-2.1.19.tar.gz 1537350
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r1 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r1
deleted file mode 100644
index d7812557f204..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 268ead27f4ac39bcfe17d9e38e0f2977 cyrus-sasl-2.1.20.tar.gz 1775163
-RMD160 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c cyrus-sasl-2.1.20.tar.gz 1775163
-SHA256 f0b97118e3e014a185c17777672a93300ca561cf5f2beeac2d4aa6abec09534d cyrus-sasl-2.1.20.tar.gz 1775163
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r2 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r2
deleted file mode 100644
index 095a8ff9d86b..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 268ead27f4ac39bcfe17d9e38e0f2977 cyrus-sasl-2.1.20.tar.gz 1775163
-RMD160 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c cyrus-sasl-2.1.20.tar.gz 1775163
-SHA256 f0b97118e3e014a185c17777672a93300ca561cf5f2beeac2d4aa6abec09534d cyrus-sasl-2.1.20.tar.gz 1775163
-MD5 a3a8fcefa0874e1fb97787a034880d9f cyrus-sasl-ntlm_impl-spnego.patch.gz 7430
-RMD160 e5de01ff94f62e4bf83c44416e90112a212b26bc cyrus-sasl-ntlm_impl-spnego.patch.gz 7430
-SHA256 b6ecd6dc5c1c4a6341d9f663db2c0d79932b0b0844d4409ca8daa902c659108d cyrus-sasl-ntlm_impl-spnego.patch.gz 7430
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3
deleted file mode 100644
index 095a8ff9d86b..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 268ead27f4ac39bcfe17d9e38e0f2977 cyrus-sasl-2.1.20.tar.gz 1775163
-RMD160 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c cyrus-sasl-2.1.20.tar.gz 1775163
-SHA256 f0b97118e3e014a185c17777672a93300ca561cf5f2beeac2d4aa6abec09534d cyrus-sasl-2.1.20.tar.gz 1775163
-MD5 a3a8fcefa0874e1fb97787a034880d9f cyrus-sasl-ntlm_impl-spnego.patch.gz 7430
-RMD160 e5de01ff94f62e4bf83c44416e90112a212b26bc cyrus-sasl-ntlm_impl-spnego.patch.gz 7430
-SHA256 b6ecd6dc5c1c4a6341d9f663db2c0d79932b0b0844d4409ca8daa902c659108d cyrus-sasl-ntlm_impl-spnego.patch.gz 7430
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21
deleted file mode 100644
index a57afed20711..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9a8de902bf642a4f66007d07c16335ce cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-RMD160 acf1d479c4559acdda66ab66da999ffc2f68d029 cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-SHA256 b02b97bbc3968248c4f04d3d67a9aac4baa4aa4f8388eefec548475784a2d968 cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-MD5 dde02db234dea892bee298390890502e cyrus-sasl-2.1.21.tar.gz 1584931
-RMD160 93e0e1868453c5781602b5cce23e746b8823a26b cyrus-sasl-2.1.21.tar.gz 1584931
-SHA256 fa37bcc8b855597aa1e6b72915b38985991b4abd4e7bc116c3e88fd4e86fb0fb cyrus-sasl-2.1.21.tar.gz 1584931
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21-r1 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21-r1
deleted file mode 100644
index a57afed20711..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.21-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9a8de902bf642a4f66007d07c16335ce cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-RMD160 acf1d479c4559acdda66ab66da999ffc2f68d029 cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-SHA256 b02b97bbc3968248c4f04d3d67a9aac4baa4aa4f8388eefec548475784a2d968 cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465
-MD5 dde02db234dea892bee298390890502e cyrus-sasl-2.1.21.tar.gz 1584931
-RMD160 93e0e1868453c5781602b5cce23e746b8823a26b cyrus-sasl-2.1.21.tar.gz 1584931
-SHA256 fa37bcc8b855597aa1e6b72915b38985991b4abd4e7bc116c3e88fd4e86fb0fb cyrus-sasl-2.1.21.tar.gz 1584931