Version bump

Package-Manager: portage-2.2.0_alpha185/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 d6f48219fa68..307266d0a25f 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.435 2013/06/19 06:04:04 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.436 2013/06/25 05:41:19 eras Exp $
+
+*dovecot-2.2.4 (25 Jun 2013)
+
+  25 Jun 2013; Eray Aslan <eras@gentoo.org> +dovecot-2.2.4.ebuild:
+  Version bump
 
 *dovecot-2.2.3 (19 Jun 2013)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 27db0a98ed2d..c9230e46f631 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -16,6 +16,7 @@ DIST dovecot-2.2-pigeonhole-0.4.0.tar.gz 1144018 SHA256 e630d0c73e9c60028c5d2578
 DIST dovecot-2.2.1.tar.gz 4258863 SHA256 50af4c6d6d20f97b4d9b1559266d79be03da9930d20885ec5fbe4daf5afa2545 SHA512 e91da79a705873132190af7aef3db11d79c613b03a67b2ec28d2f95c2763e0fe0b3767addf604704bcb446794eb0915b28b525692b66306696fc5c6f175eeac8 WHIRLPOOL b1f1bd69c885c6da36bac53d9c4fdb4d9145a7f0f749fea4486e467a66b8d8d9eac13300fb1c8b3f6af314d142d808904ea938981cb1fb3c3726b6a3a625f9ec
 DIST dovecot-2.2.2.tar.gz 4282339 SHA256 30c98e8f9e40d7397d451a8679359b70031702f205aefbff1a6e27656fb63b9a SHA512 622dbb41044c45d45cfcacdf10cc4d83c29311730b62091591251d871c7ae99dba64bfda5bd7e10d6862a3d30eab492a75d208f30f5a80fefc8db471bb9caae1 WHIRLPOOL 075b9b8b8bce9e5ad010d293a7346db3d1e4b4c2663288936fee04ee556694e2fccbad4f7f1466a5b9f8f9c04b4833c6d33c9a13b8330ed798747b2c5856fd09
 DIST dovecot-2.2.3.tar.gz 4331148 SHA256 a93dccf736d5ce937b1d713c086d7283b5341e2ed07f5ddc646752825f22bb97 SHA512 222458744210f24c53665f385fd146d16ad5d08ae05f77a7d687a028ecba05f31542d628aec8ca8f4c1fc3bbd8db00413271fd3d0e93febe5a769f419cba8441 WHIRLPOOL 4153d6c060617a6806f94f3840e761d425386839922fe894181e2ec4b51dd75539395f45de4fb5b8fdfb5e9c3623f83fc00a8a2e998c59f74adbdffef93b3d56
+DIST dovecot-2.2.4.tar.gz 4335791 SHA256 018ffa5eb3a77772cb7ae932a67449536d92a3fa9781202481a4203c003dbdc4 SHA512 c5d33500af6c8440fcdb6b6c2a495b495066bb013985284d9c5b3ba4bd52a0985b37047791a5e89e6e98148590e22596d2574156614ab71e247173f9a828a2f2 WHIRLPOOL 42edbda3a96392c4bb3cec47b02ee472520d4b27d05a4c21364019e4e6fd209731718de78c9924299144d201ef394dbf3b8453ff56a2da259e7229ccad1c3a25
 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-r1.ebuild 8641 SHA256 c2df2ed4180f356fe95d598b46d73f16878c9dc7cd2edde7f60ea5d9747a384c SHA512 7bc8fc194a19d1b61edd4e0d6e714d18a659e80960456d8abe0d2e804c04507b79faf9b48103341553f83d86a8716bc6ba84f9679b6a960fcd9d12885be7f063 WHIRLPOOL 709415f65fdb97fcde1a4478c78f2d32a2d49355bbee657437512f0f431a87227364ccd2e889debdb0c5d4bb142f8fb494d5dab37c2b09d8b2876d000179ea0c
@@ -25,22 +26,23 @@ EBUILD dovecot-2.2.1.ebuild 8563 SHA256 02723b5a19724ee045a2d0d5a06a6945038264d2
 EBUILD dovecot-2.2.2-r1.ebuild 8637 SHA256 16159458a4d3ba6104c6120601b84e86069828bc1b582802237147bc870f1b97 SHA512 d2d081f70b059d43c07bd2b43cac5a8ab5be550ef71026d4bf35779cae2954244b88a348d8e4632cb192b27633a2a0be713bdfc9fcbaca37bbf42df306ed821a WHIRLPOOL 8a4b73d920e89636985302245c517ce9789dc88f30588a5d0821092746adcae4fd119613ff27edc8127cd054db78eecd7292a444a5ec3b752ebef01a3ad4bd0b
 EBUILD dovecot-2.2.2.ebuild 8563 SHA256 8cc32dd996b9aae9ab5d00f0d78b879ba536a60524627dd6f22c559e49b7fb93 SHA512 078f3ff658d39c4c26680c14b6efd71538d81f301b4e4e6cd40d5ddedf25f3d15aed83cd1e2b2fcac56d487e40f1f3545d9e6b04764025304f000f512650942b WHIRLPOOL 354963c06d1f9b13ddf8fa456bc015cc456e321bed6e036f2a1e8fdec8b51531c3877bc5944acfe0252c82a8c0cb09e7aa226262626a43ca7ae5d046ee22f16f
 EBUILD dovecot-2.2.3.ebuild 8631 SHA256 4355540dd4296ccdff76c11b35607a99200b43e666e91ae2c36b956a67a4cb4b SHA512 228ee923597ac923a14d36bc9cd09a146f1ce1ea9bea21daf26eae83360fcf6acbdbc66c740554e24bb3aae71c6d723649f228e2c07ac9782bd32dd6d0ced1f8 WHIRLPOOL d41548bc2bac191028aa0948ab07c4db5a110166040080c708e7b1c397c7b11610d019165f391dc4236e221881e29c3bacc6bcde7634da82fa2e68d825ab8856
-MISC ChangeLog 64972 SHA256 80aa357285e6030a75cc3e0d462e88f54ec9ef74e39fd904cb47251fc87065a1 SHA512 06945436d163a0b09a8e0ba1d445a0c9b726a3b16788f0f4dcc084191a681c69768607eced9f85e555f31bfdddabc8d9ee5b31be64be80b40fa06666e5ea408f WHIRLPOOL 4b6c2f66cf91602a88f4e2d5b3cc3fd7a1c678a72dd9d71b68c77e7c4da81a6879069b5a2abcfba4751f4295ee5181e1a7eb9940b1def6f17966bb814aec380b
+EBUILD dovecot-2.2.4.ebuild 8631 SHA256 58977abbfea2f5b989bcbbcf466ea8d1ce69e7307fbc3d63bd0b5d1ad0bf4e54 SHA512 8dca6b1714d32a4bd8cc5dd7b61b3db8f6ffe909ea6ebf9cc9e4402f6e884f683e5f073e917a76ebd16d9a9a3a75dc8fc5bc50ac24e059415062e08cc228ec9b WHIRLPOOL fa8fea3e53f32e741748b440b69126ad79823f16bc33a428ee1b30a4f974f9dab72170efb63a17113fe1b6d13c601d7285cf49af9fffe660fa432d96daee8364
+MISC ChangeLog 65085 SHA256 a998046087c27b550fd6a61a943755797b115c19ecddecdbe0e83478c697109f SHA512 a7fd46714a700fa15404171ca3a978964bed3ca5af8229ac37cfb5845bd1227057b89c1784aef75ca91236cb66cf7aa2b7b40ed3681492afd1f2dacd14e7cc49 WHIRLPOOL cbb2130f722084f3a173a8af5bf2d10370c617bf0144d9aa3b764a74f28ff9965c070a3ee0524019e2c23c3f1f6aaf70d7f0ea992af8d931e5b063d8abc5760e
 MISC metadata.xml 948 SHA256 ad1e5324e4ac307c9fd4acfaab4375a91399c3302c0bf7a358cc9b879953e64b SHA512 a58ed0e97a8ad182eed6a253b247a388e7e6a955ad0ec8c2c63469fa9c77d0af824bb00d959505cddda354ac434da3e22100cce7449556268ccf95fafe05f98b WHIRLPOOL c5977d6032ac360f22b723fe811e3c65988cbbc06952b222666166c074092bf4ef68465f19fe689282a74a1383c1bb99802711ff4d7b8501cb989d8989385fed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRwUnbAAoJEHfx8XVYajsf14wP/2iYfeN/95H3QgXik6BeO8Jc
-ULfAd+UL1xg0e50lAzbZDLqRVhDgxSOLaXqOIThjRu43Vha3kIsurplqiCiJjYVk
-qkavGrPzDARyvNDyGBetBOyt+oModT4LWEIEsert+RKeWdXCdwXvSSXJIVwUBjZe
-zopnY/jK4b+3TUyfcJerAXO2uIZcnfXMLHWzljJZuHUqH+6vUCjNjZNOpJxvwjIU
-qJH8jIO/SQTlY3UnFQVjrhSD4Mh6J2zgqR+VhlBmC6dNFK89YQ+ZIGupXH9R6pmV
-O7p0sjNOepCsWvNtjdujWq6KqMLhQFYVs9my/mXo+lcbaCVooQIbVBKEBs7nEbaA
-nPNB40ExCkV12LrxZw0Wz+DsL0KRh4YZBkVVEmLu5tpPGbCDfKPJoDW/09nT6qob
-KTkmyYu0FcacDTYVW95gfGELw5Jl+cUWqc3hYGIvJiyJ1u5CNbcPIr9O5ddJPRWn
-J2nFtFlB41k7GorgNoJbm4xRAENWIQYuNMpy9owQfGjDt4vX6Va/PtC3+uWeQiy4
-lXHK/l25KgO/3+JiIfLWbZ6JhWqcflJiYs6h2t0dGqtjpo41S0NBqhaSbtEcLQx4
-1gD2d0b44Rbdnz0bdqbuTXzO2mj/m0F/GdJwhVeiFaEdDgaFz0cGlAsCAAvpNpWd
-mL68DziLU+rkvj3gRLEe
-=/T+a
+iQIcBAEBCAAGBQJRyS2KAAoJEHfx8XVYajsf0K0P/1Tr1QSq5WzeZhRO6jePbwUO
+VtuyIgLdo1HdVeNMilN39zIstDi6mij/MVYNQejJXPzAJ86w7JrZ9jb/7HAfV+Bo
+IkvNNxWQ9pnb9BIAzZ21DUQbgOh/N8kiCtaE3smuYXnYxCk98nQMevqEOAmw2fJ0
+LfA1wxtERoKm9lo/2ku9+8DX4RVILjzQtQVdMLK4Ir/q1dO5rnbt51bbRAuQvAQm
+zeMe9xkIF3gq7nFl9EljlEo0F2Gobmchco1NYnizIOH3qzjhgVJqvdoL061vB2b5
+LBEc+hESuUnKVw12eBRBYi/8pFHfBAnIetFno7nS8xKgp6y3MyFXbffLz3ZftVrj
+S5N+Z/3zflsHJQzCVYx5gqo2MPqkppI4CxT5kqwVu7wTGJ5NvTDW+tclORVL0po+
+LpUykJ9crpFfd6NnFHbJCFerwHkEdGHsN0/TdyyaXEokMHT+NqCtUHeY957fTCKb
+Ppq0a5CwXjO7giObFnp2Pj7ZrVGUj2q3Lx07bdTUz3KjjVvn/Da97oEVBsJQoJff
+K1nabgaWVp5UNriBtBhnA523aIRBl9dEb/KR/P0nRFZWtANRd4+asPH7nKWPKnD0
+Uzfftsi3zUQ8GrHA4vG0d2bKK23ruTHSCad6+/Kb0b6o3k5cD97I+frEBiMCyI9c
+gVw0czxVNEyU9c6UaXBo
+=usD+
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.2.4.ebuild b/net-mail/dovecot/dovecot-2.2.4.ebuild
new file mode 100644
index 000000000000..fff8de02ec94
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.4.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.4.ebuild,v 1.1 2013/06/25 05:41:19 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.4.0"
+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."
+}