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

5 files changed, 18 insertions, 13 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/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 )