bug #55956, backport fix I put into 3.0.5 for gdbm vs. berkdb.

6 files changed, 44 insertions, 39 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 7f63f0a7a137..43d515a85543 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,11 @@
 # 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.76 2004/07/01 22:30:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.77 2004/07/05 07:37:12 robbat2 Exp $
+
+  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,
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 013140b82247..240062375119 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,40 +1,40 @@
-MD5 d6dce5e76ee803e7b0062e850386547f ChangeLog 13034
+MD5 a74f0f58436fd5595467caa8846111d8 courier-imap-3.0.5.ebuild 8528
+MD5 a4d0b07bbc55362fa253234c01b60cb2 courier-imap-3.0.2-r1.ebuild 8123
+MD5 be2df850f07da0eab3900fc6448e005c courier-imap-3.0.2.ebuild 7898
+MD5 f6dc5b9454301bf9d0b01f778f7ac32b courier-imap-3.0.4.ebuild 8120
+MD5 da76d000ea9604b61ac44560701224c7 courier-imap-3.0.4-r1.ebuild 8155
 MD5 86ca68534e1694486bad27a5e47078ec courier-imap-2.1.2-r2.ebuild 7885
-MD5 18226b4bd0ef5a2ee40569f737141cf1 courier-imap-3.0.2-r1.ebuild 8128
-MD5 0f930e4c6ef9af18c9b57b42d64dda94 courier-imap-3.0.2.ebuild 7903
-MD5 43c1b33c709511c68c1c60bc4fb35e18 courier-imap-3.0.4-r1.ebuild 8160
-MD5 e922dd287a793d324c2275bdec75e206 courier-imap-3.0.4.ebuild 8125
+MD5 a280c9d57f762a8ee5e8b8b3cef9ff50 ChangeLog 13268
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
-MD5 a74f0f58436fd5595467caa8846111d8 courier-imap-3.0.5.ebuild 8528
+MD5 d9d0cf2a19ee5b20039583b7cb4cffcc files/courier-pop3d-ssl.rc6-3.0.5 1204
+MD5 5879bfc8c6b847d7ef364b4ca6b40880 files/courier-imapd-ssl.rc6-3.0.5 1196
 MD5 12ca0f1c57bbe3d8e8fd8cf56e5e3bc3 files/authdaemond-3.0.4-r1 1075
-MD5 f156e5a11ab06f0bee9c0b1e6e2c8887 files/authdaemond.conf 440
 MD5 7d5ddf4fa33c73befa0bd434a17022f9 files/authdaemond.conf-3.0.4-r1 544
-MD5 92cd406de622a1cf2de2ffc0662349bc files/authdaemond.rc6 957
+MD5 1709ef97052398ee74b0d7d7786d398a files/gentoo-pop3d-1.7.3-r1.rc 1020
 MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
-MD5 8518e782ded83266586160919806ec06 files/courier-imap-2.1.2-removerpm.patch 4308
-MD5 60552b53a15c049f8f490d454764315d files/courier-imap-2.1.2-res_query.patch 610
-MD5 dfe2c230fed9f3be8e27d5d0baeef193 files/courier-imap-3.0.2-db40vs41.patch 585
-MD5 73fffd635f45ec99ecf6a45a9d0e4516 files/courier-imap-3.0.2-disable-fam.diff 1996
-MD5 ce975bfaa13118f7fcc463f2e0486277 files/courier-imap-3.0.2-removerpm.patch 4264
+MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
 MD5 c8836ccb71ec53cb7570308b10d9c247 files/courier-imapd-ssl.rc6 1200
 MD5 90bb778616a7c67658b9e78890d4b8fe files/courier-imapd.rc6 945
+MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
+MD5 a5029d4de95a9deca6254a889ed7fd0b files/gentoo-pop3d-ssl-1.7.3-r1.rc 1012
+MD5 60552b53a15c049f8f490d454764315d files/courier-imap-2.1.2-res_query.patch 610
+MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
+MD5 8518e782ded83266586160919806ec06 files/courier-imap-2.1.2-removerpm.patch 4308
+MD5 ce975bfaa13118f7fcc463f2e0486277 files/courier-imap-3.0.2-removerpm.patch 4264
+MD5 f156e5a11ab06f0bee9c0b1e6e2c8887 files/authdaemond.conf 440
+MD5 9e69a26cf7b3bf68338f701fece09a35 files/gentoo-imapd-ssl-1.7.3-r1.rc 1036
+MD5 d56218342e6b7d9e7aec913b9d44de87 files/digest-courier-imap-3.0.2-r1 72
+MD5 ccbd15ff6786ce62a52455ec5f02233e files/digest-courier-imap-3.0.4-r1 72
 MD5 d1bfa2a8019ebac0a33d3ef7a8945eeb files/courier-pop3d-ssl.rc6 1208
-MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
-MD5 5879bfc8c6b847d7ef364b4ca6b40880 files/courier-imapd-ssl.rc6-3.0.5 1196
-MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r2 72
+MD5 73fffd635f45ec99ecf6a45a9d0e4516 files/courier-imap-3.0.2-disable-fam.diff 1996
+MD5 dfe2c230fed9f3be8e27d5d0baeef193 files/courier-imap-3.0.2-db40vs41.patch 585
 MD5 d56218342e6b7d9e7aec913b9d44de87 files/digest-courier-imap-3.0.2 72
-MD5 d56218342e6b7d9e7aec913b9d44de87 files/digest-courier-imap-3.0.2-r1 72
 MD5 ccbd15ff6786ce62a52455ec5f02233e files/digest-courier-imap-3.0.4 72
-MD5 ccbd15ff6786ce62a52455ec5f02233e files/digest-courier-imap-3.0.4-r1 72
+MD5 cf0b34bc53717e49f0f75bd610a0fac9 files/digest-courier-imap-3.0.5 72
 MD5 2399f4a660fd7149e3fe19f0bfc230e1 files/gentoo-imapd-1.7.3-r1.rc 1074
-MD5 9e69a26cf7b3bf68338f701fece09a35 files/gentoo-imapd-ssl-1.7.3-r1.rc 1036
 MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
-MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
-MD5 1709ef97052398ee74b0d7d7786d398a files/gentoo-pop3d-1.7.3-r1.rc 1020
-MD5 a5029d4de95a9deca6254a889ed7fd0b files/gentoo-pop3d-ssl-1.7.3-r1.rc 1012
-MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
 MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
-MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
+MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r2 72
+MD5 92cd406de622a1cf2de2ffc0662349bc files/authdaemond.rc6 957
+MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
-MD5 d9d0cf2a19ee5b20039583b7cb4cffcc files/courier-pop3d-ssl.rc6-3.0.5 1204
-MD5 cf0b34bc53717e49f0f75bd610a0fac9 files/digest-courier-imap-3.0.5 72
diff --git a/net-mail/courier-imap/courier-imap-3.0.2-r1.ebuild b/net-mail/courier-imap/courier-imap-3.0.2-r1.ebuild
index c434e80fca73..807b0fcdd859 100644
--- a/net-mail/courier-imap/courier-imap-3.0.2-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-3.0.2-r1.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.2-r1.ebuild,v 1.6 2004/07/01 22:30:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.2-r1.ebuild,v 1.7 2004/07/05 07:37:12 robbat2 Exp $
 
 inherit eutils
 
@@ -10,14 +10,14 @@ HOMEPAGE="http://www.courier-mta.org/"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gdbm ldap berkdb mysql pam nls postgres fam selinux"
+IUSE="ldap berkdb mysql pam nls postgres fam 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* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	!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 )
diff --git a/net-mail/courier-imap/courier-imap-3.0.2.ebuild b/net-mail/courier-imap/courier-imap-3.0.2.ebuild
index 313f1d8e3804..4a3e1e2d7a5c 100644
--- a/net-mail/courier-imap/courier-imap-3.0.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-3.0.2.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.2.ebuild,v 1.13 2004/07/01 22:30:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.2.ebuild,v 1.14 2004/07/05 07:37:12 robbat2 Exp $
 
 inherit eutils
 
@@ -10,14 +10,14 @@ HOMEPAGE="http://www.courier-mta.org/"
 KEYWORDS="x86 ppc sparc ~mips ~alpha hppa amd64"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gdbm ldap berkdb mysql pam nls postgres fam selinux"
+IUSE="ldap berkdb mysql pam nls postgres fam 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* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	!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 )
diff --git a/net-mail/courier-imap/courier-imap-3.0.4-r1.ebuild b/net-mail/courier-imap/courier-imap-3.0.4-r1.ebuild
index bb5c62f8b0a3..5cdd5cf7916a 100644
--- a/net-mail/courier-imap/courier-imap-3.0.4-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-3.0.4-r1.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.4-r1.ebuild,v 1.5 2004/07/01 22:30:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.4-r1.ebuild,v 1.6 2004/07/05 07:37:12 robbat2 Exp $
 
 inherit eutils
 
@@ -10,14 +10,14 @@ HOMEPAGE="http://www.courier-mta.org/"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gdbm ldap berkdb mysql pam nls postgres fam selinux"
+IUSE="ldap berkdb mysql pam nls postgres fam 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* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	!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 )
diff --git a/net-mail/courier-imap/courier-imap-3.0.4.ebuild b/net-mail/courier-imap/courier-imap-3.0.4.ebuild
index 074a01be7dfc..12f58015b779 100644
--- a/net-mail/courier-imap/courier-imap-3.0.4.ebuild
+++ b/net-mail/courier-imap/courier-imap-3.0.4.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.4.ebuild,v 1.4 2004/07/01 22:30:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.4.ebuild,v 1.5 2004/07/05 07:37:12 robbat2 Exp $
 
 inherit eutils
 
@@ -10,14 +10,14 @@ HOMEPAGE="http://www.courier-mta.org/"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gdbm ldap berkdb mysql pam nls postgres fam selinux"
+IUSE="ldap berkdb mysql pam nls postgres fam 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* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	!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 )