Version bump. Make Berkeley DB optional - bug #385825

Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 029c9c8f5738485ea6fb74bfdd6234a024e648fc..c5b21c475e908c50388157e9292296b0551d7f99 100644 (file)
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.295 2011/11/07 09:09:21 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.296 2011/11/07 09:31:29 eras Exp $
+
+*postfix-2.9_pre20111106 (07 Nov 2011)
+
+  07 Nov 2011; Eray Aslan <eras@gentoo.org> -postfix-2.9_pre20111025.ebuild,
+  +postfix-2.9_pre20111106.ebuild:
+  Version bump. Make Berkeley DB optional - bug #385825
 
 *postfix-2.8.7 (07 Nov 2011)
 

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d9bab8adfa6b68d52f2e19a5a5d0ddb596529527..f6edd70d0148329be42bf5445a6844d3aa2cf2d1 100644 (file)
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -14,7 +14,7 @@ DIST postfix-2.8.4.tar.gz 3646391 RMD160 fbeb785c5ed08febf5cf71ea375b10120c1f62b
 DIST postfix-2.8.5.tar.gz 3647010 RMD160 db4761f14b146c233426fa1afe49782e64f0c9e0 SHA1 49ef711c80b5a3434258ab24ae00940932503e80 SHA256 f8ed6c98bf5058c363da936a8034c64cee38ca67110e9212491de862116e1c17
 DIST postfix-2.8.6.tar.gz 3647498 RMD160 1f85ff0e9432109342436144f6963d39b79910e1 SHA1 32613ad01cad10ae04aad626f9a69ac9126b3d28 SHA256 8b427a5dfe95da98918fcafce4032bac5d6190603fbc090da3c5c3a22c74dae5
 DIST postfix-2.8.7.tar.gz 3647643 RMD160 ab0700f8f340fad11bf2a294a36ff1d70a1a8783 SHA1 81c87aceff4d9af67a304354bab9c99ac98fc8a0 SHA256 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
-DIST postfix-2.9-20111025.tar.gz 3676422 RMD160 a3953eeb4b5c8b258d22ed40f6e31af96c92e0a6 SHA1 6893b00ffb1298bb92b3873034f56726b4e04e65 SHA256 d95b77398b9fa52d0cdc6c787dc066ea449128205fb69b25dfde712cdc1a7668
+DIST postfix-2.9-20111106.tar.gz 3679774 RMD160 1c80eaaef74fb53f44a85a1f20e50271a706569f SHA1 62a9c0d847a70443915e2aefd5f5d82ac990334d SHA256 1981581d8602f416515d9301e529498285d1142ca07504c1edd96cc8e4a2120c
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
 DIST postfix-vda-v10-2.8.3.patch 56777 RMD160 ce30005d590d884c589612e65dbd34cbdbf84a31 SHA1 c27217b9af33c86a44bbb4469b7ebd4203210f7a SHA256 02599bdf16e7d77fe6043d1dac972daecdd40c4b2758579200d6ccb11e83acaa
@@ -30,23 +30,23 @@ EBUILD postfix-2.8.4.ebuild 8427 RMD160 b1dcc810141c23f572de3074d1279ce8c2767761
 EBUILD postfix-2.8.5.ebuild 8440 RMD160 8f8529637f854ca90160eab32785b33015dfcaf3 SHA1 268a3cc82863f98e284cdca16660e27566436c14 SHA256 ea2318bbd45256a894645f798e1c3a59a4ba9ad2dd09bde9206519f402dc5891
 EBUILD postfix-2.8.6.ebuild 8423 RMD160 0e17349a55210ac640dfbbe65a4fdb57350dc1fb SHA1 47c5ec60cd17d1e605958b955c2735a587d497a7 SHA256 3e152e0de7892eccde44d7940190de058fa8e9ee5dc3fc1f7e7bd9dcab29653c
 EBUILD postfix-2.8.7.ebuild 8423 RMD160 4f603638f773bf64af1dd9cbf0f8916dbb1e5f49 SHA1 d60f2fc8872cb6ccd7ef864b4a24ced73594067d SHA256 b0b633b991107b10154791da81da29a132959dba32245d2591baba22a8734bc2
-EBUILD postfix-2.9_pre20111025.ebuild 8905 RMD160 0f3cf8d60edeb4861f5bf406ba06f0d2cad398eb SHA1 550e23b47cdbfaf638be52cd10f821dd86f682e4 SHA256 3462e9329608568f89b47cb2e594dcf539d0e36186eee3d8c2eb09ffa8ffd9c8
-MISC ChangeLog 70587 RMD160 7244a34f5e7bb668a719cffb8fedc87a1c0b36ca SHA1 5793e22088ba692d2ee46799391b7b38bcf22d63 SHA256 2fa4274f2a931694deee0f01f9afa0b51edc4cd5f8e2dba89f872ed98be839fb
+EBUILD postfix-2.9_pre20111106.ebuild 8899 RMD160 d2d089efd7593f53cff363f3d55a21dfa7b4b506 SHA1 92e1e0a03e890aa8d7b14d2ae720cb514b029a2d SHA256 4d1724ad97f55336a02098cc628286c6b0c56049b712a8dc4ac6f5dfcbb5fca2
+MISC ChangeLog 70796 RMD160 159db10449565466332672194ab3ec004ba1ad21 SHA1 321070663157ced9f87214d4fc848b9079d66a50 SHA256 80f3ee11b244ee06d4524198b9d732bd330d0e1765a2d0ba332db58ab95c0cd8
 MISC metadata.xml 501 RMD160 faf5708865464f36ec686bb58b2474e2a5a1fb53 SHA1 f5d83c47e3edc4a6c337d4bb905eb4917dc0d417 SHA256 7a46203782ad8363c75a53faa35a434e20f879a7f23f624388ce248ea8bb55a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOt6BPAAoJEHfx8XVYajsf2BUP/35+JJMzAbZnmvKKkVwsogM2
-Tg9CsNNfQrDEFHMRqqeOrxhGZplSshqCB5g+Mz60ryTKaEQ1FjMQ2hjrMaN/j0aE
-RQAWwywJ2SAZUGb8ozFCaJ66zQXmkWFck8NItEekNhZy2FoK1v5KuNrmoJ0HBRfd
-eVrMEzMPys/hUB5OslP7RV4JNGPdF56Yo50Tg7QLA+ztmfPKs3Un3MQvmG7jdAC3
-Ftl526sDBtZnatA+3dTYOvGq5REr3jZt8NrAd37VAG5J+fjtSA1172kCJyyzf3vw
-zY7SlSRdZZb1ZAVQsgXFU56DKoLrl/sYs4H0g4K0HJtGPitbwIYxRV6TimUsZDXB
-leR5gkX7hYvrZuj8S8sioC60e6Dq5Wd9Y7ezGkptAud3khp/KMI4vC0K8nr0do/w
-F8Z7Mu88thVaw8na52v9aPZlu6ntSq1UE5XcVAiJr6vwpjknfTQYZNaT1eNWEwig
-T+3CR3y6YTTVgHlXdjSxlf/wX9omOTHPAgatcgjT7RMfjnln3IAwbXGBWEzc2HFb
-rVVotYTKTQP8W9sd3G1XOJjiYU85B32s2rEh7ZrwFWm+omCmUs/f2zzt91wyw9B8
-RxSOHHLfWR+hUgQjr9y+ju0bxif7r9OHy7HSRuVmFQHLncvDl0a4PYFAmpgX9cv0
-vGxPIU0UVnGFCTrt2+/y
-=rsy/
+iQIcBAEBCAAGBQJOt6V3AAoJEHfx8XVYajsfT1MQAIJPITFCUHqyoZPD4wAaby7T
+vWAHlYvokUdqFXQ+H4jRUreZFJsSt0ftHdK/oqsbGuGQesG41aMvyUxVv5vZfST/
+qiB8PWjMAt6RzR5fKmwjj9uGPrYeGizqDSZv81ZJ08g2uZzFjzad50104Jike3oy
+IXVStZiWo0zCnU7GonAC8U04fPInOhnP8Vdm0c5ppkia4owTy1nQRj+aDZVw9I4+
+d8OUE0+qyB/b922F+q/GuQ0WU82PXZfl6OP5Z3btCKuWj6NmGcJlZ6L8ig8oAdZ5
+qS1tTqHFEz2SPGSRDWCKGWFC9vVzPaMqq0frXx3HVsH62/XZbj0pl0Kaq6MWox1C
+9TTIYk9Tn6Paadzfs2uzQbEFUX4sdHJGo8iwVWd8pL91m51G2aUKrc3DK52HH1aP
+p5d7gFVvNPr+HE1x3NOlU0zccSv2+CYa/CVvjme28aOc629pFKR7TRkyyl7JUl2O
+nbC64Hk6MUxvkIebGJxmfeSXhx9MLeE2PxnUIOw+mQIdo+vIi80nC5teUajMzH05
+Jrgpd1izvNfUmn/unGGWubuMgvsCVH+Kq0syH9mb3LL5CQamGEFa0j6GxNC9pTH8
+QqH83ACfuyK+Uqt8sUPhJz5wjwgyFciK3j1UVK6//sY79Gay0K6xJ1mWU5vnoJ/L
+jFSJmE/7FlAtST2fsb+f
+=zh9i
 -----END PGP SIGNATURE-----

diff --git a/mail-mta/postfix/postfix-2.9_pre20111025.ebuild b/mail-mta/postfix/postfix-2.9_pre20111106.ebuild
similarity index 95%
rename from mail-mta/postfix/postfix-2.9_pre20111025.ebuild
rename to mail-mta/postfix/postfix-2.9_pre20111106.ebuild
index ab75995ff377564eeaaad21514954703dec8fc72..8ffbe2494ffe01a4d04d623a1c6de1f0ccf412fd 100644 (file)
--- a/mail-mta/postfix/postfix-2.9_pre20111025.ebuild
+++ b/mail-mta/postfix/postfix-2.9_pre20111106.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20111025.ebuild,v 1.1 2011/10/26 19:24:56 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20111106.ebuild,v 1.1 2011/11/07 09:31:29 eras Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
 MY_PV="${PV/_pre/-}"
 MY_SRC="${PN}-${MY_PV}"
 MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-VDA_PV="2.8.3"
+VDA_PV="2.8.5"
 VDA_P="${PN}-vda-v10-${VDA_PV}"
 RC_VER="2.6"
 
@@ -21,11 +21,11 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 LICENSE="IBM"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cdb doc dovecot-sasl hardened ipv6 ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+IUSE="+berkdb cdb doc dovecot-sasl hardened ipv6 ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
 
-DEPEND=">=sys-libs/db-3.2
-       >=dev-libs/libpcre-3.4
+DEPEND=">=dev-libs/libpcre-3.4
        dev-lang/perl
+       berkdb? ( >=sys-libs/db-3.2 )
        cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
        ldap? ( net-nds/openldap )
        ldap-bind? ( net-nds/openldap[sasl] )
@@ -58,20 +58,13 @@ REQUIRED_USE="ldap-bind? ( ldap sasl )"
 
 S="${WORKDIR}/${MY_SRC}"
 
-group_user_check() {
-       einfo "Checking for postfix group ..."
+pkg_setup() {
+       # Add postfix, postdrop user/group (bug #77565)
        enewgroup postfix 207
-       einfo "Checking for postdrop group ..."
        enewgroup postdrop 208
-       einfo "Checking for postfix user ..."
        enewuser postfix 207 -1 /var/spool/postfix postfix,mail
 }
 
-pkg_setup() {
-       # Add postfix, postdrop user/group (bug #77565)
-       group_user_check || die "Failed to check/add needed user/group"
-}
-
 src_prepare() {
        if use vda ; then
                epatch "${DISTDIR}"/${VDA_P}.patch
@@ -134,6 +127,12 @@ src_configure() {
                        src/util/sys_defs.h || die "sed failed"
        fi
 
+       if ! use berkdb; then
+               # change default hash format from Berkeley DB to cdb
+               sed -i -e "s|#define HAS_DB$|//#define HAS_DB|g" -e "s/hash/cdb/" \
+                       src/util/sys_defs.h || die
+       fi
+
        if use cdb ; then
                mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
                CDB_LIBS=""