Version bump bug #329241 by Eray Aslan. dbox USE flag changed to sdbox to follow upstream.

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

5 files changed, 40 insertions, 260 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index a633bd575fe9..fbbbb35e5a00 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.247 2010/07/18 20:44:48 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.248 2010/07/21 12:10:59 darkside Exp $
+
+*dovecot-2.0_rc3 (21 Jul 2010)
+
+  21 Jul 2010; Jeremy Olexa <darkside@gentoo.org> -dovecot-1.2.8.ebuild,
+  -dovecot-2.0_rc2.ebuild, +dovecot-2.0_rc3.ebuild, metadata.xml:
+  Version bump bug #329241 by Eray Aslan. dbox USE flag changed to sdbox to
+  follow upstream.
 
   18 Jul 2010; Joseph Jezak <josejx@gentoo.org> dovecot-1.2.11-r2.ebuild,
   dovecot-1.2.12.ebuild, dovecot-2.0_rc2.ebuild:
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 7090cbf8e988..9e34e37422fb 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -5,13 +5,11 @@ AUX dovecot-1.1.11-c08c602ca0dc.patch 1110 RMD160 dbb1908ce6959c6efe1bb43e315573
 AUX dovecot-1.2.init 1720 RMD160 0f641929fd2c58878f6d69e6ba454b9110603031 SHA1 c498c5208f0504f2eadc460d515f563f907d05ef SHA256 9c7ef516324cd5a17c5f28f6af272d8d06106420c747ff5c4da6fa14a3ac316c
 AUX dovecot.init 874 RMD160 aa899b69d42946dcf2262c38731319474e759041 SHA1 4f0a95cf6ba9e86bd9008694ea927dc97703b24d SHA256 145d68382d757110aa86f58b2567fb25648fa0ca62788e3461f2b45fc5999c80
 AUX dovecot.init-r2 1618 RMD160 5b5c88847c096282f5ab94b82db7fab5c9e42aa3 SHA1 d9f61ac897a6e377dc8cf2c6da4952a4ff7918e9 SHA256 6ad0d1fc09c41ba390e717667e4dad3838f669ef7b227e3cbdb60c499758a901
-DIST 37b0ecfb4de7.tar.gz 666860 RMD160 708bb0843ec297e15f1f02bf6f606f7289fb881e SHA1 3bb72bfcbf767f5aa33b25d14b65eb1685da8657 SHA256 dad2ed1c380e61b65e25f9cafc26a1417dd703edd218ce785215295d5408dff6
+DIST 01ee63b788c9.tar.gz 668333 RMD160 f6b39fd8becfaf63e0cd07e8be1a1db7611092bc SHA1 a84d69c03a4ba71b9c196ce29b5446c1d6b50265 SHA256 6e9305e59654fe1a236f1f78f7323dc6a82b5fb07d8aeb5f7782db621e0e2274
 DIST dovecot-1.1-managesieve-0.10.7.tar.gz 358166 RMD160 a8ca467e4a61b916a68a8252e6c3e8adc211472c SHA1 88d7b88dfc1cb4cc4dfac4de6aa3601a5272d345 SHA256 122deb67237714601223112846604942fe70c4d52edc8142851de0be502d8c23
 DIST dovecot-1.1.19-managesieve-0.10.7.diff.gz 6317 RMD160 b739bf737c38cda7744f8de609550f6c94a8e021 SHA1 f0e8726e8b1bc57362089fa07e5bb1c44961f5ac SHA256 63d9c896a5d6e2c52a41fd533e50ef24847392fc37fc47c0bc4322eefa2e47bb
 DIST dovecot-1.1.19.tar.gz 2389194 RMD160 8fe25b5a5347792e7aa919cc285c1b8c99bab36e SHA1 ce8f8a135a2c8ef1bd0cd1ceff04018402f3cb58 SHA256 33df1d97b9241b25dfcbc78c86ba6114f16ddf14763879432a6afe4acd1bc95a
 DIST dovecot-1.2-managesieve-0.11.11.tar.gz 439239 RMD160 161d143f5a42aee929abf51b62b3b0e6e7a9f07a SHA1 53f8618a9e02f953912390a7b803eb6218bf969a SHA256 792cc06e60250e29f517afa350069af2d7001746445d3b19bbf1aef8b6dd853e
-DIST dovecot-1.2-managesieve-0.11.9.tar.gz 396242 RMD160 1b85540bb0b32e30a6f8e780b6922c4e8ce3bb23 SHA1 63f3c6cf6615586c5b4bbd2feffc9f0c774edcb7 SHA256 9aff87fae19b2fc0e11f4b78c0b1415e1141ba3930579c46cbf912e0cda652ff
-DIST dovecot-1.2-sieve-0.1.12.tar.gz 964938 RMD160 92ed585f098ebaa37bececa56bdd912d47e7f162 SHA1 cd142f051b45b58cc162222f9ccdc12e1f69c343 SHA256 dc28182fc0bedb2622a851a33a1dab4c851aaa106c14550f782a3b8abde36514
 DIST dovecot-1.2-sieve-0.1.15.tar.gz 1051262 RMD160 7fd3d23d5ef93d443cdedc8512dab649b2a99694 SHA1 2827df60028639ec15422a86f48a1c9b2a78431a SHA256 edddc49237d5cb07a7938de9850b475b071e9350b2035f99a15db7a56882295c
 DIST dovecot-1.2-sieve-0.1.16.tar.gz 1049918 RMD160 1609c33226946e403bcb00d97d7df3bea74a78f5 SHA1 88ac215356bb9e3e08adc54195c99d1317fd5a67 SHA256 fbe7f49244e05ca2c8fccfd3ac199723e9dfa0fd3608dce83ceaed923ffac974
 DIST dovecot-1.2-sieve-0.1.17.tar.gz 1029070 RMD160 7b53742c7388bf27521a46b8e1121f45a764df87 SHA1 420142a8438d76e3849727c3ab4bde5a5b7fb7e4 SHA256 e02a4a1b5958bbe1c8e216f11d00166e33c31b304cbd4180de29b1a1dd5e7d0b
@@ -19,15 +17,12 @@ DIST dovecot-1.2.11-managesieve-0.11.11.diff.gz 6454 RMD160 bfd7593b8ffa36ac6062
 DIST dovecot-1.2.11.tar.gz 2878057 RMD160 cb2090a21e99cfaf98d7cbfdc98adbf42df6e2cc SHA1 97e63377be3641d4c7aa5a0c6d4e2bd602d45972 SHA256 2971691d4f8307b7014ca6671f44151cb53379f80746aa4a95cdeb0b846e0474
 DIST dovecot-1.2.12-managesieve-0.11.11.diff.gz 6455 RMD160 8f55a97e9a68e53faafa78a5f725969403f1f295 SHA1 f3719fc5427c97c65416658d73ff3234eaa204c9 SHA256 ea6549ed32cb1968971ef00725b43c8154023b4ed67ae1eb272485a0cf90a64f
 DIST dovecot-1.2.12.tar.gz 2882517 RMD160 9a2ecf836607905acebee57d082b0b4c36108260 SHA1 72fedd20c00eb3763012555c3622f84286cb8e65 SHA256 1ef0c40822cf64f20af1e65b4402da75296489aba25df8b13e2386df6952c281
-DIST dovecot-1.2.7-managesieve-0.11.9.diff.gz 6458 RMD160 32fe5f253b352063f21166596efe66684df1d251 SHA1 636976c8302fc1f45085b4bc5a6970104fe0dce7 SHA256 bce916dd22493cbc0eaf918f75da1e2bef48d5d9fc5ce0bfec8d950754af4659
-DIST dovecot-1.2.8.tar.gz 2702887 RMD160 b685d002224435f372364b7e69d550c136630cea SHA1 ded015aa8094070a7315840a9a329e97de93a85d SHA256 145c5dd8519d526c4bc2c1b4d6b5eeb09ba000f57fe5e16af1f72a73acc788c7
-DIST dovecot-2.0.rc2.tar.gz 3053175 RMD160 246af3631d1cb52dc4bfe417d6b52cb87953b017 SHA1 d4e63ccd3e20f235e4b8c175c0d0da6d05395cf4 SHA256 fd68b6f627ea4789b29da9950fc5825eb6f76b8b347e9e7ddff5f9671d746e83
+DIST dovecot-2.0.rc3.tar.gz 3063406 RMD160 c1d65515c1179981792e1a627548da29b4d7e77b SHA1 354779307fc0d5886e24f306bec0a8b3a82ce8e6 SHA256 7c64021803a0aa0b5f5b5888787fe5a54f379abf058570e50c2a9c720865e760
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
 EBUILD dovecot-1.1.19.ebuild 8581 RMD160 4cfb649e5cd577ab715f831210d6bdf7ddb7ea05 SHA1 3217a1cef3a0cd9192c7093d4cc3403eb1bcc9ea SHA256 b0fb355d36c9fc56016bfa3c6bcca07582dc60900c13c6c8d99848c98d8dada2
 EBUILD dovecot-1.2.11-r1.ebuild 8541 RMD160 f31a3cff9606f0254ba14d5bd5f60962daf99dba SHA1 874ee918a521b1995da49d9e7bb9d7d28d78fd36 SHA256 0e75be8e0338a01c54e72b507d8fe3c17ef1aa31a19ece769a5e3311897ca0ed
 EBUILD dovecot-1.2.11-r2.ebuild 8549 RMD160 d28caf09bbcebbc9e7393ad852a33eb887b3465b SHA1 3f7daf5e0df61733fb598f66826ab7af76d8bce9 SHA256 6897fcd0e88ca7cff75088268e5abe32cb9d15d54fa479e66fd75360d8b3d4b6
 EBUILD dovecot-1.2.12.ebuild 8547 RMD160 c5fc0acae6570bfcf3d57c772c5fb89ecc311b0e SHA1 a7c705774a4f4683b721a5e5e8692e875be8ffda SHA256 1a11428ec920f63a58f4d70847e26cf1aded769d4c7cfb7f2e98c7bbba4de1e8
-EBUILD dovecot-1.2.8.ebuild 7747 RMD160 4d47f9bbac6c6756c30b9eec848748457c0f5aaf SHA1 ec7d18b4f24694343beb53859adc3bdb6144ef87 SHA256 a9917c67aa30c605d63c6966bdea227012eeae4ce281de2dfa6e6aea7dfcff9d
-EBUILD dovecot-2.0_rc2.ebuild 9028 RMD160 26407c12529346d3cd7d641be796123b7733b889 SHA1 eb0f1fd56457ae7bdd0f843a5dfbc30948b41d98 SHA256 48d822b4b2cea729bc4b853abcd9246668467b84e11a88219583f40bb52f4d5a
-MISC ChangeLog 40144 RMD160 f8a0584d920074abd5a6750c61da9fa9f9f352fe SHA1 603db8e71f855932b8c280608460b1b83dc12565 SHA256 38b0ebcef514f29cb4c171e017031493f47c2be71edd133f55020459203530cf
-MISC metadata.xml 862 RMD160 f14088668acf1ea15d5e567cad302cf825283b0f SHA1 70d3c74f44820fdd09ad2471b4244ecfdb01d9a5 SHA256 ce4c5aa7f02d7bc7173f375318362cac11c2df191c51f44d27136ad5170a7b31
+EBUILD dovecot-2.0_rc3.ebuild 9493 RMD160 33cdaf59ca34d00195b86e1227f7e65e9ff0f184 SHA1 2cb1c8598c72c7a34927ee855377ef30a763e90c SHA256 659bd08ac0d58babb092bacdc36da4b1df6f0a4c9e6d5d4f1260d24d17a66318
+MISC ChangeLog 40413 RMD160 c2f13372dfab6bbc1fe40dc2183239975c966274 SHA1 fc6fe6123e1e267e53f2499ccb420e2f6ed07de6 SHA256 7154bd339af1602760d8c9c6216e143fcbd78cd2bb59c86979774f2374744fb5
+MISC metadata.xml 919 RMD160 1e3a625fb64bee092b52fe671c7b51cbbc0cea80 SHA1 d4c9aa0299f149d3d552a10971d3efcc84809a1d SHA256 872564b7c2a02f4c2e042ea7b64e5ef14b0e1b63ddf8f04af36db9aa0efab372
diff --git a/net-mail/dovecot/dovecot-1.2.8.ebuild b/net-mail/dovecot/dovecot-1.2.8.ebuild
deleted file mode 100644
index 9074e1a870bf..000000000000
--- a/net-mail/dovecot/dovecot-1.2.8.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.8.ebuild,v 1.4 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.12"
-managesieve_version="0.11.9"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-1.2.7-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_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 too?
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		die "USE flag problem"
-	fi
-
-	# Add user and group for login process (same as for fedora/redhat)
-	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
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-1.2.7-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; 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}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# 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 /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use ssl; then
-		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
-			-e 's,^KEYDIR=.*,KEYDIR=\$SSLDIR/dovecot,' \
-			-e 's,^CERTFILE=.*,CERTFILE=\$CERTDIR/server.pem,' \
-			-e 's,^KEYFILE=.*,KEYFILE=\$KEYDIR/server.key,' \
-			doc/mkcert.sh || die "failed to update SSL settings in mkcert.sh"
-	fi
-
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-	dodoc doc/* || die "dodoc doc/ failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox to
-	local mail_location="maildir:~/.maildir"
-	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|' "${conf}"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
-		|| die "failed to update mail location settings in dovecot.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	fi
-
-	# Listen on ipv6 and ipv4
-	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_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
-			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
-			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
-			|| die "failed to update SQL settings in dovecot-sql.conf"
-		dodoc doc/dovecot-sql-example.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
-			|| die "failed to update LDAP settings in dovecot-ldap.conf"
-		dodoc doc/dovecot-ldap-example.conf
-	fi
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-2.0_rc2.ebuild b/net-mail/dovecot/dovecot-2.0_rc3.ebuild
index a1ee0f570086..8943fa3b146c 100644
--- a/net-mail/dovecot/dovecot-2.0_rc2.ebuild
+++ b/net-mail/dovecot/dovecot-2.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_rc2.ebuild,v 1.2 2010/07/18 20:44:48 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_rc3.ebuild,v 1.1 2010/07/21 12:10:59 darkside Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils versionator ssl-cert
 
 MY_P="${P/_/.}"
 major_minor="$( get_version_component_range 1-2 )"
-sieve_snapshot="37b0ecfb4de7"
+sieve_snapshot="01ee63b788c9"
 SRC_URI="http://dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz
 	sieve? (
 	http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.tar.gz
@@ -23,7 +23,7 @@ SLOT="0"
 LICENSE="LGPL-2.1" # MIT too?
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
 
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve
+IUSE="berkdb bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve
 mbox mdbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
 
 DEPEND="berkdb? ( sys-libs/db )
@@ -40,6 +40,8 @@ DEPEND="berkdb? ( sys-libs/db )
 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"
@@ -68,12 +70,11 @@ src_configure() {
 	fi
 
 	local storages=""
-	for storage in cydir dbox mdbox maildir mbox; do
+	for storage in cydir sdbox mdbox maildir mbox; do
 		use ${storage} && storages="${storage} ${storages}"
 	done
 	[ "${storages}" ] || storages="maildir"
 
-	cd ${MY_P}
 	econf \
 		--localstatedir=/var \
 		--with-moduledir="/usr/$( get_libdir )/dovecot" \
@@ -100,6 +101,8 @@ src_configure() {
 		# snapshot. should not be necessary for 2.0 release
 		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
 		./autogen.sh || die "autogen failed"
+		# stupid no-op check in Makefile
+		#sed -i -e 's/^check: check-recursive/check: test/' Makefile*
 
 		econf \
 			--localstatedir=/var \
@@ -110,7 +113,6 @@ src_configure() {
 }
 
 src_compile() {
-	cd "${MY_P}"
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
 
 	if use sieve || use managesieve ; then
@@ -119,8 +121,18 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	default_src_test
+	# not yet.  WIP upstream
+	#if use sieve || use managesieve ; then
+		#einfo "Beginning sieve tests..."
+		## snapshot. should not be necessary for 2.0 release
+		#cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
+		#default_src_test
+	#fi
+}
+
 src_install () {
-	cd "${MY_P}"
 	emake DESTDIR="${D}" install || die "make install failed"
 
 	# insecure:
@@ -168,10 +180,10 @@ src_install () {
 			keepdir /var/dovecot
 			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
 			"${confd}/10-mail.conf" || die "sed failed"
-		elif use dbox ; then
-			mail_location="dbox:~/.dbox"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
 		elif use mdbox ; then
-			mail_location="mdbox:~/.dbox"
+			mail_location="mdbox:~/.mdbox"
 		fi
 	fi
 	sed -i -e \
@@ -247,6 +259,7 @@ src_install () {
 		dodoc doc/rfc/*.txt
 		docinto sieve/devel
 		dodoc doc/devel/DESIGN
+		doman doc/man/*.1
 	fi
 
 }
@@ -265,8 +278,9 @@ pkg_preinst() {
 		elog "in ${ROOT}etc/dovecot"
 	elif [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
 		elog "There are a lot of changes in configuration files in dovecot-2.0."
-		elog "Please check the conf files in ${ROOT}etc/dovecot."
-		elog "You can run doveconf -n before running etc-update or"
+		elog "Please read http://wiki2.dovecot.org/Upgrading/2.0 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 "Do not {re}start dovecot without checking your conf files"
 		ewarn "and making the necessary changes."
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index 8f8d4a6902cb..0110b217cc67 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -16,6 +16,7 @@
     <flag name="managesieve">Adds managesieve protocol support</flag>
     <flag name="mdbox">Adds mdbox storage support</flag>
     <flag name="pop3d">Build pop3d support</flag>
+    <flag name="sdbox">Adds sdbox storage support</flag>
     <flag name="sieve">Build the sieve plugin</flag>
     <flag name="vpopmail">Add vpopmail support</flag>
   </use>