Restore ChangeLog to previous state before it was killed by blubb. Add patch that was previously left out. fixes bug 168190.

(Portage version: 2.1.2-r10)

3 files changed, 718 insertions, 2 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index f890ae9d8f67..68c721b35f9b 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.141 2007/02/23 15:59:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.142 2007/02/25 22:56:32 chutzpah Exp $
+
+  25 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
+  +files/courier-imap-4.0.6-db4-tcpd_configure.in.patch,
+  courier-imap-4.1.2.ebuild:
+  Restore ChangeLog to previous state before it was killed by blubb. Add patch
+  that was previously left out. fixes bug 168190.
 
 *courier-imap-4.1.2 (23 Feb 2007)
 
@@ -26,3 +32,700 @@
   +courier-imap-4.0.6-r1.ebuild:
   fix bug 141775
 
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  courier-imap-3.0.7.ebuild, courier-imap-3.0.8.ebuild,
+  courier-imap-4.0.1.ebuild, courier-imap-4.0.1-r1.ebuild,
+  courier-imap-4.0.1-r2.ebuild, courier-imap-4.0.4.ebuild,
+  courier-imap-4.0.6.ebuild:
+  Remove gnuconfig_update usage, leave it to econf.
+
+  23 Nov 2006; Francesco Riosa <vivo@gentoo.org> courier-imap-3.0.7.ebuild,
+  courier-imap-3.0.8.ebuild:
+  dev-db/mysql => virtual/mysql
+
+  28 Sep 2006; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-4.0.6.ebuild:
+  Bug #144651, fix spelling and typos.
+
+  15 Sep 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-4.0.6-db4-configure.in.patch,
+  courier-imap-4.0.6.ebuild:
+  Fix bug #134943 - compile failure with newer versions of berkdb.
+
+  05 Sep 2006; Joshua Kinard <kumba@gentoo.org> courier-imap-4.0.4.ebuild:
+  Marked stable on mips.
+
+  25 Aug 2006; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-4.0.4.ebuild, courier-imap-4.0.6.ebuild:
+  Add chown fixup to avoid some user weirdness of perms 600 on a directory.
+
+  18 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  courier-imap-4.0.4.ebuild:
+  ppc stable, bug #143830
+
+  18 Aug 2006; Joshua Jackson <tsunam@gentoo.org> courier-imap-4.0.4.ebuild:
+  Stable x86; bug #143830
+
+  17 Aug 2006; Simon Stelling <blubb@gentoo.org> courier-imap-4.0.4.ebuild:
+  stable on amd64
+
+  17 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  courier-imap-4.0.4.ebuild:
+  Stable on alpha wrt bug #143830.
+
+  15 Aug 2006; Jason Wever <weeve@gentoo.org> courier-imap-4.0.4.ebuild:
+  Stabgle on SPARC wrt bug #143830.
+
+  14 Aug 2006; Jeroen Roovers <jer@gentoo.org> courier-imap-4.0.4.ebuild:
+  Stable for HPPA (bug #143830).
+
+  14 Aug 2006; Brent Baude <ranger@gentoo.org> courier-imap-4.0.4.ebuild:
+  Marking courier-imap-4.0.4 ppc64 wrt bug #143830
+
+  07 Aug 2006; Aron Griffis <agriffis@gentoo.org> courier-imap-4.0.4.ebuild:
+  Mark 4.0.4 stable on ia64
+
+*courier-imap-4.0.6 (07 Aug 2006)
+
+  07 Aug 2006; Aron Griffis <agriffis@gentoo.org>
+  +courier-imap-4.0.6.ebuild:
+  Bump to 4.0.6 (from 4.0.4)
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-4.0.1-r2.ebuild:
+  Mark 4.0.1-r2 stable on alpha
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-4.0.1-r2.ebuild:
+  stable on ia64
+
+  25 Aug 2005; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
+  courier-imap-3.0.8.ebuild:
+  stabilize alpha
+
+  12 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  courier-imap-4.0.4.ebuild:
+  Fix courier-authlib dependency to 0.57.
+
+*courier-imap-4.0.4 (08 Aug 2005)
+
+  08 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/courier-imap-4.0.4-courier-imapd.rc6,
+  +files/courier-imap-4.0.4-courier-imapd-ssl.rc6,
+  +files/courier-imap-4.0.4-courier-pop3d.rc6,
+  +files/courier-imap-4.0.4-courier-pop3d-ssl.rc6,
+  +courier-imap-4.0.4.ebuild:
+  Updated to 4.0.4, initd files updated for new baselayout,
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  courier-imap-4.0.1.ebuild:
+  Stable on ppc.
+
+*courier-imap-4.0.1-r2 (31 May 2005)
+
+  31 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +courier-imap-4.0.1-r2.ebuild:
+  Bug #79240, courier-imap should not provide files for /etc/pam.d/.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  courier-imap-4.0.1-r1.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> courier-imap-4.0.1.ebuild:
+  stable on amd64
+
+  03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  courier-imap-3.0.7.ebuild, courier-imap-3.0.8.ebuild,
+  courier-imap-4.0.1-r1.ebuild, courier-imap-4.0.1.ebuild:
+  sys-apps/procps -> sys-process/procps
+
+  13 Feb 2005; Jason Wever <weeve@gentoo.org> courier-imap-4.0.1.ebuild:
+  Stable on sparc.
+
+*courier-imap-4.0.1-r1 (11 Feb 2005)
+
+  11 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/courier-imap-4.0.1-r1-courier-imapd.indirect,
+  +files/courier-imap-4.0.1-r1-courier-pop3d.indirect,
+  +files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc,
+  +files/courier-imap-4.0.1-r1-gentoo-imapd.rc,
+  +files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-4.0.1-r1-gentoo-pop3d.rc,
+  +courier-imap-4.0.1-r1.ebuild:
+  Bug #81540, implemented a workaround for upstream removing functionality
+  that is still widely used. For all users wanting to use relay-ctrl-allow,
+  remove it from your courier-authlib config, and put it in
+  /etc/courier-imap/{pop3d,imapd} as LOGINRUN="relay-ctrl-allow" at the end.
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> courier-imap-4.0.1.ebuild:
+  Marked stable on mips.
+
+  03 Feb 2005; Tuấn Văn <langthang@gentoo.org> courier-imap-4.0.1.ebuild:
+  Stable on x86. This upgrade is non-trival. Please read:
+  http://www.courier-mta.org/imap/?INSTALL.html~upgrading
+  less /usr/share/doc/courier-imap-4.0.1/courier-imap-gentoo.readme.gz
+  and pay attention to postinstall messages.
+
+  16 Jan 2005; Guy Martin <gmsoft@gentoo.org> courier-imap-3.0.8.ebuild:
+  Stable on hppa.
+
+  07 Jan 2005; Tuấn Văn <langthang@gentoo.org> courier-imap-4.0.1.ebuild:
+  change lib --> $(get_libdir)
+
+*courier-imap-4.0.1 (04 Jan 2005)
+
+  04 Jan 2005; Tuấn Văn <langthang@gentoo.org>
+  +courier-imap-4.0.1.ebuild:
+  errata release
+
+  04 Jan 2005; Tuan Van <langthang@gentoo.org> courier-imap-4.0.0.ebuild:
+  change !virtual/imapd to !mail-mta/courier
+
+  04 Jan 2005; Tuan Van <langthang@gentoo.org> courier-imap-4.0.0.ebuild:
+  turn off configure cache. it confuses the new configure script.
+
+*courier-imap-4.0.0 (01 Jan 2005)
+
+  01 Jan 2005; Tuan Van <langthang@gentoo.org>
+  +files/courier-imap-4.0.0-courier-imapd-ssl.rc6,
+  +files/courier-imap-4.0.0-courier-imapd.rc6,
+  +files/courier-imap-4.0.0-courier-pop3d-ssl.rc6,
+  +files/courier-imap-4.0.0-courier-pop3d.rc6,
+  +files/courier-imap-4.0.0-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-4.0.0-db4-configure.in.patch,
+  +files/courier-imap-4.0.0-disable-fam-configure.in.patch,
+  +files/courier-imap-4.0.0-gentoo-imapd-ssl.rc,
+  +files/courier-imap-4.0.0-gentoo-imapd.rc,
+  +files/courier-imap-4.0.0-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-4.0.0-gentoo-pop3d.rc,
+  -files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,
+  -files/courier-imap-4.0.0_rc1-courier-imapd.rc6,
+  -files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,
+  -files/courier-imap-4.0.0_rc1-courier-pop3d.rc6,
+  -files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-4.0.0_rc1-db4-configure.in.patch,
+  -files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch,
+  -files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc,
+  -files/courier-imap-4.0.0_rc1-gentoo-imapd.rc,
+  -files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc,
+  -files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc, +courier-imap-4.0.0.ebuild,
+  -courier-imap-4.0.0_rc1.ebuild:
+  New version release.
+
+  23 Dec 2004; Tuan Van <langthang@gentoo.org>
+  files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,
+  files/courier-imap-4.0.0_rc1-courier-imapd.rc6,
+  files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,
+  files/courier-imap-4.0.0_rc1-courier-pop3d.rc6:
+  authdaemond --> courier-authlib
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  courier-imap-3.0.8.ebuild:
+  Stable on amd64.
+
+*courier-imap-4.0.0_rc1 (11 Dec 2004)
+
+  11 Dec 2004; Tuan Van <langthang@gentoo.org>
+  -files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6,
+  -files/courier-imap-3.0.8.20041116-courier-imapd.rc6,
+  -files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6,
+  -files/courier-imap-3.0.8.20041116-courier-pop3d.rc6,
+  -files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-3.0.8.20041116-db4-configure.in.patch,
+  -files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch,
+  -files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc,
+  -files/courier-imap-3.0.8.20041116-gentoo-imapd.rc,
+  -files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc,
+  -files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc,
+  +files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,
+  +files/courier-imap-4.0.0_rc1-courier-imapd.rc6,
+  +files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,
+  +files/courier-imap-4.0.0_rc1-courier-pop3d.rc6,
+  +files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-4.0.0_rc1-db4-configure.in.patch,
+  +files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch,
+  +files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc,
+  +files/courier-imap-4.0.0_rc1-gentoo-imapd.rc,
+  +files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc,
+  +files/courier-imap-gentoo.readme, -courier-imap-3.0.8.20041116.ebuild,
+  +courier-imap-4.0.0_rc1.ebuild:
+  Release candidate.
+
+  29 Nov 2004; Andrej Kacian <ticho@gentoo.org> courier-imap-3.0.7.ebuild,
+  courier-imap-3.0.8.ebuild:
+  app-admin/fam -> virtual/fam, for bug #67170.
+
+  27 Nov 2004; Philip Walls <malverian@gentoo.org> courier-imap-3.0.8.ebuild,
+  courier-imap-3.0.8.20041116.ebuild:
+  Migrate to virtual/fam
+
+*courier-imap-3.0.8.20041116 (18 Nov 2004)
+
+  18 Nov 2004; Tuan Van <langthang@gentoo.org>
+  +files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6,
+  +files/courier-imap-3.0.8.20041116-courier-imapd.rc6,
+  +files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6,
+  +files/courier-imap-3.0.8.20041116-courier-pop3d.rc6,
+  +files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-3.0.8.20041116-db4-configure.in.patch,
+  +files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch,
+  +files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc,
+  +files/courier-imap-3.0.8.20041116-gentoo-imapd.rc,
+  +files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc,
+  +courier-imap-3.0.8.20041116.ebuild:
+  Commit for testing only. Do not use.
+
+  16 Nov 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.8.ebuild:
+  Add virtual/imapd blocking. Bug #55309.
+
+  16 Nov 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.8.ebuild:
+  fix bug #69867.
+
+  07 Nov 2004; Jason Wever <weeve@gentoo.org> courier-imap-3.0.8.ebuild:
+  Stable on sparc.
+
+  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> courier-imap-3.0.8.ebuild:
+  Marked stable on mips.
+
+  02 Nov 2004; Tuan Van <langthang@gentoo.org> -files/authdaemond.conf,
+  -files/authdaemond.rc6, -files/courier-imap-3.0.2-db40vs41.patch,
+  -files/courier-imap-3.0.2-disable-fam.diff,
+  -files/courier-imap-3.0.2-removerpm.patch, -files/courier-imapd-ssl.rc6,
+  -files/courier-pop3d-ssl.rc6, -files/gentoo-imapd-ssl.rc,
+  -files/gentoo-imapd.rc, -files/gentoo-pop3d-ssl.rc,
+  -files/gentoo-pop3d.rc, courier-imap-3.0.7.ebuild,
+  courier-imap-3.0.8.ebuild:
+  remove cruft. fix RDEPEND use? syntax error.
+
+  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)
+
+  22 Sep 2004; Tuan Van <langthang@gentoo.org>
+  +files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-3.0.8-db4-configure.in.patch,
+  +files/courier-imap-3.0.8-disable-fam-configure.in.patch,
+  +courier-imap-3.0.8.ebuild:
+  Version bump.
+
+  30 Aug 2004; Tom Gall <tgall@gentoo.org> courier-imap-3.0.7.ebuild:
+  stable on ppc64, bug #61745
+
+  25 Aug 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.7.ebuild:
+  Stable on x86.
+
+  25 Aug 2004; Jason Wever <weeve@gentoo.org> courier-imap-3.0.7.ebuild:
+  Stable on sparc wrt bug #60865.
+
+  25 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> courier-imap-3.0.7.ebuild:
+  Marked stable on amd64.
+
+  23 Aug 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.7.ebuild:
+  add dohtml, remove *.html from dodoc.
+
+  23 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.7.ebuild:
+  Loosing the DB restriction now that we support DB4.
+
+  22 Aug 2004; Rajiv Aaron Manglani <rajiv@gentoo.org>
+  courier-imap-3.0.7.ebuild:
+  fix up docs.
+
+  22 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  files/authdaemond-3.0.4-r1:
+  bug #61254.
+
+  21 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.7.ebuild:
+  Fix a bug for Rajiv.
+
+  20 Aug 2004; Guy Martin <gmsoft@gentoo.org> courier-imap-3.0.5.ebuild:
+  Stable on hppa.
+
+*courier-imap-3.0.7 (19 Aug 2004)
+
+  19 Aug 2004; Tuan Van <langthang@gentoo.org>
+  +files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-3.0.7-db4-configure.in.patch,
+  +files/courier-imap-3.0.7-disable-fam-configure.in.patch,
+  +courier-imap-3.0.7.ebuild:
+  Version bump. Add patches to support db4. Add gdbm USE flag back.
+  Add logic to default to gdbm if both 'berkdb' and 'gdmb' USE flags present.
+
+  20 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> courier-imap-3.0.5.ebuild:
+  Marked stable on amd64.
+
+  19 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  courier-imap-3.0.5.ebuild:
+  Stable on sparc wrt #60865
+
+  19 Aug 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.5.ebuild:
+  stable on x86. GLSA bug #60865.
+
+  05 Jul 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild,
+  courier-imap-3.0.4-r1.ebuild, courier-imap-3.0.4.ebuild:
+  bug #55956, backport fix I put into 3.0.5 for gdbm vs. berkdb.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  courier-imap-2.1.2-r2.ebuild, courier-imap-3.0.2-r1.ebuild,
+  courier-imap-3.0.2.ebuild, courier-imap-3.0.4-r1.ebuild,
+  courier-imap-3.0.4.ebuild, courier-imap-3.0.5.ebuild:
+  virtual/glibc -> virtual/libc
+
+*courier-imap-3.0.5 (26 Jun 2004)
+
+  26 Jun 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.4-r1.ebuild, courier-imap-3.0.5.ebuild,
+  files/authdaemond-3.0.4-r1, files/authdaemond.conf,
+  files/authdaemond.conf-3.0.4-r1, files/authdaemond.rc6,
+  files/courier-imapd-ssl.rc6, files/courier-imapd-ssl.rc6-3.0.5,
+  files/courier-imapd.rc6, files/courier-pop3d-ssl.rc6,
+  files/courier-pop3d-ssl.rc6-3.0.5, files/courier-pop3d.rc6,
+  files/gentoo-imapd-1.7.3-r1.rc, files/gentoo-imapd-ssl-1.7.3-r1.rc,
+  files/gentoo-pop3d-1.7.3-r1.rc, files/gentoo-pop3d-ssl-1.7.3-r1.rc:
+  fix bugs 42686, 52496, 39653, 52174, 52658, new upstream version.
+
+  17 Jun 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  Remove 2.1.2-r1 as per bug #54020.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, courier-imap-2.1.2-r2.ebuild,
+  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild,
+  courier-imap-3.0.4-r1.ebuild, courier-imap-3.0.4.ebuild:
+  Fix use invocation
+
+  28 May 2004; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  Update metadata.xml.
+
+*courier-imap-3.0.4-r1 (19 May 2004)
+
+  19 May 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.4-r1.ebuild, files/authdaemond-3.0.4-r1,
+  files/authdaemond.conf-3.0.4-r1:
+  bug #51306 again, authdaemond changes
+
+*courier-imap-3.0.4 (17 May 2004)
+
+  17 May 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.4.ebuild:
+  version bump, bug #51306. severe problem found in 3.0.2.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, courier-imap-2.1.2-r2.ebuild,
+  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild:
+  Add inherit eutils
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, courier-imap-2.1.2-r2.ebuild,
+  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild:
+  Add die following econf for bug 48950
+
+*courier-imap-3.0.2-r1 (23 Apr 2004)
+
+  23 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.2-r1.ebuild, files/courier-imap-3.0.2-disable-fam.diff:
+  bug #48838, make it possible to disable fam properly, configure.in patch by
+  <robbat2@gentoo.org>
+
+*courier-imap-2.1.2-r2 (19 Apr 2004)
+
+  19 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r2.ebuild:
+  remove 1.7.3-r1, add new revision of 2.1.2 with QA fixes for bug #48362
+
+  19 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.2.ebuild:
+  fix bug #21330 a bit better
+
+  31 Mar 2004; Robin H. Johnson <robbat2@gentoo.org>
+  files/courier-imapd-ssl.rc6, files/courier-imapd.rc6,
+  files/courier-pop3d-ssl.rc6, files/courier-pop3d.rc6:
+  avoid bug #46351 recurring by having init scripts use famd.
+
+  06 Apr 2004; Joshua Brindle <method@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, courier-imap-3.0.2.ebuild:
+  added selinux policy to rdepend
+
+  28 Mar 2004; Jochen Maes <sejo@gentoo.org> courier-imap-3.0.2.ebuild:
+  courier-imap-3.0.2.ebuild
+
+  26 Mar 2004; Jason Wever <weeve@gentoo.org> courier-imap-3.0.2.ebuild:
+  Marked stable on sparc wrt bug #45584.
+
+  26 Mar 2004; Jon Portnoy <avenj@gentoo.org>
+  courier-imap-3.0.2.ebuild :
+  Stable on AMD64
+
+  26 Mar 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.2.ebuild:
+  clean up vpopmail and more in ebuild. bump to x86 for security bug #45584.
+
+*courier-imap-3.0.2 (26 Mar 2004)
+
+  26 Mar 2004; <solar@gentoo.org> courier-imap-3.0.2.ebuild,
+  files/courier-imap-3.0.2-db40vs41.patch,
+  files/courier-imap-3.0.2-removerpm.patch:
+  courier-imap <3.0.0: Courier Multiple Remote Buffer Overflow Vulnerabilities.
+  bug #45584
+
+  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> courier-imap-2.1.2-r1.ebuild,
+  files/courier-imap-2.1.2-res_query.patch:
+  Add patch for res_query to allow courier-imap to compile on amd64. Should close #41160.
+
+  22 Feb 2004; Aron Griffis <agriffis@gentoo.org>
+  courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r1.ebuild:
+  Remove arm keywords
+
+  28 Jan 2004; Jon Portnoy <avenj@gentoo.org> courier-imap-2.1.2-r1.ebuild :
+  AMD64 keywords.
+
+  18 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  fix bug #38606.
+
+  08 Jan 2004; Jason Wever <weeve@gentoo.org> courier-imap-2.1.2-r1.ebuild:
+  Added ~sparc keyword.
+
+  22 Dec 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  fix bug #33346
+
+  09 Dec 2003; Martin Holzer <mholzer@gentoo.org>
+  courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r1.ebuild:
+  adding RESTRICT="nomirror"
+
+  07 Dec 2003; foser <foser@gentoo.org> courier-imap*.ebuild :
+  Fix fam-oss dep to fam, due to move
+
+  14 Nov 2003; Rajiv Aaron Manglani <rajiv@gentoo.org>
+  courier-imap-1.7.3-r1.ebuild:
+  marked stable on ppc.
+
+  31 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  fix bug #32410, bump to stable
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, files/courier-imap-2.1.2-removerpm.patch:
+  commit brandy's patch for bug #28070
+
+*courier-imap-2.1.2-r1 (02 Oct 2003)
+
+  02 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  add fam support - bug #29879
+
+*courier-imap-2.1.2 (25 Sep 2003)
+
+  25 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2.ebuild:
+  version bump
+
+  03 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.1.ebuild:
+  add fix for bug #27528, and add a few comments about the last fix too
+
+  03 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.1.ebuild, files/courier-imap-2.1.1-db40vs41.patch:
+  apply Brandy's patch for bug #27517
+
+*courier-imap-2.1.1 (28 Aug 2003)
+
+  28 Aug 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.1.ebuild:
+  version bump, fix ipv6 bug, another attempted tcltk fix
+
+*courier-imap-2.0.0 (31 Jul 2003)
+
+  31 Jul 2003; Robin Hugh Johnson <robbat2@gentoo.org> courier-imap-2.0.0.ebuild:
+  Bump to latest stable upstream version, new fix for userpriv
+
+*courier-imap-1.7.3-r1 (31 Jul 2003)
+
+  31 Jul 2003; Robin Hugh Johnson <robbat2@gentoo.org> courier-imap-1.7.3-r1.ebuild,
+  files/gentoo-imapd-1.7.3-r1.rc, files/gentoo-imapd-ssl-1.7.3-r1.rc,
+  files/gentoo-pop3d-1.7.3-r1.rc, files/gentoo-pop3d-ssl-1.7.3-r1.rc:
+  Fixed Prerun support again, bump to x86.
+
+  10 Jun 2003; <msterret@gentoo.org> courier-imap-1.7.1.ebuild,
+  courier-imap-1.7.2.ebuild, courier-imap-1.7.3.ebuild:
+  DEPEND on sed >= 4
+
+*courier-imap-1.7.3 (20 May 2003)
+
+  27 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: 
+  Fix bug #21803
+
+  25 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: 
+  Fix bug #21577
+
+  20 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: 
+  Version bump and move warning message. Removed extraneous cflag filtering.
+  Fixed bug #21330 as well.
+
+*courier-imap-1.7.2 (19 May 2003)
+
+  19 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.2.ebuild, 
+  files/gentoo-imapd-ssl.rc, files/gentoo-imapd.rc, files/gentoo-pop3d-ssl.rc,
+  files/gentoo-pop3d.rc:
+  Version bump. Fixed DB3/DB4 stuff properly (minor bug in sed-foo).  Install
+  all auth modules. Added prerun support for some other mail stuff.  Fix
+  SRC_URI. Fix Vpopmail support. Other misc cleanups.
+
+*courier-imap-1.7.1 (30 Apr 2003)
+
+  30 Apr 2003; Alastair Tse <liquidx@gentoo.org> courier-imap-1.7.1.ebuild:
+  version bump. workaround db3/db4 coexisting problems. added
+  /var/lib/courier-imap
+
+  18 Feb 2003; Nick Hadaway <raker@gentoo.org> files/gentoo-*.rc :
+  Updated gentoo-*.rc with fix0rs found by Psi-Jack!
+
+*courier-imap-1.7.0 (01 Feb 2003)
+
+  11 Apr 2003; Alastair Tse <liquidx@gentoo.org> courier-imap-1.7.0.ebuild:
+  deps now reflect that it needs db3 and nothing else. fixes #18734.
+
+  04 Feb 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.7.0.ebuild :
+  Updated vpopmail detection to account for a different home directory
+  for vpopmail.
+
+  01 Feb 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.7.0.ebuild,
+  files/digest-courier-imap-1.7.0 :
+  Version bump.  Includes some postgres changes and other fixes.
+
+*courier-imap-1.6.2-r1 (29 Jan 2003)
+
+  29 Jan 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2-r1.ebuild,
+  files/digest-courier-imap-1.6.2-r1 :
+  Now filtering -funroll-loops and -fomit-frame-pointer like in the
+  courier ebuild.
+
+*courier-imap-1.6.2 (31 Dec 2002)
+
+  14 Jan 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2.ebuild :
+  Tamed down the postgres dependancy.
+
+  09 Jan 2002; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2.ebuild :
+  Marked stable for x86.
+
+  31 Dec 2002; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2.ebuild,
+  files/digest-courier-imap-1.6.2 :
+  Version bump.  new ebuild logic for unicode support.  Added postgres
+  use variable support.
+
+*courier-imap-1.6.1 (12 Dec 2002)
+
+  25 Dec 2002; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.1.ebuild,
+  files/gentoo-imapd-1.6.1.rc, files/gentoo-imapd-ssl-1.6.1.rc,
+  files/gentoo-pop3d-1.6.1.rc, files/gentoo-pop3d-ssl-1.6.1.rc :
+  Updated the gentoo rc files and ebuild as logger has changed
+  to courierlogger.
+
+  12 Dec 2002; Nick Hadaway <raker@gentoo.org>
+  courier-imap-1.6.1.ebuild, files/digest-courier-imap-1.6.1 :
+  Version bump.  Added a test for vpopmail so proper configure options
+  are passed.
+
+06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*courier-imap-1.5.3 (25 Sep 2002)
+
+  25 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  courier-imap-1.5.3.ebuild, files/digest-courier-imap-1.5.3 :
+  Version bump.  Lots of SSL fixes.
+
+*courier-imap-1.5.1 (03 Aug 2002)
+
+  11 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  courier-imap-1.5.1.ebuild, files/authdaemond.conf,
+  files/authdaemond.rc6 :
+  Updated authenticator choosing mechanism.  Removed pgsql authenticator
+  as it is not a supported backend.
+
+  30 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
+  Added ppc to keywords.
+
+  03 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  courier-imap-1.5.1.ebuild, files/digest-courier-imap-1.5.1 :
+  Version bump.  Added support for unicode searching, and proper
+  listening to the ipv6 use variable.
+
+*courier-imap-1.5.0 (24 Jun 2002)
+
+  22 Jul 2002; Nick Hadaway <raker@gentoo.org> authdaemond.rc6 :
+  Fixed small typo.  changed pqsql to pgsql.  Closes bug #5163.
+
+  26 Jul 2002; Nicholas Jones <carpaski@gentoo.org :
+  Added in a check for vpopmail as Courier-IMAP just assumes that if
+  the user exists, then all the files MUST exist.
+
+  24 Jun 2002; Donny Davies <woodchip@gentoo.org> :
+  Chase latest release.
+
+*courier-imap-1.4.5-r3 (20 Jun 2002)
+
+  20 Jun 2002; Kyle Manna <nitro@gentoo.org> :
+
+  Moved maildirmake for /usr/sbin to /usr/bin, close bug #3844
+
+*courier-imap-1.4.5-r2 (14 Jun 2002)
+
+  14 Jun 2002; Kyle Manna <nitro@gentoo.org> :
+
+  Forgot to install /etc/init.d/authdaemond
+
+*courier-imap-1.4.5-r1 (8 Jun 2002)
+
+  8 Jun 2002; Kyle Manna <nitro@gentoo.org> :
+
+  Added pop3 init scripts.
+
+*courier-imap-1.4.3-r1 (30 Apr 2002)
+
+  30 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Added tcltk? ( >=dev-tcltk/expect-5.33.0 ) to RDEPEND, closing #2282.
+
+*courier-imap-1.4.3 (1 Apr 2002)
+
+  1 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Updated to latest release.  Added --enable-workarounds-for-imap-client-bugs
+  to ./configure which helps some clients; notably Netscape Messenger.  Now
+  installs a pam_stack aware pam.d/ file.
+
+*courier-imap-1.4.1-r4 (14 Mar 2002)
+
+  14 Mar 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+  Fixed bug where /etc/courier-imap/pop3d didn't have MAILDIR=.maildir set.
+
+*courier-imap-1.4.1-r2 (21 Feb 2002)
+
+21 Feb 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+  Modified the ebuild so that /usr/sbin/{imapd,pop3d} get renamed to
+  /usr/sbin/{courier-imapd,courier-pop3d}.  I also had to change hack
+  the /usr/lib/courier-imap/*.rc files to call these newly-named functions.
+  While I was at it I cleaned up the ebuilds and fixed the not-yet-caught
+  bug that pop3d was still trying to use Maildir instead of ${MAILDIR}.
+  Fixes bug #584.
+
+*courier-imap-1.4.1-r1 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/net-mail/courier-imap/courier-imap-4.1.2.ebuild b/net-mail/courier-imap/courier-imap-4.1.2.ebuild
index 2206609fcc93..c40fa80ece4f 100644
--- a/net-mail/courier-imap/courier-imap-4.1.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.1.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2.ebuild,v 1.1 2007/02/23 15:59:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2.ebuild,v 1.2 2007/02/25 22:56:32 chutzpah Exp $
+
+WANT_AUTOCONF="2.6"
 
 inherit autotools eutils multilib
 IUSE="fam berkdb gdbm debug ipv6 nls selinux"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch
new file mode 100644
index 000000000000..6fdff769afa7
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch
@@ -0,0 +1,11 @@
+--- tcpd/configure.in.orig	2007-02-02 17:20:18.000000000 +0100
++++ tcpd/configure.in	2007-02-02 17:20:58.000000000 +0100
+@@ -84,7 +84,7 @@
+ 	USE_GDBM=0
+ 	LIBGDBM=""
+ 	dblibrary=../bdbobj/libbdbobj.la
+-	LIBDB="-Wl,$LIBDB"
++	LIBDB="$LIBDB"
+ 	;;
+ *)
+ 	COURIERTCPD=""