Version bump - bug #326755. Add mdbox USE flag - bug #326557. Don't die because of missing USE flags. Thanks to Eray Aslan and Tim Harder

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

4 files changed, 44 insertions, 29 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 0a57c0a49c1a..67dfafd8a064 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.245 2010/07/14 16:00:05 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.246 2010/07/14 16:07:14 darkside Exp $
+
+*dovecot-2.0_rc2 (14 Jul 2010)
+
+  14 Jul 2010; Jeremy Olexa <darkside@gentoo.org> -dovecot-2.0_beta6.ebuild,
+  +dovecot-2.0_rc2.ebuild, metadata.xml:
+  Version bump - bug #326755. Add mdbox USE flag - bug #326557. Don't die
+  because of missing USE flags. Thanks to Eray Aslan and Tim Harder
 
   14 Jul 2010; Jeremy Olexa <darkside@gentoo.org> -dovecot-1.1.7-r1.ebuild,
   -dovecot-1.1.16.ebuild, -dovecot-1.2.6.ebuild, -dovecot-1.2.7.ebuild,
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index d243a311a917..801da05f6aa3 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -5,7 +5,7 @@ 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 b877a1db00a5.tar.gz 666617 RMD160 021f74b27f613efdace9102028d334f378ab08a5 SHA1 e0fd744e54457692c1f9ebf5623f5c920a040b87 SHA256 69fc9beff5a637eda802b5e5a840b652a22da699e8a6b602fe93cea00d97539a
+DIST 37b0ecfb4de7.tar.gz 666860 RMD160 708bb0843ec297e15f1f02bf6f606f7289fb881e SHA1 3bb72bfcbf767f5aa33b25d14b65eb1685da8657 SHA256 dad2ed1c380e61b65e25f9cafc26a1417dd703edd218ce785215295d5408dff6
 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
@@ -21,13 +21,13 @@ DIST dovecot-1.2.12-managesieve-0.11.11.diff.gz 6455 RMD160 8f55a97e9a68e53faafa
 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.beta6.tar.gz 3464359 RMD160 eecde90aab83c97ba5352c4a9ef990aec03a7f09 SHA1 97cea30ea6c0bfd2d6d6634aded83e27d4d2ae29 SHA256 bcbd26a6bd8ac0f199f94d8581bc6a314898adae823744ffa39ea72527787b31
+DIST dovecot-2.0.rc2.tar.gz 3053175 RMD160 246af3631d1cb52dc4bfe417d6b52cb87953b017 SHA1 d4e63ccd3e20f235e4b8c175c0d0da6d05395cf4 SHA256 fd68b6f627ea4789b29da9950fc5825eb6f76b8b347e9e7ddff5f9671d746e83
 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 8545 RMD160 791057381b7e4162d80db05672a17d293088c86c SHA1 ac09851b1488badf7d06d0a3b4c335ce7df67835 SHA256 5d3657d28e49d52a14b62b8c6f071a08bb8d2adcb43c82d8fd44abf46c2ea5ca
 EBUILD dovecot-1.2.12.ebuild 8543 RMD160 6eff4f84419429dda14e690fdfd24b1a78c35a7a SHA1 4954856d55e12cc0180de46c565e0c663eb7da12 SHA256 b2c92a18575cec2f1e339227629084ebcf948aee6451f05358c694195c762390
 EBUILD dovecot-1.2.8.ebuild 7747 RMD160 4d47f9bbac6c6756c30b9eec848748457c0f5aaf SHA1 ec7d18b4f24694343beb53859adc3bdb6144ef87 SHA256 a9917c67aa30c605d63c6966bdea227012eeae4ce281de2dfa6e6aea7dfcff9d
-EBUILD dovecot-2.0_beta6.ebuild 8769 RMD160 6304fd5f4fcc2a3cf3a1a43e9d4e7738fe8af86c SHA1 e7d4c00304faef54181c0a2fe95495ad0f1b23cf SHA256 3783d420d1c5f1c826fa5babb1b632c38fde5652fb224b457bdefc0767cdd6fa
-MISC ChangeLog 39714 RMD160 f87978279d13569b9adc528385f4868db919f84c SHA1 3db41b7e0b202840352e2e8ae22838608bea8daf SHA256 5e3337d2959158dd6d5bcde28b3e58932fb7a7d0f4f96a4040f7caebc9d41af1
-MISC metadata.xml 805 RMD160 5463fdc136060ba785d5d1394774f7bb6c76bdb5 SHA1 a309cf7dcbd283d70f7d418ca1a198400023dabe SHA256 f4edba91969b56d55fed13f18f0f49b81325377e1786a3d129feeb8de6086ee2
+EBUILD dovecot-2.0_rc2.ebuild 9025 RMD160 570ba49a61104972e5c89b1fabc287e8a966595f SHA1 e15028d592b6a2b6e3efe9b2de61b88e98667c7e SHA256 520ee2fb595b64bbb6956386ad8f666a11ba759a066a7a5c12cfbf696814ede0
+MISC ChangeLog 40007 RMD160 1e77c6e8245f4b3b0b052230660cdff503a8e20d SHA1 16fe38ef9f5b2e28b49a2af1853cc87e666f164b SHA256 846fd1b9ca30059687a4b89d63cee4c9202a19507723bdec529afe289e9d6373
+MISC metadata.xml 862 RMD160 f14088668acf1ea15d5e567cad302cf825283b0f SHA1 70d3c74f44820fdd09ad2471b4244ecfdb01d9a5 SHA256 ce4c5aa7f02d7bc7173f375318362cac11c2df191c51f44d27136ad5170a7b31
diff --git a/net-mail/dovecot/dovecot-2.0_beta6.ebuild b/net-mail/dovecot/dovecot-2.0_rc2.ebuild
index 132b0cd06dbc..2c905632624f 100644
--- a/net-mail/dovecot/dovecot-2.0_beta6.ebuild
+++ b/net-mail/dovecot/dovecot-2.0_rc2.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_beta6.ebuild,v 1.2 2010/06/17 20:52:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_rc2.ebuild,v 1.1 2010/07/14 16:07:14 darkside Exp $
 
 EAPI="2"
 
@@ -8,10 +8,13 @@ inherit eutils versionator ssl-cert
 
 MY_P="${P/_/.}"
 major_minor="$( get_version_component_range 1-2 )"
-sieve_snapshot="b877a1db00a5"
-SRC_URI="http://dovecot.org/releases/${major_minor}/beta/${MY_P}.tar.gz
+sieve_snapshot="37b0ecfb4de7"
+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
+	)
+	managesieve? (
+	http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.tar.gz
 	) "
 DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
 HOMEPAGE="http://www.dovecot.org/"
@@ -20,7 +23,8 @@ SLOT="0"
 LICENSE="LGPL-2.1" # MIT too?
 KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86"
 
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
+IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve
+mbox mdbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
 
 DEPEND="berkdb? ( sys-libs/db )
 	caps? ( sys-libs/libcap )
@@ -38,13 +42,10 @@ RDEPEND="${DEPEND}
 
 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"
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+		ewarn "Hit Control-C now if you want to abort"
+		epause 10
 	fi
 
 	# Add user and group for login process (same as for fedora/redhat)
@@ -67,7 +68,7 @@ src_configure() {
 	fi
 
 	local storages=""
-	for storage in cydir dbox maildir mbox; do
+	for storage in cydir dbox mdbox maildir mbox; do
 		use ${storage} && storages="${storage} ${storages}"
 	done
 	[ "${storages}" ] || storages="maildir"
@@ -91,7 +92,7 @@ src_configure() {
 		--disable-rpath \
 		${conf}
 
-	if use sieve; then
+	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"
@@ -112,7 +113,7 @@ src_compile() {
 	cd "${MY_P}"
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
 
-	if use sieve; then
+	if use sieve || use managesieve ; then
 		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
 		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make sieve failed"
 	fi
@@ -137,14 +138,14 @@ src_install () {
 	rm -rf "${D}"/usr/share/aclocal
 
 	dodoc AUTHORS NEWS README TODO || die "basic dodoc failed"
-	rm -f doc/Makefile*
-	dodoc doc/* || die "dodoc doc failed"
+	dodoc doc/*.{txt,cnf,xml,sh} || die "dodoc doc failed"
 	docinto example-config
 	dodoc doc/example-config/*.{conf,ext} || die "dodoc example failed"
 	docinto example-config/conf.d
 	dodoc doc/example-config/conf.d/*.{conf,ext} || die "dodoc conf.d failed"
 	docinto wiki
 	dodoc doc/wiki/* || die "dodoc wiki failed"
+	doman doc/man/*.{1,7}
 
 	# Create the dovecot.conf file from the dovecot-example.conf file that
 	# the dovecot folks nicely left for us....
@@ -159,13 +160,19 @@ src_install () {
 	sed -i -e "s:/usr/share/doc/dovecot/:/usr/share/doc/${PF}/:" \
 	"${confd}/../README" || die "sed failed"
 
-	# .maildir is the Gentoo default, but we need to support mbox too
+	# .maildir is the Gentoo default
 	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|' \
-		"${confd}/10-mail.conf" || die "sed failed"
+	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 dbox ; then
+			mail_location="dbox:~/.dbox"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.dbox"
+		fi
 	fi
 	sed -i -e \
 		"s|#mail_location =|mail_location = ${mail_location}|" \
@@ -223,7 +230,7 @@ src_install () {
 			|| die "failed to update vpopmail settings in 10-auth.conf"
 	fi
 
-	if use sieve; then
+	if use sieve || use managesieve ; then
 		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
 		emake DESTDIR="${D}" install || die "make install failed (sieve)"
 		sed -i -e \
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index 265d755425c7..8f8d4a6902cb 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -14,6 +14,7 @@
     <flag name="cydir">Adds cydir storage support</flag>
     <flag name="dbox">Adds dbox storage support</flag>
     <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="sieve">Build the sieve plugin</flag>
     <flag name="vpopmail">Add vpopmail support</flag>