close 45668 plus minor cleanup

(Portage version: 2.0.51-r15)

3 files changed, 26 insertions, 18 deletions

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index d3cbb1c37c43..41c5c801ae99 100644
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/courier-authlib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.24 2005/01/31 01:40:47 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.25 2005/01/31 04:14:07 swtaylor Exp $
+
+  30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.52-r1.ebuild, courier-authlib-0.53.ebuild:
+  mostly cosmetic changes. also puts authldap.schema in /etc/openldap/schema/
 
   30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
   courier-authlib-0.52-r1.ebuild:
diff --git a/net-libs/courier-authlib/courier-authlib-0.52-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.52-r1.ebuild
index 9187f603f1c5..3c5bcc95e3a9 100644
--- a/net-libs/courier-authlib/courier-authlib-0.52-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.52-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2005 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.52-r1.ebuild,v 1.2 2005/01/31 01:40:47 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.52-r1.ebuild,v 1.3 2005/01/31 04:14:07 swtaylor Exp $
 
 inherit eutils gnuconfig
 
 DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" || SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
+[ -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/"
 S="${WORKDIR}/${P%%_pre}"
 
@@ -77,7 +78,7 @@ src_compile() {
 
 	use debug && myconf="${myconf} debug=true"
 
-	ewarn "${myconf}"
+	einfo "${myconf}"
 
 	econf \
 		--sysconfdir=/etc/courier \
@@ -105,15 +106,14 @@ orderfirst() {
 }
 
 src_install() {
-	dodir /var/lib/courier/authdaemon
-	dodir /etc/courier/authlib
-	dodir /etc/init.d
+	diropts -o mail -g mail
+	dodir /etc/courier
 	keepdir /var/lib/courier/authdaemon
 	keepdir /etc/courier/authlib
 	emake install DESTDIR="${D}" || die "install"
 	emake install-migrate DESTDIR="${D}" || die "migrate"
 	emake install-configure DESTDIR="${D}" || die "configure"
-	rm ${D}/etc/courier/authlib/*.bak
+	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}
@@ -124,9 +124,11 @@ 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
-	use ldap && dodoc authldap.schema
 	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
 	use postgres && dohtml README.authpostgres.html
+	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
+		cp authldap.schema ${D}/etc/openldap/schema/ )
+	dodir /etc/init.d
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
 }
diff --git a/net-libs/courier-authlib/courier-authlib-0.53.ebuild b/net-libs/courier-authlib/courier-authlib-0.53.ebuild
index 5ed30355f875..e3d3e521e9db 100644
--- a/net-libs/courier-authlib/courier-authlib-0.53.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.53.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2005 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.53.ebuild,v 1.1 2005/01/30 19:51:07 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.53.ebuild,v 1.2 2005/01/31 04:14:07 swtaylor Exp $
 
 inherit eutils gnuconfig
 
 DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" || SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
+[ -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/"
 S="${WORKDIR}/${P%%_pre}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~ppc64"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
 IUSE="postgres ldap mysql berkdb gdbm pam crypt uclibc debug"
 
 DEPEND="virtual/libc
@@ -77,7 +78,7 @@ src_compile() {
 
 	use debug && myconf="${myconf} debug=true"
 
-	ewarn "${myconf}"
+	einfo "${myconf}"
 
 	econf \
 		--sysconfdir=/etc/courier \
@@ -105,15 +106,14 @@ orderfirst() {
 }
 
 src_install() {
-	dodir /var/lib/courier/authdaemon
-	dodir /etc/courier/authlib
-	dodir /etc/init.d
+	diropts -o mail -g mail
+	dodir /etc/courier
 	keepdir /var/lib/courier/authdaemon
 	keepdir /etc/courier/authlib
 	emake install DESTDIR="${D}" || die "install"
 	emake install-migrate DESTDIR="${D}" || die "migrate"
 	emake install-configure DESTDIR="${D}" || die "configure"
-	rm ${D}/etc/courier/authlib/*.bak
+	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}
@@ -124,9 +124,11 @@ 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
-	use ldap && dodoc authldap.schema
 	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
 	use postgres && dohtml README.authpostgres.html
+	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
+		cp authldap.schema ${D}/etc/openldap/schema/ )
+	dodir /etc/init.d
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
 }