migrate courier-imap too

4 files changed, 8 insertions, 109 deletions

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index d409cc2e1268..40c74e5d7b14 100644
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/courier-authlib
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.7 2004/12/01 10:08:29 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.8 2004/12/01 18:09:28 swtaylor Exp $
+
+  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.50.20041116.ebuild,
+  courier-authlib-0.50.20041129.ebuild:
+  also check /etc/courier-imap folder for auth*rc configs to migrate
 
 *courier-authlib-0.50.20041129 (01 Dec 2004)
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.50.20041116.ebuild b/net-libs/courier-authlib/courier-authlib-0.50.20041116.ebuild
deleted file mode 100644
index 82089d976342..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.50.20041116.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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/courier-authlib-0.50.20041116.ebuild,v 1.3 2004/11/21 07:01:39 mr_bones_ Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier-authlib/${P}.tar.bz2" || SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-#KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64"
-KEYWORDS="-*"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt uclibc debug"
-
-DEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )"
-
-RDEPEND="virtual/libc
-		gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-src_unpack() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		einfo 'This only limits using webmail to change authpam passwords.'
-	fi
-	unpack ${A}
-	cd ${S}
-	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-	if ! use gdbm ; then
-		epatch ${FILESDIR}/configure-db4.patch
-		export WANT_AUTOCONF="2.5"
-		gnuconfig_update
-		ebegin "Recreating configure"
-			autoconf ||  die "recreate configure failed"
-		eend $?
-		cd ${S}/bdbobj
-		ebegin "Recreating bdbobj/configure"
-			autoconf ||  die "recreate bdbobj/configure failed"
-		eend $?
-	fi
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with pam authpam` `use_with ldap authldap`"
-
-	if use berkdb ; then
-		use gdbm && \
-			einfo "Both gdbm and berkdb selected. Using gdbm." || \
-			myconf="${myconf} --with-db=db"
-	fi
-	use gdbm && myconf="${myconf} --with-db=gdbm"
-
-
-	if [ -f /var/vpopmail/etc/lib_deps ]; 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 authpostgres`"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-ewarn "${myconf}"
-
-	./configure \
-	    --prefix=/usr \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--libexecdir=/usr/lib/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file=${S}/configuring.cache \
-		--build=${CHOST} \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-	emake || die "Compile problem"
-}
-
-src_install() {
-	dodir /var/lib/courier
-	dodir /etc/courier/authlib
-	dodir /etc/init.d
-	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
-	chown mail:mail ${D}/etc/courier/authlib/*
-	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
-	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.50.20041129.ebuild b/net-libs/courier-authlib/courier-authlib-0.50.20041129.ebuild
index 1a3ba30d5591..a5a4f09c4a82 100644
--- a/net-libs/courier-authlib/courier-authlib-0.50.20041129.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.50.20041129.ebuild
@@ -1,6 +1,6 @@
 # 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/courier-authlib-0.50.20041129.ebuild,v 1.1 2004/12/01 10:08:29 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.50.20041129.ebuild,v 1.2 2004/12/01 18:09:28 swtaylor Exp $
 
 inherit eutils gnuconfig
 
@@ -49,6 +49,7 @@ src_unpack() {
 			autoconf ||  die "recreate bdbobj/configure failed"
 		eend $?
 	fi
+	sed -i -e'/for dir in/a\\t\t\/etc\/courier-imap \\' ${S}/authmigrate.in
 	sed -i -e'/for dir in/a\\t\t\/etc\/courier\/authlib \\' ${S}/authmigrate.in
 }
 
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.50.20041116 b/net-libs/courier-authlib/files/digest-courier-authlib-0.50.20041116
deleted file mode 100644
index 5cd974166f26..000000000000
--- a/net-libs/courier-authlib/files/digest-courier-authlib-0.50.20041116
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6afed924f2195f55e17082336d679a7 courier-authlib-0.50.20041116.tar.bz2 1969809