stable 3.0.8, remove 3.0.5

4 files changed, 7 insertions, 290 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 881659eca42b..8030ad8f39e2 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.92 2004/09/22 16:32:35 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.93 2004/11/01 22:52:50 langthang Exp $
+
+  01 Nov 2004; Tuan Van <langthang@gentoo.org> -courier-imap-3.0.5.ebuild,
+  courier-imap-3.0.8.ebuild:
+  stable on x86.
 
 *courier-imap-3.0.8 (22 Sep 2004)
 
diff --git a/net-mail/courier-imap/courier-imap-3.0.5.ebuild b/net-mail/courier-imap/courier-imap-3.0.5.ebuild
deleted file mode 100644
index 0d97ea324735..000000000000
--- a/net-mail/courier-imap/courier-imap-3.0.5.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.5.ebuild,v 1.8 2004/08/20 13:10:34 gmsoft Exp $
-
-inherit eutils
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-KEYWORDS="x86 ppc sparc ~mips ~alpha hppa amd64"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb debug fam ipv6 ldap mysql nls pam postgres selinux"
-PROVIDE="virtual/imapd"
-# not compatible with >=sys-libs/db-4
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( =sys-libs/db-3* )
-	!berkdb? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	>=dev-tcltk/expect-5.33.0
-	fam? ( app-admin/fam )
-	selinux? ( sec-policy/selinux-courier-imap )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-lang/perl
-	sys-apps/procps"
-
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv nomirror"
-
-VPOPMAIL_INSTALLED=
-VPOPMAIL_DIR=
-export VPOPMAIL_INSTALLED VPOPMAIL_DIR
-
-vpopmail_setup() {
-	VPOPMAIL_DIR=`grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6`
-	VPOPMAIL_INSTALLED=
-	if has_version 'net-mail/vpopmail' && [ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]; then
-		VPOPMAIL_INSTALLED=1
-	else
-		VPOPMAIL_DIR=
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# patch to fix db4.0 detection as db4.1
-	# bug #27517, patch was sent upstream, but was ignored :-(
-	EPATCH_OPTS="${EPATCH_OPTS} -p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-3.0.2-db40vs41.patch
-
-	cd ${S}
-	# explicitly use db3 over db4
-	if use berkdb; then
-		sed -i -e 's,-ldb,-ldb-3.2,g' configure
-		sed -i -e 's,-ldb,-ldb-3.2,g' bdbobj/configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' bdbobj/configure
-	fi
-
-	# Fix a bug with where the password change module is installed. Upstream bug in configure file.
-	sed -i -e 's,--with-authchangepwdir=/var/tmp/dev/null,--with-authchangepwdir=$libexecdir/authlib,' configure
-
-	epatch ${FILESDIR}/${PN}-3.0.2-removerpm.patch
-
-	# bug #48838 - make is possible to disable fam
-	EPATCH_OPTS="${EPATCH_OPTS} -p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-3.0.2-disable-fam.diff
-
-	cd ${S}/authlib
-	aclocal
-	autoconf
-	cd ${S}/maildir
-	aclocal
-	autoconf
-}
-
-src_compile() {
-	vpopmail_setup
-
-	local myconf
-	myconf="${myconf} `use_with pam authpam`"
-	myconf="${myconf} `use_with ldap authldap`"
-	myconf="${myconf} `use_with mysql authmysql`"
-	myconf="${myconf} `use_with postgres authpostgresql`"
-	# the --with-ipv6 is broken
-	#myconf="${myconf} --with-ipv6"
-	use ipv6 || myconf="${myconf} --without-ipv6"
-	use berkdb \
-		&& myconf="${myconf} --with-db=db" \
-		|| myconf="${myconf} --with-db=gdbm"
-
-	if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-		einfo "vpopmail found"
-		myconf="${myconf} --with-authvchkpw"
-		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
-		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
-	else
-		einfo "vpopmail not found"
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	if use nls && [ -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	local cachefile
-	cachefile=${WORKDIR}/config.cache
-	rm -f ${cachefile}
-
-	# fix for bug #21330
-	CFLAGS="`echo ${CFLAGS} | xargs`"
-	CXXFLAGS="`echo ${CXXFLAGS} | xargs`"
-	LDFLAGS="`echo ${LDFLAGS} | xargs`"
-
-	# fix for bug #27528
-	# they really should use a better way to detect redhat
-	myconf="${myconf} --without-redhat"
-
-	# bug #29879 - FAM support
-	#if has_version 'app-admin/fam' && ! use fam; then
-	#	ewarn "FAM will be detected by the package and support will be enabled"
-	#	ewarn "The package presently provides no way to disable fam support if you don't want it"
-	#fi
-	myconf="${myconf} `use_with fam`"
-
-	# fix for non-x86 platforms, bug #38606
-	# courier-imap doesn't respect just --host=$CHOST without --build
-	[ -z "${CBUILD}" ] && export CBUILD="${CHOST}"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS}" econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--cache-file=${cachefile} \
-		${myconf} || die "econf failed"
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	vpopmail_setup
-
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	insinto /etc/courier-imap
-	newins ${FILESDIR}/authdaemond.conf-3.0.4-r1 authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN='>> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-	mv ../sbin/man .
-	cd ..
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
-	dosym /usr/sbin/courierlogger /usr/lib/courier-imap/courierlogger
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond-3.0.4-r1 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6-3.0.5 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6-3.0.5 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.7.3-r1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.7.3-r1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.7.3-r1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.7.3-r1.rc gentoo-pop3d-ssl.rc
-
-	local authmods
-	authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	use mysql && authmods="${authmods} authmysql"
-	use postgres && authmods="${authmods} authpgsql"
-	use pam && authmods="${authmods} authpam"
-	use ldap && authmods="${authmods} authldap"
-	[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	exeinto /usr/lib/courier-imap/authlib
-	for i in ${authmods}; do
-		[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i}
-	done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-
-	keepdir /var/lib/courier-imap/authdaemon
-
-	# bug #42686, more docs
-	dodoc 00README.NOW.OR.SUFFER AUTHORS INSTALL NEWS NEWS.html README ChangeLog
-	docinto imap
-	dodoc ${S}/imap/{ChangeLog,BUGS,FAQ,FAQ.html,README,README.html,README.imapkeywords.html}
-	docinto maildir
-	dodoc ${S}/maildir/{AUTHORS,INSTALL,README.maildirfilter.html,README.maildirquota.txt,README.sharedfolders.txt}
-	docinto tcpd
-	dodoc ${S}/tcpd/README.couriertls
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-}
diff --git a/net-mail/courier-imap/courier-imap-3.0.8.ebuild b/net-mail/courier-imap/courier-imap-3.0.8.ebuild
index 973f8259c6b0..4a122d6a6493 100644
--- a/net-mail/courier-imap/courier-imap-3.0.8.ebuild
+++ b/net-mail/courier-imap/courier-imap-3.0.8.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-mail/courier-imap/courier-imap-3.0.8.ebuild,v 1.4 2004/10/03 06:06:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.8.ebuild,v 1.5 2004/11/01 22:52:50 langthang Exp $
 
 inherit eutils gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="fam berkdb gdbm debug ipv6 ldap mysql nls pam postgres selinux"
 #userpriv breaks linking against vpopmail
 RESTRICT="nouserpriv"
diff --git a/net-mail/courier-imap/files/digest-courier-imap-3.0.5 b/net-mail/courier-imap/files/digest-courier-imap-3.0.5
deleted file mode 100644
index c28f1bb12a42..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-3.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8b0c79997905dc46cfe4cc13be74ceaf courier-imap-3.0.5.tar.bz2 1648873