Drop old

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

5 files changed, 19 insertions, 652 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index f8aeb8207752..a9ff08065f7f 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.259 2013/01/01 18:55:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.260 2013/01/04 08:12:15 eras Exp $
+
+  04 Jan 2013; Eray Aslan <eras@gentoo.org> -cyrus-sasl-2.1.25-r1.ebuild,
+  -cyrus-sasl-2.1.25-r2.ebuild, -cyrus-sasl-2.1.25.ebuild:
+  Drop old
 
   01 Jan 2013; Raúl Porcel <armin76@gentoo.org> cyrus-sasl-2.1.25-r3.ebuild:
   s390/sh stable wrt #445208
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index fd186f89df47..d689d9831941 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -44,17 +44,24 @@ DIST cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz 7462 SHA256 9514a7436b11184cfd7
 DIST cyrus-sasl-2.1.23.tar.gz 1613642 SHA256 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136 SHA512 bf72db55fefe9eccfe4a12caf1160efc80aba98f8acc2743af360fda96659a3ee1fc3a5af6104b3dfc8fc4571f4e98526b9719a6cdf0948980cf76a9cb1a2b0e WHIRLPOOL 36e0b85228105186160ac8f8751137a067bca0cf6e219dda527808cb04ae597273c97b9d8cd3c1e3b900787a70ad67e5395127ab5107ef0e8ac0100b04612673
 DIST cyrus-sasl-2.1.25.tar.gz 5209240 SHA256 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe SHA512 cab89deb025cb29b316990f29e7456be4fd1303553032df35c50331e5608c27ade16fd9b48578a294153493a12cd82af1db2f8a2ce7e385b03a9ebfc82085289 WHIRLPOOL eef119539e5c71af9c3505956ca20a8ae12e58f1d91e2c0fcc5af7679cda9e4f0d44beb3d45f03e24d604ff1b9f4b9850ed494c41a4c7a237b22f4b91e3fa79c
 EBUILD cyrus-sasl-2.1.23-r6.ebuild 8954 SHA256 18ab7153c4303c16c995007406fe99a997e80fda0dd89a5821eff3ae4e0a435b SHA512 a0583520a67d0abf2a5d74340765933f4a2e999c0e69204a3b79666099d3c29d3338d82f6f6caa3d521ec44eea2647809cd083513aed435e671cfa3f9f579ae7 WHIRLPOOL 35640bc5a5d027fb6c16f0e7a07221aea6aad07b2fbb0100e5627b036ddf25fcd7dee43243239dd8a5e4b3266d27118eac381df69ccb7aac74c66d00a068d58f
-EBUILD cyrus-sasl-2.1.25-r1.ebuild 6567 SHA256 2d416c123885163ae360e1ad7d4b947a7ceeae3adfe07b39c2be3e68fb80f167 SHA512 831bac1f48b7b0e146879e736be276d6209fbe26695ea0765f60efeae4f61bb263371c4e817857d169ab10da18e3a18d2d23c68fd21ac074544705216c3a88a9 WHIRLPOOL 4a82396ece1b442a9f5e12ef8c765e72452d080827ee6956e1dc65ffbd31ba345a2a64769faf3e516656fde16353adfd6e22fcd11848d2589ae033786351c5b5
-EBUILD cyrus-sasl-2.1.25-r2.ebuild 6566 SHA256 e4631eeaf2bb829586e197a548b8fcb8ae3427fe3fb1f15d9fd34565a31cb42c SHA512 3100c109412f3209673a53f4860da94e488462f2e687c541934c05d132ad08ca44dee1e124243def6660b5565d5fef2c4697a64d87a87f22372bcdcdcae27e94 WHIRLPOOL 65ee61c83771327d4cf72ac711af47ceabfcee7b1158c11ffffd87eb4519601e7dbff8b0942168419cd5e8b4f0a7a819c8a1bbdb9ab57411dc85656b15bb76b3
 EBUILD cyrus-sasl-2.1.25-r3.ebuild 6726 SHA256 ba12c28fa49b6abb2614e07c15ce2cd68cde7fbfe04863bb3060620ad2b3beaa SHA512 8fad9f5a630cbb3d264278499271533332bff60fa4f035ba172d21e1cbff3505b3c802566d0c9630c2bfd58982ea9d23e2419cc2d5983e04afa2ad883c7e12c5 WHIRLPOOL 356235348270b87b9b90a53712b6cef7a32039633d748a905bb956d0a61aa2da7b3f23f6a0e1afd75825acdd7b51931f716233b4ea7fff445c2db4e8303cf82a
 EBUILD cyrus-sasl-2.1.25-r4.ebuild 6782 SHA256 1fcc52d0617172574e530f3694b448073c8ba1c9d28817c2d5fa46c6bb9d52f6 SHA512 6e3035878310c8dba723c6977603e159021ea476649e89da27ebc55f8a6449af8202c57644035e464935b4f6e098a1a231a5905e6b587f7def7b92ca8a3806a1 WHIRLPOOL fda600c68fffb35b6f823b1323abcacb8b89ede25cc90cd77110790493b5c3f3ce26a6a0a753c171a08eee19fb87c54ad242b2e54ef5cb42a1af7bb6ca02c914
-EBUILD cyrus-sasl-2.1.25.ebuild 6523 SHA256 65c4d63bb888aeb16a8e01f061ebb85a991ca195e5cd6e45a892308be7ddfa78 SHA512 5238a077aa59a74f73b398c3e36a9f7ae1ae3b36f153fcb8b40f80c0fa2f9507455b2a13f1eca84acab3233d517c332fac0ec879fab12960204980dc617f2124 WHIRLPOOL 54d2707f6158b4fc3d33091cacab13b5c06322b96baf36c6bb4bc6f6dd962860fcecdd207775f676ee45b160340eda013db3965822cb93f3b27241ad19639b2f
-MISC ChangeLog 43191 SHA256 45993bcbf57b102991f67101e812c503a5c3f5645b60abaef22efce48f448542 SHA512 a5a8da64a2170d5aa8ee8dc8606d57dd9a40bb2d91a460cbe0f53165ae26597856c0a72f3c2f6f07d687922df2dfc3a4d09c616b0b0839356c45205580520c4f WHIRLPOOL 292368813509ac4ffbf977eda86cc48c630d505e44f78dc0af241b5914d00495f7bc0dfb19bb8d2b148a591d6f430be2218b51606d0557459910e0613dbfd4b4
+MISC ChangeLog 43333 SHA256 bf5e6bdc877779e1a95bee46bbd6f6cf7b289c3c9557d18b57a180f6f6fc5abf SHA512 5ff89a607edf2f4f0323a6d720d927c510c235e956f91f3568198d1f5783452fa8e8958e16afc8a9b0ec71a253853d0221c27d4d26b5c8f308abe4ff44c95a2a WHIRLPOOL 858c8423784b059f46ef35b95a5259bd055a8d6c761bd40e6b1d346eeb8c9eac5912e21c26cbdf4ed46822200d77381bfe847a71c4d1c200b24270d759408809
 MISC metadata.xml 727 SHA256 6b9f368b484972e833084dba4aedf70c09767b816b57cb43a7c0945b8b11b497 SHA512 8b6c6556dd9adff73a6f0bc40fd8064cae8ce8b45734ab0a30b7611be9f226144403fa0dbcf6d3965bd03e12b7c36848c91937bd8133a5581bd296d741a013c7 WHIRLPOOL 5e24419ac72d0ef8591de06c7ab4d95435234e8d894ee31b2015e6465d15a777919c714aae4e3293e194ccfcb505cf0d77f2565959d5e9ecf41c1cbb7b9ff1c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDjMSUACgkQuQc30/atMkCyuQCeJzjzXqmaBvQZHVbXOwxse9u9
-SjEAn107Hqgq7QncBxLRR3GUi08x3Aqg
-=aRlH
+iQIcBAEBCAAGBQJQ5o7pAAoJEHfx8XVYajsfdZwQAIO/DgUfVw4OHZO2dyHFmw5a
+j2T/holDdDITh93aXZadFJY+dxmX2fapdzNB2mZTTrQr+cwTrJaEPBBL5k166F+i
+0/0BV5mOwbrEdunsJBSZpOrYLGTXUhKRJqmI03b3Uu0uO2yI8TH3n0WMVrUy+GWq
+V59qh9wPLk27zVWx+ACFD/XQ7skMl+kmsbC9gzxrDQs+e8F+V5X0UWVZOBgaOoYW
+CNE1YnHy0Lxgz9SubVrcdFUXdQeIjQsjOn5B75qbXJLFVWVG4237uu7KF5dr8wCN
+B/2rw+vIPOMX9MINEFcqbaWx51sT36sxrznwTLuZjhMVyobcdwL7KtMdO6cOyit6
++yG9yacTG5706in5boKhOv5cAaWGHF1uKAZgIwJZbxrCwwnBGJoyLZSAn15vpPoh
+URKzDXhJHTTctqnk7cNFmwVP/xlCF2QMzxHx0Hg4NWW8YgZ3uwu2525oV93iAhG8
+pDJdnlRtqAEiyTI5TAy2OvSJKmXRECcpZmb3Tcbx6Jx9Y8F5WlNmt2aHiF2kQCW2
+A0VfmjB6pI3mu8kZfy/FtHAb0Vt7FAmdciia4O3FLbRi85mYVAv/PA6gOsFidR5N
+zsZhMwLfkuO44r1QGf1Jnpsg4KTCFbHmPPXjdfjTUtkeZpTb0HUH/KKBogwvbk8q
+CulBVR2T8107LrhjNCy+
+=FXVe
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
deleted file mode 100644
index d90122470f47..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2012 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.25-r1.ebuild,v 1.3 2012/12/21 13:27:37 eras Exp $
-
-EAPI=4
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
-
-SASLAUTHD_CONF_VER="2.1.21"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	kerberos? ( virtual/krb5 )
-	openldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sasldb_al.patch
-	epatch "${FILESDIR}"/${P}-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${P}-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${P}-autotools_fixes.patch
-	epatch "${FILESDIR}"/${P}-as_needed.patch
-	epatch "${FILESDIR}"/${P}-missing_header.patch
-	epatch "${FILESDIR}"/${P}-gssapi.patch
-	epatch "${FILESDIR}"/${P}-lib_before_plugin.patch
-	epatch "${FILESDIR}"/${P}-fix_heimdal.patch
-	epatch "${FILESDIR}"/${P}-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23+db-5.0.patch
-#	epatch "${FILESDIR}"/${P}-fix_dovecot_authentication.patch
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	# Java support.
-	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-	fi
-
-	# Fix for bug #59634.
-	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' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-	else
-		einfo "Building without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	fi
-
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--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 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable java) \
-		$(use_with java javahome ${JAVA_HOME}) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# 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
-
-	# Add testsaslauthd (bug #58768).
-	cd "${S}/saslauthd"
-	emake testsaslauthd
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	if use sample ; then
-		docinto sample
-		dodoc sample/*.c
-		exeinto /usr/share/doc/${P}/sample
-		doexe sample/client sample/server
-	fi
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	if use java ; then
-		java-pkg_dojar ${PN}.jar
-		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-		# hackish, don't wanna dig through makefile
-		rm -Rf "${D}/usr/$(get_libdir)/java"
-		docinto "java"
-		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-		dodir "/usr/share/doc/${PF}/java/Test"
-		insinto "/usr/share/doc/${PF}/java/Test"
-		doins "${S}"/java/Test/*.java
-	fi
-
-	docinto ""
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-
-	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2.0.23
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2.0.23
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild
deleted file mode 100644
index c99bb62a5714..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2012 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.25-r2.ebuild,v 1.4 2012/12/21 13:27:37 eras Exp $
-
-EAPI=4
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
-
-SASLAUTHD_CONF_VER="2.1.21"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	kerberos? ( virtual/krb5 )
-	openldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sasldb_al.patch
-	epatch "${FILESDIR}"/${P}-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${P}-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${P}-autotools_fixes.patch
-	epatch "${FILESDIR}"/${P}-as_needed.patch
-	epatch "${FILESDIR}"/${P}-missing_header.patch
-	epatch "${FILESDIR}"/${P}-gssapi.patch
-	epatch "${FILESDIR}"/${P}-lib_before_plugin.patch
-	epatch "${FILESDIR}"/${P}-fix_heimdal.patch
-	epatch "${FILESDIR}"/${P}-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23+db-5.0.patch
-	epatch "${FILESDIR}"/${P}-get_fqhostname.patch
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	# Java support.
-	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-	fi
-
-	# Fix for bug #59634.
-	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' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-	else
-		einfo "Building without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	fi
-
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--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 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable java) \
-		$(use_with java javahome ${JAVA_HOME}) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# 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
-
-	# Add testsaslauthd (bug #58768).
-	cd "${S}/saslauthd"
-	emake testsaslauthd
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	if use sample ; then
-		docinto sample
-		dodoc sample/*.c
-		exeinto /usr/share/doc/${P}/sample
-		doexe sample/client sample/server
-	fi
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	if use java ; then
-		java-pkg_dojar ${PN}.jar
-		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-		# hackish, don't wanna dig through makefile
-		rm -Rf "${D}/usr/$(get_libdir)/java"
-		docinto "java"
-		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-		dodir "/usr/share/doc/${PF}/java/Test"
-		insinto "/usr/share/doc/${PF}/java/Test"
-		doins "${S}"/java/Test/*.java
-	fi
-
-	docinto ""
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-
-	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2.0.23
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2.0.23
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild
deleted file mode 100644
index 6ef165aa6010..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2012 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.25.ebuild,v 1.4 2012/12/21 13:27:37 eras Exp $
-
-EAPI=4
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
-
-SASLAUTHD_CONF_VER="2.1.21"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	kerberos? ( virtual/krb5 )
-	openldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sasldb_al.patch
-	epatch "${FILESDIR}"/${P}-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${P}-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${P}-autotools_fixes.patch
-	epatch "${FILESDIR}"/${P}-as_needed.patch
-	epatch "${FILESDIR}"/${P}-missing_header.patch
-	epatch "${FILESDIR}"/${P}-gssapi.patch
-	epatch "${FILESDIR}"/${P}-lib_before_plugin.patch
-	epatch "${FILESDIR}"/${P}-fix_heimdal.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23+db-5.0.patch
-#	epatch "${FILESDIR}"/${P}-fix_dovecot_authentication.patch
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	# Java support.
-	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-	fi
-
-	# Fix for bug #59634.
-	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' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-	else
-		einfo "Building without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	fi
-
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--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 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable java) \
-		$(use_with java javahome ${JAVA_HOME}) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# 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
-
-	# Add testsaslauthd (bug #58768).
-	cd "${S}/saslauthd"
-	emake testsaslauthd
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	if use sample ; then
-		docinto sample
-		dodoc sample/*.c
-		exeinto /usr/share/doc/${P}/sample
-		doexe sample/client sample/server
-	fi
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	if use java ; then
-		java-pkg_dojar ${PN}.jar
-		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-		# hackish, don't wanna dig through makefile
-		rm -Rf "${D}/usr/$(get_libdir)/java"
-		docinto "java"
-		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-		dodir "/usr/share/doc/${PF}/java/Test"
-		insinto "/usr/share/doc/${PF}/java/Test"
-		doins "${S}"/java/Test/*.java
-	fi
-
-	docinto ""
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-
-	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2.0.23
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2.0.23
-}