Version bump. Add tcp-wrappers support - bug #464186

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

4 files changed, 310 insertions, 21 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index a676012bbb19..bf5462d4de59 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.417 2013/03/22 12:45:15 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.418 2013/04/08 10:05:52 eras Exp $
+
+*dovecot-2.1.16 (08 Apr 2013)
+*dovecot-2.2_rc6 (08 Apr 2013)
+
+  08 Apr 2013; Eray Aslan <eras@gentoo.org> +dovecot-2.1.16.ebuild,
+  +dovecot-2.2_rc6.ebuild, -dovecot-2.2_rc3.ebuild:
+  Version bump. Add tcp-wrappers support - bug #464186
 
   22 Mar 2013; Eray Aslan <eras@gentoo.org> -dovecot-2.1.12-r1.ebuild,
   -dovecot-2.1.13.ebuild:
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 29b0b786b746..c51ccd68d7fb 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -8,30 +8,33 @@ DIST dovecot-2.0-pigeonhole-0.2.6.tar.gz 1234253 SHA256 49829e4aed763848b63b2bf9
 DIST dovecot-2.0.19.tar.gz 3357056 SHA256 50e49e181acea7f2c08008c5a61500c01803dc36b5ae1e6ffe24c1c56e3c69b4 SHA512 a6a54675c3f991a9c86a285d3fcbd388ba92f902e032362a6fc846522090daf05b8e2d4bae623a1568120384c981105c8b80c1ab0f365fdb1c22da1a84e025f9 WHIRLPOOL aad7772edf993c364cc53b36425c2a34b1170215a6f54cb22ea34cbf5b5b587602e393e38ca98e583129f2673d6f467e466f554eb5277e49ad5126305ca93ae4
 DIST dovecot-2.1-pigeonhole-0.3.1.tar.gz 1084148 SHA256 e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7 SHA512 9df0a428f43287606522120a368c07513b39852325c436bc9c523e52f82a4c97232991ca832630baaa8c704adc2234ed18c2c0a63f8211f7f412dbe285436240 WHIRLPOOL 72e346e338a3e0149cc978ccc9c54943efad165d82d54cade1d954688f1806b30b3509c7f90c6589673c2808f9d85497af28aec63e2e060ca5934ea4ef101e9a
 DIST dovecot-2.1-pigeonhole-0.3.3.tar.gz 1078559 SHA256 1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e SHA512 1e9b611fce25860e3c1663bb98ba14d823cd7903ca9889194da157180e296c5a38de368bef0ff152620644963b51f2a0648673a0136f304d677e88ba2ee4e9be WHIRLPOOL f83c77559e1bf98e4f8b29652d5a66720fe9f1264af3ec943fd4c184071e2c0495cca4b86d541eee91fd34f3cd6cf902e8e347cb2dab55b8ecb51d4db2c50a98
+DIST dovecot-2.1-pigeonhole-0.3.4.tar.gz 1089752 SHA256 34da8801c7695c397a53a13574fe8674b92aa9d936f91a1b6e6df787488a6d05 SHA512 7f58f46defbe9dd213f3a7bda510460ebdea3f90fddbdcbede151a206cccc412e447d03334b97cc748b499716bc34b515fec26fed5bf6210f0005f94ff3768c2 WHIRLPOOL a4a535b2471e405e52821c2e65a6bb3effdacf58fe0852eb21707d82933b7207c97c57f7e9bb49ac601fd31f22ad72fc71454f0ff6ae96d7a0f1f12eb6a66977
 DIST dovecot-2.1.15.tar.gz 3862058 SHA256 706a69cede44551401dc5f49225b97b4b7b7e30ddbdc5cc11176a23a0fa72ded SHA512 e97f12ba5fbf2608c377730467efd0bd6773aab2f31dd886c25e8966ca084599498da1c092fc52e46456da3fd7fc4ca410623b1077838a3561ed164ca0acd9d3 WHIRLPOOL 5bdcad2f1c5833d2142c1282c4321c3488f3c4e75ea8a95561d57ba41f733ec08633f2d69b8cdee5cb0a233f8088d89fc61ec816f0ed3eb7769b331e3c865b75
+DIST dovecot-2.1.16.tar.gz 3866802 SHA256 a61d5fa774615849f6e754232c41a7a87dd0de619f1089627c3682180fa9b447 SHA512 634600ae99db8d29766aa05d21df06f4f5e9c2bb3b8378e6a92fcdc0eb3e2ae2e8383c7d516623d774dc13bae72a47a79587ec5b527c7bb47fdb5da704c4047b WHIRLPOOL 93b0dad89b190211fcdf5ab2efbc7fcf77cc667a6a94c27bd507fb824d9efef8089d6e85ec3ced04d895660d0691cbc021cadb94c5e48dea04a10b48c19b31e9
 DIST dovecot-2.1.9.tar.gz 3829755 SHA256 77d11112bced9e2bbb1410ce5e6464af477775315ec67c7f3ab4d0da64e3c512 SHA512 da16bce6fdb535dd8eb48b4626444296e78808613f5a0d3d28dd7a509a82a276ee4f34d3ed8c339a98bd6aaee10ddf1c2df62060748b4c603a06ab165086d8de WHIRLPOOL f5bfe022687f36fcb06aa46165d6ffe8323bd13e990b7acecaed6af91226c5b06bc1e479f242dd6f963ff6039f633d790221559af42c4debf39ca252715a81f3
-DIST dovecot-2.2-pigeonhole-b75b00760b86.tar.bz2 579987 SHA256 a55c514b91f4c43dbdb656785bde813fd64ad5f5df66e5dc071212d420c3c003 SHA512 2005a080d8a97dca62b0fd4d444ec875f3f0e8bc1a0d0f56a0a03e812dcd9d366ee387b7fdb1e53dc49052391032fcbc4b1eefd817035d9356812c5c42320617 WHIRLPOOL 823dcabad94917dfa4ae6e21a885255ba989fadeb03e140e7337b13fc366ff00f05b88c50e2d3d1b5df842c8d871d5bc9e4f113335d1468f5713f6f47bcead50
-DIST dovecot-2.2.rc3.tar.gz 4222611 SHA256 71f9e19925b5e713be06a019084ddbb3dd2e0452c31fe07466f7613d39f8ee67 SHA512 3af9ba7f33c9c4062d2242d75635237481f1c97a9947fd889d01f369cfeca2bff790653da00a427cd2e25fe4f392117b9a8e6bfa81ceccd146959a2b74b16aa7 WHIRLPOOL c7fdb7d6ae09654742baf447e762fda30757ee434efbaabcf14db57d8cc73ea9c70844a7d7684ae8a66e72cc307ed96a5a0990d115d667f3d9f3b59403b15093
+DIST dovecot-2.2-pigeonhole-aafcff20c8a7.tar.bz2 614194 SHA256 5252082598458dffacaa2036eb36bdd3f5bf01e58aec54395d7c0d3b59e5b837 SHA512 8707c12f64990c845e4fffe3ec625f7122abd1fb0c25cabc1b99407930491ce211acb9e5de0d9df3d079f926985eb0d13e0cdcbb54808f7fdfc3de467e764468 WHIRLPOOL b7d873ada5f447abd1eadbdf69bc45c7da335a1888a0fae7c8b616c473853970c957024fe1861a97c8514d58e57be7bcc9f22b97a6d8be3ec1a078a5bc70019d
+DIST dovecot-2.2.rc6.tar.gz 4249696 SHA256 2d429fc74eb88102414887d602ff75a0e05311f70d5369a64d9650c79eca9a8a SHA512 e7c8b54628f1b23deb159f42d8323ad3a0c067754e8d5f58727c9e8d03d539b79e36d20795bfcb2dd4134c57b30737b10cee620b966bca9c250bf905912f5e0a WHIRLPOOL aac227c9378f663571ee7b89496d353f87dcd863a8dc6b831f537c0211a6df89a1916195ed544b0d5e46141321b67317c60acfd54a097901d2d6db523f5b0ba5
 EBUILD dovecot-2.0.19.ebuild 8872 SHA256 672190f8898d8587dad95872745bb65af195a77e2894527091e9032d4259a366 SHA512 52ef08b376d6bf6a443e9c4aea0db3b6a1a80e3cc0a899558e6dbdac6f36fbee5a1a84eb96f1d396a114ec74bafcb8ffada4a64a05a976fdbdc88c800dd0ccc3 WHIRLPOOL d4debf95e6404d908ccfbc1b01315902f77364c998488e1edd13b4a1008c308a3ba51479d228df4969e00efc29bab849216453d847d602f058674fb742aae6a2
 EBUILD dovecot-2.1.15.ebuild 8487 SHA256 93da1e5635449886882835c47e75614e539ee1bab86bb2fcb5a71f77a51fc132 SHA512 ea3f45e424cd1aed63691d643d79f30b1d306d1c78583420ffce4eb209e8b9e82b6c6e8291935d9f8ce49eb9fa96deeabfb985f23877993eb659e0e84e44a371 WHIRLPOOL f3a8f3ae06c8d34c1e14839010114f23cdc8ce4b6cc3b092488a7250a5770c8ffc009c100571fba0f44f970474c241df31b5dcdd99c20d86c44b86ead817204f
+EBUILD dovecot-2.1.16.ebuild 8567 SHA256 6cc3e226e7977103d89422e5df65d7e7bdf093bcb73cce3847a47ba3ae96577b SHA512 f5b50a95225d358027b5de868c549dffad5fe24ca55d4f68b33b9281e7562bf6ef495af6d86a62d42777dda0bd64e80e14f8c9c99f0762a45871b1a531512363 WHIRLPOOL 4d6e1696f45c7c7a71a69a98cdae9c3f26afec8811ca63a23b5063d39fc615c181b81db07497b88776bdc52c4b6d4a53b1d043c7d8490a0f5caa31d725a9f799
 EBUILD dovecot-2.1.9.ebuild 8711 SHA256 7d1dcd87630cd6ea0692aeb1b3e5a323692935948634610fac6ecadc6a0c4e2b SHA512 15d6ec32508190d166eeeb5ba195e9228d58da7834cc0f670f68d43357b8dd8c3b82fbab909ea7d232ca0d8676820af4946d66acefc836526d598f61d249df33 WHIRLPOOL 73ce697ed35a319b87e2e9b4bc6286c848a847b0c72c14cc18f31e381d3815952567ef02b4c23fe280e473983ebbf078101539234ccc532810a5f73c601a5d36
-EBUILD dovecot-2.2_rc3.ebuild 8568 SHA256 9900469b919358b86e7d1ee196912af484c9f5e662bb3ee1a5e055f887643e8f SHA512 fe7e36dad1ebcb822c139d9fa13f51b5389981f36411392eeef34cfea35575a722c65e840fd377e1b03a586e945664b0afd9ace601baffc33c530db882ab96c2 WHIRLPOOL bcc4fde1b64d8d47dfc0ba347b0e7c709d2cb06383ac22d505f4e40c0d6072d86e279fb055365abb470f67b3955ed29cb6410b331c540c7335cfa416b3b13aff
-MISC ChangeLog 62710 SHA256 b9acbfcada80da3949fcaedaad68ef330fbdbd8045cad5fbab9e2c628233f260 SHA512 6980e62704bac5439c8270e6c856a4f294d5c1573c0a13a6101e29f78ff0ccdab39abc5f90009c2ab2c2a2edb6e7bd6eeca1fb21610ecce9dffe0b656fd0f0c7 WHIRLPOOL 366e590dc9b557f7536e2ac48b382c6ab0f40380cb5235fe6e0de8f184bc082dff485134e964edb303706768929bb11981d021eae3203756a5d01a027b193897
+EBUILD dovecot-2.2_rc6.ebuild 8637 SHA256 e91810d0d800b9bc9bdd28272afff4a97a38deae5e0a09cade52373549b567c5 SHA512 8e8419a9a90bf59f139d63b4b4c3f1f76deebb28eb05adb3e7f99fde439ec230dd37410712c0fe5b8c3101b1609c68b6c2c115e0fde2357e4a604b1aff5f1e59 WHIRLPOOL ce38a6a0051a9fae094fab18ac968e356f7f8246326dd1efb782f320493856bd98c9a9ef7ae1c9494f1882aaa78c198d1241de7b5cc0ae481bad4220673f7488
+MISC ChangeLog 62948 SHA256 6ce582fd0dc577c9ca8f52d13fb757822c447c2f1e8b1d3e67d744d87b0d54d5 SHA512 1d91e5dae18a3c9649be2e6a8338c499f042dc9ebffd644e58ad2c671b7341f9e1196dee14902b65cfcc5256b1e880153a9046e5668951e8f74f357abfa0ec46 WHIRLPOOL d88a2146460a9ebb3356073e19eb73f9976d656293fdb6b05756904b3b30b918dca2a0c15f11e211c84e89617b2b81a748065d41bd493bd6dbbc6a9075c1e4da
 MISC metadata.xml 879 SHA256 40171ddac84b6d47c050e61ec8158085dc11c1da24c3c85b0375632868da55f6 SHA512 0f0dbfc71c087fd1c6f0b673ff83b837ea8e203f74cdbd159dd66943fbccb39fdd30bc38ba19b74403a369110c205218e397dec35db72ae53bd1431bfa61b702 WHIRLPOOL 25c2f71d1e7f8987155b7c7fa08f45ff2e1f647bb390ef19e4f84dbb319ede24bf1bbce9482a823e487eab08948368b74898f57ca182f8904c501a7bc4f70755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRTFJlAAoJEHfx8XVYajsfAVcP/RrmCXFDFKTo5VbkTp16Oxcu
-EkUGtEGp5dDHR0RmTHsbRi0juCjybD0Zp0uaCwV3sSU3d8lsBe1+2bpEEVMoL5wt
-DoASLoRbqyOSAHgTtELJ8MkdKO6uSEQrn44yrVSobth389wM1XR3uI7usRzMnzFe
-lELp1DSgcSpVLs1MgzEnvuSnROjlQMGZS5MOaDQM1vWMEQZtzfyaiC3NGHgT0r0c
-Idz6iUkFhATw630AHte9YTUbB46JAjm6NQ4IU/vC897UwhZoUcpepJYq5nPUYfoS
-0NhfpprVOIhOhtLjo99jmXPG0d4ZWOFxvdEMRK49UGVaqpPK5YU/RmEkUPPI0fgy
-HDSQ8L/XO/Xi2+bkpcc66HuXoBTbz54IG5aut0+rBhTYS5yOby3j5dHu/S78X2At
-5AZyvqZtcXHsXnlZPW7GGIa/y0d9mTtOT3xl1OrdJzG9sIF0H1RC776pEKcgYQ9a
-2jW0rFh2JpBH0x9KeHSjWmCLw9R3NS2VhD9yjkxagUDqEw+Gv/y1XKui+khl5xIV
-NhBzSSsQ/D0rM15dGDTVZFQowfFiDz66F5NFYnVp3dY0myd3kRW9RDUdG1ZbaHRB
-Fn+McybFGWJjwikqryukADjQzcs8MtZcsk9Du0trUi3hqKXFPf0QcFYJI60sp8mJ
-HnEAc0kgwVcfcJ1PTrk6
-=jfIH
+iQIcBAEBCAAGBQJRYpaCAAoJEHfx8XVYajsfuWMP/2zyy+hE7xJD70aysAb0mplR
+5fG5k01CQl75ylDLW2f5z3xlVkASoCj21//wt2kju9SQoWv/cP8svF8P/TkSQjJC
+UZppRaedyxX1qXYKaO1ojzFt5Axede4KVprzpyni9e21DNMdA3WHClnzi+DCOHRL
+Y+2bu1LuikyzN+qpOZ68Q2leT1/b5nSl7i8osRRW+Fu8bWhJDxiNl3kp5KyK7CRL
+1xWpY7qnnSfclmFIanrBB3dPfmkiOV80Ied2ckA4D33hs8VKGlWx5erC1cYTwCnU
+CAc+IJ4MLoX4m/iWvltGY2wEgP2QIPjnYBBjJ9je09Kj4KTDvZMouHKgy608OaYB
+MYs5qNyGFfqByI86GYx4RwWAgoLtcXs+S5dgx0M57PoDNyLJRdcMRU7hNAso6yQu
+453vmB7S8Oi7YHdheqhzUmlJGvImDLTMzGIYhR5dlfpUTOOO9DUlOAFttLTOzWCg
+K5H5Z+58fg7/nOgxJxUymFEsRZMsps7Ep+syyQpYorsSWdOwLYoTU0IQzt5O9V5Z
+bEvam6GQF7IugKPrNlK9yat9gdcAcVJR+3ykUC4tLLMswlciv4Jz7AWfnoqA76qG
+66E3ewNfHv5QjnpocTrzgelguw6lPRlOc1tSohQgjJUhjEihsNnL+rJLF2XK4WZe
+x4JkEU2q9kp0bPZcHnA4
+=hIeT
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1.16.ebuild b/net-mail/dovecot/dovecot-2.1.16.ebuild
new file mode 100644
index 000000000000..ca69b03ca196
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.1.16.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.16.ebuild,v 1.1 2013/04/08 10:05:52 eras Exp $
+
+EAPI=5
+inherit eutils versionator ssl-cert systemd user multilib
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.3.4"
+SRC_URI="http://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
+	sieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve +ssl
+static-libs suid tcpd zlib"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	vpopmail? ( net-mail/vpopmail )
+	virtual/libiconv"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+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_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 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.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/dovecot-2.2_rc3.ebuild b/net-mail/dovecot/dovecot-2.2_rc6.ebuild
index dc2c9f9e102a..f3d4881be657 100644
--- a/net-mail/dovecot/dovecot-2.2_rc3.ebuild
+++ b/net-mail/dovecot/dovecot-2.2_rc6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2_rc3.ebuild,v 1.1 2013/03/22 09:57:06 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2_rc6.ebuild,v 1.1 2013/04/08 10:05:52 eras Exp $
 
 EAPI=5
 inherit eutils versionator ssl-cert systemd user multilib
 
 MY_P="${P/_/.}"
 major_minor="$(get_version_component_range 1-2)"
-sieve_version="b75b00760b86"
+sieve_version="aafcff20c8a7"
 SRC_URI="http://dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz
 	sieve? (
 	http://hg.rename-it.nl/dovecot-${major_minor}-pigeonhole/archive/${sieve_version}.tar.bz2 \
@@ -26,7 +26,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve +ssl static-libs suid zlib"
+IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve +ssl static-libs suid tcpd zlib"
 
 IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_OTHER}"
 
@@ -40,6 +40,7 @@ DEPEND="caps? ( sys-libs/libcap )
 	selinux? ( sec-policy/selinux-dovecot )
 	sqlite? ( dev-db/sqlite )
 	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
 	vpopmail? ( net-mail/vpopmail )
 	virtual/libiconv"
 
@@ -95,6 +96,7 @@ src_configure() {
 		$( use_with postgres pgsql ) \
 		$( use_with sqlite ) \
 		$( use_with ssl ) \
+		$( use_with tcpd libwrap ) \
 		$( use_with vpopmail ) \
 		$( use_with zlib ) \
 		$( use_enable static-libs static ) \