[gentoo-commits] repo/gentoo:master commit in: mail-mta/postfix/

[Eray Aslan]

commit:     6961f5b4d702c9e48a89942e70eb95b18b4113cc
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  2 15:39:42 2026 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Fri Jan  2 15:39:42 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6961f5b4

mail-mta/postfix: turn berkdb and lmdb USE flags on

Having both flags on by default will make migration easier

Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 ...{postfix-3.11.0_rc3.ebuild => postfix-3.11.0_rc3-r1.ebuild} | 10 ++++------
 ...2_pre20251231.ebuild => postfix-3.12_pre20251231-r1.ebuild} | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/mail-mta/postfix/postfix-3.11.0_rc3.ebuild 
b/mail-mta/postfix/postfix-3.11.0_rc3-r1.ebuild
similarity index 96%
rename from mail-mta/postfix/postfix-3.11.0_rc3.ebuild
rename to mail-mta/postfix/postfix-3.11.0_rc3-r1.ebuild
index fcfc907af924..a96922855851 100644
--- a/mail-mta/postfix/postfix-3.11.0_rc3.ebuild
+++ b/mail-mta/postfix/postfix-3.11.0_rc3-r1.ebuild
@@ -22,7 +22,7 @@ LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 
-IUSE="berkdb cdb dovecot-sasl +eai ldap ldap-bind +lmdb mbox memcached mongodb 
mysql nis pam postgres sasl selinux sqlite ssl tlsrpt"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind +lmdb mbox memcached 
mongodb mysql nis pam postgres sasl selinux sqlite ssl tlsrpt"
 
 DEPEND="
        acct-group/postfix
@@ -107,7 +107,8 @@ src_configure() {
        fi
 
        if use lmdb; then
-               mycc="${mycc} -DHAS_LMDB"
+               # default is lmdb
+               mycc="${mycc} -DHAS_LMDB -DDEF_DB_TYPE=\\\"lmdb\\\" 
-DDEF_CACHE_DB_TYPE=\\\"lmdb\\\""
                AUXLIBS_LMDB="-llmdb -lpthread"
        fi
 
@@ -156,10 +157,7 @@ src_configure() {
 
        if ! use berkdb; then
                mycc="${mycc} -DNO_DB"
-               # change default database type
-               if use lmdb; then
-                       mycc="${mycc} -DDEF_DB_TYPE=\\\"lmdb\\\" 
-DDEF_CACHE_DB_TYPE=\\\"lmdb\\\""
-               elif use cdb; then
+               if use cdb && ! use lmdb; then
                        mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
                        ewarn
                        ewarn "cdb USE flag is on but lmdb USE flag is not. 
Local database files"

diff --git a/mail-mta/postfix/postfix-3.12_pre20251231.ebuild 
b/mail-mta/postfix/postfix-3.12_pre20251231-r1.ebuild
similarity index 96%
rename from mail-mta/postfix/postfix-3.12_pre20251231.ebuild
rename to mail-mta/postfix/postfix-3.12_pre20251231-r1.ebuild
index baf930941d40..bd7624a81bd8 100644
--- a/mail-mta/postfix/postfix-3.12_pre20251231.ebuild
+++ b/mail-mta/postfix/postfix-3.12_pre20251231-r1.ebuild
@@ -22,7 +22,7 @@ LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 
-IUSE="berkdb cdb dovecot-sasl +eai ldap ldap-bind +lmdb mbox memcached mongodb 
mysql nis pam postgres sasl selinux sqlite ssl tlsrpt"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind +lmdb mbox memcached 
mongodb mysql nis pam postgres sasl selinux sqlite ssl tlsrpt"
 
 DEPEND="
        acct-group/postfix
@@ -107,7 +107,8 @@ src_configure() {
        fi
 
        if use lmdb; then
-               mycc="${mycc} -DHAS_LMDB"
+               # default is lmdb
+               mycc="${mycc} -DHAS_LMDB -DDEF_DB_TYPE=\\\"lmdb\\\" 
-DDEF_CACHE_DB_TYPE=\\\"lmdb\\\""
                AUXLIBS_LMDB="-llmdb -lpthread"
        fi
 
@@ -156,10 +157,7 @@ src_configure() {
 
        if ! use berkdb; then
                mycc="${mycc} -DNO_DB"
-               # change default database type
-               if use lmdb; then
-                       mycc="${mycc} -DDEF_DB_TYPE=\\\"lmdb\\\" 
-DDEF_CACHE_DB_TYPE=\\\"lmdb\\\""
-               elif use cdb; then
+               if use cdb && ! use lmdb; then
                        mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
                        ewarn
                        ewarn "cdb USE flag is on but lmdb USE flag is not. 
Local database files"