Add v2.1_rc1 release - bug #392709

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

6 files changed, 406 insertions, 16 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 94d60722b761..f2d5a0b1cb2e 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.330 2011/11/28 10:56:14 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.331 2011/12/04 06:59:12 eras Exp $
+
+*dovecot-2.1_rc1 (04 Dec 2011)
+
+  04 Dec 2011; Eray Aslan <eras@gentoo.org> +dovecot-2.1_rc1.ebuild,
+  +files/SnowballAnalyzer.h, +files/SnowballFilter.h:
+  Add v2.1_rc1 release - bug #392709
 
   28 Nov 2011; Eray Aslan <eras@gentoo.org> dovecot-2.0.16.ebuild,
   dovecot-2.0.16-r1.ebuild:
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 29f87f398249..779bc1bfd32d 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX SnowballAnalyzer.h 1780 RMD160 7de1e12e51e017045fccb16b0627c9f755b9111b SHA1 c2f1899229af2de7fa1f0cff5f9879dd782a3778 SHA256 363357e7c1adf7a56e34ab75577d795781c2f9615d2334ace0f56bc6b3d6c706
+AUX SnowballFilter.h 1336 RMD160 1b3658873e4bdbca3ea70d8dc8240434405d541e SHA1 1484e942088861e16dc9cbaf817ff751c9c22935 SHA256 efb784cec3ec06e4f345655f303eadfa693f0d15c5c438d47da1104640849aed
 AUX dovecot-1.2.init 1701 RMD160 89cdc58d6ad9ac41f8946fabf3c80e0b9f4b61ea SHA1 9cbf10e9d1997ad3703ee1ae37edbcfad6f16b79 SHA256 44b308537454362b00f8ab87257c4a0d8eb5a183452ca2e3487f74b642fac8e0
 AUX dovecot-2.0.12-sdbox.patch 545 RMD160 92b9d80e3cd1c2f915d4c4fcc751a8267c9cf619 SHA1 6046b2a8076b478deab2003142b31020f875fb5e SHA256 f4f70d4ff9453e5ec3246b3bef27adf101de84ce2d1dcff50577ff79b22d9441
 AUX dovecot.init-r2 1599 RMD160 25ef78d824139012d9df98d3f7f0da420a84c061 SHA1 c796be3c8d1b97a3abbf5026dedeab6750187b3b SHA256 208dd8f1f29a09aa306ea7f89aedf11468b187141f2c39b7c148e6007c8de4be
@@ -16,6 +18,8 @@ DIST dovecot-2.0.13.tar.gz 3272542 RMD160 2c0edd03aba7935e6db18af1384a26bf0b5b43
 DIST dovecot-2.0.14.tar.gz 3300530 RMD160 f138eb0a290089a308aed8aa40f1a69a64f87926 SHA1 47b4010b277f39cfc9afddf8c0a30e40a17da088 SHA256 42eec803c84bc21a7658a0637428ef6d2f4e2ea8e8cce1177783cc4812c3c7fc
 DIST dovecot-2.0.15.tar.gz 3303717 RMD160 2c315bbce2d7173b1e62c96d3a4bda0910a59d0d SHA1 b90f5c1610d8866413fc39cede218534ad6490e8 SHA256 63640303b5deb299a605a94ffd706cac6866d934175b291d2e66f64e95b97e0d
 DIST dovecot-2.0.16.tar.gz 3317662 RMD160 dfe0cf2bbd211a07bb492c2f0d944a6a9f1c5f79 SHA1 0df6e84233339ee308deaecd8f1a7ffddcaeca16 SHA256 a9652ce1f0767b9a4d4f613dd4d41bbe7b55c25728be6f1283dacf0aff62f057
+DIST dovecot-2.1-pigeonhole-b3bff60a18da.tar.bz2 559589 RMD160 8663b39ff8a517cd7188ee07d9b5ef2c40e0223a SHA1 b95dda50d077a207e1d6eda713df3342a64fb681 SHA256 fa819e96b6620e690d0511b34c741b5495fae59c5c6f71e035f3b4c47165b174
+DIST dovecot-2.1.rc1.tar.gz 3561759 RMD160 f45057183702fd6faa5aca345fc48755389b6387 SHA1 ef3a5803118bbf6fc9c67c4b4437ff3910305828 SHA256 629c34f00f269775f55ccc3b2e5fa042632991b1594b1ef1d4e2663dcdacfb33
 EBUILD dovecot-1.2.17.ebuild 8744 RMD160 1c40bc02a47f1bd32bab43c5a37129a53394bbe8 SHA1 5ecf16dbef283f4c0279aba519d129d45e7b2298 SHA256 8f086c275f79bda4f54e2c9b9758c8e636bee12e106748475acac0967238082e
 EBUILD dovecot-2.0.13.ebuild 8928 RMD160 4519a9482f527025f0608c196f4459ce39b5fa2a SHA1 e703435608e33381cb3c27c036113f3f07cbc086 SHA256 047b4a5964a50753d4d0604e517af71a6442d7ee79f1e6e49baf3da40d2d2622
 EBUILD dovecot-2.0.14-r1.ebuild 8857 RMD160 cd4ac752464f887f6a67d8f200a52ee77cd50710 SHA1 fad9c74dc2bb48f34514c34ddc4543429dea71b1 SHA256 850b199377ca85f4e32cac0dbb6e6502fb6ad689509baa2ca72539dbb8047038
@@ -23,22 +27,23 @@ EBUILD dovecot-2.0.14.ebuild 8854 RMD160 926c22e953d956dc3983fbbb8d7eef43e9700d1
 EBUILD dovecot-2.0.15.ebuild 8852 RMD160 d22cf98e15958acb6d414b6a6a56268e9f36f050 SHA1 ca3e304979825f8da066ffdf97d39e9a0be87d9f SHA256 5451118790e070c118639421aa834d8829e554578af514f1c1eb08a4395e6158
 EBUILD dovecot-2.0.16-r1.ebuild 8784 RMD160 f77f1e16ebaa8819387070acf2d1be84d5c7f7ea SHA1 2f7470cb0c53aa9a6badeb66e0e458ee24bb5799 SHA256 e66d6271f8b453e6fa62186db248e11900f7f7be4659662aa31c6e67f9abcdb5
 EBUILD dovecot-2.0.16.ebuild 8773 RMD160 44299f1dec54e065b0c54328c5aced0a2cfbe894 SHA1 08b7a5805f8dbc0b589e8635ef0a466bc16838b4 SHA256 ed58e56c96e49b28c5c6ccd58d22b0eda96df3a0ae0678badf7f3d015e3c9bc7
-MISC ChangeLog 51322 RMD160 31a4b08fefd18c305d2b16d5f7c3de23e64db74f SHA1 c094f17399d9ee5fd9a72aa5871ddd3de8837e06 SHA256 2e2a2384c3577f0f0118ad6e1fcb7fff05690e18da0d98af72b4f33d03a84953
-MISC metadata.xml 703 RMD160 a7a55f21501b09979922b24a931fbf7a5bbf86b1 SHA1 b4c9f2cd2a2fae951e319960ce3aba33d56301cf SHA256 3a897cb8fc88c875563623d2757f7b0ebd08743ba4d4fcbdfe37072d99694c58
+EBUILD dovecot-2.1_rc1.ebuild 9081 RMD160 0dbe98b586ba3c925fe22a8c7d928fa2751c1ea2 SHA1 4c1aaa7637006d23da180f9fd86879c5891d3a11 SHA256 95d54cbf4cfb9979d0f2674fef769454b0f03c4f77696f9c03d40d6c21ec2a2b
+MISC ChangeLog 51515 RMD160 2218a33d0655aebd41637e2c105160f7e3bce095 SHA1 538c77aa045017ecc9cffea82ae39bb6156212ce SHA256 5d18b3d622c93cac94a8a1959a6b56beadc95cfd6a36d8224a75fac866f86c16
+MISC metadata.xml 871 RMD160 8e53e66f2ad0b595ef424cf855c108d103a87f49 SHA1 ea5616a16a1cb3394600ad17a1422383acb100f5 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO02jUAAoJEHfx8XVYajsfYEEP/0QQM/yPg/dJEmpUNbuwu8Yb
-VUOsqIctdml1+yAlSSB2NM+MBc5psV6t4I7mWqUUrawprmX4/PBL+omL6EwjCGJ2
-miaVW+/IA0v+PJ5woENMkbw4mptZvlWSfP3Bsqqc+4I+/inyKje9h5VPzwPZLMmT
-XSLiexeTPUU4/ZwLaWtL5fK+dzmYPW8/Zbqq7tDOFqFeecrWDFx1MXWUqxNCZK1N
-EScRQT91AQPKB79umJk59ldYEu1F9EkKv2k5laRC9cqdNP/0NFIGKcE1N347kSWd
-ztLk3MiNTAmCKPna5wZVmki28NhRVnHfz96flHEb0XYRxe9TmRnMVrrPlO7y8SlW
-2xC0GHPI0BtFR4k2e+amr0cr4LCuo5rSbdetDhq/v7kt1hQvtfTJAIxOOGJP2vii
-myceh1hUviZOuLJ9uKX6n4OekrxnLUbt53Zw1zmeqP2iltafPMqEn9FWVP0l+ohd
-+c8brhgRe9oArONM7e+7ro0H2c5ezQaSIZuzqhx6aCJ2Vl3ZFKqBNB8NRcoapYs7
-mu5+NXKS7mMFfdHYB5sL3r9zDwcreNqWCAKzv/Xob5sBUVIavz3eUzO2Bpy0+Xx9
-OfkTC3ucnSf9yR5BGBZYIvu1tk0hbFP7xCn4T/0b2DHd2wpObL+mhYo79R2Z24R2
-5EQRND/10eXB1SAbIrHu
-=835d
+iQIcBAEBCAAGBQJO2xpPAAoJEHfx8XVYajsf+GoQAIj7E2Q8nOhdgsevgO1nKLFy
+Y2D53KUXp+TV2ZOPEyq9RzxfAUx/84QxuaxwroAOCTIbJuAPh/9ILCS0kluseWE9
+2BFBqw9IzxxB2Vskscq16Ipkb1jnQjwQL8K+cnBdjvjU/HTvOWlCR++htMnBTcMG
+uinlNiegvSG194MO4d8IUYkUCVkSCzGXaQHyYSz88yRWmRhMb2+3S/KZhtweq0nd
+8IKXZfWG7Eat4sOAp9gu3RmmWkOrtMhXQcIEyHXm4DVnuJdHsv5iIqNWyqOplQpW
+SU7aK6DKr0HIllphEKrAEaveluewVx7835FkwrF+xPgyXmixON6ER0UHWfu2oN0P
+kq4fOzAZmbwmmq9njFU05Qg4HxxUhLMyrhKZtsKVxkQP1kH3Hn5eyxd8eROhjIlm
+GAITVk4Ok3lVIvkWqJlT4YOcvdJqE8RWiSAlNQ/iobSpx8v91l1vpF7UdZv5vd9N
+D6kAFXovh+mpaFL8YH6gL8xZyKVa2g1gfjO7MbaFwbSy93bSg2uS2aNBGSFNzmFi
+04t486tCHhK861rKm66y0g4qg6k8koAnoPybVHqpcexzh+iXWrh5nSQH8Yjs7QyN
+FJaoyBN0PEYai3/fyUo2LQrQRpkNU4hySYIC3T7E7RdLWjsjhgOXHqiqwqb05iZX
+MclBZZ14JWfiIH95vodc
+=+3xQ
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1_rc1.ebuild b/net-mail/dovecot/dovecot-2.1_rc1.ebuild
new file mode 100644
index 000000000000..61136cca5084
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.1_rc1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1_rc1.ebuild,v 1.1 2011/12/04 06:59:12 eras Exp $
+
+EAPI=4
+
+inherit eutils versionator ssl-cert
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.3.0"
+sieve_snapshot="b3bff60a18da"
+SRC_URI="http://www.dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz
+	sieve? (
+	http://www.rename-it.nl/${PN}/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
+	)
+	managesieve? (
+	http://www.rename-it.nl/${PN}/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
+	) "
+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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+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 )
+	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_prepare() {
+	cp "${FILESDIR}/SnowballAnalyzer.h" "${S}/src/plugins/fts-lucene" || die
+	cp "${FILESDIR}/SnowballFilter.h" "${S}/src/plugins/fts-lucene" || die
+}
+
+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 \
+		--without-systemdsystemunitdir \
+		${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 || die "emake dovecot-config failed"
+		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_preinst() {
+	if has_version "<${CATEGORY}/${PN}-2" ; then
+		elog "There are a lot of changes in configuration files in dovecot-2.0."
+		elog "Please read http://wiki.dovecot.org/Upgrading and"
+		elog "check the conf files in ${ROOT}etc/dovecot."
+		elog "You can also run doveconf -n before running etc-update or"
+		elog "dispatch-conf to get an idea about what needs to be changed."
+		ewarn "\nDo NOT {re}start dovecot without checking your conf files"
+		ewarn "and making the necessary changes.\n"
+	fi
+}
+
+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
+}
diff --git a/net-mail/dovecot/files/SnowballAnalyzer.h b/net-mail/dovecot/files/SnowballAnalyzer.h
new file mode 100644
index 000000000000..c82fd990741f
--- /dev/null
+++ b/net-mail/dovecot/files/SnowballAnalyzer.h
@@ -0,0 +1,46 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
+#ifndef _lucene_analysis_snowball_analyser_
+#define _lucene_analysis_snowball_analyser_
+
+#include "CLucene/analysis/AnalysisHeader.h"
+
+CL_CLASS_DEF(util,BufferedReader)
+CL_NS_DEF2(analysis,snowball)
+
+/** Filters {@link StandardTokenizer} with {@link StandardFilter}, {@link
+ * LowerCaseFilter}, {@link StopFilter} and {@link SnowballFilter}.
+ *
+ * Available stemmers are listed in {@link net.sf.snowball.ext}.  The name of a
+ * stemmer is the part of the class name before "Stemmer", e.g., the stemmer in
+ * {@link EnglishStemmer} is named "English".
+ */
+class CLUCENE_CONTRIBS_EXPORT SnowballAnalyzer: public Analyzer {
+  char* language;
+  CLTCSetList* stopSet;
+  TokenStream *prevstream;
+
+public:
+  /** Builds the named analyzer with no stop words. */
+  SnowballAnalyzer(const char* language="english");
+
+  /** Builds the named analyzer with the given stop words.
+  */
+  SnowballAnalyzer(const char* language, const TCHAR** stopWords);
+
+  ~SnowballAnalyzer();
+
+  /** Constructs a {@link StandardTokenizer} filtered by a {@link
+      StandardFilter}, a {@link LowerCaseFilter} and a {@link StopFilter}. */
+  TokenStream* tokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader);
+  TokenStream* tokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader, bool deleteReader);
+  TokenStream* reusableTokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader);
+};
+
+CL_NS_END2
+#endif
+
diff --git a/net-mail/dovecot/files/SnowballFilter.h b/net-mail/dovecot/files/SnowballFilter.h
new file mode 100644
index 000000000000..f35a58a13634
--- /dev/null
+++ b/net-mail/dovecot/files/SnowballFilter.h
@@ -0,0 +1,41 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
+#ifndef _lucene_analysis_snowball_filter_
+#define _lucene_analysis_snowball_filter_
+
+#include "CLucene/analysis/AnalysisHeader.h"
+#include "libstemmer.h"
+
+CL_NS_DEF2(analysis,snowball)
+
+/** A filter that stems words using a Snowball-generated stemmer.
+ *
+ * Available stemmers are listed in {@link net.sf.snowball.ext}.  The name of a
+ * stemmer is the part of the class name before "Stemmer", e.g., the stemmer in
+ * {@link EnglishStemmer} is named "English".
+ *
+ * Note: todo: This is not thread safe...
+ */
+class CLUCENE_CONTRIBS_EXPORT SnowballFilter: public TokenFilter {
+	struct sb_stemmer * stemmer;
+public:
+
+  /** Construct the named stemming filter.
+   *
+   * @param in the input tokens to stem
+   * @param name the name of a stemmer
+   */
+	SnowballFilter(TokenStream* in, const char* language, bool deleteTS);
+
+	~SnowballFilter();
+
+    /** Returns the next input Token, after being stemmed */
+    Token* next(Token* token);
+};
+
+CL_NS_END2
+#endif
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index c4b0b6726c7b..c5edc6996dd1 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -14,5 +14,7 @@
     <flag name="sdbox">Add sdbox storage support</flag>
     <flag name="sieve">Add sieve support</flag>
     <flag name="vpopmail">Add vpopmail support</flag>
+    <flag name="imapc">Add imap client storage support</flag>
+    <flag name="lucene">Add lucene full text search (FTS) support using <pkg>dev-cpp/clucene</pkg></flag>
   </use>
 </pkgmetadata>