Remove old.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

5 files changed, 6 insertions, 934 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index bf3417993b90..f16ea7ca0dc1 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.294 2013/08/06 12:36:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.295 2013/09/05 23:10:12 radhermit Exp $
+
+  05 Sep 2013; Tim Harder <radhermit@gentoo.org> -cyrus-sasl-2.1.23-r6.ebuild,
+  -cyrus-sasl-2.1.25-r4.ebuild, -cyrus-sasl-2.1.26-r1.ebuild,
+  -cyrus-sasl-2.1.26-r2.ebuild:
+  Remove old.
 
   06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> cyrus-sasl-2.1.23-r7.ebuild,
   cyrus-sasl-2.1.26-r3.ebuild:
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild
deleted file mode 100644
index 392c19269e04..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild
+++ /dev/null
@@ -1,252 +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.23-r6.ebuild,v 1.10 2012/12/21 13:27:37 eras Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
-
-ntlm_patch="${P}-ntlm_impl-spnego.patch.gz"
-SASLAUTHD_CONF_VER="2.1.21"
-
-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="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 crypt gdbm kerberos openldap mysql ntlm_unsupported_patch pam postgres sample srp ssl urandom"
-
-DEPEND="authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	kerberos? ( virtual/krb5 )
-	openldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use gdbm && use berkdb ; then
-		echo
-		elog "You have both 'gdbm' and 'berkdb' USE flags enabled."
-		elog "gdbm will be selected."
-		echo
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	# 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"
-
-	# UNSUPPORTED ntlm patch #81342
-	use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
-	epatch "${FILESDIR}"/${PN}-2.1.17-pgsql-include.patch
-	use crypt && epatch "${FILESDIR}"/${PN}-2.1.19-checkpw.c.patch #45181
-	epatch "${FILESDIR}"/${PN}-2.1.22-as-needed.patch
-	epatch "${FILESDIR}/${PN}-2.1.21-keytab.patch"
-	epatch "${FILESDIR}"/${PN}-2.1.22-crypt.patch #152544
-	epatch "${FILESDIR}"/${PN}-2.1.22-qa.patch
-	epatch "${FILESDIR}/${PN}-2.1.22-gcc44.patch" #248738
-	epatch "${FILESDIR}"/${P}-authd-fix.patch
-	epatch "${FILESDIR}"/${P}+db-5.0.patch
-	epatch "${FILESDIR}/${PN}-0001_versioned_symbols.patch"
-	epatch "${FILESDIR}/${PN}-0002_testsuite.patch"
-	epatch "${FILESDIR}/${PN}-0006_library_mutexes.patch"
-	epatch "${FILESDIR}/${PN}-0008_one_time_sasl_set_alloc.patch"
-	epatch "${FILESDIR}/${PN}-0010_maintainer_mode.patch"
-	epatch "${FILESDIR}/${PN}-0011_saslauthd_ac_prog_libtool.patch"
-	epatch "${FILESDIR}/${PN}-0012_xopen_crypt_prototype.patch"
-	epatch "${FILESDIR}/${PN}-0014_avoid_pic_overwrite.patch"
-	epatch "${FILESDIR}/${PN}-0016_pid_file_lock_creation_mask.patch"
-	epatch "${FILESDIR}/${PN}-0026_drop_krb5support_dependency.patch"
-	epatch "${FILESDIR}"/${P}-rimap-loop.patch #381427
-	epatch "${FILESDIR}"/${P}-gss_c_nt_hostbased_service.patch #389349
-
-	sed -i -e '/for dbname in/s:db-4.* db:'$(db_libname)':' \
-		"${S}"/cmulocal/berkdb.m4
-
-	# Upstream doesn't even honor their own configure options... grumble
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# make sure to use common plugin ldflags
-	sed -i '/_la_LDFLAGS = /s:=:= $(AM_LDFLAGS) :' plugins/Makefile.am || die
-
-	# Recreate configure.
-	rm -f "${S}/config/libtool.m4" || die "rm libtool.m4 failed"
-	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
-}
-
-src_configure() {
-	# Fix QA issues.
-	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).
-	use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
-
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-krb4 \
-		--disable-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 openldap 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_enable srp) \
-		${myconf}
-}
-
-src_compile() {
-	# We force -j1 for bug #110066.
-	emake -j1 || die "emake failed"
-
-	# 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 || die "emake testsaslauthd failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Install everything necessary so users 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
-
-	# 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 || die "Failed to copy java files to /usr/share/doc/${PF}/java/Test"
-	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 || die "Failed to install saslauthd to /etc/pam.d"
-
-	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-${SASLAUTHD_CONF_VER}.conf" saslauthd || die "Failed to install saslauthd to /etc/conf.d"
-
-	exeinto /usr/sbin
-	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || die "Failed to install testsaslauthd"
-}
-
-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 sample ; then
-		elog "You have chosen to install sources for the example client and server."
-		elog "To build these, please type:"
-		elog "\tcd /usr/share/${PN}-2/examples/sample && make"
-	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
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild
deleted file mode 100644
index d3d479904b8e..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2013 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-r4.ebuild,v 1.15 2013/04/24 08:48:34 eras Exp $
-
-EAPI=4
-
-# should be fixed in automake-1.13.2(?).  Please test and remove if appropriate.
-# See automake bug #13514
-WANT_AUTOMAKE="1.12"
-
-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="net-mail/mailbase
-	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
-	epatch "${FILESDIR}"/${P}-service_keytabs.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' configure.in
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		configure.in || die
-
-	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 || use sqlite ; 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.26-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r1.ebuild
deleted file mode 100644
index b0905815cde1..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2013 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.26-r1.ebuild,v 1.3 2013/04/24 08:48:34 eras Exp $
-
-EAPI=5
-
-# should be fixed in automake-1.13.2(?).  Please test when released.
-# See automake bug #13514
-WANT_AUTOMAKE="1.12"
-
-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="net-mail/mailbase
-	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}"/${PN}-2.1.25-sasldb_al.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		configure.in || die
-
-	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 || use sqlite ; 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
-}
-
-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
-}
-
-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
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild
deleted file mode 100644
index dbb99525c574..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2013 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.26-r2.ebuild,v 1.1 2013/07/13 12:01:10 pacho Exp $
-
-EAPI=5
-
-# should be fixed in automake-1.13.2(?).  Please test when released.
-# See automake bug #13514
-WANT_AUTOMAKE="1.12"
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-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="net-mail/mailbase
-	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}"/${PN}-2.1.25-sasldb_al.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		configure.in || die
-
-	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 || use sqlite ; 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=/run/saslauthd \
-		--with-pwcheck=/run/saslauthd \
-		--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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /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
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	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
-}
-
-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
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2
-}