Version bump

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

3 files changed, 296 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 3a185417b7a8..c448a6bafe34 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.386 2012/11/29 15:38:37 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.387 2012/11/30 07:43:18 eras Exp $
+
+*dovecot-2.1.12 (30 Nov 2012)
+
+  30 Nov 2012; Eray Aslan <eras@gentoo.org> +dovecot-2.1.12.ebuild:
+  Version bump
 
 *dovecot-2.1.11-r1 (29 Nov 2012)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 42484dff4d9f..94e31385bf26 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -19,6 +19,7 @@ DIST dovecot-2.1-pigeonhole-0.3.2.tar.gz 1078365 SHA256 532477bfa7aa49501c8709e2
 DIST dovecot-2.1-pigeonhole-0.3.3.tar.gz 1078559 SHA256 1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e SHA512 1e9b611fce25860e3c1663bb98ba14d823cd7903ca9889194da157180e296c5a38de368bef0ff152620644963b51f2a0648673a0136f304d677e88ba2ee4e9be WHIRLPOOL f83c77559e1bf98e4f8b29652d5a66720fe9f1264af3ec943fd4c184071e2c0495cca4b86d541eee91fd34f3cd6cf902e8e347cb2dab55b8ecb51d4db2c50a98
 DIST dovecot-2.1.10.tar.gz 3843490 SHA256 8acc99c2a7e8b598aef2fef443c5fb6779099e57573f86a1eaa2b8479d0becb9 SHA512 d4abc4788f90e63fecf6ed0786b26d855b1580e99a598e06a946a2bfd120ea23533bd96b28304cd517f7a74d7115086cc8471dee3d3b0f49389be2dc43252931 WHIRLPOOL 0ba5cb11deb672d306466f2d0c707e714adb5e152370db5cedd7ace5d8332d72be8bd2b1e8d5e624106fd22c27fa48898f3a3a2446204f49e5f96e44204dd56a
 DIST dovecot-2.1.11.tar.gz 3838856 SHA256 0ffdf2c61b46fb7f8e11f59284ec57693ff7469f3e6c1354658cbd8668ebc265 SHA512 c934b095b37f95bdeaaa79cf26e9cab2b6f93ce6e3104da20799e93172c8067831ea8cdc38b7b4862cb199bc4bfbe95d1dd0eaef6e439291720c7974352beb5c WHIRLPOOL 1d94da63a0da2e7bc9983d3995c3e90d3d6dfdf4958306328b3188fb5c7d8d9e4434eb2f08a973399f9912047c0df85755bed6cc4f3e04686622734f639394c2
+DIST dovecot-2.1.12.tar.gz 3839088 SHA256 d76ae15146452d053c423d883b2cbc24f62a55cf2f1f547577f42bc7d8d20840 SHA512 269beb56be927c33415fe0c0a94c73331b32a4d0104f28e98e9a24ea27475450abb18c8fea1aa134ac8f9747a0fe2fe92049c7318929dee7ef6126a0d7a0f6dd WHIRLPOOL 9b3f615b17d88ed67829960220fd27ae2a9b64cc31d2395a7dff9a349c217b7505454d2f3c0aeac5d1e6dc42602a42b715ab6b9620e3e4128c4a6cdc19acc333
 DIST dovecot-2.1.8.tar.gz 3807008 SHA256 48807384f815072cf5a9c8a94726b4179433d4a3dd35f33cbe8db3a7880b000d SHA512 587e7112e357dd87c32d8d20a756da9db54574e2ec50723667281749727afb5a3810acb1e679f482119a94c57d6fbec65ba23b857496ed17e7edf7c19fd8c679 WHIRLPOOL 7d63f68fc97b527796e8474622c4814d6b281d90182509492a07ef64850c01eb24faccffbce5c80bbc991b792f5881a09b237cbe2a7cab6dae391bb464ea25fd
 DIST dovecot-2.1.9.tar.gz 3829755 SHA256 77d11112bced9e2bbb1410ce5e6464af477775315ec67c7f3ab4d0da64e3c512 SHA512 da16bce6fdb535dd8eb48b4626444296e78808613f5a0d3d28dd7a509a82a276ee4f34d3ed8c339a98bd6aaee10ddf1c2df62060748b4c603a06ab165086d8de WHIRLPOOL f5bfe022687f36fcb06aa46165d6ffe8323bd13e990b7acecaed6af91226c5b06bc1e479f242dd6f963ff6039f633d790221559af42c4debf39ca252715a81f3
 EBUILD dovecot-1.2.17.ebuild 8843 SHA256 72e69d6d5aed5c0339f9ff5b7aa126a90fcc708594956aa85bf80ff3425942f0 SHA512 4a4d54db76f903f92273cc9908b84f8024bcae8282fc9f7f360808d1793cd3a5589a2be680526a30efdadb5953cb5657cfb06faa9ae71b4ae2c1aba937a11f86 WHIRLPOOL 5f7e9a02ea87c3ccef3fffe2020aaa9e3e9f4a5b6111641bad87ec477c01f6550645dcd9c9ca5ff2c2650a2dd59e32577d2e53a8ded2ffc63f028e78aea08d98
@@ -29,24 +30,25 @@ EBUILD dovecot-2.0.21.ebuild 8860 SHA256 f70952beb5e170f39a04f45b37cfe918e20b918
 EBUILD dovecot-2.1.10.ebuild 8523 SHA256 71869c90e3cbfef35aa97199703603c5cf2a02e433bf08a78c0de0a9d38babb4 SHA512 e98664586ca9571b7100f306297d9a5814945f3232ef360b3e7dd9c52702f30260eb99362f8172296178680624d7a72f7ebf79410eb91707f228b97574045431 WHIRLPOOL 89d823437ebc0db3227c2258d1f92d95e4103c7f676e3d424b1712691e45e6f309a2ad2535ea280523d565c85864af7549c636591ea03d0476d914deaf7505f4
 EBUILD dovecot-2.1.11-r1.ebuild 8501 SHA256 8d8acb679e0730d0943c323e6aeb7ab0a1fe94365c19d26ae333c2f9e10ce9f2 SHA512 82843114f3b68d615336d0176ac3aa8eee80d0a5c1ccf09e9fe074c8fb173ea9f000448486452acafcf20e1a8344b43b7d2bf4249383bd7d34af22f8d2b26425 WHIRLPOOL d727bbeac45bf4ad0646b1b2002c2c14d92d67c7aa4d83e013ef1bc48a48f479ac413ac6c4c2101aa0158b8522e9ba9852adc6e4a3b9ee66b6824f0fe1ba7601
 EBUILD dovecot-2.1.11.ebuild 8498 SHA256 0e7939d44a5423c56a06d51ce4e52386b34a26396a494eac1741a60794358ce1 SHA512 9efe2f252b58f329815f80629ed2a0e22d6a78b64fc9d0ff2ba2dd6bb6ebcc76a84d5404326f194d8b13c38146e63bc846e7fed7b24da56840c598dc263d14ef WHIRLPOOL 9b2f65e6c1dbceaec1e7111f4f87c91a95946e07d8293aa44569e6cac0ffc24f7fc2bbe505c132aed03e3d49f0975704e5dbac3408c66e33507c67a426811d13
+EBUILD dovecot-2.1.12.ebuild 8498 SHA256 f2bd9b31682140a2ab50016f40d00b1dc25b9ffbdc78d685e2bb5adc1f0b3229 SHA512 d9a809dd1e6de0efbe3a6980498a8007d1049faaec69d12014f1684db8b26f86ee8c9723d105512ca870a91e8be50035b8d3814c2aea47bd2f381bd6299a02a5 WHIRLPOOL 6f1f5b64d94550df29a4ec0f7f75d16859eb44980576e768214dced1483afce42b032231c7c76d8aec8e5800230a7c41aa7f9ada8948b4c57773cc56ddb6ac28
 EBUILD dovecot-2.1.8.ebuild 8532 SHA256 471c43812dd030bd700a940765851332bc6733f46ec85492572170a43df22787 SHA512 afcaad9eee3551f543a47aed76de94ce90d28817ac045dc62dd452020d2f959e211b35d033c3fb51eed468ced94abf947d50a389c976f8b4220f508961388387 WHIRLPOOL 2c6b4fa55f5862b8d0f410e9fd74c8488fd9c24a388c5c8007ca1e49d6ab9481b32a5619cf4f988c3e255e84041092a53fcef601ea2e74872aa93cd6d3395e01
 EBUILD dovecot-2.1.9.ebuild 8714 SHA256 0f1b50ab144066ff88affc755c1db0fca55ff5c4da36a3ab317368440d7b2567 SHA512 d28532b702f46d4a615eaaf104060713da17623e379d11322b198cf3890d79e075f3749d8c17b3251d02d60de2b619a34f001a3bfe0f4639527c7bb0cd2d7bf1 WHIRLPOOL 1f9a035bd7853bf36799a8d80d3ca0d67bc0ad1f3efa70e684dc944d4ff443b25791b4bd5f965554a137deb469c71f2415968a11e5577f4ded9993c3775f3952
-MISC ChangeLog 58939 SHA256 f03fb3eb6da8ba88a505f640f6fc05660922b5c3fa3cdd86496b5c13c62030d7 SHA512 d71fb7000db8727b34aaced1398861a3096abb6a8d1df2137ffdca367fbaf7d78dc21e4e044c768e5ca58cf2c7b039530edc49d1c3751191791edab60fd4a3f3 WHIRLPOOL 45524082762ecc61043357544230b11010ec07fc249ca75b96ed2816ce9a5862807faf5f7dfeff4a60783c2954b01d12ec413b753892535c7b17c3675e2c1f3c
+MISC ChangeLog 59054 SHA256 3f0c448629db3ed3057a75da6ca48bcdf29b4bf152f91d02c258a4aa961e1fcb SHA512 ab618319e790875341d92404aa8b3f7913598209ee297b3a778105998255064b7a6eb39500b1158af818b6326957b448ed39c38aa12056fb24b31959c536934b WHIRLPOOL ac570d918ea3df3607614595d62ea7d4d883a738ed8d85e3886bb5bfb4afa06f6414e95576522ae30a30099bb07643486c548f2b42e2093326928b94dad6769f
 MISC metadata.xml 933 SHA256 812401153320655b32b0f2fedd9f76466f45163240e0080a9ad186b78d22e068 SHA512 41aa2b321d6a865df42b29ba13fe8135167a91064f26a4221f5a9bd3fbaa0e8bb578927c57e7024bf1930ec7c15f60834df3efea794e7823003b70bf9cfdfc3c WHIRLPOOL ad79725cb991235ae60249280866d245d890a5824766e467dfd281aa9c4df1158b1f54931a033f6cbb78d4863c112135c36e93183bc235ce9be8bda26d6cb3c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQt4GHAAoJEHfx8XVYajsf0owP+wSUcKaYCL9PSSQzvtCzzlDI
-iAIQNx8v8HlSSWE5xOIqN0ssMSXfYY9EZfTnIFMQlNQuooqcz6G5OKExyqTHpR7v
-wl8ENlnAGKIM5Ymont1ZafnKf739xFKOSaAMW3fjLKVuob9fs1jqX6jvxbnDC5bd
-43eGa7ZgyT2cp3ILMluXn+nHDeaMIF7UpZklz0kvptHrotTv2SpoYTVR4ag5lVKa
-oss724sCoDxZyzzshT0tBaTL4YaDnYIwD18eJZeYQjG7/Hu2VFk++E6VWE1SgWbj
-mUr2LssoEj9GfiVcStLuXNpSl0IbKrzebfHM0gGnIXz/yXu0Qvh+tNdgIR4rmKao
-nsdRGl9ceqxnQZVccGjID91hZZ97RHyQSo4kziVLSRfz0gRF2H9fAcsy24CRxi36
-M5xnE5cCtbzgWsfZyarkWRJpxXerLPRzcKqyJjPFWJEdNFdOpLMptp83jr77o9G4
-H1Vkba3hb/9npRlKa5aw8NIcw8+Lfqu5nNKU/JKWcgBj8dStijtVcqqkcGx9EjlZ
-REi9kcera+EXu32UJEEFcicqCRuqIU3UxubWel/NqS65778UZMfkhI3uDeXLLlnc
-gTI0hfQl7MHRoQ2pcnSH+Xj9T3L/Z8OwuL6b51VUZSyLmCQEx/eteNX8nL6few7c
-Kl5oFapKsfYdbno3+hnz
-=Qpsk
+iQIcBAEBCAAGBQJQuGOhAAoJEHfx8XVYajsfjlkP/A6eRQXHaEkrAlqz0B9w/DAU
+kjz1EXluGItA0r7xux061pfzpcgJ1nFfeR1S8IVRwjfEUpGdCW1K9TRPTVAlYGSy
+tnirkYFRB0HWWXOYyEy9kowNGoVe/Pd03BSl1fA9V713eY/ZYKsKdDClKnBFFDpH
+91Eh5lJjXwmVGQ2uzKYqcitdQdhUlH2OK7WfajYFvpm+/Dzhu9bOfPJoLh1vWZn5
+SqPt0DzFQaIakUhltbwZEydMxl9m85xRnTaZkCwh6NJPeEXaoiigzC0ccT0hN5J1
+ZeDilp5ASN7KnEYH6n2MG04P/TPvFiWCY3kNmHTkVoeqo2fcLWr0ywGGJWN1QTnH
+Sq4BqUoQ2J4uMLKlCcZq5QgCkIZ5lp3S6e1oMbYkPvx9SPBCTTDbh7NSzlu/pY+m
+hoV70GbBl5rdHDblLaHd6GQYW1bm5OuTnq+qVK/bH/fJ7fxAZmKUVFvWmXm79IrU
+w4GzaZhh6rAemGkVAeyWX7blsecdYIVYTVSrR7j/fyZJbUqvPtuw7dkZP2EGh8x2
+UQ/Aq2UEz79OogAWVtapDhit8mjdJvCg8bePJ5oHUvX8kdvyQtc9TVFKK07BPbnB
+/bKuisviJ3ADW0u9k9m+rUFbf3vt9tZNC57RDEJhF1NauwwVvd5aWGotu4n/F96t
+solbrRdYnzkQ2te8Tiam
+=1O7D
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1.12.ebuild b/net-mail/dovecot/dovecot-2.1.12.ebuild
new file mode 100644
index 000000000000..d0e729142cf7
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.1.12.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.12.ebuild,v 1.1 2012/11/30 07:43:18 eras Exp $
+
+EAPI=4
+inherit eutils versionator ssl-cert systemd user multilib
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.3.3"
+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 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 )
+	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 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-r3 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."
+}