Version bump

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

6 files changed, 295 insertions, 30 deletions

diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index 7db28beac9a6..e5afa8e21ff6 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.122 2012/08/06 18:08:48 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.123 2012/12/06 14:03:47 eras Exp $
+
+*cyrus-imap-admin-2.4.17 (06 Dec 2012)
+
+  06 Dec 2012; Eray Aslan <eras@gentoo.org> +cyrus-imap-admin-2.4.17.ebuild:
+  Version bump
 
   06 Aug 2012; Eray Aslan <eras@gentoo.org> -cyrus-imap-admin-2.4.12.ebuild,
   -cyrus-imap-admin-2.4.13.ebuild, -cyrus-imap-admin-2.4.14.ebuild:
diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest
index 7627d74849d5..eb4c1da090a2 100644
--- a/net-mail/cyrus-imap-admin/Manifest
+++ b/net-mail/cyrus-imap-admin/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 AUX cyrus-imap-admin-2.4.10-ldflags.patch 2168 SHA256 1ff6c9141c4e332dec5784a5516390af7cd2f9859f7844878be081cb95b07dfc SHA512 b9799b47b528e577e7a5341de6f1f5bdba8227e3644458524b41141a2ecb3c3c4108342e085f2e03084d6d8e958542d29049599dd18ba3036c9b1edbc3f2d061 WHIRLPOOL c6ae3c715c2034d9bb87ffb0653e131194ef2cb8c402327a791cf5428637709d9058a0906d93aa1d6aa9c9759a4f22094db79b4cf261316bf5d72d59b0c62895
 DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f59786df4a7821c70dc27b2a225f32c4
+DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
 EBUILD cyrus-imap-admin-2.4.16.ebuild 1500 SHA256 4fe07c617f2b051e3c9160923506102d003c2607ef1b6a0d64edd56edb1787be SHA512 1dafb975ce7cde7c1a343fc96e7ab203923b9f17bd6630801adf674e66cc0ee473f2aadeb4977acaca1a6b10c2b4a6647686444286cbacf44906bf35c7b61696 WHIRLPOOL 4fc6983d9762992f5a72d335e3de72da8eaeb8b3f2a5a0b542b2ddfdeacba54362d0a86f4b43241be2025566a8857cb7c3405e1e051e53a0fc11eb0b86155938
-MISC ChangeLog 17847 SHA256 8ca255e82d99661012c2518d4706b77cb1cd392bd9602f11a4aa458b88c955b0 SHA512 2653478b8a507c0129f7d08502aff3f5698c764c0078d38f7d7aab72b095bf6f298d763384272b997c371f4c110c448abd351596a1186612d9d7a51a6d472db8 WHIRLPOOL 7ce54166665d1c6a3ae76e1bbeab447f75896820b4e4f6b112a31b32179ecab24a1a0b1374d8c0ac475b84aa6ee3211e8086c51a39a91896c06768f337058b7c
+EBUILD cyrus-imap-admin-2.4.17.ebuild 1503 SHA256 48d943dcbc1f42784bddb0666ef1c5552b2ec4da9d29b77479a6a906f6241d3d SHA512 f7887db8dc8bf4032976fefef6935baaef0bf7f25665dbf3063f4902951da732132b5842a223383953bf60af29c78a44347274f3c090fef9be1940cdd5c0c1d8 WHIRLPOOL 8916a5643f1f9a9ee5a5642a5ddd80df407efecdb11c595f9db3252fb418055d40e6ce09f956f823c35a1bbf6d0ae978237c84e20aaab3794ec6c3e14059898c
+MISC ChangeLog 17980 SHA256 9902d1156e6906385714397cf3f5419735d2bf78bf89406585b6c8a6c74fe4ab SHA512 349b4451acb936d6f12cbed800bb1fdaddbd2f23beff02102f4ec2693bc04d8bbe5b0241bcd1c19232ac8a829ac16c58301ecfa5e4f96e59bf4969f7673d5dab WHIRLPOOL b4f594144c9509fb10b83c755c4245b279b8a82bfb07e5139573d16734a62b7399fe9673d48207197374594a2296f83a77d35232505bff4f50990b56cba8fd20
 MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQIAg2AAoJEHfx8XVYajsfmoQP/jip1izCNo+TUWcovE0tzDuD
-mkvM2PUgZhi9pY5Cl5i0S1afpPqxMpDQ5ZbKNp5Bzls+Tew0P5ze2VIxvRzPLeLQ
-5Ps8bQHYxqokqEI5wlSOJ29Q35LGDQMXMR2HGx/JqrivFcfqmmgJKlMOJqLgtUCr
-ziFMw/R9D8Czori8XcF2dq1OWzvQgzhZPPDG3sA8jRg9SMOnXjv73vP3cgM55+Lt
-nr4kfdGDRlTKRLmGjEqdBRwz18HL1DX0DkaI4h2s9ZScyRRvXfFhUOeXLsJdS98c
-WTNbxW/lsqYL0ltiokDqbF2khMNB/4ffVMqOfBzsKBRnaAbhk8q4eqrABb8wu6ew
-VIXnTu6jgOzGNZ3EvZ8+Y9f1pO0iZfTvSEC6ALT/x4CWN/J+RYP17/41sKIcy0ov
-iVXiH92We6CSxYI7CRQm2ZZpy7UK0vhDO4Tgug9a1ccb64Mg2qK19fZ6AHc9Az/I
-J/JnYOAqCyKuN5XDMyOqIqR6mHsCGYUOY+TZctQ1bN6mnl4mOVrkfmK9zk6Wh4W9
-vKvBGLI2hVsq3zsS/aqBYVNN1cOwivi7z535biUxotlRKAGZjQPWSRLL2h4kWuKL
-FrETXqS4mN4mcfTF0nwcRLxC6CgaDkriDSklpilMrDiMNZFU57izHqkPo5CT3yIX
-JupxiUBoLJZoQlUyW6Qv
-=Fcx8
+iQIcBAEBCAAGBQJQwKXEAAoJEHfx8XVYajsfcr0P/i1/iEbuMRoEcSLLHd68qTk2
+Xzyi5OU9BUk5m9V/R7MYXU1xOlsQodunjDa97X2J3xs8a4m1St8RAbomPbMyF3eC
+fwH/eN/wI4/ZaGMvfPRfq9hiionKH8pOXgPMUbhdsXu8zU0mPvvx19ZSMwkeOlQp
+BRil4LosRLr2hHBJJLlIE4gLu/W5p4roTDKFs4WxuCldnjbhI/KI1FavXAXiL78O
+abSCPnRg5AnVnfkkH/0019f26CQfUSN2lAL+CQLLWSEw+2VSDjpExiu6QjB7gSyy
+ZmJ/Jy8VZkH/K1D5vXMH8G9Uq/Qu7HQsjeNfBl15PR78nObPXsoX0EkP8MWHc/2v
+D3pf6GEtbrUJJ7FbTmiVmVxah1wW1VYwbiAf6uoMKoZn6geJkVHnvmwk98pK7gDN
+xK0dpU7Cb9i8dYWAjI01vZZRYFmD0P/Cy5HO++kZFIfZp516mlG2HoKNiQEs1Q8p
+MEAURf7TkHHX0oaAUwbEh1xWbXmXvjrAKLxKHT42xoGgN3noIAQ0pl5OLC41oR9J
+xoUIKW51HZMAzJ2ZILyMCRt6NpJDTsMQOTQPfL182XQULldbLXVmL9f7nDt5HD5G
+UtBzR2SKFdGAGyjx1O0kDVw6y4uhlj8qywZritFgbT3Zawnkq0WWuaQLdh7+9rwF
+Mjp7HLXHY2AyzsU9WTrq
+=XqGw
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17.ebuild
new file mode 100644
index 000000000000..03ed0f43ee66
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 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.17.ebuild,v 1.1 2012/12/06 14:03:47 eras Exp $
+
+EAPI=4
+
+inherit eutils perl-app db-use
+
+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="as-is"
+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"
+}
+
+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
+	fixlocalpod		# bug #98122
+}
diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 1d344f6c8e0b..182976808d1b 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.201 2012/08/06 18:12:23 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.202 2012/12/06 14:02:45 eras Exp $
+
+*cyrus-imapd-2.4.17 (06 Dec 2012)
+
+  06 Dec 2012; Eray Aslan <eras@gentoo.org> +cyrus-imapd-2.4.17.ebuild:
+  Version bump
 
   06 Aug 2012; Eray Aslan <eras@gentoo.org> -cyrus-imapd-2.4.12.ebuild,
   -cyrus-imapd-2.4.13.ebuild, -cyrus-imapd-2.4.14.ebuild:
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 8f4e96aa4913..b5ed930ab92d 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -7,23 +7,25 @@ AUX cyrus.pam-include 109 SHA256 d4ef9ed9c7c9add97df75f0e19a833bee872d3863a2b3cb
 AUX cyrus.rc6 568 SHA256 f2f796f1ab208bcd5641a1610b07673f92069e6f5b2370f453e3a24014ab2c6c SHA512 ff7a5c82b04c8b37488fa149c1f658228727c5fd207c5769bce25df7bba26e8930e3a5d994881758e2905e19f8f281207b0bc8a4783740b6f86610416990c7d9 WHIRLPOOL baf717bebba0f8c329cf04eb1491faf5db47f7271ca41826e4fb1a858d2b343bed15ce140ce87da498a3bbd17865cd5f2c6b39c1b0ba62904d96bd2d09c61458
 AUX imapd.conf 1587 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65a6deb42503f SHA512 d444501e528eb98bd570e20ca44f54ef50b18c0967702ea94b53c18fb602406844a8c1b3ef78d48eafd14261e553ed5e0fc661e6137ef1db49924e0f4054b97e WHIRLPOOL 91817d292a9491ccd698ed6071617c7151fdbc8337fe4d20655201dd090a4373649fb6d9afe43959cbff9979d819c87f1e2b7ec2e69412629b06ebc47828194d
 DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f59786df4a7821c70dc27b2a225f32c4
+DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
 EBUILD cyrus-imapd-2.4.16.ebuild 4911 SHA256 0c3f94ed0c97430bb4a770f761815abb1f6a0abaa730d35551967d8f3870967c SHA512 e903bec58a38834be3f8fbca868222c7995478e4af22743b8452d7e8cfff1504a9d9756963dbe5591b4c8ea2aa93099baffc85c83fb43aa95c924ea86e09fe16 WHIRLPOOL ee46a36f3cbaeb751176f7789ac305b2158d1191b40b009bc9690370fe69da3101198bfddea099edd82a0d7d2bcc5c83a9b5f00fc3ae3a13ee2b47addc471aa9
-MISC ChangeLog 36422 SHA256 30c5e0621859603fb44e9c46ca41eb4d1c140c775d4074ddccc0aa8a0700204b SHA512 1db4d8ff6ac079bf12f4bb290e0943fc5976feb67cad8777c0395979a39c413c8461839fd2dc3a80537c511a94fb0156724c9a239e8dbb681020228b111d22f1 WHIRLPOOL 9833dcbff648d124537f2a01b6f4730cb7abc71b751678e12e3cc6f710ea574aa3482f84177136096e3249ffeae292f0be57bdbaf362d2410eab91128c1a5490
+EBUILD cyrus-imapd-2.4.17.ebuild 4985 SHA256 6ad8ef4aa577381e42aa96e154c80222c6e9d5f772eda1db5ab9e3c249ab9ed6 SHA512 3a542675ce81a98cca1eaea9c80b803c5fcedf227efffcf0688f3391ee921faa58062f1135524c074196dfcb8da1d15c98a175e25f66ba0ffc1635cc3291c5be WHIRLPOOL bf5936e92658284588f9ff47e7237381fc66862145cf73412031c40408a55bee78cd9a9593004f2bfe65a0854696349b6a9a4327d59cea0823428c82ed2c4b09
+MISC ChangeLog 36545 SHA256 d547d2f069b537a4e2200dc2f1890be5baa1f8f0553d5e8618f479fde2d55069 SHA512 01e5f3c97d774ebf9beac0efb2e108a38d9f4a62e6bb480329c7046c6f9554ae29674bd5fb38801a4fddd19610ab2741fe6c7e16b0c6fcdbfdea005c93cfd260 WHIRLPOOL cb1f42eb8a996444a6ad6faba62801293d7d988d137f6c232165c85595790abc5f957cfd8c07cf73fc72607a22b1738a0ca741059916afeb19673c2b31c3957c
 MISC metadata.xml 313 SHA256 4fc55c30d8af0d3b7555b4c0d5fa85ccc60232dc786d56a25c5482079a367ecd SHA512 cea96d1ce7e691487f4818d3bccd9fd7eb4794766be6b1a50d261cd78c49c8cca1a48f06f0efd0113bbe999da5341a5b42ba39083a36af6a278fc55e1b01a547 WHIRLPOOL 00267ff3d40dcbba12a8a07b3e34873b586280024a803cd151a6e9391214600320ea133a91e15f2cfdc8779914b5f6a6ff08712f83275183f94acb91fc772c59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQIAkMAAoJEHfx8XVYajsffzwP/iHqiO3Q34DwPkAX36nESlFO
-iPgEH8EGnpMnXTRxw5wD0odhK4q91IkBDCEZrryFO2hGgMzq8Wq9wOlV56Z9DfrI
-IDcHIE4gsi0M99AALUATVSSBAfqW6yowQJZGt74sjKXcEDZ9JHuf2n6C14rx83Gb
-F10QJMaRzZVFk9BpwUXcC2IJVWBuoje0Cikb23d5prv4E+m1wWHJfKpE+yTYOLj9
-tsbGocibmj4LPsX+MvpGvdQNvP/LVnNmfy9e82Mf61lyGAtRGN8BX7UcZ3tYUTcv
-aF0SgsickZEaEyiZ1gWk6Q3MGw7Pqgd7WJXp7gE16TAKA6b83rcTT5QeXlEiGMOT
-kUP9jeGaldLN5sXho5Mtta1X2o2PxK2EA998I00NVC6S7ECKQC4YGEAR36aNBBNa
-7pxGv9hT3+rPfS+URDRAOPrIG+jQYlZZURiafqbPownu6jW/Dfr7hCyIn+c/0CUb
-LAPSIRNLTjCyS4Qdj8YYq0cPSg9ZSy+HKuj8ejj4ONsysHtGhoj4FYQ1cXFvglN0
-yvzr6dIKaPs8/uGbLlBR2Ccze+fKPtWDj3sU7d4HDrrAwVumsC+ZqfKrVcbKrQ8C
-hV5U+fNKKuZsREKUmg2Pdo0wfNELldD7wosCF+Br7f2DHOAS3jUHvSHlGbfKlqB3
-lwJgGqTfW/zVuePIyhhO
-=Bf4S
+iQIcBAEBCAAGBQJQwKWQAAoJEHfx8XVYajsfmZMP/0l2yP2YPIZpLy4FuFBljtdg
+dTn/ckQQh8adGWom1fgkuUDSZrJs0jpjMETSFXYiXLacJJPUWgGStyKYdQJUtrwD
+3OAH8vT6TZ1culeE8wcNThCNm6/5SLdt8oN5IqzSFnR+eidTDVosrIqMTEd35pjx
+YU6zf50XkIz8UPDnTsYwwr/mDLS8MuThAZteyp/5HjTGkU1DOaOLMo9EEqFZ6jRB
+nMqkiKrKc6X3CI7ml453gEYOmvUKmhibNykrzz3q8BOhv29hls/GG1rcfZ9lzcBu
+6K6lC2E/AgaLBD07Jl8QcavTRKZywcMt6Ad+FpPLMECbmNAORNE2dnuZTpPQJN75
+CvGfXjR2dZ7A66b/Qh0QtzYSjXyTDmDzZPH3ZhHx1TxcoZ+zFoZWXGVuM5qhKtwK
+YjEngWMwCS32UvZjY7CM6p/p4cSU6m5EUYwB93U9FA92QqEydfsUJHNI5Cf/2E3v
+Wae2w+nq2uyJhzk31YTuWqntxaYDACe4x2EJtlrV2XktosFOsU1NpQyWaB2cQaTX
+A+YP58vxpnCcZkt6ZdGulB1ilLl4+07qjFyK89DhiJYM/XHBnydzW3aD/GFD+8Q/
+ZA/YJQ8bFI/b8jOGaqIbcpz+l1sOd1BMR9FZbZq/mYe5krrB7zA0CrKFeMTRuBUj
+g2xQamGJRQw9d7uFjqX8
+=DxyH
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
new file mode 100644
index 000000000000..678e51c46888
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2012 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.17.ebuild,v 1.1 2012/12/06 14:02:45 eras Exp $
+
+EAPI=4
+
+inherit db-use eutils multilib pam ssl-cert user
+
+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="as-is"
+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"
+
+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 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql-base )
+	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
+}
+
+src_configure() {
+	local myconf
+	if use mysql ; then
+		myconf=$(mysql_config --include)
+		myconf="--with-mysql-incdir=${myconf#-I}"
+	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
+}