Version bump. Drop s390 - bug #399329

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 106 insertions, 8 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index fbc41a4b568f..eb6666c4f485 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.326 2012/01/16 12:08:58 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.327 2012/01/18 22:19:50 eras Exp $
+
+*postfix-2.9.0_rc1 (18 Jan 2012)
+
+  18 Jan 2012; Eray Aslan <eras@gentoo.org> -postfix-2.9_pre20120115.ebuild,
+  +postfix-2.9.0_rc1.ebuild, +files/postfix-2.9.0_rc1_no-berkdb.patch:
+  Version bump. Drop s390 - bug #399329
 
   15 Jan 2012; Raúl Porcel <armin76@gentoo.org> postfix-2.8.7.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #395289
diff --git a/mail-mta/postfix/files/postfix-2.9.0_rc1_no-berkdb.patch b/mail-mta/postfix/files/postfix-2.9.0_rc1_no-berkdb.patch
new file mode 100644
index 000000000000..3f9eef7e5161
--- /dev/null
+++ b/mail-mta/postfix/files/postfix-2.9.0_rc1_no-berkdb.patch
@@ -0,0 +1,81 @@
+When building without berkeley db support, don't die when db.h is not found.
+
+--- a/makedefs
++++ b/makedefs
+@@ -273,18 +273,17 @@ case "$SYSTEM.$RELEASE" in
+ 		# Postfix no longer needs DB 1.85 compatibility
+ 		if [ -f /usr/include/db.h ]
+ 		then
+-		    : we are all set
++		    SYSLIBS="-ldb"
+ 		elif [ -f /usr/include/db/db.h ]
+ 		then
+ 		    CCARGS="$CCARGS -I/usr/include/db"
++		    SYSLIBS="-ldb"
+ 		else
+ 		    # No, we're not going to try db1 db2 db3 etc.
+ 		    # On a properly installed system, Postfix builds
+ 		    # by including <db.h> and by linking with -ldb
+ 		    echo "No <db.h> include file found." 1>&2
+-		    echo "Install the appropriate db*-devel package first." 1>&2
+-		    echo "See the RELEASE_NOTES file for more information." 1>&2
+-		    exit 1
++		    echo "Building without Berkeley DB support." 1>&2
+ 		fi
+ 		# GDBM locks the DBM .pag file after open. This breaks postmap.
+ 		# if [ -f /usr/include/gdbm-ndbm.h ]
+@@ -296,7 +295,6 @@ case "$SYSTEM.$RELEASE" in
+ 		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
+ 		#     GDBM_LIBS=gdbm
+ 		# fi
+-		SYSLIBS="-ldb"
+ 		for name in nsl resolv $GDBM_LIBS
+ 		do
+ 		    for lib in /usr/lib64 /lib64 /usr/lib /lib
+@@ -352,19 +350,17 @@ EOF
+     Linux.3*)	SYSTYPE=LINUX3
+ 		if [ -f /usr/include/db.h ]
+ 		then
+-		    : we are all set
++		    SYSLIBS="-ldb"
+ 		elif [ -f /usr/include/db/db.h ]
+ 		then
+ 		    CCARGS="$CCARGS -I/usr/include/db"
++		    SYSLIBS="-ldb"
+ 		else
+ 		    # On a properly installed system, Postfix builds
+ 		    # by including <db.h> and by linking with -ldb
+ 		    echo "No <db.h> include file found." 1>&2
+-		    echo "Install the appropriate db*-devel package first." 1>&2
+-		    echo "See the RELEASE_NOTES file for more information." 1>&2
+-		    exit 1
++		    echo "Building without Berkeley DB support." 1>&2
+ 		fi
+-		SYSLIBS="-ldb"
+ 		for name in nsl resolv
+ 		do
+ 		    for lib in /usr/lib64 /lib64 /usr/lib /lib
+@@ -381,20 +377,18 @@ EOF
+ 		# Postfix no longer needs DB 1.85 compatibility
+ 		if [ -f /usr/include/db.h ]
+ 		then
+-		    : we are all set
++		    SYSLIBS="-ldb"
+ 		elif [ -f /usr/include/db/db.h ]
+ 		then
+ 		    CCARGS="$CCARGS -I/usr/include/db"
++		    SYSLIBS="-ldb"
+ 		else
+ 		    # No, we're not going to try db1 db2 db3 etc.
+ 		    # On a properly installed system, Postfix builds
+ 		    # by including <db.h> and by linking with -ldb
+ 		    echo "No <db.h> include file found." 1>&2
+-		    echo "Install the appropriate db*-devel package first." 1>&2
+-		    echo "See the RELEASE_NOTES file for more information." 1>&2
+-		    exit 1
++		    echo "Building without Berkeley DB support." 1>&2
+ 		fi
+-		SYSLIBS="-ldb"
+ 		for name in nsl resolv
+ 		do
+ 		    for lib in /usr/lib64 /lib64 /usr/lib /lib
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index 27c279ec075f..93688f4e0a2d 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -7,6 +7,8 @@
 			version 1 (server only) SASL implementation</flag>
 		<flag name='ldap-bind'>Adds support for binding to LDAP backend
 			using <pkg>dev-libs/cyrus-sasl</pkg></flag>
+		<flag name='memcached'>Adds support for using <pkg>net-misc/memcached</pkg>
+		    for lookup tables</flag>
 		<flag name='vda'>Adds support for virtual delivery agent quota
 			enforcing</flag>
 	</use>
diff --git a/mail-mta/postfix/postfix-2.9_pre20120115.ebuild b/mail-mta/postfix/postfix-2.9.0_rc1.ebuild
index 89acc9b2bfca..1a1e17fabd28 100644
--- a/mail-mta/postfix/postfix-2.9_pre20120115.ebuild
+++ b/mail-mta/postfix/postfix-2.9.0_rc1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20120115.ebuild,v 1.1 2012/01/16 12:08:58 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.0_rc1.ebuild,v 1.1 2012/01/18 22:19:50 eras Exp $
 
 EAPI=4
 
 inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
 
-MY_PV="${PV/_pre/-}"
+MY_PV="${PV/_rc/-RC}"
 MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
 VDA_PV="2.8.5"
 VDA_P="${PN}-vda-v10-${VDA_PV}"
 RC_VER="2.6"
@@ -20,8 +20,8 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
 
 DEPEND=">=dev-libs/libpcre-3.4
 	dev-lang/perl
@@ -38,6 +38,7 @@ DEPEND=">=dev-libs/libpcre-3.4
 
 RDEPEND="${DEPEND}
 	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
 	net-mail/mailbase
 	selinux? ( sec-policy/selinux-postfix )
 	!mail-mta/courier
@@ -70,6 +71,10 @@ src_prepare() {
 		epatch "${DISTDIR}"/${VDA_P}.patch
 	fi
 
+	if ! use berkdb; then
+		epatch "${FILESDIR}/${P}_no-berkdb.patch"
+	fi
+
 	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
 		src/util/sys_defs.h || die "sed failed"
 
@@ -134,8 +139,7 @@ src_configure() {
 	fi
 
 	if ! use berkdb; then
-		sed -i -e "s|#define HAS_DB$|//#define HAS_DB|g" \
-			src/util/sys_defs.h || die
+		mycc="${mycc} -DNO_DB"
 		if use cdb; then
 			# change default hash format from Berkeley DB to cdb
 			sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die
@@ -311,5 +315,10 @@ pkg_postinst() {
 		elog "startup scripts in ${ROOT}etc/init.d, please consider"
 		elog "upgrading your config for postmulti support. For more info:"
 		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
+		if ! use berkdb; then
+			ewarn "\nPostfix is installed without BerkeleyDB support."
+			ewarn "Please turn on berkdb USE flag if hash or btree table"
+			ewarn "lookup support is needed.\n"
+		fi
 	fi
 }