Version bump

Package-Manager: portage-2.2.0_alpha129/cvs/Linux x86_64

3 files changed, 297 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 2659fbabd2fc..57d3659dda3f 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.374 2012/09/03 16:05:01 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.375 2012/09/18 19:26:21 eras Exp $
+
+*dovecot-2.1.10 (18 Sep 2012)
+
+  18 Sep 2012; Eray Aslan <eraya@gentoo.org> +dovecot-2.1.10.ebuild:
+  Version bump
 
   03 Sep 2012; Eray Aslan <eras@gentoo.org> dovecot-1.2.17.ebuild,
   dovecot-2.0.17.ebuild, dovecot-2.0.19.ebuild, dovecot-2.0.20.ebuild,
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 88227a6d7e02..d133441592d7 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -15,6 +15,8 @@ DIST dovecot-2.0.19.tar.gz 3357056 SHA256 50e49e181acea7f2c08008c5a61500c01803dc
 DIST dovecot-2.0.20.tar.gz 3360751 SHA256 fa630159127e710dcd623b99bc655d1f5f85891fd1615f194ea72d4fe3cf82c0
 DIST dovecot-2.0.21.tar.gz 3372011 SHA256 540ec583703a29c95eaec82f0162b8e5a86ccca4c470e9309ede82b40e8e8145
 DIST dovecot-2.1-pigeonhole-0.3.1.tar.gz 1084148 SHA256 e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7 SHA512 9df0a428f43287606522120a368c07513b39852325c436bc9c523e52f82a4c97232991ca832630baaa8c704adc2234ed18c2c0a63f8211f7f412dbe285436240 WHIRLPOOL 72e346e338a3e0149cc978ccc9c54943efad165d82d54cade1d954688f1806b30b3509c7f90c6589673c2808f9d85497af28aec63e2e060ca5934ea4ef101e9a
+DIST dovecot-2.1-pigeonhole-0.3.2.tar.gz 1078365 SHA256 532477bfa7aa49501c8709e213316e8d02f221fd019ca34772bad26d404fe243 SHA512 cebe17a9dba67d584515fc2267fc2007fb41e9c2e966608ea2e6f48a571fb6904414ef46b9a1f795d53a2a70396c34db375f6e7e3294c34476f20d5277e0cfaa WHIRLPOOL 92895e4b243509894ea7f018269f86a1766dcc72e282ee970fff22b679fecbdee11f2ce84ef8d056c4a6ef88d89a43d10bc4969c4754c2d3ec10ed72e1c523a7
+DIST dovecot-2.1.10.tar.gz 3843490 SHA256 8acc99c2a7e8b598aef2fef443c5fb6779099e57573f86a1eaa2b8479d0becb9 SHA512 d4abc4788f90e63fecf6ed0786b26d855b1580e99a598e06a946a2bfd120ea23533bd96b28304cd517f7a74d7115086cc8471dee3d3b0f49389be2dc43252931 WHIRLPOOL 0ba5cb11deb672d306466f2d0c707e714adb5e152370db5cedd7ace5d8332d72be8bd2b1e8d5e624106fd22c27fa48898f3a3a2446204f49e5f96e44204dd56a
 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 8793 SHA256 2d1a8c2cee026d11c56b642f5bd7e9e750669450eebc2aa9972257d3bdb97085 SHA512 a59d5fdf9e0614bf56e63479c7edaf18de957e88c2d965a5359f7507e642c80b53e9304434238226cf92a715dcd08600cd7ec696967eeb936a0ef5ecb2f5627b WHIRLPOOL aec8d622f89848fc6d5458de71a421665f168807e3dfa88bc159bcd1e176202ac4c48be943ba21a8f7a940e76af6727d4eb7ca2f6a9cc4e6a3fc20458ca3fa60
@@ -22,24 +24,25 @@ EBUILD dovecot-2.0.17.ebuild 8823 SHA256 549bc0240db5fb9beb724ffc828dbd9be3f54f9
 EBUILD dovecot-2.0.19.ebuild 8822 SHA256 ab02343ca4775fe85100cb744645fe803ab7abe3696d2bb2b5272b6a19e30906 SHA512 b66b9f4c4ca4cc8df1116ba64a5b158092ebb5f91d8cad75ee00288b48a0e61561744c99c1599dbe37e3dcb5222d120c538dffb9dcdfc8172a18afb636a9fbdd WHIRLPOOL 73a46484c98e60951b2462e2e670de04a703695c296e1279209d2e242debd1f8c76be3d0049f5e54b4771a785ca1184b576a3c3de144a1d246619c5a4abd3eb8
 EBUILD dovecot-2.0.20.ebuild 8833 SHA256 265dab034e31522cba6c36ce85a7fc453767541031bc24b69ed909a33ecad0b7 SHA512 8035f6ba894004a4f4fbabb9f723e1f5b424fefb6e61d71abd84404753b433d5344a144b41ee1a1b0fa030a092e9d3d1e7b347a76a34e59c14c5b221ad6f7a6e WHIRLPOOL a84afbd38f3fb5a1eb92c31de30eda35431e3a42fdc4057059e4988cd4837c8ee4d49c40744698c7406525c248ca2ed7fd7958e74028f9dd72ce35068a88b061
 EBUILD dovecot-2.0.21.ebuild 8810 SHA256 ee04558862ce9ca95811d43ebe7641512a0074f68ebe1a5aca6e43397e96b6a1 SHA512 b3e6bee99e21010ff91f660db1850e120a042a3d1c3d61ef87a24ca43b4876e8f50506951c8fc1c696c9b64bfde992178d1c1b84aefa2d0a9c6f18de72cb3b6e WHIRLPOOL 335d367afb16f6f9da35d6766d256ed810c76db58c4844c935eeaaa71e405cfb9fc7e3e5aad910e297ab1c12a0c4f09a41b7a11619a84518ee457a50437fe0f3
+EBUILD dovecot-2.1.10.ebuild 8463 SHA256 fa2f383cdf2e19bc062feebd0f91fdc6d227f3ef9b254ec4a6ea25a3be384bee SHA512 64b3458df9a3fd8481ac3bec251246c6149799d48ba39322f079cbe356f76255855f4c1322e1394f380b9adbe7dafd8ac3b8fb6a32cf60a5e4a6d26804eac4f4 WHIRLPOOL bdfe813deafc38a645ef2e4699f4e6dfcce4a69f5269e393125f8385ac7c591841b99208cb1bbe9028adcf379564406042b1c56c2244644916478f2a34075467
 EBUILD dovecot-2.1.8.ebuild 8472 SHA256 4a21e216b602d5114cc6646a4d308c0d5ea5044ef4b51ffa5c16b33cb1e813fd SHA512 f840c5d07d898e4ff78ac913b471f3e0e447ceff627566e3c2f6b09a25b13785213973284ed6aab3569f40a7f33fa609099354051d0c11af35766975b620d799 WHIRLPOOL d0481819516ed841b074808a73b12f54b1f524c2570fab49998c8890a7924d5ffe5285a818be59c883b597a7abf98f9fa64a6ff35ee67d9188ab9038ce90254e
 EBUILD dovecot-2.1.9.ebuild 8659 SHA256 11b6fe0f219dc231ef062dacffa45f005f034f86ac5b7c7b1d28c47e6bdf7125 SHA512 ce145b2a4603e622a861c48d5e79e99d4cddf84048af5176f41268945d6fcf3f2fd4729605e9ce65c85c1152e822b2a5e4c3bda7daca5bde166fae74d5e03bac WHIRLPOOL bb47053f8bdf0a5b52b4b70e41f86ac14d99ed984b55390963964cb5b1d912c022f4f89317e2d2a1e54a5d83e6946826723e33c86b3def74422921d9ecd58085
-MISC ChangeLog 57550 SHA256 165cad7e85580c454bed8c96157bde9264e5d9a7e21429b4e41d096fbaa80ffa SHA512 5969d4110544a1c0fa3241d42caad6d85f568c24db9fe1d5ac4bdb9fff5dc3bba651a853f1a857cd376575f5295614fdb96f85c88f9b9f510e18cb3373b2de33 WHIRLPOOL 949907a6d4569983fec76d6294f173e902b30d54c5e4e06f3fb63a3234639d5e96a93361d0f233eafa405d11fe95129bd2e4e3db3d13b486b2c48c9e15357b4a
+MISC ChangeLog 57666 SHA256 ce474d41592e84b2e8ea414a660c632f40f87e71e4f7e595e003fb956eeea9bd SHA512 55cea42fa1f0ccda5adb6518ecfb75fe8b5ab45737a7ccfe3b8ead73099d266f3c823996ad817fa74ac8ec2a1bd6e72d37817c9cfd7b66ce8b70552aecc8ac6e WHIRLPOOL 49c4e9c76af4bdd0869380fafed8a5c2b17dd552d2dcced8cbba0c243d713364f87ea79c38107666f18b345151874bd2c3f0de16fa9911704d89d9b4fcea0edf
 MISC metadata.xml 871 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8 SHA512 651ab1dc7f14e5a9749ee2b249fd1c135da045a51861dee59adce119e1943259d9d69cedb68a45ebd2084b16d8baee13ac78130c7c58044700fe285826943a4f WHIRLPOOL 9aa300af8a4d0a0f59c06337081cd14f3d7be9197bdffc6db9f144f5eba739c6a2fb0e6dc3a465df6af030091073262c4c277b6b758c8ebd27be397c3d4c14d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQRNU0AAoJEHfx8XVYajsf2bwP/Rkm05EtiizKIqp2hb5QhCpn
-aDzwfOxmk/dRQgHgeKQpsBwrR3DD5bGE6ww+wGeLlmbFg6LCn4Q6D00/Ns6p/CU+
-T7cklVbaU40EVTQNHmcDVhunWv4wzxbv4eGBicnyEVP1+twrXPOyqhEqJ/AVY5cz
-wfUIC1xOdYfUtVHzUFDqWrZfqHuhD7LKtf9EJaVlUvCWsCXI1OhkKPAxWuXceOMz
-GQH6JxCUUilA+ec1PIRJaBfc7AAjx2WDzvmnMqvRzzelo2Q8MgI1s1rQFPEgx+y+
-/7VKh6dSnCGdJNxg2uuisq7ecMwGs5VgzTrPZn3IDS4j8JHTwBAwZ1Gi+ShWbto4
-p3pSDEXqCYZW7lnXHihN2T8kaFqpUElj/Bo5xve7f2/hRGuU673na8796OqZM92W
-Nh7NdvSM7B03OAFCYU1UazUVQAvPC19oyfYzod4yJZihTem/DkSOIGTrrWRUEp7G
-+b2NR6/tlAmj/4fEFmjttlxY9wJCdAp1YxTPRZgg81hF1/XZG9/XNEytz2OfLEq6
-VuWT4+mKjGqWENqe774PJQGKkZTRW2lOU6+WZNBAlN/6ZEMiiw2pAmmdF4KZvV/4
-/tx91b09+KqLZ1oTteDNeS6POPaNvSbPdxyIfeN8DDS+0KmGZRS4hzU+4fzIORoJ
-fUkSCRnS2xe33SPF4jS5
-=wjZt
+iQIcBAEBCAAGBQJQWMrtAAoJEHfx8XVYajsfA34QAIQcDkPl4txkvwYqTjsUzE0Y
+32nBm22I+6P3T2uiv+C7pKKeBjbG3ERkrb+RMcS4Lpp7MJrchAt6XBuB6z8rg93c
+yHbcChOORcHTHN9FoHLCxebVkGm7/NP8DI1lpOflneOqyLpOcUQYM9LHSVLm+Ibp
+R8xIIWs4gIRdWZ78RfYH+lxSVUd5tS0+sO2VK3qM95EADbpxgCXbgOGai/Mu0hfB
+K6OgZdIxRS9/5vXmRlBMFp2jbnqrpyVIVq/o5unvTVXwu7QAE1NkWV1WwtLAPrE+
+aiA1YpQMGGpHAoTqAgauFSfQk+PynsCjvddh956euDSd90Qm8mljsaT7duWanJj4
+mGOI37FyBwGpqJfUrKdjR4bFKjrv8ERz+snt96ScVgI8edMq/SzwNTQWfXE4+0yp
+jnDvOEJ5S2euMzLruw47rkaCC4WAmAFxTCRsTSEbO32gecTeiXEA2tOQ66dJit9e
+XwsmFjp26grBI/35nF77B/AWs3URoIXPu/c0Xq215qdi4wxg8jR8jfBYDCburDNL
+o5RLLfDSI+kXMDtVAAsCmnBg6PD22dCDbZjoIdg1ZZ7Q9Y8FGzUsxsG9nmyQ8c/R
+3dbH+WcTyHhv4/Fn2ySpUEma/ZQritwmdEZiYdme310W1VoRqRXe+Bk3JXVpRRi2
+ZeEU4CbcBRIglmEjjlH7
+=tcKP
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1.10.ebuild b/net-mail/dovecot/dovecot-2.1.10.ebuild
new file mode 100644
index 000000000000..ebfad626e0bc
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.1.10.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.10.ebuild,v 1.1 2012/09/18 19:26:21 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.2"
+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 ~sparc ~x86"
+
+IUSE="bzip2 caps cydir sdbox doc ipv6 imapc kerberos ldap lucene +maildir managesieve mbox
+mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib"
+
+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] )
+	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
+
+	# Add user and group for login process (same as for fedora/redhat)
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in cydir sdbox mdbox maildir mbox imapc; 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" \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		--without-stemmer \
+		$( 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 ) \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		$(systemd_with_unitdir) \
+		${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() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+
+	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_src_test
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default_src_test
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${ED}" install
+
+	# 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 sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		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 "Upgrade notes can be found at:"
+	elog "\thttp://wiki2.dovecot.org/Upgrading"
+}