Version bump

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

6 files changed, 320 insertions, 36 deletions

diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index c2aa6336f8f1..8729b24ca759 100644
--- a/net-mail/cyrus-imap-admin/ChangeLog
+++ b/net-mail/cyrus-imap-admin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/cyrus-imap-admin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.136 2014/11/16 20:42:08 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.137 2015/07/21 15:35:26 eras Exp $
+
+*cyrus-imap-admin-2.4.18 (21 Jul 2015)
+
+  21 Jul 2015; Eray Aslan <eras@gentoo.org> +cyrus-imap-admin-2.4.18.ebuild:
+  Version bump
 
   16 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   cyrus-imap-admin-2.4.17-r1.ebuild:
diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest
index e12a24cd2b13..8b8fa8789e13 100644
--- a/net-mail/cyrus-imap-admin/Manifest
+++ b/net-mail/cyrus-imap-admin/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 AUX cyrus-imap-admin-2.4.10-ldflags.patch 2168 SHA256 1ff6c9141c4e332dec5784a5516390af7cd2f9859f7844878be081cb95b07dfc SHA512 b9799b47b528e577e7a5341de6f1f5bdba8227e3644458524b41141a2ecb3c3c4108342e085f2e03084d6d8e958542d29049599dd18ba3036c9b1edbc3f2d061 WHIRLPOOL c6ae3c715c2034d9bb87ffb0653e131194ef2cb8c402327a791cf5428637709d9058a0906d93aa1d6aa9c9759a4f22094db79b4cf261316bf5d72d59b0c62895
 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
 EBUILD cyrus-imap-admin-2.4.17-r1.ebuild 1797 SHA256 046fefb25ca8dd76ea768aec0c9855ddc6219a77f81ceec5e9eac50828bada03 SHA512 e7919c065bd2acb160a5ac941ac6fff9bbbcf7572d7c3bf477894fa908c8d5dc1f2534637d1c29b400bf53a76c5e68036b9a3b097b7b5232b541729e0862032f WHIRLPOOL aa9f5b4a0f47d3ce51a731bd0ea1f2af073363ba57d26302fe5ed19746700aad76df936430ad524eedde9218a5a42174818228defd0663fddfec4da90fff6912
-MISC ChangeLog 19652 SHA256 aad7a2da2e8b30a1b321b13d8630fa2e3024ef3b42af57f0dcb005daee984207 SHA512 419518028d187c1e8d88cafca2f9a5e8f2be494c81d2c3ac37d4f5a498d9618c6fb686a42d43b6a6615f5d2ea1ac1c70f8a948bd07118bacf9036c1ea214f818 WHIRLPOOL 30dfd72f14f76f8d8f85925fe25e0995c52727ed894bdc807c87581c1927a1aeaba0e0f1c171d0b82228c52ada34f644faeb8a8d62aa1433894e464d5add5d4c
+EBUILD cyrus-imap-admin-2.4.18.ebuild 1798 SHA256 5160c02467d6fa4e9c2b0cfdb6d1e08809020d034d3e4c8b9689ac060242e538 SHA512 64f7bd39b5c01732727a3c64bb919a9bdf4f2f5bd3bb9c940769e36d923a9f5208a50e687236a2b2b12ed6c33f8974f192ee6bc66b4bc0fc5704025718281224 WHIRLPOOL a5730e926d60553c2b77d12d8a8fed6e2e93c14e86368f4421d52a00647a740d4086e4048f24cf4c6f3f85631dece2c7d9b1defb99a7e95966793cfc560e00a1
+MISC ChangeLog 19780 SHA256 e9b84c92a6f0326c92f8c60a6962af58936ba49496224610e3a0aab3e29b21d3 SHA512 667468d2fd4d40ea5dea54a04238ce8e1b2ddc9db120301325f984781eb81d72e89b9d6c53366a4854db33587b7e0160a67829e66f1ed5a0de7fede5a1d7a094 WHIRLPOOL 2a78be208a4ff6fafc4e97e8e12a710b1d716f31837973e6b736ef85c3509de0f934d39b1117aa15b445e2e6e41a81c414449eacfeb1a3777bb7df732e4c80d6
 MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJUaQwhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcdbIP/RJww9oonpt4iVz71iRSzZCs
-+adyYbRANFEy2Qdrue8FCaWc2Tu/Vmqg6W615jEYwKIr36HXdYRcaObpy9l5rAIF
-q81S5dkfzWDN8uUQ/k8ZMEIMcmMkONgJIUexBLgETVZQZB86D3cnVvSKawihAkR9
-XtXbiPGEUYgxX7JPrrVJ7jc3AWag/CO3RpxdKbnsIjtIQA7nT6kVnbrC76q/yRSk
-SXbxHSdG6EMhN/MsSMnfZmCzpFqQrDH4MTkL1Ro+JEa0YcanmXBQOgOnycMYjQ4B
-ua42pXEN1w6U9+3ef8NOs3oWcydyLmZw9Emn2wg1blvOQUWhCor1U9I0b8Jbqur8
-AS8HXxR+LUxhctX0Zu6Gw1XvY5ody6HfLa7L+WakTBhAvk68efe2LskZTkEqcOvf
-zwJmQiDoOs/Aj6EuQduNWoHVaZhwq0zT9CwM8W5T5xXyeiEtOh/y+clCOS/lobvn
-Fez+mhl+wolSy6uH88vE33WrK6OyDlUbNsp7jCAFNDHiQJ9w0+BmV2+RI+zuHi+6
-qptDAu/ZZWQLCPWDOFK41QTh1/1DWDXtVysdhPAjyKyj3Gpw4QF60g7s9MB0zqv8
-uL3tdE9q+fEfrqTd5LcEr71jv+bYaSrRLxQ01XlRiaswQeHs8iOsth9kIj+UKl7k
-aESikL2MIIQUxuJIcDns
-=HGso
+iQJ8BAEBCABmBQJVrma/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
+N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsfunQP/3lmv8GPBOyyBHOwt59sGMeY
+ZnvD4tSUOOzPvgl7zGjahKxmBP0cC1GMuD2yhWPqXMzaaDAARd3H5DOOXXv8KKQS
+agFLE0n+nbHXAKpWl5NKES582VX0Q2tVHKxTEm2f8U6lpn4JX3lF/shEdRcMIkXV
+l72sGNxCgt/9+mKSSNWApL+TRd563Nm26AfALGxJQUk7FF/+kZ2ixI9zEEqNJ7ly
+2W+QOCrv6ks3KbuXJHX8NiNT4LL3p3Mraqq+iZMODWJZTKNmyXC66CqodKHXufzN
+aEso1hlS+yrC9TOZrQGKFky9E0Od3uJ0Jrqu2RuJECyL02dmMddLpvL6xfVta95I
+e2c5VbwU/pTESTYj5MSNZz1TeYGF+9QQT2XStoheQyoWhOnm0XdNZCyjHhdHkQ13
+6i4xj3cIuKz1YvyHLpb6fAvbUEucDgreTRLH3XiBjQwIiDF7PmfQgCGBuWQ03OeM
+kC2oRdrQmlZ2Jewwg1tkolJ+mWqEyGmZrZGOGErJWZtPYsQpkUmzY3Qiga5T8jMZ
+Pk1uv9+N5+dT/dEbulhSSGusIDfyJ/g8Z6r627Izt5N+BDeRqRQJbgN5OUwioT7B
+a7DNtgLv0icQfh4JUKMZV8519puGX6SX7PfwA3+O1lnnia/xsgY/aXJuNA4FKDnn
+l1GPjpQ6Cwb8d4/oVGYm
+=jqfE
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild
new file mode 100644
index 000000000000..700d72ff6982
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild,v 1.1 2015/07/21 15:35:26 eras Exp $
+
+EAPI=5
+inherit autotools db-use eutils perl-app toolchain-funcs
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Utilities and Perl modules to administer a Cyrus IMAP server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-${MY_PV}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="berkdb kerberos ssl"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-perl/Term-ReadLine-Perl
+	dev-perl/TermReadKey
+	berkdb? ( >=sys-libs/db-3.2:* )
+	ssl? ( >=dev-libs/openssl-0.9.6:* )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="$RDEPEND"
+
+S="${WORKDIR}/cyrus-imapd-${MY_PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.4.10-ldflags.patch"
+	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
+		perl/sieve/lib/Makefile.in \
+		imap/Makefile.in \
+		lib/Makefile.in \
+		installsieve/Makefile.in \
+		com_err/et/Makefile.in \
+		sieve/Makefile.in \
+		syslog/Makefile.in
+	AT_M4DIR="cmulocal" eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use berkdb ; then
+		myconf="--with-bdb-incdir=$(db_includedir)"
+	fi
+	econf \
+		--disable-server \
+		--enable-murder \
+		--enable-netscapehack \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-perl=/usr/bin/perl \
+		--without-krb \
+		--without-krbdes \
+		$(use_with berkdb bdb) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ssl openssl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -C "${S}/lib" all
+	emake -C "${S}/perl" all
+}
+
+src_install () {
+	emake -C "${S}/perl" DESTDIR="${D}" INSTALLDIRS=vendor install
+	perl_delete_localpod		# bug #98122
+}
diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 74436c8734c5..06abc0408ca6 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.216 2015/06/26 17:33:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.217 2015/07/21 15:37:46 eras Exp $
+
+*cyrus-imapd-2.4.18 (21 Jul 2015)
+
+  21 Jul 2015; Eray Aslan <eras@gentoo.org> +cyrus-imapd-2.4.18.ebuild:
+  Version bump
 
   26 Jun 2015; Brian Evans <grknight@gentoo.org> cyrus-imapd-2.4.17-r1.ebuild:
   Non-maintainer commit: Fix mysql_config references for build failures wrt bug
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 87484e8b00d1..bb8a444c04f7 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -9,27 +9,29 @@ AUX cyrus.rc6 568 SHA256 f2f796f1ab208bcd5641a1610b07673f92069e6f5b2370f453e3a24
 AUX imapd.conf 1587 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65a6deb42503f SHA512 d444501e528eb98bd570e20ca44f54ef50b18c0967702ea94b53c18fb602406844a8c1b3ef78d48eafd14261e553ed5e0fc661e6137ef1db49924e0f4054b97e WHIRLPOOL 91817d292a9491ccd698ed6071617c7151fdbc8337fe4d20655201dd090a4373649fb6d9afe43959cbff9979d819c87f1e2b7ec2e69412629b06ebc47828194d
 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
 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
-MISC ChangeLog 38592 SHA256 00882e095e2351533072e9243980df79283836cbed03c938af7b5d751b406667 SHA512 2f083ab9fa6aa495979f28b4e67d7987ab4ceab21ab1cec8f6b2b9bae97dc263b7ccff4d9ab95d3df034b3b5d559ec5a3a04f36d51b663edcb5edfe07a1a38e0 WHIRLPOOL 8a8030d4cd17dbb0b2d0bd915c8a975b8829ffb236b4d244d274cf685e4c33542d7ad1d035a3ee6a4f3c9c2fe907eb88d74135f03e4848d940d92025b7d6e594
+EBUILD cyrus-imapd-2.4.18.ebuild 5405 SHA256 a98a1d98f5a00ccc683e9fd6c793ed61dd7317277235b366c903ce8493b3b548 SHA512 4813680c548d25ea06077e02f4e9ffa7b0030b48b4d4cfd158ae9ad8c57aafb4fe99d4c8d6d815191ef51255a929186d5030afb406f287012a948fb927c07cfc WHIRLPOOL de3e72e1da3d6dd26021065329392b1da46916a1cb9328de63e5eb2db4b93cedb6d41354d6d0e02af4a52320d30d00656fee2ed579a626fba2a6467531075ca8
+MISC ChangeLog 38711 SHA256 60a24d84bc667f56aca7ded0acdc27344285fe4738cfcfe01ae9d8a2933f23d7 SHA512 d12f152a2629d1b65298f300fdc90780689d0fcbdaa5d82424e22f6b985c9e1162e27742607784dc330e2be668f761c2f9ba20d0dd29e399bc5eb94f29b3cba1 WHIRLPOOL 6ed59aa4f3ea3ab87cf238e1b63e5e88a91adae93cad5e772519c350bfd86ee374df56f0c9b9d9aef1cabd08f1c417c0669ba6d5449e8e9ede0f589c1f6b1962
 MISC metadata.xml 313 SHA256 4fc55c30d8af0d3b7555b4c0d5fa85ccc60232dc786d56a25c5482079a367ecd SHA512 cea96d1ce7e691487f4818d3bccd9fd7eb4794766be6b1a50d261cd78c49c8cca1a48f06f0efd0113bbe999da5341a5b42ba39083a36af6a278fc55e1b01a547 WHIRLPOOL 00267ff3d40dcbba12a8a07b3e34873b586280024a803cd151a6e9391214600320ea133a91e15f2cfdc8779914b5f6a6ff08712f83275183f94acb91fc772c59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVjY2JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2h60QALZ/Ma1VTmmsLefeCL9RJ4Ia
-Y348EGqQuUj1afWDABfJGbwe3TtQuLhjfQJdbHSSRh8gfsAewE0h0B4nrHTkJzA4
-M8xd08C+3FZj19a/hImriEiDb+twN8BMcPD4ao2hv8tltNBEoTQGPn/Mn7c3RiCm
-Qj/Eb/mw2KQV+Szlti5+E2o7/5TO4cJDub2+H6r1bO8BydPRVmTQQND4ci9BKnUK
-R+vCrPqywU7Jg7pE+LDyqRqs96vm3vc4jNywLi1QQo5ioixkZJCw9pxFINtHpPtJ
-fqwnf12/FpjPgWExrJNRF3xNWu4iD551dlDA4nCXflFInubd82zRaPGH9QUP99IO
-duLM6R79OPnA0Si3hYUA2bx1wWDCb0mEnUqs87bDlhJu7JS6cqMysXAnOLPItMSC
-49We1C1+56wUI0Fq+v6bwRuptOK5QENK+i3SCYwy+2oaX6kT8Tib7C/S/E1o1JvE
-jNdLdkGBw1Lq7pIFWDwZvGQPCU9Zkb/ll39KQGpQAbBWCg5xmHSTfsJKEz2Ap6f7
-/yP0IQ0bdo7pH7THd5bUee0IaMSqzHzOmgQHCoHnoK7ZKjfqsmEM7XoQ2dBQFih9
-0dpZozRCJUngx6kDezlxYuJq2rjkkJXFDLwwNK0VMoX9rzMOiLwJJ4Kh+2rXwJfM
-cyPWBRvqaWR2kA1IK8yd
-=Srhq
+iQJ8BAEBCABmBQJVrmdMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
+N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsfLv0P/j3P8sKK6yUP9x5pf1cOCtyg
+mvrhIyjFeT3vcYi90ngl0bkPPf6g0PCdkNe3q2mZQ9nnfv88WrnV1exXd3l4TB3w
+hMCCGCzMUy9dGdqUpSEur7JWGKYiEPazLBWS7aAXTMqU4lnn14RbigaoclDvkAWx
+ihBEhnR496eUoKQwgXqGLHTCzeAT1TiN/gZlXu3goT2i1UGd27mlq7y6rg2L7/O5
+w4dQU6YoaeCxJgYH/Tqz8bRuwyt46Fae+twGOGDz5ZmFsFD+9E5fznPvRzr78hUK
+/cHhw41292nVPe/MRwKLfMw8DFHgEgqzu+phGq4yvBAGZEuBP0Zvd+e8LTA/KMVH
+KnyDRcctFQTtnco54el3kKhAIRYdB+JAQNTt1CD9WshGdsZ4QE4LuH3ImrTL+aWN
+CpXsr9MmyqumSTVocvbxlQOalgERyz0rCheBtkGcrCAt+lNEXul4uDbJxCqbBEEm
+fDenSKPOMQuttm/lfvZ981a5CxhhAA19gv+H3WYtyKzgFjLiCOuPlQaaJdeKxSoh
+xT4wkJhPk2sEiN3f/ntLkdGH2YLIkEx9qGcVrQ0ul+HA4v7t+8/fTZZKfds8DjI0
+jY41bKliXWlBYXP9V63AuwymDjD1HskuZzLffL70H7X4txu7rMi/PUO3O5RZjU6p
+WZ4Q2PUiaJg7AWqRH6AA
+=xRwp
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
new file mode 100644
index 000000000000..cd85da21fb93
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
@@ -0,0 +1,198 @@
+# 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.4.18.ebuild,v 1.1 2015/07/21 15:37:46 eras Exp $
+
+EAPI=5
+inherit autotools db-use 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 kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+RDEPEND="sys-libs/zlib
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	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 )
+	ssl? ( >=dev-libs/openssl-0.9.6:* )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+DEPEND="$RDEPEND"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!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() {
+	# 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"
+
+	# do not strip
+	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
+
+	# correct afs include and liblwp.a directory
+	sed -i -e '/I${with_afs_incdir/s/\/include//' \
+		-e '/liblwp/s/liblwp/afs\/liblwp/' \
+		"${S}"/configure{,.in} || die
+	# same with lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+	# libcom_err.a to libafscom_err.a
+	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
+		configure{,.in} || die
+
+	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
+		perl/sieve/lib/Makefile.in \
+		imap/Makefile.in \
+		lib/Makefile.in \
+		installsieve/Makefile.in \
+		com_err/et/Makefile.in \
+		sieve/Makefile.in \
+		syslog/Makefile.in || die
+
+	AT_M4DIR="cmulocal" eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use mysql ; then
+		myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)"
+		myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)"
+	fi
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	if use berkdb ; then
+		myconf+=" --with-bdb-incdir=$(db_includedir)"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-perl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_enable nntp) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# file collision - bug #368245
+	if ! use nntp ; then
+		rm "${D}"/usr/share/man/man8/fetchnews.8*
+	fi
+
+	dodoc README*
+	dohtml doc/*.html doc/murder.png
+	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
+}