Drop old versions and therefore revert the mips stable keyword as per #209999

Package-Manager: portage-2.1.4.4

4 files changed, 8 insertions, 493 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index f7cae3b17a83..1f23cc2678cf 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/cyrus-sasl
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.191 2007/10/28 21:49:37 tove Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.192 2008/03/15 22:36:36 dertobi123 Exp $
+
+  15 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -cyrus-sasl-2.1.22.ebuild, -cyrus-sasl-2.1.22-r1.ebuild:
+  Drop old versions and therefore revert the mips stable keyword as per
+  #209999
 
   28 Oct 2007; Torsten Veller <tove@gentoo.org>
   +files/cyrus-sasl-2.1.22-db4.patch, cyrus-sasl-2.1.22-r2.ebuild:
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 60ddaa67352a..163649bba7ac 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -11,8 +11,6 @@ AUX saslauthd.pam-include 160 RMD160 643057c1c0e6fc859114b152dab1bf0e89c13c70 SH
 AUX saslauthd2.rc6 525 RMD160 b21261a0c3670d66314269775ec8ff06e9437d88 SHA1 1dfb2736a8a12181a1948870b1063577f6863b2d SHA256 329fb67382e307ab6d37aa789667b04a91ba3f69e9c1023b0902adafed065ee9
 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
-EBUILD cyrus-sasl-2.1.22-r1.ebuild 8420 RMD160 39e045f62e248fa82a3f37130ebcee80b61690b1 SHA1 390838bca89f536978115c4ecc84a8df559dd50d SHA256 8217f29dd672b54df523fbae97bc0bcd145a82faa3ffa25657b42f9249b093fc
 EBUILD cyrus-sasl-2.1.22-r2.ebuild 8619 RMD160 d697e8b838f107239f1c240064235034cd656715 SHA1 5790a95b5ab57e3fbd3f0bfab582c0df8887cd0a SHA256 5a842f3d16303b34a14985c0396ce94608c4e054e6076d3d878fbb804d5e66f2
-EBUILD cyrus-sasl-2.1.22.ebuild 8397 RMD160 6a1ec034757839af303321469a544d2d5277bcd3 SHA1 4a666675b8818f20a3f6e8227e0c0d8459c4170c SHA256 1eb56994178095576cc0a5fc24c8ec8dff8a210581e4bd1af1fcc40f1f5ced10
-MISC ChangeLog 32453 RMD160 0ef4f68eee0c52883d29911ff6d67fd27733f455 SHA1 df27a8b221d399f04786d528bb2536764d50086b SHA256 0391ff3105ecb8680495d8af39b0ab88e93798ccaa3e0303cd915adc6dfca91e
+MISC ChangeLog 32657 RMD160 ad4bacffffb2c8c7d680486d65e7198cb523afc5 SHA1 cad18326bec618e25ff6739afbcd12b99f7391d8 SHA256 348a9c448bb5cda132692f2e45ac9a5bfd94d222a16de9bc75176406b6c8fd83
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild
deleted file mode 100644
index a0db4816aa85..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2007 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.22-r1.ebuild,v 1.15 2007/03/03 22:38:03 genone Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.7"
-
-inherit eutils flag-o-matic java-pkg multilib autotools pam
-
-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="as-is"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-# 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="berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	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-1.4* )
-	ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	use java && java-pkg_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
-		ewarn "Waiting 10 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 10
-	fi
-}
-
-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"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/${PN}-2.1.17-pgsql-include.patch"
-
-	# UNSUPPORTED ntlm patch. Bug #81342
-	use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
-
-	# --as-needed.
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	# 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}
-
-	# Fixes for bug #152544
-	epatch "${FILESDIR}/${P}-crypt.patch"
-
-	# Recreate configure.
-	cd "${S}"
-	rm "${S}/config/libtool.m4"
-	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
-}
-
-src_compile() {
-	local myconf="--enable-login --enable-ntlm --enable-auth-sasldb --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_enable postgres`"
-	use postgres &&	myconf="${myconf} `use_with postgres pgsql $(pg_config --libdir)`"
-
-	# 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"
-
-	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
-	# We sed'd Makefile.in already. Remove this block after testing period.
-	# sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile
-
-	# we force -j1 for bug #110066
-	emake -j1 || 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() {
-	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
-
-	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 || \
-		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 /etc/conf.d/saslauthd"
-
-	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 "Generate 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 example client and server."
-		elog "To build these, please type:"
-		elog "\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:"
-		ewarn "	gpasswd -a postfix mail"
-		ewarn "to add postfix to 'mail' group."
-	fi
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild
deleted file mode 100644
index a5b045498b59..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2007 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.22.ebuild,v 1.25 2007/07/12 02:25:34 mr_bones_ Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
-
-inherit eutils flag-o-matic java-pkg multilib autotools pam
-
-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="as-is"
-SLOT="2"
-#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-KEYWORDS="mips"
-# 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="berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	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-1.4* )
-	ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-
-	use java && java-pkg_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
-		ewarn "Waiting 10 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 10
-	fi
-}
-
-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"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/${PN}-2.1.17-pgsql-include.patch"
-
-	# UNSUPPORTED ntlm patch. Bug #81342
-	use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
-
-	# --as-needed.
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	# 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}
-
-	# Recreate configure.
-	cd "${S}"
-	rm "${S}/config/libtool.m4"
-	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
-}
-
-src_compile() {
-	local myconf="--enable-login --enable-ntlm --enable-auth-sasldb --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_enable postgres`"
-	use postgres &&	myconf="${myconf} `use_with postgres pgsql $(pg_config --libdir)`"
-
-	# 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"
-
-	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
-	# We sed'd Makefile.in already. Remove this block after testing period.
-	# sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile
-
-	# we force -j1 for bug #110066
-	emake -j1 || 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
-
-	# 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
-
-	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-${SASLAUTHD_CONF_VER}.conf" saslauthd || \
-		die "failed to install /etc/conf.d/saslauthd"
-
-	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 "Generate 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 example client and server."
-		elog "To build these, please type:"
-		elog "\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
-}