Remove old

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

4 files changed, 20 insertions, 450 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index e5fd29e463a8..6e4a081d89ab 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.277 2013/03/01 12:43:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.278 2013/03/11 11:57:14 eras Exp $
+
+  11 Mar 2013; Eray Aslan <eras@gentoo.org> -cyrus-sasl-2.1.25-r3.ebuild,
+  -cyrus-sasl-2.1.26.ebuild:
+  Remove old
 
   01 Mar 2013; Agostino Sarubbo <ago@gentoo.org> cyrus-sasl-2.1.25-r4.ebuild:
   Stable for sh, wrt bug #457688
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 4e414d8f0bf1..2c4fb3c4b121 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cyrus-sasl-0001_versioned_symbols.patch 914 SHA256 d64669070f4d19d884eaeb7d2b3b66987a714c2dda462bbbc4bcf452b705c3e0 SHA512 83329417818f1a33fb013090024e15786dadfc0fc865e2c6f09addbf8ba51519f171f8d583cd558b2ec98c2ece112a5427f8a6b02b74246cc948fe196a38681c WHIRLPOOL acb76440be9cbbb671d686080ec9478c70773c7a84526f2f1ea8bf4b994b51bb8c32830ba12c4e8c8dcfc973e17a00b847e7f67c39f639c1b1ad825612c989bc
 AUX cyrus-sasl-0002_testsuite.patch 1055 SHA256 d7fff57482c2a9b148296ec680327d0cbd5254ed0a0bc99f46e2dc73758a6abc SHA512 a7ea09cfb76b4c99ca8b1316c547e6168108e11495368453fbc4e4842306727c2e1aafe9d959d195d6eb5262b5e1f91668fc7ac1d24dc6b15149ae162288994e WHIRLPOOL 5b71f60005aeeea61ad403f8a7c8c8379348f22a16780a2ef35fb092ed265191638e859c9faf576e7e06dafe8357960db0b8ba8ff8d8a940731eb8de41f81a2e
@@ -46,26 +46,24 @@ DIST cyrus-sasl-2.1.23.tar.gz 1613642 SHA256 20efcc4040cbab6e89a636a07dcf5720ee0
 DIST cyrus-sasl-2.1.25.tar.gz 5209240 SHA256 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe SHA512 cab89deb025cb29b316990f29e7456be4fd1303553032df35c50331e5608c27ade16fd9b48578a294153493a12cd82af1db2f8a2ce7e385b03a9ebfc82085289 WHIRLPOOL eef119539e5c71af9c3505956ca20a8ae12e58f1d91e2c0fcc5af7679cda9e4f0d44beb3d45f03e24d604ff1b9f4b9850ed494c41a4c7a237b22f4b91e3fa79c
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 SHA256 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0 WHIRLPOOL bcba17705d5d7ef9a03802d6a0c3a887bba0473605a3a48d2672aeac187193f2488f28ab01bdf659d7a68b94b4c74e36428ca4b5be840fbed2968f1592534b33
 EBUILD cyrus-sasl-2.1.23-r6.ebuild 8954 SHA256 18ab7153c4303c16c995007406fe99a997e80fda0dd89a5821eff3ae4e0a435b SHA512 a0583520a67d0abf2a5d74340765933f4a2e999c0e69204a3b79666099d3c29d3338d82f6f6caa3d521ec44eea2647809cd083513aed435e671cfa3f9f579ae7 WHIRLPOOL 35640bc5a5d027fb6c16f0e7a07221aea6aad07b2fbb0100e5627b036ddf25fcd7dee43243239dd8a5e4b3266d27118eac381df69ccb7aac74c66d00a068d58f
-EBUILD cyrus-sasl-2.1.25-r3.ebuild 6726 SHA256 ba12c28fa49b6abb2614e07c15ce2cd68cde7fbfe04863bb3060620ad2b3beaa SHA512 8fad9f5a630cbb3d264278499271533332bff60fa4f035ba172d21e1cbff3505b3c802566d0c9630c2bfd58982ea9d23e2419cc2d5983e04afa2ad883c7e12c5 WHIRLPOOL 356235348270b87b9b90a53712b6cef7a32039633d748a905bb956d0a61aa2da7b3f23f6a0e1afd75825acdd7b51931f716233b4ea7fff445c2db4e8303cf82a
 EBUILD cyrus-sasl-2.1.25-r4.ebuild 6790 SHA256 513a064c352542fc9aacae0707f6f1059807e133825923af437428f88dd8d908 SHA512 1b2612daddfd2a6ccd0de2ff7b07398477b0aa5adbeb1a79e8097b5c693d53910fe10121d1501d73cc67407e3b4181fa9a5bf8c9e69f46b3c292ef12c38d31f9 WHIRLPOOL c1e5d1c7e604e74f86b232f5a93e8f5643f7e7170bcda09be47f30d232d07429af26f1fdc13b9b836acbd66c0a3da57c16bfabf2f3b9bc2803a3ea3a41e12dbc
 EBUILD cyrus-sasl-2.1.26-r1.ebuild 6617 SHA256 0070b2a709f6a105ebb991bb4c07eb5fa097ca3a13940df6612ac545c7a16b2e SHA512 097411473cf80270b8ca9cb1d89eb8543341f1ab97cc16c946cf4ad130cf04e03bdd0dc23341748b5ea90dcfcf89d354e178221c9e8cdae1b70e9785c726171b WHIRLPOOL a08dd90850780abb7628e68fcfddb3144300fbbfdd69f432e1f996d4a302db1988f0e6dcb82f6b4decb4eda2428cd004d73c87a1e0107a259730f7b08a2939b6
-EBUILD cyrus-sasl-2.1.26.ebuild 6568 SHA256 48c24a1ad977a0810ae915e3908a558a8b03114f52edac3d7c7fe38d86603632 SHA512 38bb5231a2ca2be769a2ca2008c629a3a4fb5e61554466b78b80a38c17b4cb2278b941e5e6ef7b52fb515816960099a3d9805276261d9d394fce88132c699311 WHIRLPOOL 30a0bdf7c28f64a7c072bf305fcd7436797ac369ec99c6308b41c1a945fe35324bb5259b433c76be5678250a2e4d9f4b90092a92bebe7e21d2dc8b27288f15ae
-MISC ChangeLog 45369 SHA256 58fbdc3db6c5ad541e82c7510ade6b115f7d9f6a6323db08aa6fb746bc007dda SHA512 86eb48423b599a41296dc4cad7c25a089a09b79722682e221b4093a67f8385e6107c06f606ef6f3800a50c2ff1259c354ee413fd6e7911b8616d9547ce321ca6 WHIRLPOOL 8d63939fd0b913da0ce1ac45f706bf59530bf6cd55083aad310d61bddb7762ad8d3a16926888a204144d076285b9d14f76ca212b119ec5a5c4284bbc8340daee
+MISC ChangeLog 45487 SHA256 2286442948d7483b46a37907a18fb94b55a09930943314d2d174bd0092798877 SHA512 cd37b22a670d5ff338ddd06d3dcd6d473e2045e5ec0ad2aaabdc75316e4fe36ae63df3937e0a661c8a780d98cb4bb5e3717634a527ea56c5cd5b6eb3b93fb732 WHIRLPOOL be82d2fc6e95c417d3167ccec713701840072ecbe1d76b8658002d5061183a06dfc096dbeb5164f84f8ffebce3a61f7c21ec3ed8f99da3fa711b6521d257edcf
 MISC metadata.xml 727 SHA256 6b9f368b484972e833084dba4aedf70c09767b816b57cb43a7c0945b8b11b497 SHA512 8b6c6556dd9adff73a6f0bc40fd8064cae8ce8b45734ab0a30b7611be9f226144403fa0dbcf6d3965bd03e12b7c36848c91937bd8133a5581bd296d741a013c7 WHIRLPOOL 5e24419ac72d0ef8591de06c7ab4d95435234e8d894ee31b2015e6465d15a777919c714aae4e3293e194ccfcb505cf0d77f2565959d5e9ecf41c1cbb7b9ff1c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRMKH1AAoJELp701BxlEWfT/AQAIJKjUYbXnJe9flFz2VoPfr6
-3p1lbDTCEQBqsw2hv3aJSGlR5wPC1Q0wEndJvVYjZCuzPwY6a2jyKAoZx8nBm31e
-xkawvfawPpFR1536Rd6gICzhXVld2Fr8yul0cTBbVyKE45rbD73Ys8pBbzZCn/ZF
-a8DYBHKun600H6lWpSWN4wGeGIdH6AsJiha2Pueele50cQEjsa03XFdNsukJa1e6
-6sxyHboObTJjAENBdrzNnpoVeHX3JSE0qIXxZiYpcf9q1Y2gPUAvzS7MUNTUC86Q
-/batOdlLISIIHChrykgj8EPTpdzUvlaJQv8aB1E2TGgQullXZXi5o+fZmIUilWF/
-+R9Cgm0Gu9Q/0lmFxb5E9CULPsAH879GP/X3yayCuZEq96rFrgXBK/N8ctgHm/q/
-OBT5vHhY/2H5pvyhgm8QTN5Egl2Bpw9S5OTqoyDmpfKpZCWXNk/taeqzkYssrzB+
-qARKDL0yRe0QZmZyKkV3XyqV5DrnAkpvHOraHHEgtiXrYJE9bS7lQisNsnyHTjFy
-gmTtcQ0w/gjUgQloFLwTwbEyI8gckE1I6ANMLQQ37DHJgK7BZ0P0Z2WuWp1jGZxt
-DerB0sIlAP8KUicgdSZoR7OtgkYviT4Oh/GuF8kUwqzGkZW8fWX7oz31ghiZz1rY
-Se+P5Jo4nxrKXfpwLp++
-=y2Ll
+iQIcBAEBCAAGBQJRPcacAAoJEHfx8XVYajsfmPMP/1ojYbryCF1faWWS9ijEVH+P
+S504Pp722Gg8vZ2j0w9NMljIXX1S5xWH3bex6OCiSyr0fXHpsqws3GksC/RtwurD
+8+xR9zwmETzH+D2x9656tEC2CVV4Zs6eY8euXBQFW9D5ixuQDVjVdZ95HFJ0OQBZ
+4XsVB1UniIWgjvlnZWY0vwLWO3h3CP/iEx8wWsW0NPjGxId6yR6PHXz9kmMNRucs
+EGzxWzphKsWiggnpDSYFDetrVpb0X6uOvkslsDbHlkCjTFfxM1ZB7EhLJQIedpuO
+YGSVwPvvSEdzYnV65yi4RS5bLxJq1bAu9Hob5L/jqVTx/Wo92dn/+kp85+vd0qdF
+S7Gkyy721MTgqj2KFPwABRjziDVOCK8FwQtPQHQxRdwbyAZQ5NMFp8fYEzM84BeK
+pYdlbWOl42BVba3+ICNnBObrrVXxd05i8zIsjuf84XgIonioTlRfBvKvEUEIeOuT
+UCO+sme6Ulzy4djQbp2lWj8Xeo8rBrOeF3E51Rb3hCCieLc2Nz6pj4f6+QddBPHX
+6HpGuD1Ct0GuM6FoW+awqQ9KC1D6Xh4XAZVgPaCA59w4cEB55wHvdjfG6rGe4KoQ
+p3hZK4MnhZYJ/nfvVAbeFc2+vUHRYmHnLlCYzQ/kxUflxaIUQp7neFEFHjK8kCKS
+ZZXo68e2Fy7Xj6PwixRR
+=TZbV
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
deleted file mode 100644
index 347061f693d0..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
+++ /dev/null
@@ -1,219 +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-r3.ebuild,v 1.13 2013/01/01 18:55:31 armin76 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
-
-	# 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"
-
-	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.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26.ebuild
deleted file mode 100644
index fbfc853dfc4a..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26.ebuild
+++ /dev/null
@@ -1,213 +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.ebuild,v 1.1 2013/02/22 15:47:31 eras Exp $
-
-EAPI=5
-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
-
-	# 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"
-
-	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.0.25
-}
-
-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.25
-}