Cleanup, version bump.

(Portage version: 2.1.2.3)

12 files changed, 109 insertions, 282 deletions

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index 4990a07b3fe8..d9beb90d5650 100644
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-libs/courier-authlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.63 2007/03/30 16:52:03 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.64 2007/04/08 14:10:55 chtekk Exp $
+
+*courier-authlib-0.59.2 (08 Apr 2007)
+
+  08 Apr 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/0.59.1-configure-db4.patch,
+  -files/0.59.1-remove-obsolete-macro.patch,
+  +files/0.59.2-configure-db4.patch,
+  +files/0.59.2-remove-obsolete-macro.patch, files/courier-authlib,
+  -files/initd/courier-authlib, metadata.xml, courier-authlib-0.58.ebuild,
+  -courier-authlib-0.58-r1.ebuild, -courier-authlib-0.59.1.ebuild,
+  +courier-authlib-0.59.2.ebuild:
+  Ebuild cleanup, version bump to 0.59.2.
 
   30 Mar 2007; Timothy Redaelli <drizzt@gentoo.org>
   courier-authlib-0.59.1.ebuild:
diff --git a/net-libs/courier-authlib/courier-authlib-0.58-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.58-r1.ebuild
deleted file mode 100644
index b1338e98a5bb..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.58-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.58-r1.ebuild,v 1.2 2007/01/17 11:15:22 masterdriverz Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-
-RESTRICT="nouserpriv"
-
-DEPEND="gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-		>=dev-libs/openssl-0.9.6
-		pam? ( >=sys-libs/pam-0.75 )
-		mysql? ( virtual/mysql )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-S="${WORKDIR}/${P%%_pre}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'Without it, you will not be able to change system login passwords.'
-		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		einfo 'and others) will work just fine.'
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e "s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-	if ! use gdbm ; then
-		epatch "${FILESDIR}/${PV}-configure-db4.patch"
-	else
-		epatch "${FILESDIR}/${PV}-remove-obsolete-macro.patch"
-	fi
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-
-	eautoreconf
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf
-	myconf="$(use_with pam authpam) $(use_with ldap authldap)"
-
-	if use berkdb; then
-		if use gdbm; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="${myconf} --with-db=db"
-		fi
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	if has_version 'net-mail/vpopmail' ; then
-		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-		use mysql && ewarn "vpopmail found. authmysql will not be built."
-		use postgres && ewarn "vpopmail found. authpgsql will not be built."
-	else
-		myconf="${myconf} --without-authvchkpw $(use_with mysql authmysql) $(use_with postgres authpgsql)"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	einfo "Configuring courier-authlib: ${myconf}"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
-		orig="$(grep \"^${option}=\" ${file} | cut -d'\"' -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [ -e "$dir/userdb" ]; then
-			einfo "found $dir/userdb"
-			cp -v $dir/userdb ${D}/etc/courier/authlib/
-			chmod go-rwx ${D}/etc/courier/authlib/userdb
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install failed"
-	emake install-migrate DESTDIR="${D}" || die "migrate failed"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "install-configure failed"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	if use mysql; then
-		dodoc README.authmysql.myownquery
-		dohtml README.authmysql.html
-	fi
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	if use ldap; then
-		dodoc README.ldap
-		dodir /etc/openldap/schema
-		cp authldap.schema "${D}/etc/openldap/schema/"
-	fi
-	doinitd "${FILESDIR}/initd/courier-authlib" || die "init.d failed"
-}
-
-pkg_postinst() {
-	if [ -e /etc/courier/authlib/userdb ]; then
-		einfo "running makeuserdb"
-		chmod go-rwx /etc/courier/authlib/userdb
-		makeuserdb
-	fi
-
-	# Suggest cleaning out the following old files
-	list="$(find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\")"
-	if [ ! -z "${list}" ] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		einfo "The following files are no longer needed and can likely be removed:"
-		einfo " rm $(echo \"${list}\")"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.58.ebuild b/net-libs/courier-authlib/courier-authlib-0.58.ebuild
index 23a3665e0e51..47ccbcd53d89 100644
--- a/net-libs/courier-authlib/courier-authlib-0.58.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.58.ebuild,v 1.13 2007/01/17 11:15:22 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.58.ebuild,v 1.14 2007/04/08 14:10:55 chtekk Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -157,8 +157,7 @@ src_install() {
 		dodir /etc/openldap/schema
 		cp authldap.schema "${D}/etc/openldap/schema/"
 	fi
-	# Note: different init.d file to -r1
-	doinitd "${FILESDIR}/courier-authlib" || die "init.d failed"
+	doinitd "${FILESDIR}/${PN}" || die "doinitd failed"
 }
 
 pkg_postinst() {
diff --git a/net-libs/courier-authlib/courier-authlib-0.59.1.ebuild b/net-libs/courier-authlib/courier-authlib-0.59.2.ebuild
index 99b33c1d7a5d..4fe4b8fc6a84 100644
--- a/net-libs/courier-authlib/courier-authlib-0.59.1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.59.2.ebuild
@@ -1,37 +1,36 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.59.1.ebuild,v 1.2 2007/03/30 16:52:03 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.59.2.ebuild,v 1.1 2007/04/08 14:10:55 chtekk Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
 inherit eutils flag-o-matic autotools
 
-DESCRIPTION="courier authentication library"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="Courier authentication library."
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="berkdb crypt debug gdbm ldap mysql pam postgres vpopmail"
 
 RESTRICT="userpriv"
 
 RDEPEND="gdbm? ( sys-libs/gdbm )
-	!gdbm? ( sys-libs/db )"
+		!gdbm? ( sys-libs/db )"
 
 DEPEND="${RDEPEND}
 		>=dev-libs/openssl-0.9.6
-		pam? ( virtual/pam )
-		mysql? ( virtual/mysql )
 		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( virtual/mysql )
+		pam? ( virtual/pam )
 		postgres? ( >=dev-db/postgresql-7.2 )"
 
-S="${WORKDIR}/${P%%_pre}"
-
 pkg_setup() {
 	enewuser mail -1 -1 /var/spool/mail
+
 	if ! has_version 'dev-tcltk/expect' ; then
 		ewarn 'The dev-tcltk/expect package is not installed.'
 		einfo 'Without it, you will not be able to change system login passwords.'
@@ -43,18 +42,23 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -e "s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-	if ! use gdbm; then
+
+	sed -i -e "s|^chk_file .* |&\${DESTDIR}|g" authmigrate.in || die "sed failed"
+
+	if use elibc_uclibc ; then
+		sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub || die "sed failed"
+	fi
+
+	if ! use gdbm ; then
 		epatch "${FILESDIR}/${PV}-configure-db4.patch"
 	else
 		epatch "${FILESDIR}/${PV}-remove-obsolete-macro.patch"
 	fi
 
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
-	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
+	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' authmigrate.in || die "sed failed"
+	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' authmigrate.in || die "sed failed"
+	sed -i -e"s|@@INDENT@@|		|g" authmigrate.in || die "sed failed"
+	sed -i -e"s|\$sbindir/makeuserdb||g" authmigrate.in || die "sed failed"
 
 	eautoreconf
 }
@@ -62,11 +66,13 @@ src_unpack() {
 src_compile() {
 	filter-flags -fomit-frame-pointer
 
-	local myconf
-	myconf="$(use_with pam authpam) $(use_with ldap authldap)"
+	local myconf=""
 
-	if use berkdb; then
-		if use gdbm; then
+	myconf="${myconf} `use_with pam authpam`"
+	myconf="${myconf} `use_with ldap authldap`"
+
+	if use berkdb ; then
+		if use gdbm ; then
 			ewarn "Both gdbm and berkdb selected. Using gdbm."
 		else
 			myconf="${myconf} --with-db=db"
@@ -74,12 +80,12 @@ src_compile() {
 	fi
 	use gdbm && myconf="${myconf} --with-db=gdbm"
 
-	if use vpopmail; then
+	if use vpopmail ; then
 		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
 		use mysql && ewarn "Building vpopmail support instead of authmysql"
 		use postgres && ewarn "Building vpopmail support instead of authpgsql"
 	else
-		myconf="${myconf} --without-authvchkpw $(use_with mysql authmysql) $(use_with postgres authpgsql)"
+		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
 	fi
 
 	use debug && myconf="${myconf} debug=true"
@@ -104,10 +110,10 @@ src_compile() {
 
 orderfirst() {
 	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [ -e "${file}" ] ; then
+	if [[ -e "${file}" ]] ; then
 		orig="$(grep \"^${option}=\" ${file} | cut -d'\"' -f 2)"
 		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e"s/^${option}=.*$/${new}/" ${file}
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}"
 	fi
 }
 
@@ -118,10 +124,10 @@ finduserdb() {
 		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
 		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
 		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [ -e "$dir/userdb" ]; then
-			einfo "found $dir/userdb"
-			cp -v $dir/userdb ${D}/etc/courier/authlib/
-			chmod go-rwx ${D}/etc/courier/authlib/userdb
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -f "${dir}/userdb" "${D}/etc/courier/authlib/"
+			chmod go-rwx "${D}/etc/courier/authlib/userdb"
 			continue
 		fi
 	done
@@ -132,14 +138,14 @@ src_install() {
 	dodir /etc/courier
 	keepdir /var/lib/courier/authdaemon
 	keepdir /etc/courier/authlib
-	emake install DESTDIR="${D}" || die "install failed"
-	emake install-migrate DESTDIR="${D}" || die "migrate failed"
-	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-	emake install-configure DESTDIR="${D}" || die "install-configure failed"
-	rm -vf ${D}/etc/courier/authlib/*.bak
-	chown mail:mail ${D}/etc/courier/authlib/*
-	for y in ${D}/etc/courier/authlib/*.dist ; do
-		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
+	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install-migrate|| die "emake install-migrate failed"
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure || die "emake install-configure failed"
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/*
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
 	done
 	use pam && orderfirst authdaemonrc authmodulelist authpam
 	use ldap && orderfirst authdaemonrc authmodulelist authldap
@@ -147,29 +153,31 @@ src_install() {
 	use mysql && orderfirst authdaemonrc authmodulelist authmysql
 	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
 	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	if use mysql; then
+	if use mysql ; then
 		dodoc README.authmysql.myownquery
 		dohtml README.authmysql.html
 	fi
-	use postgres && dohtml README.authpostgres.html README.authmysql.html
-	if use ldap; then
+	if use postgres ; then
+		dohtml README.authpostgres.html README.authmysql.html
+	fi
+	if use ldap ; then
 		dodoc README.ldap
 		dodir /etc/openldap/schema
-		cp authldap.schema "${D}/etc/openldap/schema/"
+		cp -f authldap.schema "${D}/etc/openldap/schema/"
 	fi
-	doinitd "${FILESDIR}/initd/courier-authlib" || die "init.d failed"
+	doinitd "${FILESDIR}/${PN}" || die "doinitd failed"
 }
 
 pkg_postinst() {
-	if [ -e /etc/courier/authlib/userdb ]; then
-		einfo "running makeuserdb"
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
 		chmod go-rwx /etc/courier/authlib/userdb
 		makeuserdb
 	fi
 
 	# Suggest cleaning out the following old files
 	list="$(find /etc/courier -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
-	if [ ! -z "${list}" ] ; then
+	if [[ ! -z "${list}" ]] ; then
 		ewarn "Courier authentication files are now in /etc/courier/authlib/"
 		einfo "The following files are no longer needed and can likely be removed:"
 		einfo " rm $(echo \"${list}\")"
diff --git a/net-libs/courier-authlib/files/0.59.1-configure-db4.patch b/net-libs/courier-authlib/files/0.59.2-configure-db4.patch
index a784107543e4..be12d843c47c 100644
--- a/net-libs/courier-authlib/files/0.59.1-configure-db4.patch
+++ b/net-libs/courier-authlib/files/0.59.2-configure-db4.patch
@@ -35,3 +35,34 @@
  fi
  
  LIBS="$saveLIBS"
+--- bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
++++ bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
+@@ -21,15 +21,19 @@
+ dnl Checks for libraries.
+ 
+ saveLIBS="$LIBS"
+-AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
+-
+-FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
++for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++  do
++        AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++          AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++            AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
++
++  done
++FOUND_DB=0
++AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
++AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
diff --git a/net-libs/courier-authlib/files/0.59.1-remove-obsolete-macro.patch b/net-libs/courier-authlib/files/0.59.2-remove-obsolete-macro.patch
index 72a398391aa1..72a398391aa1 100644
--- a/net-libs/courier-authlib/files/0.59.1-remove-obsolete-macro.patch
+++ b/net-libs/courier-authlib/files/0.59.2-remove-obsolete-macro.patch
diff --git a/net-libs/courier-authlib/files/courier-authlib b/net-libs/courier-authlib/files/courier-authlib
index d0071fafe1fa..88417a8ac65b 100644
--- a/net-libs/courier-authlib/files/courier-authlib
+++ b/net-libs/courier-authlib/files/courier-authlib
@@ -1,14 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib,v 1.1 2007/01/16 23:04:09 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib,v 1.2 2007/04/08 14:10:55 chtekk Exp $
+
 depend() {
 	need net
 	provide authdaemond
 }
 
 checkconfig() {
-	if [ ! -e /etc/courier/authlib/authdaemonrc ] ; then
+	if [[ ! -e /etc/courier/authlib/authdaemonrc ]] ; then
 		eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
 		return 1
 	fi
@@ -27,14 +28,14 @@ start() {
 	checkconfig || return 1
 	setauth
 	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --start --pidfile "$pidfile" --exec \
-		/usr/bin/env $logger -- ${LOGGEROPTS} -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
+	start-stop-daemon --quiet --start --pidfile "${pidfile}" --exec \
+		/usr/bin/env ${logger} -- ${LOGGEROPTS} -pid="${pidfile}" -start "${AUTHLIB}/${AUTHDAEMOND}" 
 	eend $?
 }
 
 stop() {
 	setauth
 	ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --stop --pidfile "$pidfile"
+	start-stop-daemon --quiet --stop --pidfile "${pidfile}"
 	eend $?
 }
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.58-r1 b/net-libs/courier-authlib/files/digest-courier-authlib-0.58-r1
deleted file mode 100644
index ccddca8e1b38..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.58-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fb691558d611cb191ae6a83002f0195b courier-authlib-0.58.tar.bz2 2006735
-RMD160 6474612496cd287f294c7f52239ea853c44e4aa1 courier-authlib-0.58.tar.bz2 2006735
-SHA256 d877cc6c65e90471ec9410c5ce7af467ba5beb3922b9cfbf2bf6aa24f6bdc7ad courier-authlib-0.58.tar.bz2 2006735
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.59.1 b/net-libs/courier-authlib/files/digest-courier-authlib-0.59.1
deleted file mode 100644
index ce8150e9da8e..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.59.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4e7327980724c4c327aace23facd5d59 courier-authlib-0.59.1.tar.bz2 2101729
-RMD160 3ccd24004411155b5b5bfe959c557a29e58b9826 courier-authlib-0.59.1.tar.bz2 2101729
-SHA256 72d9faf01b9e211142ee25f414b19e6de06de1f040a5338ab19c2770b9289724 courier-authlib-0.59.1.tar.bz2 2101729
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.59.2 b/net-libs/courier-authlib/files/digest-courier-authlib-0.59.2
new file mode 100644
index 000000000000..fd0bae8d95dc
--- /dev/null
+++ b/net-libs/courier-authlib/files/digest-courier-authlib-0.59.2
@@ -0,0 +1,3 @@
+MD5 b3022de4f9f2977da1dc6d2ae424277d courier-authlib-0.59.2.tar.bz2 2109549
+RMD160 499da7ec09fbe46be5ea9450c6ecb9c3d648244b courier-authlib-0.59.2.tar.bz2 2109549
+SHA256 326f4a2e0c2a6259083f521ae838984eca051483dadfdcda4b0a535d7472f396 courier-authlib-0.59.2.tar.bz2 2109549
diff --git a/net-libs/courier-authlib/files/initd/courier-authlib b/net-libs/courier-authlib/files/initd/courier-authlib
deleted file mode 100644
index a3c03cc36f6d..000000000000
--- a/net-libs/courier-authlib/files/initd/courier-authlib
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/initd/courier-authlib,v 1.1 2007/01/16 23:04:09 masterdriverz Exp $
-depend() {
-	need net
-	provide authdaemond
-}
-
-checkconfig() {
-	if [ ! -e /etc/courier/authlib/authdaemonrc ] ; then
-		eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
-		return 1
-	fi
-}
-
-setauth() {
-	source /etc/courier/authlib/authdaemonrc
-	AUTHLIB="/usr/lib/courier/courier-authlib"
-	AUTHDAEMOND="authdaemond"
-	pidfile="/var/run/authdaemon.pid"
-	logger="/usr/sbin/courierlogger"
-	export DEBUG_LOGIN DEFAULTOPTIONS LOGGEROPTS
-}
-
-start() {
-	checkconfig || return 1
-	setauth
-	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --start --pidfile "$pidfile" --exec \
-		/usr/bin/env $logger -- ${LOGGEROPTS} -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
-	eend $?
-}
-
-stop() {
-	setauth
-	ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --stop --pidfile "$pidfile"
-	eend $?
-}
diff --git a/net-libs/courier-authlib/metadata.xml b/net-libs/courier-authlib/metadata.xml
index 41f33d1cde77..9fe616d38dec 100644
--- a/net-libs/courier-authlib/metadata.xml
+++ b/net-libs/courier-authlib/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-  <herd>no-herd</herd>
-  <longdescription>
-      authentication library common to all courier packages
-  </longdescription>
+	<herd>no-herd</herd>
 </pkgmetadata>