Version bump - bug #554336. Fix berkeleydb detection - bug #555122

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

5 files changed, 285 insertions, 17 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 51cc835268e8..c5fb1093462c 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.218 2015/07/21 15:39:59 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.219 2015/07/22 14:34:43 eras Exp $
+
+*cyrus-imapd-2.5.4 (22 Jul 2015)
+
+  22 Jul 2015; Eray Aslan <eras@gentoo.org> +cyrus-imapd-2.5.4.ebuild,
+  +files/cyrus-imapd-db.patch, metadata.xml:
+  Version bump - bug #554336.  Fix berkeleydb detection - bug #555122
 
   21 Jul 2015; Eray Aslan <eras@gentoo.org> cyrus-imapd-2.4.18.ebuild:
   Add missing slot to sqlite
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 95c70380a48c..13f9e0decc32 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX cyrus-imapd-2.4.17-statuscache.diff 400 SHA256 7d3bf6d54a8ce0c26d8d09176ade4d3e3224693105dd16d53584e05ca090bfe7 SHA512 1c8b54a0fc1a98bf4ae0461f9015c8ed3cea1beaec5eab7a11357f4ac3ebdcaec148591cb90a786ad03b13b0c4554fccd4c44ca2a628dec9a03fad3b75b99747 WHIRLPOOL 54ad58d9801bdaa57232988c4ad9ee0bf17d2cebb159292062863bc79ed801a2e488249d81ddfc44180246ed33f05d4d2974ed59e0937bbe1f62f8e3c9e5ccaf
+AUX cyrus-imapd-db.patch 2193 SHA256 b2b7520f59f109823db38a477aa2c953ce234cdb5fc17c19212ddc4d8c73290b SHA512 a756552c0f1dd548661b4402e170474977484f3a4b32e765f8648d02109dc131d313e924b07bb3ad704f34cab4aef079b206b6d1e8d97911657886bd2476910c WHIRLPOOL ac917da63126934a6e7e225cd35dcecc45d82e922b63a114e4f835753be9fbaac767bad03e1a1b2507ce91747d074bc2723869c117d66a07d99aeaaa47f5088d
 AUX cyrus.conf 1354 SHA256 23189674bb5c2f021f35027cfe22cfe56e022ce5e03da67f5c4913473bec1292 SHA512 898b12057a51bba54920ec61305ba19c3e8b90a86d1cb814acaec9bffccd63cccb04b9240aee4d933a8ebabbf41d8c38029db412796390c10f18ef2ee7e9e138 WHIRLPOOL 34d2884a02b9af705d322c6613cac44516dfd01f727d973c45bb2eaaa33334093a63dcdd39d2947a5a2a6c5dc792ed27b5d395e5b94d640c7ed26bf38daccdf5
 AUX cyrus.confd 279 SHA256 3e786c28ffc44a222214b22d8849728360edc37f4b3f7d7c1473a23ab58c28a9 SHA512 a94d158726331479c2260e331c9de0650e881d1292f37c21ee930da793551cce1baca15d7ff555b29b220c32d4bdc7aca78899dfb6f8c61e48c48732a684846c WHIRLPOOL ac706a43a060cb18ad9dec0a92f7becd66d63277364c4844d2e1d735b28ced2a805e9c9dc449c1e55b963eb8884f08d4674a0578e6260d4a35c3154d5974759f
 AUX cyrus.pam-include 109 SHA256 d4ef9ed9c7c9add97df75f0e19a833bee872d3863a2b3cb1d0674fefba54e3d8 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4 WHIRLPOOL 96661c7bfa33f47c15629ba1d4b7ff34a5a83a2334e2862706c6da4bf5c05092c987f6df81dda8f7427c209afe29bc566d81a92e1e79e3a054911969fd717b5b
@@ -10,28 +11,30 @@ AUX imapd.conf 1587 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65
 DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f59786df4a7821c70dc27b2a225f32c4 SHA512 31931e94ebe869516f10886cee5ab152fb6d6376bf009250718077732c6172a6430f3502370e15e94f6165500e5b4108623bceea7c0dcfb3eb746e9ff0fcffab WHIRLPOOL 1e9916d03448e7f036aa6320af69a7ae57ae37205f98d4cfee8c335d9dcdc1c09ba243f4506036da4ca17f859f5c7eef0cb56443dfe51ad3075f0e4d62874fcb
 DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
 DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
+DIST cyrus-imapd-2.5.4.tar.gz 3070894 SHA256 98839d2865c0ff5c5dc0f59aba54ad111135697c3383919e037651d90f00aaaa SHA512 0bc78bf63560cc0d89f0ef4a5f6a160300cbb1090394d6bc62f51a0d73ea3615a1ecbf95cb6dab9d10c99afd3a95079a6df86a8157042e13bf907bb4eca94423 WHIRLPOOL 02ee9a685e6825473e9643e70ad4e22e22a9b6e263ec81692ff0d9e68c3b1b07b5ed1cdb1bbf4119242429779fe0435d9ae00651fbaec465308ac8bdf96650eb
 EBUILD cyrus-imapd-2.4.16.ebuild 4924 SHA256 c402a10f9c32b1ec54a5a5c2a432b6973aed5185e94569ecfb716afbd69b6c78 SHA512 50c88579d3be4ac393c84b777e57f9d2fc557a4ba11db3a5fccbd5b6af0cf5318ff7e70fbb1645f23d90f8f2cd67e49c5a2eb92576412d07d9e9f5ad0a888ba0 WHIRLPOOL ceba5e9a91cb1fce9d700c02014a58783511d36dd674fdd2ce8861e35fca8fe278e062e4bf37cb604f96d745a4da27ea0035fe372720a8204d8484f4499a7a39
 EBUILD cyrus-imapd-2.4.17-r1.ebuild 5539 SHA256 1f365c08b65cb55be17827a21ddd142905200558650834935661aa69a0989fe9 SHA512 0180b4aa07b73f819751ad5fca091baef2a46d9e64b11b68ff06a22f3556ad5fbe6416869eb4f006ad3dd3136ec57aacd68cb70a4df33cfadbdb1adbd133105c WHIRLPOOL 4e30cd8ed811294c22fe38b7436a150e315a5bebe28ec0d60bd5af0dbc6d235584659cb6c3323a46b30f81c831d544c03d0ec112e653561abf8cf985b6f9548b
 EBUILD cyrus-imapd-2.4.17.ebuild 5273 SHA256 92c2cec62763463645f3cc964a929db0f0d495ee8fff296df212f0fb6d989101 SHA512 3b5eb4b5bcc64f923e68e26eba4957cbdf97b7cb4e2c74580db8514fa9bfce2fd88828b6a36cb85594891ebae170bc3433f6b94e8501df20caff56c75ee39447 WHIRLPOOL 130ce08eff26e045b4eb26e524e67a669ffcf61f20a98a4734e55aaa83fcdf7388269219931dd758a9574aaebf8bc8b5192283134ec2a1c3c3fad56932bb0df0
 EBUILD cyrus-imapd-2.4.18.ebuild 5407 SHA256 51737daeb2445a1ed3a3144310083900b1bfc00c8da1277df7968328f394a292 SHA512 d47eb5e0afc3da3d2c351b8f11b150a5c5504f43132b8b7dff3bf5dd6ed53829a77fae77ed911ef6af209eaa574e1f5216cf1907272cf8453a27ade9a7a9dd96 WHIRLPOOL 49a67993dad7fe3ebace9a7b12e59bb1492d30d302c1aa7f945136e91c8b9d2c2e952f61a96cd81fd0d3636a8b51e8fa5fdaf00763135557f447b8894d996a32
-MISC ChangeLog 38812 SHA256 df55d9609b09e9cfdce622f6c313f46bd57c848fac98702b891fc48345ccc023 SHA512 00a5e3fb6247e70cc642ee08531366f6301c246d83f932650a9bf58660fa5bb53a5aecf60f0027137551ca51e83f9a38f1ecd007909034e9c3124b768a93f4d1 WHIRLPOOL 95a1c320aa1564b2e94e57a53a5ee72c262a150d08cb2fdf01299fecdd4aa4a214797917ce6eaa39231b2594bc1bc88abe242569ee808d7645da5d425807ceb5
-MISC metadata.xml 313 SHA256 4fc55c30d8af0d3b7555b4c0d5fa85ccc60232dc786d56a25c5482079a367ecd SHA512 cea96d1ce7e691487f4818d3bccd9fd7eb4794766be6b1a50d261cd78c49c8cca1a48f06f0efd0113bbe999da5341a5b42ba39083a36af6a278fc55e1b01a547 WHIRLPOOL 00267ff3d40dcbba12a8a07b3e34873b586280024a803cd151a6e9391214600320ea133a91e15f2cfdc8779914b5f6a6ff08712f83275183f94acb91fc772c59
+EBUILD cyrus-imapd-2.5.4.ebuild 4747 SHA256 18721792b7fbce96f92e6d44d43b2e15a41c9dc38306dda62b5fccbbcf77d4d1 SHA512 55df3014aaf89dacad88f7a2ad52dfa8ecf03cc6c22d3b89cd385950a81012a9e072cb780996eae9a7e36c1f2e51dedaffbb9c3e4749778e387dcc148d26ab36 WHIRLPOOL ef9790ad64c94eceb08bda5e200ecbca28c79546aedf59828a3d980a1e464dd3b16302ccf5faa4b9beb1991d114929a30c56754969d75638449889aab546a8b6
+MISC ChangeLog 39033 SHA256 b05b93ff190c7f66f5725ec7fa8097e0f7a583f7759f5d30fe13e71ef077019c SHA512 381e326f09537b9d1383aea0aa1f3d8593068198fe604537dea87640ceb8e3a434dbe23ee3a5c886c152c960b7f9cf467f8925b2292d593a483cc6efee58a4e8 WHIRLPOOL 1cba3208a76e19ed2bc5b8025d38350533db791062e65b9d10e1c2e79cb148a7110e09cff6bc8b10b5ee459874a765245c103f413cace53341210fab115f749f
+MISC metadata.xml 419 SHA256 73fcd4624700d174876e09a88ab6f826ae5b83670e5783ca23515fceb64588b2 SHA512 768102ea08c8f86561902a00a2bddd3d9a0f71d3c28ad489b91ed0ff196a6af6ef5a3a427dd703f24e3fb5f9dc71be52b61cd9096e54bcabd17c7b3f20bc6ece WHIRLPOOL 1251eea1cd31ecff6ebeec8e1d4ff78e257aad7833bded364b38a1ccc309eadccdb36f3222831ce2d8d2ffce20a043718b1bc4796aec2dcf7f97cb165506cf5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVrmfQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVr6oFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
-N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsfqXwQAKS0d9PvSOfO9Ugdl0QHa+Bk
-/2e6JBq2Jn6Dv2Wq+sn8FsncvA4UFGztdfIAAVLRwbqoaWUQqchGyYR4eHy33Bll
-ImgczuKJKTzl6FyvC5dRfJdX5Vdvi66wNhPunp3ZG4kduaTFh1WSVCKn0lPajNSd
-Zcb5MSNAS6KHIzN9D4cYhMIYkluLOVT8egVVJP0OEVXdavUYG5ZCEC+R2NlGYpwG
-7SQvcR4E2BljoRJ/PeiqRRiie1n9m0k8MiitbL7DDBu90vTOr88vI1ivhCyAKgLH
-ehq8ln+dsz4rO12nuOMt1OA7sfIYWMqEMTZsjbQp5LeA2MRSF/1JYQqbPu5FVbIb
-q1S/3KHaI80Ag4JU+ow6ezoZMAVQ9+zulGCi/4b2wLoX5cltanEscRFEBLRKeIuy
-n3fL6JZpvq8Y0wDszIuGEDbYgBCphUS9fLUMvSGNXuDVpdvJi1GRptBKI5uOxezJ
-LygaVtEIkcfvuPy0bxYLeTq4FY773MBPbtOWrNPn6OoWorvjWD5tHkdNxeaH30q8
-brKIpZNGaUJS/+RKstNmx+75Arb2vFP/U/Iz8hi69Q2vFQOQVqfV0ckmNtIA7DVm
-6gA5VvPMvXOmWhE8KNc74Ddbf+NeDNzYbBcwVahzS8Quchf6pLxa5zIVrWFwBWrT
-YOspayMrM5MUw/A0gQrA
-=oeoB
+N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsfIAAP/2f1PH2BO8/P3NVcneuoyFkg
+hQGmrnPCJCvMr16OG6epxkGD2MyCv4BU5emQaGb7c3tHmNkNxf6IlQynvmuI6OPl
+9URfVls1hS6yTThZwqNgHN6QUILRWWnvaQZJuBW+McYtKUu/8HgkOl1RFQfhu2bN
+6lXJkZhmMwzU3OF3+QBHX4tmwpMXf/fRaERXRR4B6YJefn6RRp4VUb/JcyHnKdUt
+L6HsnBRVeFacGg4VwEMP4tKRiIb27I/f6kyOavn/SAfcaeRqWOidj1+ks3cfOW1o
+jJyQDl4B6IIv8NcOSxEo6iJEZlMcY7+yhxWHm6rxkNwXWtwF7OcUHKa4hqh448va
+RT5goJdHEbh0sohmac3f6wjcbWOKJ/LFPHy7Rr0/vQ3xkTnIWgGKB8LrNve2DcUZ
+SiIp7GxBfElRA6K86Lsm/g895u+Vsqupa6edW1Nb+OA1HWkv51NIoenVg+D2Jc8e
+POb7Jqcw/XrgVCysASI7HfEzk3LQlHQR8NuSRu0+wMM4Ti5RhxdS389WHDpU2AfG
+q4R7ogHuxLGtiZ2lW5f7i5MdsPGhrjvIr7jObdTlKfnapVbWjWg2Kgny4frXxa9v
+6UpMTx/AKs2+jFDSWfwEeIomqbQkfzH3EQudUDHA7kwlRr6GyyhkX7rOdsCzyjOt
+/WrtGggvEF8uQwBkAp3F
+=VROb
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild
new file mode 100644
index 000000000000..8d49365ab46a
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild,v 1.1 2015/07/22 14:34:43 eras Exp $
+
+EAPI=5
+inherit autotools eutils multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
+	replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-0.9.6:* )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-db.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dohtml doc/*.html
+	docinto text
+	dodoc doc/text/*
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch
new file mode 100644
index 000000000000..f720cf2cb127
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch
@@ -0,0 +1,81 @@
+--- configure.ac	2015-07-06 01:22:19.000000000 +0000
++++ configure.ac	2015-07-22 11:18:33.000000000 +0000
+@@ -236,50 +236,29 @@
+ dnl Berkeley DB Detection
+ 
+ AC_ARG_WITH(bdb,
+-	[AS_HELP_STRING([--with-bdb=DIR], [use Berkeley DB (in DIR) [yes]])],
+-	with_bdb=$withval, with_bdb="yes")
+-
+-dnl support old-style
+-AC_ARG_WITH(dbdir,, with_bdb=$withval)
++	[AS_HELP_STRING([--with-bdb], [use Berkeley DB [yes]])],
++	[],
++	[with_bdb="yes"])
+ 
++# On a properly installed system, we build
++# by including <db.h> and by linking with -ldb
+ case "$with_bdb" in
+-  no)
+-	use_berkeley="no"
+-	;;
+-  yes)
+-	use_berkeley="yes"
+-	with_bdb_lib=none
+-	with_bdb_inc=none
+-	;;
+-  *)
+-	use_berkeley="yes"
+-	with_bdb_lib="$with_bdb/lib"
+-	with_bdb_inc="$with_bdb/include"
++  no)	;;
++  *)	AC_CHECK_FILE([/usr/include/db.h],
++  	[],
++	  AC_CHECK_FILE([/usr/include/db/db.h]),
++	  [BDB_INC="-I/usr/include/db"],
++          AC_MSG_ERROR([No <db.h> include file is found.  Install the
++	  appropriate db*-devel package first.]))
++	BDB_LIB="-ldb"
++	AC_SUBST(BDB_INC)
++	AC_SUBST(BDB_LIB)
++	LIBS="${LIBS} ${BDB_LIB}"
++	CPPFLAGS="${CPPFLAGS} ${BDB_INC}"
++	AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
+ 	;;
+ esac
+-
+-if test "$use_berkeley" != "no"; then
+-  CYRUS_BERKELEY_DB_CHK()
+-
+-  if test "$dblib" = "no"; then
+-    AC_MSG_ERROR([Berkeley DB 3.x or later was not found.  You may need to 
+-    supply the --with-bdb-libdir or --with-bdb-incdir configure options.])
+-  fi
+-
+-  if test "$with_bdb_lib" != "none"; then
+-    CMU_ADD_LIBPATH($with_bdb_lib)
+-  fi
+-
+-  BDB_INC=${BDB_INCADD}
+-  BDB_LIB=${BDB_LIBADD}
+-  AC_SUBST(BDB_INC)
+-  AC_SUBST(BDB_LIB)
+-
+-  LIBS="${LIBS} ${BDB_LIBADD}"
+-  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
+-  AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
+-fi
+-AM_CONDITIONAL([USE_BERKELEY], [test "$use_berkeley" != "no"])
++AM_CONDITIONAL([USE_BERKELEY], [test "$with_bdb" != "no"])
+ 
+ dnl End Berkeley DB Detection
+ 
+@@ -1800,7 +1779,7 @@
+    pcre:               $cyrus_cv_pcre_utf8
+ 
+ Database support:
+-   bdb:                $use_berkeley
++   bdb:                $with_bdb
+    mysql:              $with_mysql
+    postgresql:         $use_pgsql
+    sqlite:             $use_sqlite
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index eb85099509a8..120284d1cc4f 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -5,5 +5,7 @@
   <use>
 	<flag name="replication">Enable replication support in the cyrus imap server</flag>
 	<flag name="sieve">Enable sieve support</flag>
+	<flag name="http">Enable http support</flag>
+	<flag name="server">Enable building server binaries</flag>
   </use>
 </pkgmetadata>