Fix building without berkdb support - bug #457138

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

3 files changed, 20 insertions, 21 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 5ffe20a5ea7b..deb1fa3f3891 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.419 2013/02/13 16:37:37 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.420 2013/02/13 20:12:23 eras Exp $
+
+  13 Feb 2013; Eray Aslan <eras@gentoo.org> postfix-2.10.0.ebuild:
+  Fix building without berkdb support - bug #457138
 
 *postfix-2.11_pre20130211 (13 Feb 2013)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 27571089da73..389016ea2bae 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -13,27 +13,27 @@ DIST postfix-2.9.5.tar.gz 3761272 SHA256 590381cc0705a6d3fd2279760e79aff625adab6
 DIST postfix-2.9.6.tar.gz 3767309 SHA256 790542a238f64d2620c26e787c98b07fb6e75a7620ce0584a7932b089dc5367c SHA512 ed53d835814368de9c6de7fe6d24cea36890273acbe62bbbb2c0b4a730765cf5662e8886d6095d8915d1774004c6b5cb278f640c81c63b564a8bfa3bee736912 WHIRLPOOL 24bbacada140e413ca628d9ad8b5eb55a0e3258dc9cef4bf407ebd8b8aac670379a785e60acd14c08f7a94f5058de899014e273634cd52a15a4c8003375a687d
 DIST postfix-vda-v11-2.9.1.patch 55009 SHA256 611283a932577944bcdde36e5fe1a80ca750a0a66eb5f3490666e2adafd2bf84 SHA512 ce34b533c2f50cf714d8bd51791c3e30ba91f49861e3c1dcfb08d21d2d38be970b3e3040c7e224142d085c7b11b6b14bfa230844e21daa2eb0bf59641dcc29b9 WHIRLPOOL 0668cafec5678d09504220e31ce60344fc0cb46cfec449db2aade89ee09c598484012c5ef0536a0dfea24df51c6bc86d1a9e491f136312afdab90725e5efe86e
 DIST postfix-vda-v11-2.9.5.patch 55009 SHA256 df30379c456971a514ae5587531bb5cd8492921a6a27e6d23f5014a1434945aa SHA512 c44497536e2bc313f2301e799a6614f396fc7bb06ef31493460edc59b0922b4d9a24802a84e2b8cf158277f5b0c8c59b53a4f8ef6896ee1e2ba538c562687010 WHIRLPOOL 70c438d2e98aaae6ebd37fadb5d5d0cbe3b31baf2119657009802be62bfeef7dc6a6e62fc8259bfe635ccbf4b0c8ffa17b35a04648c6c138575dda8314a28744
-EBUILD postfix-2.10.0.ebuild 10444 SHA256 378db909a9d330651664e5d5962128fec70c56aa12c564ae1457529f20c7caef SHA512 90f733cf6256f5de02a9d9b1bf6fae8d61a559ced49ab97958e9b5540ac1b9c30ec417a8a5463c52570e190eda1b80f73f74092ced351e851be342cb305f64e7 WHIRLPOOL 2b25dacad5c026fc8a9390bdc17178dc1d0391106fc3fc10e3d0d3158ba4207749150fa348a033c502bfa64efb628b43271844d8bddb4a92ce3cd83632ed7f0f
+EBUILD postfix-2.10.0.ebuild 10371 SHA256 127fd319f41bfcb7438d02ecf71386af0084bfcc20b1da79e86135556773bae9 SHA512 dd837c31ce6fbe70fe857086e1c215ff7e9717207f4d4eafa7b964e0d1cfcb6359e94a59dca27b9bcec31414950fff44f9d420371a565f2611ef6f01099de9aa WHIRLPOOL b8ac7de31f5d627212c96fa846e1dfd842e31e69bd5c9ca7300f1ce46ac74c539cc8dc53f7dbe6f7a23d70226068484f1eeae8b62ff4d16c45b0e2de2620c10c
 EBUILD postfix-2.11_pre20130211.ebuild 10458 SHA256 3c4d20989b672fb4562a8539c8c38c67ef9f9b415cc3238a512c306409b5d1cb SHA512 6a529b1c52f259a63d3c6da1d590747d01c175fdbad12bc39ef5d5d62f1e249f37ed84c5daec559d880c0f72dff9d684a10b490879979ae6f0aa96116db6e5ef WHIRLPOOL f7404eed99284586f59d0f227e87cd8eb20854ed223720f048c2ca30b4d9fe83555b0945a7b762ad571982cadbf410df8130ed4fc50deb2fd7964bde18815408
 EBUILD postfix-2.9.4.ebuild 9607 SHA256 fc5adc3752832a6eb890cd09f455d19cf5f46be90b9506dc0a62941a8a2bd3c2 SHA512 2113abad4c72af6a87587abfcf5e45c757d1ce28e92011ecefdfa7a1803fb14e4b448086de11d13deb7f075448003664b6e7576de1cc20ad733ae04b739fc814 WHIRLPOOL 0fe266bc1597991606d2a3c71834ab62b9abdce161ed5a9bd0f155c6ea25e5ec0c0ed3d46d5667efde42569c514eb12875646b0d7768370dd3bb606b9db12632
 EBUILD postfix-2.9.5.ebuild 9608 SHA256 13824aac4df3396a46290706144fb64dd06a27e2482b7c308786a25d7fc836b0 SHA512 9349dd758a9178eb4d39a4b960b6944084e37534a7ed569ce2da3969d8d43f529351b6432c271bca01e85bcce906f4d2b5da108015a76df82c3a2262d1fed485 WHIRLPOOL f26ec58f68c5156216b064970df584757d04fa88204abed0b0d88a799d4f25df6463f9bb18654ec3c67bca74d05d12a0253041220f94d8efef993191259ba1fb
 EBUILD postfix-2.9.6.ebuild 9617 SHA256 bfa4d311ce0016c5cb3b2566711ebd89aad0c6556bf24c2655e78d380ceaafd6 SHA512 2512a3984cc1052e218903a30d47660df7b3eb3ac83c8d8e67947da48f2fe6aacc56f189ff45eb02f41a73f8e61bbb7e0354cc5ede8fb3a7e5c3b8e7257179fc WHIRLPOOL e892ba7cca6f5e6c2607e065b1b959f49151f09d8793f7195aaf97e02427f96684ef66b091e217e74bbea28db9c900630ba112d6021cf731862ec2a4c7b1526d
-MISC ChangeLog 90918 SHA256 783d0cfb909ff31c5afc9c54b8a489d4fefc395fc13e59625178571a1c9ce82c SHA512 039420bd9dbc0633bfe99cfbfcfab0ed9e72eee0e38260ef27b5eea9011d0314dc7f2733c2295eeebaa07377a5a0a19697d27a25b48609e9489bc7ed33df3932 WHIRLPOOL 26f1a1927ae7edbe07cf2c46afe448deceeeaa7f11d7e2dc1147ddf75792cd27f0941568b13cfad1ae9c4229ef3fd8b7dbdb6ea7eaaa7f088555362db5942edd
+MISC ChangeLog 91038 SHA256 8fa9ad16ae40f130284e0ace279d8e063312cfbafc0661e5b608f1c35a59099a SHA512 42755e2e97eca345693bca07a66a93c9d6dffa978bcf647c801b03a0f922db1c0a8ef688bd21fc102e22e455d37ae5347335432e3c1e6d6fb91cf1eaea6960bd WHIRLPOOL 87714532685f851c2467fc97aa52e201b9401efbaba90af5ddac78f9ea3733191168ecda8cc7cdd0d1b75f0d8b931f583154a5fcf324ade1b498ac8d0e435f7b
 MISC metadata.xml 610 SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88 SHA512 fd446f288b11070e2d6b5dad3ec259a889508c3c7f4755ea2ceda18500844e065ddc2bbce5f4108b30ebacff76443ea8a23805c21d39c2bf72210f801adcfe06 WHIRLPOOL 815ae4ddbaca96871454d44adbe3bec4a081d857c61b07cd0e382ce0d44503421a4ad156da6009cc91f24855b7c1d8adfe3fbd48c82833f9d82c1afaf798072e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRG8FdAAoJEHfx8XVYajsf2YwQAKg9egQu4EbQsTB/ixuT4RwG
-14tmMOQlNJmdwrVXUJQpzsrARrI+SiOY04FjM4aCeUsW5sAEF8KUGb+TBNo0KRTJ
-LevaqzQOhWyB3m69xefqlhOGiy4wMj8jt0hh497xbeY9AkjewpQxyG6mQjGrxnWA
-yFmF05ECVjI63H86MDhZXlgfy1d2BxAxRq2D/httWgKlLo0VxykOCcykfV6qzIxm
-IXGeEDITwtO7Mg04wrHGUAnh828K2HhltisZD5ZhV2IOQkDd53mT/i6yGevDEcE/
-B6WlvKlKauqxkrYXrTUIarnfQBSpojJo5LUG1JgQvJgOAwfWKrNe44JS3aZXcRU9
-DAeJ2+UljmkAeqdC+rNTJagfa49WcuGFj7FRIQTUrms1U50j4OxmPLS/XbdJX4bf
-jQDqHULPv+x7XRo7Z4tSpvRuGANzlZqUchRPd4n48XbeTH9ormblHM0rC7BL8MUD
-RTVVbi6CGkZElSwXwY+t/1jP3dSqYvxwxwUI3h3ufNY6TIvYS9noQ6V4JmISfSHm
-GiEtYA8l5nvtdOVokpBKwMbmeP5ZJd3WAlnikSrcgQsF5vYJWxqEz83E1sckwJvg
-AaiJiNrun/Iaq7t+LLGhyBRu0tC2hdB8HdYdm+al1b0TPu6l9g2xbO2LfmMSQ+f0
-kloxL+Bhe87WM7Uxy3TC
-=Zcow
+iQIcBAEBCAAGBQJRG/OpAAoJEHfx8XVYajsfnbEQAIPtPFgWAMQQQ93z0wIzdCpK
+ZS2tQ2voHUPXrENb0+ymHl9f/JfOR2FFZo99IydwV85R33Nq3SOY4FMAkv0v0/Si
+daelK5s2+YnjUnXWb6l4hoO3AMeIuxLlE+a+HweUls94bcbwUD/WTJSdJCQKnwby
+COsb6DW5uigLAtzK/IgAXPTCPoduWC/SHx0o7+s5dveKbTeUXEdCs6oHB/NKS14B
+7UYXEo4a+Y1ZuwyyIWc4uqbkf7vQ0WUi964XFo0r3KXdBNa3nnXtUY4UL7vnUVaR
+Y+lj1icIuY3YZVkQnajCYntgxFpGXSkyhpwwzJSiTrPZdEScQn5MO2a3jq0roEqb
+OsbUW31hs63SVrbhKeWxpbLXvbTCGeNQK18oMxr3cqGuj5wAT5dSOKGobW5wao6P
+59LM46DswY8OoYjakjC6A1SxTikBbQMdpmX5wTz+2F6m8kOIUOmjFKbUfMHwTjrz
+Qp8S081H7j9iLzFoYqI1pAv9mPqEYk/ZQAot8vp+oCm8bnsI6GkkIi3MJMv3f2oM
+CylALp47X9T/yo5NXVGDv1rLxdRsEmhjQa/sphWKjqStGWg1Ju278b9zWrV+jrvZ
+iCeJoVQdKWEM3lwFBnmDTsHP3v/+Z4xMz9YG9cXgi63MsoJ48s+n4HY3fJWn+l2/
+jVywxD9QjSNzlC0lowGE
+=sSZS
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.10.0.ebuild b/mail-mta/postfix/postfix-2.10.0.ebuild
index 688c6547cb46..6353cb1865c2 100644
--- a/mail-mta/postfix/postfix-2.10.0.ebuild
+++ b/mail-mta/postfix/postfix-2.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10.0.ebuild,v 1.1 2013/02/13 08:48:58 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10.0.ebuild,v 1.2 2013/02/13 20:12:23 eras Exp $
 
 EAPI=5
 inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator
@@ -69,10 +69,6 @@ src_prepare() {
 		epatch "${DISTDIR}"/${VDA_P}.patch
 	fi
 
-	if ! use berkdb; then
-		epatch "${FILESDIR}/${PN}_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"