Version bump

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 d078892f8b28..b6cd4b33b1b9 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.456 2013/11/21 16:07:40 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.457 2013/11/25 11:57:55 eras Exp $
+
+*dovecot-2.2.9 (25 Nov 2013)
+
+  25 Nov 2013; Eray Aslan <eras@gentoo.org> +dovecot-2.2.9.ebuild:
+  Version bump
 
 *dovecot-2.2.8 (21 Nov 2013)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 24f2c1efa48d..efb1c112d328 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -19,6 +19,7 @@ DIST dovecot-2.2.5.tar.gz 4356745 SHA256 15b2cd607e6533f4805f471a61dd1c8bd81675c
 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
 DIST dovecot-2.2.8.tar.gz 4524064 SHA256 fad94f3378dad306363b1f06de729e41a050a4f72524ad8da1bf26596a2c3309 SHA512 56bfab6376ec88f01bb447d725ffb9d03329cc7614cce40db3dbb320a5800b789fc1e13b8dede7f96232f04d1ad1c0d75ae885ec862e36dd05ac84f807fb3858 WHIRLPOOL 00793e64e508e7a19dad6a73651417acfbcb25c44ca58e20f78d52e46ab775b28c9cb26386db6f9ecc9ee3b893cb5632d9417448f0cfa508bd75d0a44b6fdaa1
+DIST dovecot-2.2.9.tar.gz 4540858 SHA256 7c3b6b8a05f6ebcc9fd01736fdcac0de12158959f5b99d1f7077f7a8626ee2d5 SHA512 41f826df22d3b34116de7abaa4543cbcf9362d7db1348e3b685019263b89d0ffe8bf0c1ddf21e4baa3bb7e98c87047b85b6fec78873df7f0db18ccecf63cea55 WHIRLPOOL 775cdbca9be788b1d20cd7f45e4d9a6265936b39a780b2232efa84958fa75a11f0984f680249e2af5faf40c9c91fa5c57026b55865dcaeddabcc90d44e3b6fae
 EBUILD dovecot-2.0.19.ebuild 8872 SHA256 672190f8898d8587dad95872745bb65af195a77e2894527091e9032d4259a366 SHA512 52ef08b376d6bf6a443e9c4aea0db3b6a1a80e3cc0a899558e6dbdac6f36fbee5a1a84eb96f1d396a114ec74bafcb8ffada4a64a05a976fdbdc88c800dd0ccc3 WHIRLPOOL d4debf95e6404d908ccfbc1b01315902f77364c998488e1edd13b4a1008c308a3ba51479d228df4969e00efc29bab849216453d847d602f058674fb742aae6a2
 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
@@ -27,22 +28,23 @@ EBUILD dovecot-2.2.5.ebuild 8622 SHA256 1e03e1cf58e2d057a1b91e88523bef307f7f2b86
 EBUILD dovecot-2.2.6.ebuild 8629 SHA256 3cfb5f8ef36ef90fa7522c08d2aed2acd9fdacbda9ef45ff81404edce730b79a SHA512 bd8cf6d9bf50d34eab57af4430ea40f2e3f112d6001b5c3e0b23aba5706c7ee1810db59492c923958f7bc0be57942e2e0ab370132c0ccf8a793f312c8c9ec0e3 WHIRLPOOL bd21382f5ac148d5987317be4c488a554502ac0313c31f0c915e755dcfa1715fe2aad1d3c1283d9902690edb660ca7b22b4068bce06cb699bccced81cfba91df
 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
-MISC ChangeLog 67587 SHA256 23015c848b8915ddb0c71770e03fc0bd569a9e65c03f9682c9f56366cb7cb37a SHA512 da22f80c72160ad653fbfc0c373e2d50004755e88c2044a916c9dc10b663c12dcb38e7de2f91363dc101665569d08507c2d276070e5535976deec6df7ee071c5 WHIRLPOOL 52c5e08c70af47e38ad2194288f6e3917a67ba2588e10f9c3e241dd4b22ade1b42230dd2b97f13011a4ab5877ef0c7ed4cb6c3d3be547b65c63e741eac62ee37
+EBUILD dovecot-2.2.9.ebuild 8631 SHA256 1131c705b43e422db399864d56a362687100ef2ca5d8c2fcd113c9c158cea3af SHA512 99395e15d8d695a5cdb43e9b2365d20260f617cacc1b318bbdcff678932ee1829e53a50437f0b8cad44d45c10cb0795c1cd22c99aa9bfd735e54c318bf2058f6 WHIRLPOOL d233e979522a35eaadecb05d99b2a149e51e24af835bddcea6da39d22ae8b321253c621bb716df0f0337bc4d3a78e6fd6258abdd0c774e5b1ab2fc360bccf4db
+MISC ChangeLog 67700 SHA256 0f6dd8c4a6e283922d9f8126d625e244d647bba90804fa3f3d85e837739b4e45 SHA512 4142465a5fc29e0d6152e4f14873efca1f9a130ae0ab1fc347222798bd7cbb22b4c57f8fbb5a53d061ef49134750eeb3e2e9d20ed2137753ea2d93c8aee55567 WHIRLPOOL b3864e265bd0609bfdda8aa3b90b987c181bf92e88155c618b08343e92fc65131f3b68e97f434e5a9fc8a6c375bb6fc467954cdb3710c0fd74fe590627231036
 MISC metadata.xml 948 SHA256 ad1e5324e4ac307c9fd4acfaab4375a91399c3302c0bf7a358cc9b879953e64b SHA512 a58ed0e97a8ad182eed6a253b247a388e7e6a955ad0ec8c2c63469fa9c77d0af824bb00d959505cddda354ac434da3e22100cce7449556268ccf95fafe05f98b WHIRLPOOL c5977d6032ac360f22b723fe811e3c65988cbbc06952b222666166c074092bf4ef68465f19fe689282a74a1383c1bb99802711ff4d7b8501cb989d8989385fed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSji/VAAoJEHfx8XVYajsfFC0P/R0M7nH3mMVlOPQV63IexHIG
-Wi27xaII/kRfDwQR4RE22/MW2Lf7aRAQPIt0hE+GBJ3exSTYpWnky6uy7gDuQyg5
-J8U4AncnEKyXstEfYEd4F1OESfig6MWnvWWYqnumRaTzXNX9eRWiT/8NIE9ADFEH
-Xq//RbkcYl6+1DHDzzvVcy/xysmjUHriHWaAVbcQkNtGSshAP8TLV5Ng+hC/x5np
-MXe1SG3U/h6DRGWS7P0WZkxf65ecOup1hdguVhUTZs64rD3d9/4FAFpHNz+IPDj0
-/Qxjbe7t+Jd6+I9/Mp+jkEQ0jQR/0bJnSkOFEMklwwlYFZNwXCM51p/P4ddfslcA
-yN0sjYnVAEYXCjpU9DGM+lalR5tt/wpWZjTeId2EGeurpS1CGyIRxjOfrOpgATjV
-U/Dr/HTZ1ZKEL71TmeyFT5ChR/S4jqRNdendLuPwgtZJaAmqLQ5BIfFlw8EJkQIF
-ZUtDt2mA0UjYbuEK2YosVfgd057V6IFweKjq/Ri6FrSZciO98IDdJPmB5brm+66u
-aSPSq5VuwY7Ivo1OqvMyO3iwEWKAOYXGetd99hf97a1oleiMktPHWBFde5CdLfvZ
-yMCGf+y3GqxpYWrPkpnNg9QUgaJKOnZX3pOmLxPowwBuucorVnTeYaHCfMcQCTxu
-MbrWJT+dimV/2EdDxpie
-=pkGh
+iQIcBAEBCAAGBQJSkztOAAoJEHfx8XVYajsfZCoP/3gGlQbswGq03Y1ttBzzwcrT
+IvzlRM+wYZAt97aj/QiTUlUXU8/rbdQVdFgPjna5xDVr5npvsPegIzB5EMcn8nPr
+JaL8cjUOn0XGhpvhZ+YDt8jWjS2XaT77QsYKU2j3cTodmEWO2YoWsd23s5shVUUK
+Uoq9ouZx0NfDdvWcSXJ2cCmRcMGDEoQFJoKrut6jG64rTRGPLL5M/FFCKUmn9umH
+rMqQPQ+LYIJkb6qfvUZ4t4jHdtnC+edGs8C+F7gM2tajyR7z0Q7AFjIQjSxoIlG5
+mJz7r5Af700uhTKQSQwOF1S8waB2PTY1siFwAOEtmS8OwQ3p5HcEk7xtZEyEL49G
+jd9cAB6wqCHBZWxfRb/wm4c0dRzbp34gNVkY7RzXU+n+HvLV5ck4UVILguMmc5En
+gh9EGPFrsyjksGg/jE/7BDN87ib5zHsGXdn0PXJyWuLmWQgWPUn6FryX1UCdWbUr
+NTKEwqJzrHY8Z8bl4STCop+HtjsNQZguxgPxwrSbaK589s/aGlfADNZ3ORp/vxGh
+xYRDN3kiDqCNqisRPMVtXdrIpb2EDNjfJV/Ux3+aUDhPvf/78QTJpoTeceeidmas
+CDHfnqCwi93DGZox5faw4JdUGjCOFU/Xkfn8fTa2+8tbAVqmnujvJrZIGh6r5Ujg
+qNoAvV7w9rAWlCw0rW82
+=jyY1
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.2.9.ebuild b/net-mail/dovecot/dovecot-2.2.9.ebuild
new file mode 100644
index 000000000000..0d54b342be32
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.9.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.9.ebuild,v 1.1 2013/11/25 11:57: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."
+}