Version bump - bug #495060

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

3 files changed, 300 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index cc44b484a374..bb45cece6f23 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # 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.463 2013/12/24 12:47:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.464 2013/12/24 12:49:55 eras Exp $
+
+*dovecot-2.2.10 (24 Dec 2013)
+
+  24 Dec 2013; Eray Aslan <eras@gentoo.org> +dovecot-2.2.10.ebuild:
+  Version bump - bug #495060
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> dovecot-2.2.6.ebuild:
   Stable for x86, wrt bug #490128
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index e94eecf6d4eb..a11bcc054336 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -15,6 +15,7 @@ DIST dovecot-2.1.17.tar.gz 3908153 SHA256 f59cb39ff5839badaf73fa28006c37b79839b4
 DIST dovecot-2.1.9.tar.gz 3829755 SHA256 77d11112bced9e2bbb1410ce5e6464af477775315ec67c7f3ab4d0da64e3c512 SHA512 da16bce6fdb535dd8eb48b4626444296e78808613f5a0d3d28dd7a509a82a276ee4f34d3ed8c339a98bd6aaee10ddf1c2df62060748b4c603a06ab165086d8de WHIRLPOOL f5bfe022687f36fcb06aa46165d6ffe8323bd13e990b7acecaed6af91226c5b06bc1e479f242dd6f963ff6039f633d790221559af42c4debf39ca252715a81f3
 DIST dovecot-2.2-pigeonhole-0.4.1.tar.gz 1156858 SHA256 361cf61c1b6c8a42d841d694736dac99c6bb5b5166e050a95c185119399c696e SHA512 82c1d8b09020e70ff428789008aa6315cebc569a93be14a776e0e3e379e5a241cb2fff1379dcd66c43d4e02f82f932b6ea45c796cac57de0b693963109517f5e WHIRLPOOL ee41152c54b892d6d73299f91cd8cc6256e3e0f14d681c8479f75a2b165038964f61649276b400b3a4ee381e201182de294033e22286a05b5174673bb23a6229
 DIST dovecot-2.2-pigeonhole-0.4.2.tar.gz 1159311 SHA256 0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13 SHA512 3b66d00a8462ee668b8671f5eaa48bb91d47ed8bf8b331f7d879ba8c581e2bef11e236b06a8c5da9f1248572348ad0b3e2b867fd0a17badf32152fedbe61c1ed WHIRLPOOL 4d86bd5c010434620d0741156d4b7b24c60252de76958c0fc774418abff4bebeb4a8a78b5490ee34b20d48f61fb2ee75c4ff04202108ecdd33e1eaa9e2763ad9
+DIST dovecot-2.2.10.tar.gz 4558660 SHA256 75592483d40dc4f76cc3b41af40caa4be80478946a699d46846d5d03e4d2e09b SHA512 862a20d4e8bcfa21fb635a3f27bc689ca5b41dec0ec4984fe0f329a719b87c23341d99c259b6fc912ab3277028a05450c2d197dd7d9748a2e6f39ac5aedfc8bb WHIRLPOOL 4b4257d906fbf3fe0b2d04b5c8f51399dff93e6ee441ac85e36cbd672a9cab23546c442a6c8b05cdb94f1e75cf96269576e15a4a2f4c6bcbdab46b6cec5164aa
 DIST dovecot-2.2.5.tar.gz 4356745 SHA256 15b2cd607e6533f4805f471a61dd1c8bd81675cecc6ea6361504247dd9af5cf8 SHA512 a449110b70a400388a815cd563fdc2dbc99620e6aab59484354e33917dd0f595717bf02980ebcd758d2222f2cf7a72adea5df76161692a0b433c273c41d7a274 WHIRLPOOL a4f06e7f3b0d04a698c15709bc9614766aa37f1eb01dc515388077d6ffbf4de45a6662e2e08e67e291825ba0dcf2959ecfaec37d7f501ae024f5b9e9724b2c60
 DIST dovecot-2.2.6.tar.gz 4483169 SHA256 62272bce0ba4b992f44b6eaf72543860ecd21694032243af009b9da2c0d3d6e5 SHA512 770fa399ac0947f4887e4021a14075280f72ec5d6f2a4ee79cec23bde2556dbdd40afd9465cd6e9de363bca40b633d809a853c7268279d58f8a49e288e80aad4 WHIRLPOOL eb964221dad48775ed98ded668461b55134a1da3ef9b2fef1b3d0de581ee1664af79eae5c3209eff49bb49981fa60634a1e853b4640c0a506789085aae154bbe
 DIST dovecot-2.2.7.tar.gz 4509163 SHA256 441e5f66cf258e6c8afa661f1082662f0cd6b25e16c6aeb0aec4591c5466ab6c SHA512 c723821874dd23fb2aafdd0092fb84ae04b0b6ea5aa7a673335b7d6aeea2aca4830c1918234a5bf7a03b25cf75ddc9c9877c17c00eb68383c016791dfd183395 WHIRLPOOL 2139c96bddc25016fe2064e103c336807b49685e6e1f4d4e7c36a0b04ed1ec27aabe1370ff9ccb9a64f7aaaf21548e855f4ff2e91de4086df18eee236d5f1c50
@@ -24,27 +25,28 @@ EBUILD dovecot-2.0.19.ebuild 8872 SHA256 672190f8898d8587dad95872745bb65af195a77
 EBUILD dovecot-2.1.16.ebuild 8556 SHA256 7b7516de25edd2ccc8dbd6656082cfa8a0119285daa0e43c34341c9a99424b38 SHA512 6ea1d693c37d3ffa5a5383f8275bcc4b1eebb1dfa76c118a2aff5042523de4b5f66cc7ceed34b51a6bb47254bcb0bec40334ade1dbbf93d3e035ba3b56bc0566 WHIRLPOOL 7153e203b76c84053e0bf8ddf2ea396320f05901b42a1b5d7e65b82228b7f9f052eea7149b4ffc46d1e2af592744441a60a2c949279c1f0606a303a0d0122aa8
 EBUILD dovecot-2.1.17.ebuild 8635 SHA256 98486c1dc60e3f2ac43385f8077b87ae237df180f41fd95147a0557335448079 SHA512 521664a37101d5e1f95167dff9c560c24507b03e2521e966ffd40350d9d07aa4aa9efcc1c80aae77e31564cff3945f890499d402be157894384bb1138e4d4768 WHIRLPOOL 8bfe32ca7f653fb2b7f4567dae0fd4957b56a05b7dd94c0bfc0dde260bf6ca64bd37af3671320494a1a54ad455b76e9ba4e07350e00bfc6a800e70599689c398
 EBUILD dovecot-2.1.9.ebuild 8711 SHA256 7d1dcd87630cd6ea0692aeb1b3e5a323692935948634610fac6ecadc6a0c4e2b SHA512 15d6ec32508190d166eeeb5ba195e9228d58da7834cc0f670f68d43357b8dd8c3b82fbab909ea7d232ca0d8676820af4946d66acefc836526d598f61d249df33 WHIRLPOOL 73ce697ed35a319b87e2e9b4bc6286c848a847b0c72c14cc18f31e381d3815952567ef02b4c23fe280e473983ebbf078101539234ccc532810a5f73c601a5d36
+EBUILD dovecot-2.2.10.ebuild 8632 SHA256 19d797f4d966f1bc0e46aaf02f4bda652189d55b758527589faa285b8209c8f5 SHA512 174e8020c895d282aaf9ff7d3d9c7ee552198e75baf751a96b336744734a85d9f346fe6d060902c4b2e559614db1ca92749439eb21c8e482ea4406cc52d54657 WHIRLPOOL f69d5e23236dbc5414642738e464c433cd41467a3144d4838a50ff8f450e9a79d7ec6a8d0034c8ab081b9a1104cf65e5d84513e205bc74cfabb90e7aa94338dd
 EBUILD dovecot-2.2.5.ebuild 8622 SHA256 1e03e1cf58e2d057a1b91e88523bef307f7f2b867a5617a2af03621021201197 SHA512 c359cf156abee4a0c7ae1438825c9515e8767c4ca4aead68a09fb3fc615709210e8e431fac77a12ea57730f525db2df23618ac44d94ce66d29bad1ab21a906d9 WHIRLPOOL 4e23ead1336a862f236b9bab85d9887e979a73a0a9a473bd5d68eed1d11faab5956045990662fc7e9a8875845dd32e9d423ea9bc055172a8534284e20c2ff994
 EBUILD dovecot-2.2.6.ebuild 8623 SHA256 8096fac47e4371e7dbaf9e7a3d917849a8de45566a7b7ded4875f6ef57f3188f SHA512 3bf3e8f1afdc24684b6202aadd3508216c81ca56a33bb4704618086c19823e4448082517777dfbb960820ece19a507ea6f2a29e333d69bbf58cba624e4126ed1 WHIRLPOOL af1708943b38bdd2891b11a2167e8763cb5eac6457134b7baae3cbc40b6f181e6b2775e29e7e7e8c0e291636e94d76db199958594ff4997971930c0df1487d69
 EBUILD dovecot-2.2.7.ebuild 8631 SHA256 cc6f8adaabc304c7d6779ee62ff8cca820ad4ecec767954b0005f360fe301b2f SHA512 3eec012e4663e9fbb5f51f672b92b6be8199c6c19a0f88bf11725bfdb5023f742e8b71011d3d10a4e44d86e8c505cc596079eaf600d132da0e3af6022a5307f9 WHIRLPOOL e3a21f6a322f15e1ee534901c59b36908d9a4d3336bf45c940437433875e8b094628a814efe52079e3ed3add56e123d1d8510a185c1d3c853368d8fe6f3b3752
 EBUILD dovecot-2.2.8.ebuild 8735 SHA256 1136f385924f18e0fb54b019223a667b21b0c590eb0863ed2991ecf275d6b419 SHA512 b7b2a6cd836a3c29230a2a50562a87752d029376557b858b99d79c3774a6b929b8c27dbf5af1fe9744a71396a7b86203439acd81bbb4fac14b038dc714e9902f WHIRLPOOL 50f03a17b4c3f3ef1e5821a26caeba3fb15325c428424d8862e5d4ab06563c91f85b23b54f4637f306427f65d470b4e9559dc8be18e81e101277af5f076456f3
 EBUILD dovecot-2.2.9.ebuild 8631 SHA256 1131c705b43e422db399864d56a362687100ef2ca5d8c2fcd113c9c158cea3af SHA512 99395e15d8d695a5cdb43e9b2365d20260f617cacc1b318bbdcff678932ee1829e53a50437f0b8cad44d45c10cb0795c1cd22c99aa9bfd735e54c318bf2058f6 WHIRLPOOL d233e979522a35eaadecb05d99b2a149e51e24af835bddcea6da39d22ae8b321253c621bb716df0f0337bc4d3a78e6fd6258abdd0c774e5b1ab2fc360bccf4db
-MISC ChangeLog 68330 SHA256 0352c32cb7fd0ee7c1ee90d426a5bf7b44969062a5f2369ac6474a68cbc39353 SHA512 98996cdf285b1235d49a36551d94ac94ab0c30f39658d0e628000bd9d0289f088b21c90a1b1d8ddba7c703afd0d69aceaed4d764b7f2221c2cfff50355af1197 WHIRLPOOL 5b1b096145d13940c906fbcce0da2c555256511cf2addbafa114f02d47168172dcde292cf54402ac01c9f3b70539e14a5a0a6f8976dee3ae3a15fb88dab73c0e
+MISC ChangeLog 68460 SHA256 7945a8f301c17e86d91747b72b1ab73760b5f21f902b8f627222931abfc31595 SHA512 7cbc5dafe0fde23197c47fc2ab28d08a49c92b582bd11d5ac88278d6eee81b680f7d1708bc4e09fec5f800f7b4465ceeda8ff6b9c06b2434e580c394d185c20c WHIRLPOOL e9173e0b5c25b0c3a5fe5c2ec4f9165267e3bea5f453c1500843fbc8d5f764d5bc58e9aba8d254fd3effabc7e99122fe9af8dc4b01ff0cc5d2a2ef3997a79526
 MISC metadata.xml 948 SHA256 ad1e5324e4ac307c9fd4acfaab4375a91399c3302c0bf7a358cc9b879953e64b SHA512 a58ed0e97a8ad182eed6a253b247a388e7e6a955ad0ec8c2c63469fa9c77d0af824bb00d959505cddda354ac434da3e22100cce7449556268ccf95fafe05f98b WHIRLPOOL c5977d6032ac360f22b723fe811e3c65988cbbc06952b222666166c074092bf4ef68465f19fe689282a74a1383c1bb99802711ff4d7b8501cb989d8989385fed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuYJTAAoJELp701BxlEWf6msP/0T1/qeS6iCuFg7XMEAZtB5b
-sZymlImyUqH4XBpDezAhd4ZfUEZiBJ4pKqGyegEBPaCCOVo3FDhUuLRUBmG2A1oc
-aYLAFB7g/VGSOEKZF6wuwACp4c9kgDK3JtuR/fl404b2YfNFXEyQZJ9RrLc0nqTg
-QY+pJrXUTkxyx5qp7J0gcIytnBF4uQwS994xntzJSuQZ1l+G2hhVMKKIbVztvmrQ
-9QgaSoHWWBKThJNtXqrngeqAdjWVJnhngcqDeR+1DfRZNYBiuc3+V5Rbx+GRMg0e
-3HqGM17VhxJRmFcIlz2CThb+Hf+nks+/fWMhaxoHA7Z7PNrr8r+nGXrRTQOJO+z+
-sWv0SXcg/x/cqU8qLdBxmSmbfXvqzchlGw0KuBLpFugjvQkxryUCrChx7K/IUz4A
-E0Zzl/gG8Nuk9qlNkwdHethFcnQvJqzM1evqSYBmr7FgymG49dNjBL+wXAzyLl8k
-m8J6V2PisKum3cVH7d64DRz/bIXGZbb+OO0KN9Wx9hglJe3vH4Hq0pWTNSXQgCPL
-I6tYdRt66Ie0m3YNLyk1R83l16H5wgKKbDigpxj6KUWyJWfX+3LAEgFbZPftO1HN
-m2KaR8uiAg7GSlqj4SiNrAl4BHdtyPToOmYMsXBPEYG6JUI+X/EhmDF1ePJtLwAv
-tFFx6dkcut3p1yzohLcE
-=sti5
+iQIcBAEBCAAGBQJSuYL+AAoJEHfx8XVYajsfznEP/AyDjKkl27N9f0PkqQh/3GgV
+SE1Y+l7lE4/srshZSL0lhtXeTZSvNUalDU3RYykIvRpixz0K+mMeVOYXUcoOY8Yh
+JXad+nwrP8YOPBVsyI/yolH4VILRtDvv5vNBbSyUvEJxJEGO9VMUmGQYvSjzYJm8
+yGqSszVz37b5dxyTKG9DQbwlLagupvknQaBR5i8+mVceiDBItsut71vkDgI8a4nu
+iY25y4DK723hsO8gmUU20y3nc6Rk0lavCtxJ2bschwt2gxvF8pDIjgZvYu2zJf4l
+it3VmyTql+0kH+kaKIZmLKS5bEPZKev3Zx/icsL2OsyTHl2SpmaGYDisd3ZkEMs7
+KP0HV859PPeDpEIMPCgh0NQJiskhbqwhE2qernWbVxF/pDegeTG+zg01eoQHX7CQ
+CdWUGOD5nT6c0lsju7zEEy0hJC2gO3upOZ/cEbN8pITyLZgsXGmDsnIevqeKLgFx
+Ktx/uwfB7S+4GNTedYsyW/gKUn/vOp7QGjOVxNBBFtOIsny2lTdNazokZL/U8IWr
+eHTP3rhVBXGwXnJ0yKtrFTD44hcEJTDgy3Zg3YeEQ6i0o10FOcoe13z1f44T94Yg
+RaIA4jmend2LqQYD5zGS+WtOdI/mx21xEyDyktBEDXptkPZRXO1gAkydj9aGtm9/
+ls1bTdUVT2o9RRtAFxpZ
+=8aGN
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.2.10.ebuild b/net-mail/dovecot/dovecot-2.2.10.ebuild
new file mode 100644
index 000000000000..5a98daca3dc5
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.10.ebuild
@@ -0,0 +1,278 @@
+# 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.10.ebuild,v 1.1 2013/12/24 12:49:55 eras Exp $
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.2"
+SRC_URI="http://dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
+	sieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://www.rename-it.nl/dovecot/${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 ~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 solr +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 )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	vpopmail? ( net-mail/vpopmail )
+	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_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."
+}