Pigeonhole version bump

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

4 files changed, 356 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 8552355e4635..d744eae25673 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.493 2014/10/28 13:33:58 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.494 2014/10/31 07:07:28 eras Exp $
+
+*dovecot-2.2.15-r1 (31 Oct 2014)
+
+  31 Oct 2014; Eray Aslan <eras@gentoo.org> +dovecot-2.2.15-r1.ebuild,
+  +files/dovecot-pigeonhole-0.4.5.patch:
+  Pigeonhole version bump
 
 *dovecot-2.2.15 (28 Oct 2014)
 *dovecot-2.2.14-r1 (28 Oct 2014)
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index e5187fe5bf35..0dc8f0a09461 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -2,10 +2,12 @@
 Hash: SHA256
 
 AUX dovecot-10-ssl.patch 675 SHA256 973d6736a13ac8e56618e1a4d1b0e7a4e47c44e792d542803745fd5f2aec6ae1 SHA512 a201cbc275dbe4182d26971cc1c90ece22c05455535b7e55241ac0e71d61233882ad088d127cca2d1cd0d82dc86b1731ec98570254e29b056315567a1fd4d4a7 WHIRLPOOL ac9f4762684713507d3f196b97d7de16d228ac3f7ebd69e759b13efcb86caba821a439a15df300c41fd9c22738aec651e92c300350228f878a9c205d28850f6c
+AUX dovecot-pigeonhole-0.4.5.patch 651 SHA256 64625ee9e3d9156ad330aefe128fa7e0cd9f54109bea9dab99a1635fcf5e3e55 SHA512 b64fd368ba4186c278022534e19b22af4ed4a1bf585872738cc5dbc0a3a21c432298bfef3132047f7ef26e8e0e1743923ebed3a726f59c95c654d57552cf0c89 WHIRLPOOL deb0f5d750e2015bb4722b71cdd732aaf72b936f2f2f5c92c970e53622f79fd3fc4f44a13c1c0b81248b0fb04de47e477ac4fe0eadf9dab4ae4cc47fea230495
 AUX dovecot.init-r4 1609 SHA256 510ebab9dc59832502a9a23d48d12b6e81f3c51c52f5e6652b00b240f621d02e SHA512 9aa5040cd169bfa0dea382d839ef73454105d3befd1e904cef8d0a07eb260051f72f130ba250d716b9bf9b22af542907446e02c4ec92f1c229a2c0a9f560e2cc WHIRLPOOL 51726ed76100521e54470137dab9869537dcf49a58872614312295dff3efab53ac58da30b8bfaaf86677f47ef1e84019e47529226c0a736eed68cac6ce64ae40
 DIST dovecot-2.2-pigeonhole-0.4.2.tar.gz 1159311 SHA256 0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13 SHA512 3b66d00a8462ee668b8671f5eaa48bb91d47ed8bf8b331f7d879ba8c581e2bef11e236b06a8c5da9f1248572348ad0b3e2b867fd0a17badf32152fedbe61c1ed WHIRLPOOL 4d86bd5c010434620d0741156d4b7b24c60252de76958c0fc774418abff4bebeb4a8a78b5490ee34b20d48f61fb2ee75c4ff04202108ecdd33e1eaa9e2763ad9
 DIST dovecot-2.2-pigeonhole-0.4.3.tar.gz 1184029 SHA256 d692f4ab077bdf2c43c98829ed24b2e6f148db488ef8ba429b430394d8b4d757 SHA512 f2bb83578bb05c7ca2213ecc110f5e7059935746f720ee43897508394f3ab8a7072d193c78caf1fa77df81a20fbbeab1ac14069989250b3032ef459e798c54ff WHIRLPOOL 854d58cdb6b0d51d6e6337a2716858020a1ec22b7da24db903965fc01a00a75af5efcde7c4ddf572c0ee2a36a51bf467da011276f8a4e092463dc76e2622bfbb
 DIST dovecot-2.2-pigeonhole-0.4.4.tar.gz 1235456 SHA256 e08c5a45f359afa34b27571e14d79de753d73d47b8e72c5142064c6fd047f93e SHA512 76b635f5213ac61161734040fed0a3d32643190f9fb8fbcbf166c797953bb09f1414e2c994c86dd965e215a79f7f1898cfcd586d02782df9ac3c6d6781bd079e WHIRLPOOL a30032e96cee2f9e4b427f7beb6986b943c829d0c6d55352d9cf7b9372c8b86b95747f637691b481fbc41aefda0b30bf9283369bc3ccd1c5114d446ff7f924da
+DIST dovecot-2.2-pigeonhole-0.4.5.tar.gz 1239438 SHA256 020a4795ca9cd528394cd55e87714776aeb396b943411dce86cb9945a68ff419 SHA512 faf369662ed3498589804e09391ef17128c834a88f2ef0a5aa6150f53c8ef512f8862a7550e47d45ef09e7ea1a0784b43025d45e83c4dd7475d04bdfba30c58d WHIRLPOOL b07c33c9830e6b127d472dca9dbed8dfffa3344d85ef5a4d4bcc51324431cb95a48c890706c16e059c5c8bc8e35ae9ab628d51aaab63f01db08769b02cb5710f
 DIST dovecot-2.2.13.tar.gz 4613824 SHA256 133cf3d2aa81733f6688ec986c91dbe07602fad81e856ba3d8046ffca85d9dce SHA512 1f3c0e600048ac2c1b2e497286620976c0fc821a6cac8e4e1492180af8eb9620cd143c89ee6d12872cecacbcadca573435cce1050c46325de3072c98ab5a9331 WHIRLPOOL 7bb81575faf69820b07d654c469fdd3fcf12c47517bb1dd6ea5566771bb60ce8f9c3a1a7b5c6df6d5f4b903d10472ffa1cca1a01c7fd158b6055794a44aacf39
 DIST dovecot-2.2.14.tar.gz 4720087 SHA256 68ac0fa105c6041129a1fe83ccf4915982d03d41d99054567892cc0fbd68ebf0 SHA512 640edfc0f6d2261485f366a6b4139bdb09f25a26439ee22573e09aeffa5f47106b0acb036c673839de12f76e6490c383ab6c7320ca85747c51c4f4757e120d24 WHIRLPOOL e32e9450db8bc4cd8aa84e81bf8aa9121b9a44a981b7cdbe5a52f986b866bbcc4078fc536fa88ae2c96d1f3666bf174ce22bef34cae05a279debab1855c9e9e6
 DIST dovecot-2.2.15.tar.gz 4747444 SHA256 d10e7769e2367d635c93fd6589efdd05f2e3acf13c7911a40167faedf23c399f SHA512 4d84744a23f21dd0923e86fdb1604a0a431e7c1a579f8323fb6643f92ac84754389e5a91fc8e8b53eac4202dba7f8541aa13ada12265e397ecdc15ff9b5c7ada WHIRLPOOL 3cccf5d6014baf8f7b66ab9fa7e90cf27001ab8842db3f1d2814b94b05fba5827103eccf7e07253632a58f8ed2a492d693bff070fd2a1a40c8016ec63b4abc2a
@@ -14,24 +16,25 @@ EBUILD dovecot-2.2.13-r1.ebuild 8919 SHA256 2ba0574295ace3f78e043622f1f6f5b0d2db
 EBUILD dovecot-2.2.13.ebuild 8899 SHA256 0ca4d3d87d331bc464a7f44dba610de846750267d9883b994ff0da2e90575ae0 SHA512 af93b8b19dbef6a4bd27a6a9f61b954ae6516abf16050ed612f3618e2915d59cb84772b2bab449856efed8f323ab2099e3e951af62c0ac06b85ab530dc092808 WHIRLPOOL 180ed73a25a869587676862d47b7097337e6cb281fa55c21848802f7a45f0eb4be2dc6a96a596703f57c2c683eb87b182c718b6d908a9baa541503bee56e8de0
 EBUILD dovecot-2.2.14-r1.ebuild 8921 SHA256 169c67ad3c3fac31592d1619263192cffd32947a3e0b1bbfa661c495736a95b4 SHA512 d966334c9ee9c1e989e40fcf130331086752aa62e2210b30313ccd3e8977de78d4113701624ee7769f8a78be885c33ec6e5d70ae7e4683f13d8aa85f27cd9c0e WHIRLPOOL 5ffeb92fbbd09a82bb6f023faa5c8a71727f421a0c4adc30579b5af1878700d94cf4f7c73e089d6d16c5a623c9f1133509eadb48f41fdde769a203a579d41ae5
 EBUILD dovecot-2.2.14.ebuild 8918 SHA256 f55b4eef83ddbf8b4c2ea62f51084ad0f4daec162c590538705077cc07496521 SHA512 34ceaa77b9e6be9490730331c077c34ae3e8e2fa9fe4255afe4b8722e182fc803af0eddb880bb61b23a23a43375070d03b6943de959672d5297b9e55e7a5503e WHIRLPOOL 875d03c9667578d0f65985b696ee7f90dfb2df3d2f4e7022bafb0e5b48e1609f0f41ceb73c5285c7062b716afc492e2ba58963a615aae0f39ba60c1f3a055bb6
+EBUILD dovecot-2.2.15-r1.ebuild 9135 SHA256 6b36452fefbfb549a87ea8e7c653d24c646369661a562fdbc777437700d10ec4 SHA512 060b344ccef776aaba89502400f2f7439efd6c4e34c06795363bb5b394a24cc79ca77b15c9d76053453a3bd57f07f206d905445f324beb8cce25cd9e84950cfe WHIRLPOOL 4b52fba20f8e11fb2feb48439c68ee26e4a27d52e79a19f75933e84002b4db41ea38332bb650c43491f80cd38568c6225bc235937027d0d46d0486daa6729617
 EBUILD dovecot-2.2.15.ebuild 8932 SHA256 d0be11d057deda1217a703f910b487a7eb4f1d69f7a9a2747c3135c7ceee058d SHA512 0e236ce5ed04d0ec8a0114663f049b2dc905c3a4137029829459c1117331ef4bc98c19f9038f9455bc019aedbabd61eb9071e48df2f92960459f52361d9f7b5a WHIRLPOOL 87cf9b0718c4659373a2dfd49c78263d7c9bf2fea627085b25bb9afdfbd55cd60d1511771ae568db6d439586b1ebd91e82377a82eb227f0ec951f5c2a94079b4
 EBUILD dovecot-2.2.9.ebuild 8622 SHA256 86f4fdac2ac4095840e57cd1188e00bd013d89face21e3fe7b5a6254af1e8efd SHA512 46e29a8b68aab961a5678fb0534490c7da2fa6284bf3b878313dfffeac0aeda429b09d093cc7eb93c0f61c54cfc259d7028dd594c16d97ff16e06f86de246025 WHIRLPOOL 82fd1003e529636ab214b8aabf7696d7a532b8e018176c1d85b259b80308b979097e5bc7ec9638780f0ed8351c25a50ebb432cc6a57dafab8152bcd40f4e669a
-MISC ChangeLog 72234 SHA256 b5a93b832a27439f6321a773c49e4781b738a582e7ca3aab9706ff65c67aefff SHA512 a22d5ac91fd0ad6ee124d3a9406b7d35add82063407fd99446b047be3083e52f548b65d6a2f121330f3373c5f311d1de7da8158689dc4b314918310721dad18e WHIRLPOOL 14132f609d273a0582fe1041b320aec262ad72b574cef271697d6e177c085f5b0ecf845ee7d1153be29f4dd532cc8a0e86506b6e540b1d4b98b29494c665779d
+MISC ChangeLog 72407 SHA256 1dc1da0e901e8ad49de1d5807524bccfe82b279dba9c13921f1ffe0e19e62b69 SHA512 321bff789b7d08261c62648211dea25eaafbd64b8683766ec2e2b2870076254edf1559ff6f9970e6610f1dadab680bbe20afed0cdac3df0a877ee433e43ab9f6 WHIRLPOOL df28570afb38d69c260995109c23b94d55c7dee4f4ddedbe358ace2efc0c5c0c19b068136c793c36a1960258f1c49809bebabd942efc9db96dfa81909e06163e
 MISC metadata.xml 1078 SHA256 cad311926efedde5a689ae18496389ca80a1e4c5b4b16f1bfb456e8e27ce118c SHA512 f208e189f4901e1385d4c237cb7c91f333021b7bc4656d8b8365d7f6d827dc3a3e7ef58963baec88f399ffea505577e94e7901c5e58119e5952736f1c129e4bb WHIRLPOOL d94e39a391cf3ce8c31647d55a387c6102e244fcc3ebdb34909024f8b2faecf7a225552c77dbc5d841ac45f2583ec38b7f8e18e9eee92fbc702210dbdb581740
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUT5tQAAoJEHfx8XVYajsfDc0P/0Rza1krGbM7YasSHcOSP/ao
-Un26QCO6FJ09JL/rAEBR8lFG3hQHCbC4t3GBz/KN6iUCer1GPIrJZYe2i71037U/
-RdqoIB7YoYpiVtckUNUd0cDvse1BAV4gxkOdzvrML5iAPTzAPPlSGFq0XN/kkl41
-Jyc+x9FYmTNn4UyToWYXbczQfZnYXOWFCefSabDQr/Iobwi+WWtxvkXXbhVqjHOZ
-zFuNEXGEBJTg3NGZSsajQUqrb4gjdCtp3q4QsVXMzJSvMfi5gVgBET2Z6KWpsLWn
-q08h5HAwDlpfG0TXsVR02cUHhWYl3jhAKyuXs12H/royMC8w+0w2bDwPCZo8xqEy
-EE3uX/lGEUhRgGxG17uEKGQms25xhNhBbpb/Aij2ZkWuZ9YHj6RntBy4fByFjnV/
-iMFFbvGpo54HXHXMLzapZKZ/xEdDh+i6DJmD7uc2fhMG+5n/pLBEPrJ0M5PFirFE
-md5c7xj83DaElC2mEDutl+z5Cg4GVnQX7KjY9l5eVAcuUDVSeL2i56iKffIO/U1W
-kU+PG+tlcmgAwpI0wNlxeQFknfwbDfWgpY7lWikWXPReOYdjXY6lzwW/F9uZomRL
-ugL7hT5+acc0eYYcKG66VYk2vJMvu/y8rISaIYfBAlY4it+oO/rtWC8BIAnRtbv+
-pOJqAY0YpYWYyd94n8UM
-=Xzzm
+iQIcBAEBCAAGBQJUUzU/AAoJEHfx8XVYajsfQ20QAJBI8q7PwLS6FB1oVdaDBVxL
+P14XtDKikv7IvHetWjgDNsBlVklQJg9OSCJRBxpVW86zmtnIrHAq9BfvyqVvOtop
+Hu/QqkTZ2y/SxCQP7yWzYM5trHLCwRx6f4hIoUd/D/aiFbdAmBf3N6elENRUhLsO
+NDYuVUzuytyrbYCOx5CdRDOKSmILaARFWtDhgriX0zrHx6NxYBzi3D3Ip1n2pp3K
++yHVgQ8kU9DaPBfCnTgK5PYjMj6NfqvlTcTeBnsYsuj0yI3ucoyGRS0IraOHIcOj
+c163o0XD8v7oVoH4q+SFIgNLgN3PtFoM4M5yCgQvCeWnfvHvLOr/ggTuRP08HamA
+5TfqZmrI26CTg7kW6XXskxR6TO7PXp0m8NyCYfWs3OJ4A9daL8VH2/RT9gk3+/z8
+Gf3eg7nnVg5kylMjNwhXFT2UGkB4+u98g2inr/cDD1+CPyqRxgqNkYQU1CrFi2xU
+RyRykqzmoflWqi/QCWpeCTCU72Vf+FUp/h/Eoz45weLoo6+a8KwQrSaOJeRF2neP
+ps0J4V6/PoptQYXPEClRJTsFez1SfiY5H4l0JRjFO807kVyHByJE/SDGnN+3Y3kW
+O1xQ9Ls+ZlgGC3HWxTU7Ltbc3waypAIz9K6zyND6r7h6a/zzk/WbF/w68oeBjvnU
+1D8Gw3yc3f2PwhokWabN
+=vhYI
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.2.15-r1.ebuild b/net-mail/dovecot/dovecot-2.2.15-r1.ebuild
new file mode 100644
index 000000000000..e9d4c478f736
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.15-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.15-r1.ebuild,v 1.1 2014/10/31 07:07:28 eras Exp $
+
+EAPI=5
+inherit autotools eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.5"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-10-ssl.patch"
+
+	epatch_user
+
+	if use sieve || use managesieve; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		epatch "${FILESDIR}/${PN}-pigeonhole-0.4.5.patch"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		$( systemd_with_unitdir ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	if ! use maildir; then
+		if use mbox; then
+			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+			keepdir /var/dovecot
+			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+			"${confd}/10-mail.conf" || die "sed failed"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		fi
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		dodoc doc/*.txt
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+		fi
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/files/dovecot-pigeonhole-0.4.5.patch b/net-mail/dovecot/files/dovecot-pigeonhole-0.4.5.patch
new file mode 100644
index 000000000000..8b7af9b84077
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-pigeonhole-0.4.5.patch
@@ -0,0 +1,32 @@
+
+# HG changeset patch
+# User Stephan Bosch <stephan@rename-it.nl>
+# Date 1414713028 -3600
+# Node ID 3e924b1b6c5c0199f1b97cb5782f52e6348a9840
+# Parent  80b47902cf40053cf13d8edbf034d0e4f8a4da07
+After make distclean the distributed tarball would fail to recompile.
+
+diff -r 80b47902cf40 -r 3e924b1b6c5c Makefile.am
+--- a/Makefile.am	Thu Oct 30 23:27:42 2014 +0100
++++ b/Makefile.am	Fri Oct 31 00:50:28 2014 +0100
+@@ -2,7 +2,10 @@
+ DOCS = doc
+ endif
+ 
+-SUBDIRS = src $(DOCS)
++SUBDIRS = \
++	. \
++	src \
++	$(DOCS)
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+@@ -11,6 +14,7 @@
+ 	examples \
+ 	COPYING.LGPL \
+ 	ChangeLog \
++	is-tagged.py \
+ 	update-version.sh
+ 
+ dist-hook:
+