From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 3 Jan 2015 10:04:57 +0000 (+0000)
Subject: Re-add CDB support, thanks to Nico Erfurth in bug #534230
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e84412194ec0e266e77f73cb53693a1899ab0f3;p=gentoo.git

Re-add CDB support, thanks to Nico Erfurth in bug #534230

Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89
---

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 16f9a2ddeaef..1b148156c2da 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/exim
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.307 2014/12/30 17:44:56 grobian Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.308 2015/01/03 10:04:57 grobian Exp $
+
+  03 Jan 2015; Fabian Groffen <grobian@gentoo.org> exim-4.84.ebuild,
+  exim-4.85_rc4.ebuild:
+  Re-add CDB support, thanks to Nico Erfurth in bug #534230
 
 *exim-4.85_rc4 (30 Dec 2014)
 
diff --git a/mail-mta/exim/exim-4.84.ebuild b/mail-mta/exim/exim-4.84.ebuild
index 2689f73c0d67..ca2bca3826a4 100644
--- a/mail-mta/exim/exim-4.84.ebuild
+++ b/mail-mta/exim/exim-4.84.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.84.ebuild,v 1.15 2014/12/28 15:57:24 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.84.ebuild,v 1.16 2015/01/03 10:04:57 grobian Exp $
 
 EAPI="5"
 
@@ -159,11 +159,12 @@ src_configure() {
 	#
 	# lookup methods
 
-	# use the "native" interface to the DBM library, support passwd
-	# and directory lookups by default
+	# use the "native" interfaces to the DBM and CDB libraries, support
+	# passwd and directory lookups by default
 	cat >> Makefile <<- EOC
 		USE_DB=yes
 		DBMLIB=-ldb
+		LOOKUP_CDB=yes
 		LOOKUP_PASSWD=yes
 		LOOKUP_DSEARCH=yes
 	EOC
diff --git a/mail-mta/exim/exim-4.85_rc4.ebuild b/mail-mta/exim/exim-4.85_rc4.ebuild
index 2586b137d2f2..abecfafcfce4 100644
--- a/mail-mta/exim/exim-4.85_rc4.ebuild
+++ b/mail-mta/exim/exim-4.85_rc4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.85_rc4.ebuild,v 1.1 2014/12/30 17:44:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.85_rc4.ebuild,v 1.2 2015/01/03 10:04:57 grobian Exp $
 
 EAPI="5"
 
@@ -159,11 +159,12 @@ src_configure() {
 	#
 	# lookup methods
 
-	# use the "native" interface to the DBM library, support passwd
-	# and directory lookups by default
+	# use the "native" interfaces to the DBM and CDB libraries, support
+	# passwd and directory lookups by default
 	cat >> Makefile <<- EOC
 		USE_DB=yes
 		DBMLIB=-ldb
+		LOOKUP_CDB=yes
 		LOOKUP_PASSWD=yes
 		LOOKUP_DSEARCH=yes
 	EOC