courier-authlib version bump

(Portage version: 2.2_rc1/cvs/Linux 2.6.26-git6 i686)

4 files changed, 20 insertions, 376 deletions

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index 21e908456723..ff7dbeb88223 100644
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/courier-authlib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.91 2008/07/16 16:09:31 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.92 2008/07/21 00:27:23 hanno Exp $
+
+*courier-authlib-0.61.0 (21 Jul 2008)
+
+  21 Jul 2008; Hanno Boeck <hanno@gentoo.org>
+  +courier-authlib-0.61.0.ebuild:
+  Version bump and simplification of sed commands.
 
   16 Jul 2008; Luca Longinotti <chtekk@gentoo.org>
   courier-authlib-0.58.ebuild, courier-authlib-0.59.2.ebuild,
diff --git a/net-libs/courier-authlib/courier-authlib-0.59.2.ebuild b/net-libs/courier-authlib/courier-authlib-0.59.2.ebuild
deleted file mode 100644
index 51f1b49311d3..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.59.2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2008 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.2.ebuild,v 1.4 2008/07/16 16:09:31 chtekk Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic autotools
-
-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"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres vpopmail"
-
-RESTRICT="userpriv"
-
-RDEPEND="gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-DEPEND="${RDEPEND}
-		>=dev-libs/openssl-0.9.6
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( virtual/postgresql-base )"
-
-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.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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 \\' 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
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf=""
-
-	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"
-		fi
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	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`"
-	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 userdb at: ${dir}/userdb"
-			cp -f "${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 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
-	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
-	if use postgres ; then
-		dohtml README.authpostgres.html README.authmysql.html
-	fi
-	if use ldap ; then
-		dodoc README.ldap
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/"
-	fi
-	doinitd "${FILESDIR}/${PN}" || die "doinitd 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 -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
-	if [[ ! -z "${list}" ]] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		elog "The following files are no longer needed and can likely be removed:"
-		elog " rm $(echo \"${list}\")"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.60.2.ebuild b/net-libs/courier-authlib/courier-authlib-0.60.2.ebuild
deleted file mode 100644
index e6d3b7d757ab..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.60.2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2008 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.60.2.ebuild,v 1.6 2008/07/16 16:09:31 chtekk Exp $
-
-inherit eutils flag-o-matic autotools
-
-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-3"
-SLOT="0"
-IUSE="berkdb crypt debug gdbm ldap mysql pam postgres vpopmail"
-
-RESTRICT="userpriv"
-
-RDEPEND="gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-DEPEND="${RDEPEND}
-		>=dev-libs/openssl-0.9.6
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( virtual/postgresql-base )"
-
-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.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use gdbm ; then
-		epatch "${FILESDIR}/0.59.2-configure-db4.patch"
-	else
-		epatch "${FILESDIR}/0.59.2-remove-obsolete-macro.patch"
-	fi
-
-	sed -i -e "s|^chk_file .* |&\${DESTDIR}|g" authmigrate.in || die "sed failed"
-	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"
-
-	local d
-	for d in $(find -name configure.in) ; do
-		[[ ${d} == */libltdl/* ]] && continue
-		cd "${S}"/${d%configure.in}
-		eautoreconf
-	done
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf=""
-
-	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"
-		fi
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-	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`"
-	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 userdb at: ${dir}/userdb"
-			cp -f "${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 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
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-	dodoc AUTHORS 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
-	if use postgres ; then
-		dohtml README.authpostgres.html README.authmysql.html
-	fi
-	if use ldap ; then
-		dodoc README.ldap
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/"
-	fi
-	doinitd "${FILESDIR}/${PN}" || die "doinitd 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 -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
-	if [[ ! -z "${list}" ]] ; then
-		ewarn "Courier authentication files are now in /etc/courier/authlib/"
-		elog "The following files are no longer needed and can likely be removed:"
-		elog " rm $(echo \"${list}\")"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.60.2-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.61.0.ebuild
index 481a491b16bf..bcfa5402f479 100644
--- a/net-libs/courier-authlib/courier-authlib-0.60.2-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.61.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 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.60.2-r1.ebuild,v 1.10 2008/07/16 16:09:31 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.61.0.ebuild,v 1.1 2008/07/21 00:27:23 hanno Exp $
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic autotools libtool
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
 DESCRIPTION="Courier authentication library."
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -13,7 +13,8 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ldap mysql pam postgres vpopmail"
 
-RESTRICT="userpriv"
+RESTRICT="userpriv
+	!berkdb? ( test )"
 
 RDEPEND="gdbm? ( sys-libs/gdbm )
 		!gdbm? ( sys-libs/db )"
@@ -57,17 +58,21 @@ src_unpack() {
 	fi
 
 	sed -i -e "s|^chk_file .* |&\${DESTDIR}|g" authmigrate.in || die "sed failed"
-	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'/for dir in/a\\t\t/etc/courier-imap \\' authmigrate.in || die "sed failed"
+	sed -i -e'/for dir in/a\\t\t/etc/courier/authlib \\' authmigrate.in || die "sed failed"
 	sed -i -e"s|\$sbindir/makeuserdb||g" authmigrate.in || die "sed failed"
 
+	sed -i -e 's:AC_LIBLTDL_INSTALLABLE:AC_LIBLTDL_CONVENIENCE:' configure.in \
+		|| die "fixing libltdl call failed"
+
 	local d
 	for d in $(find -name configure.in) ; do
 		[[ ${d} == */libltdl/* ]] && continue
 		cd "${S}"/${d%configure.in}
-		eautoreconf
+		AT_NO_RECURSIVE="yes" AT_NOELIBTOOLIZE="yes" eautoreconf
 	done
+
+	elibtoolize
 }
 
 src_compile() {