new version release

17 files changed, 72 insertions, 42 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 5db39efcbd02..f883a92748ea 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,34 @@
 # 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.104 2004/12/24 00:07:25 langthang Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.105 2005/01/02 05:24:56 langthang Exp $
+
+*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,
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 0a32962f857a..10e32fad981d 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,48 +1,48 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9a72d49ced92457074aeaf8119551eda courier-imap-3.0.7.ebuild 9228
-MD5 c6f982914e99d023996c1e743283d68d courier-imap-4.0.0_rc1.ebuild 10008
-MD5 35a2d1fe2e41301cd794310d7b871f6a courier-imap-3.0.8.ebuild 9388
-MD5 d5845548fdd18590aae4127bf5ce4b45 ChangeLog 19401
+MD5 de5013f2a6ac6570b00b24f2d689a8ff courier-imap-4.0.0.ebuild 10049
+MD5 51541e91419e6d1ab53c0f1baaefb014 courier-imap-3.0.7.ebuild 9232
+MD5 fe390d5d2b6c790c32f8797b06dc4f4f courier-imap-3.0.8.ebuild 9389
+MD5 db4d4523d16317cab203bc9e14a19bd6 ChangeLog 20723
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 MD5 d9d0cf2a19ee5b20039583b7cb4cffcc files/courier-pop3d-ssl.rc6-3.0.5 1204
-MD5 100d0f566cee5671b549040f84a2fdfe files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6 1219
 MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch 1263
 MD5 5879bfc8c6b847d7ef364b4ca6b40880 files/courier-imapd-ssl.rc6-3.0.5 1196
 MD5 aebf119b54b485aa50571173566f4a09 files/courier-imap-gentoo.readme 2827
-MD5 cea7ddd8c64d73689bb081517c4269c2 files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc 1079
 MD5 71a551a4f772f4299f9752f3d043b8c5 files/authdaemond-3.0.4-r1 1062
+MD5 7284942c2f405dbcdf36cd2d6a0b06e0 files/courier-imap-4.0.0-courier-pop3d-ssl.rc6 1223
 MD5 7d5ddf4fa33c73befa0bd434a17022f9 files/authdaemond.conf-3.0.4-r1 544
 MD5 1709ef97052398ee74b0d7d7786d398a files/gentoo-pop3d-1.7.3-r1.rc 1020
+MD5 8e12c59078c93368cbccf9a0c94dcdb1 files/courier-imap-4.0.0-gentoo-imapd.rc 1129
 MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.7-disable-fam-configure.in.patch 654
-MD5 3d8b2a9b9250d63c95a4765f371efe9f files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc 1096
-MD5 7a51b463b3f20d8cca819e652093584e files/digest-courier-imap-4.0.0_rc1 72
-MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch 654
+MD5 76bd7b9e2b5afd99c44e9316f5b18d6c files/courier-imap-4.0.0-gentoo-pop3d-ssl.rc 1067
 MD5 90bb778616a7c67658b9e78890d4b8fe files/courier-imapd.rc6 945
+MD5 7df104320e841b3755e39313b8609653 files/courier-imap-4.0.0-courier-imapd.rc6 970
 MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
-MD5 001f66a07c97c85ce380fed6e36fd87f files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6 1227
 MD5 a5029d4de95a9deca6254a889ed7fd0b files/gentoo-pop3d-ssl-1.7.3-r1.rc 1012
-MD5 4d8f2778faeb15433e7805285bab7795 files/courier-imap-4.0.0_rc1-courier-pop3d.rc6 982
-MD5 92011c7dddd994ff7b7815fd04a9ba6a files/courier-imap-4.0.0_rc1-gentoo-imapd.rc 1133
 MD5 9e69a26cf7b3bf68338f701fece09a35 files/gentoo-imapd-ssl-1.7.3-r1.rc 1036
-MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch 1263
-MD5 809353b25074ad1ff5bf77ac1766f208 files/courier-imap-4.0.0_rc1-db4-configure.in.patch 1303
+MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-4.0.0-disable-fam-configure.in.patch 654
+MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-4.0.0-db4-bdbobj_configure.in.patch 1263
 MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263
 MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.8-disable-fam-configure.in.patch 654
 MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.8-db4-configure.in.patch 1337
-MD5 2f6a5ed551ee491a264c1f2c0c5cedaf files/courier-imap-4.0.0_rc1-courier-imapd.rc6 974
-MD5 c4f606d3c35ebf8b8d5b884b52727303 files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc 1071
 MD5 5d57e73c7593d5bb37135d3964d6d4c2 files/digest-courier-imap-3.0.7 72
 MD5 140a2653b4e3e2b7c9967d691da7a9ea files/digest-courier-imap-3.0.8 72
+MD5 7a51b463b3f20d8cca819e652093584e files/digest-courier-imap-4.0.0 72
 MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.7-db4-configure.in.patch 1337
+MD5 227ad5f8ea2529a28f1e1f68a71361b7 files/courier-imap-4.0.0-gentoo-imapd-ssl.rc 1092
 MD5 2399f4a660fd7149e3fe19f0bfc230e1 files/gentoo-imapd-1.7.3-r1.rc 1074
+MD5 e70bceb7a5f75033a730e722f4519550 files/courier-imap-4.0.0-courier-imapd-ssl.rc6 1215
+MD5 182ac782495ea74fe1bf1c89ec17e3f1 files/courier-imap-4.0.0-gentoo-pop3d.rc 1075
+MD5 809353b25074ad1ff5bf77ac1766f208 files/courier-imap-4.0.0-db4-configure.in.patch 1303
 MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
+MD5 c3244da895631967f7b0d6ec3798d0bc files/courier-imap-4.0.0-courier-pop3d.rc6 978
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBy13K5FrxP71izLARApFJAJ9qWhm27BJXikZKn7sW/PII7LhaPgCfVjQX
-volDs5Dp+nCCDfLehpFzgn8=
-=Tkr2
+iD8DBQFB14W25FrxP71izLARAuUiAKDCeTlXd3z6wZgNSZV3bJIJfA6XlwCfTMye
+ea8xjQczELAHrs9tIiIjXNg=
+=iA26
 -----END PGP SIGNATURE-----
diff --git a/net-mail/courier-imap/courier-imap-3.0.7.ebuild b/net-mail/courier-imap/courier-imap-3.0.7.ebuild
index a28b8ab9e28c..0f6e96745a79 100644
--- a/net-mail/courier-imap/courier-imap-3.0.7.ebuild
+++ b/net-mail/courier-imap/courier-imap-3.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.7.ebuild,v 1.16 2004/11/29 22:57:40 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.7.ebuild,v 1.17 2005/01/02 05:24:56 langthang Exp $
 
 inherit eutils gnuconfig
 
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 ee10e42c3940..7284f071138a 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
+# Copyright 1999-2005 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.13 2004/12/16 10:09:05 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.8.ebuild,v 1.14 2005/01/02 05:24:56 langthang Exp $
 
 inherit eutils gnuconfig
 
diff --git a/net-mail/courier-imap/courier-imap-4.0.0_rc1.ebuild b/net-mail/courier-imap/courier-imap-4.0.0.ebuild
index 1b0f90b08fab..1868da716d54 100644
--- a/net-mail/courier-imap/courier-imap-4.0.0_rc1.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.0.0.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.0.0_rc1.ebuild,v 1.1 2004/12/11 07:10:46 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.0.ebuild,v 1.1 2005/01/02 05:24:56 langthang Exp $
 
 inherit eutils gnuconfig
 IUSE="fam berkdb gdbm debug ipv6 nls selinux"
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="http://www.courier-mta.org/"
-#SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-MY_PV=${PV/_rc*/}
-SRC_URI=""http://www.courier-mta.org/beta/imap/${PN}-${MY_PV}.tar.bz2""
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+#MY_PV=${PV/_rc*/}
+#SRC_URI=""http://www.courier-mta.org/beta/imap/${PN}-${MY_PV}.tar.bz2""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 #userpriv breaks linking against vpopmail
-#do not mirror beta release.
-RESTRICT="nouserpriv nomirror"
+RESTRICT="nouserpriv"
 
 RDEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6
@@ -32,7 +31,7 @@ DEPEND="${RDEPEND}
 	!virtual/imapd"
 PROVIDE="virtual/imapd"
 
-S=${WORKDIR}/${PN}-${MY_PV}
+#S=${WORKDIR}/${PN}-${MY_PV}
 pkg_setup() {
 	if ! use berkdb && ! use gdbm; then
 		echo
@@ -75,18 +74,21 @@ src_unpack() {
 
 	export WANT_AUTOCONF="2.5"
 	gnuconfig_update
+	libtoolize --copy --force
 	ebegin "Recreating configure"
 	autoconf || \
 		die "recreate configure failed"
 	eend $?
 
 	cd ${S}/maildir
+	libtoolize --copy --force
 	ebegin "Recreating maildir/configure"
 	autoconf || \
 		die "recreate configure failed"
 	eend $?
 
 	cd ${S}/bdbobj
+	libtoolize --copy --force
 	ebegin "Recreating bdbobj/configure"
 		autoconf || \
 		die "recreate configure failed"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.0-courier-imapd-ssl.rc6
index b0c8d7659af7..f79b9533b1a0 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-courier-imapd-ssl.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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/files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,v 1.2 2004/12/24 00:07:25 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.0-courier-imapd-ssl.rc6,v 1.1 2005/01/02 05:24:56 langthang Exp $
 
 depend() {
 	need net courier-authlib
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-imapd.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.0-courier-imapd.rc6
index 5b0927797b83..46f8e54d5379 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-imapd.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-courier-imapd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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/files/courier-imap-4.0.0_rc1-courier-imapd.rc6,v 1.2 2004/12/24 00:07:25 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.0-courier-imapd.rc6,v 1.1 2005/01/02 05:24:56 langthang Exp $
 
 depend() {
 	need net courier-authlib
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.0-courier-pop3d-ssl.rc6
index 9cee3b6ec6d2..007dc1136481 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-courier-pop3d-ssl.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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/files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,v 1.2 2004/12/24 00:07:25 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.0-courier-pop3d-ssl.rc6,v 1.1 2005/01/02 05:24:56 langthang Exp $
 
 depend() {
 	need net courier-authlib
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-pop3d.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.0-courier-pop3d.rc6
index a39091778d22..88cf34ea5c0d 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-pop3d.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-courier-pop3d.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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/files/courier-imap-4.0.0_rc1-courier-pop3d.rc6,v 1.2 2004/12/24 00:07:25 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.0-courier-pop3d.rc6,v 1.1 2005/01/02 05:24:56 langthang Exp $
 
 depend() {
 	need net courier-authlib
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.0-db4-bdbobj_configure.in.patch
index 776fdc144483..776fdc144483 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-db4-bdbobj_configure.in.patch
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.0-db4-configure.in.patch
index 400b746a233a..400b746a233a 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-db4-configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-db4-configure.in.patch
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.0-disable-fam-configure.in.patch
index 7019d02a6af5..7019d02a6af5 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-disable-fam-configure.in.patch
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.0-gentoo-imapd-ssl.rc
index df0ebdb3c858..9d1752a6df0f 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-gentoo-imapd-ssl.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc,v 1.1 2004/12/11 07:10:46 langthang Exp $
+# $Id: courier-imap-4.0.0-gentoo-imapd-ssl.rc,v 1.1 2005/01/02 05:24:56 langthang Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-imapd.rc b/net-mail/courier-imap/files/courier-imap-4.0.0-gentoo-imapd.rc
index 14daa0f8bf08..b2fc38ba3b2a 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-imapd.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-gentoo-imapd.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.0_rc1-gentoo-imapd.rc,v 1.1 2004/12/11 07:10:46 langthang Exp $
+# $Id: courier-imap-4.0.0-gentoo-imapd.rc,v 1.1 2005/01/02 05:24:56 langthang Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.0-gentoo-pop3d-ssl.rc
index 40220df710dc..b8bc20f7cc6f 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-gentoo-pop3d-ssl.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc,v 1.1 2004/12/11 07:10:46 langthang Exp $
+# $Id: courier-imap-4.0.0-gentoo-pop3d-ssl.rc,v 1.1 2005/01/02 05:24:56 langthang Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc b/net-mail/courier-imap/files/courier-imap-4.0.0-gentoo-pop3d.rc
index ddacbebbef17..1c1acb590353 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0-gentoo-pop3d.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-4.0.0_rc1-gentoo-pop3d.rc,v 1.1 2004/12/11 07:10:46 langthang Exp $
+# $Id: courier-imap-4.0.0-gentoo-pop3d.rc,v 1.1 2005/01/02 05:24:56 langthang Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
diff --git a/net-mail/courier-imap/files/digest-courier-imap-4.0.0_rc1 b/net-mail/courier-imap/files/digest-courier-imap-4.0.0
index db6b4d37b430..db6b4d37b430 100644
--- a/net-mail/courier-imap/files/digest-courier-imap-4.0.0_rc1
+++ b/net-mail/courier-imap/files/digest-courier-imap-4.0.0