Version bump - bug #332089 by Eray Aslan. Working sieve tests.

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

3 files changed, 19 insertions, 31 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 109a671dd9e5..ac48e32a54f0 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.252 2010/08/11 21:32:59 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.253 2010/08/16 19:57:00 darkside Exp $
+
+*dovecot-2.0_rc5 (16 Aug 2010)
+
+  16 Aug 2010; Jeremy Olexa <darkside@gentoo.org> -dovecot-2.0_rc4.ebuild,
+  +dovecot-2.0_rc5.ebuild:
+  Version bump - bug #332089 by Eray Aslan. Working sieve tests.
 
   11 Aug 2010; Joseph Jezak <josejx@gentoo.org> dovecot-1.2.11-r2.ebuild:
   Marked ppc stable for bug #314533.
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 78fe06d28116..b0ea35fba752 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dovecot-1.2.init 1720 RMD160 0f641929fd2c58878f6d69e6ba454b9110603031 SHA1 c498c5208f0504f2eadc460d515f563f907d05ef SHA256 9c7ef516324cd5a17c5f28f6af272d8d06106420c747ff5c4da6fa14a3ac316c
 AUX dovecot-2.0_rc4-asneeded.patch 630 RMD160 b4a3c4e36e74b120f6deb8e3990de0751ea5e654 SHA1 ef8c294dd08597872a2d983c1ba9ad5dc59ea97c SHA256 1f6ca549223518f99be887e7261c31a57522ce66347109ead333a71cd75d3061
 AUX dovecot.init 874 RMD160 aa899b69d42946dcf2262c38731319474e759041 SHA1 4f0a95cf6ba9e86bd9008694ea927dc97703b24d SHA256 145d68382d757110aa86f58b2567fb25648fa0ca62788e3461f2b45fc5999c80
 AUX dovecot.init-r2 1618 RMD160 5b5c88847c096282f5ab94b82db7fab5c9e42aa3 SHA1 d9f61ac897a6e377dc8cf2c6da4952a4ff7918e9 SHA256 6ad0d1fc09c41ba390e717667e4dad3838f669ef7b227e3cbdb60c499758a901
-DIST cac6acdc4d0e.tar.gz 674306 RMD160 61f760858e8fff8b2f9fc89eb43597c5fd31dfba SHA1 847e61e55476e8e0730ddfa1f3a21d4422dc7611 SHA256 35558aa410e53b00298770f3c633e8fde36008d493f129a78b12a08043061499
+DIST 0592366457df.tar.gz 674557 RMD160 fb1c81177cec7acac0c896e8e5b385de4fdf846e SHA1 56136afe333c211b22bbac56af41671d1bc63797 SHA256 1cbb5262014fce7fe6f8cfa79d3c66ae3be3773655ac8863f03077bcdc8cd7f3
 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
@@ -19,20 +16,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.13-managesieve-0.11.11.diff.gz 6463 RMD160 d26fa4db66c74d46fc562703f4493ee4d5a1b2a7 SHA1 636b1bb4dbcfd9e82c93faf4e4fdf83e2dcee755 SHA256 8646fcdf8c0fda69f8b0df88d9356861e124d7f70c75df1afb714769cd84e9ed
 DIST dovecot-1.2.13.tar.gz 2946123 RMD160 083dd4504dbf0e86187019853514811155c9087f SHA1 8a6e12cc40df02083480f9e9eef57939a81fd7af SHA256 22fa612b4c3250d33bc6e5010efd81d082b10dbce73da732fea644e085701869
-DIST dovecot-2.0.rc4.tar.gz 3078330 RMD160 30f5004a75947a7ef07223023163519b0ad257ea SHA1 3c4ffc46992d889a1bd2212c9af5df9f341acd96 SHA256 e7a2121d0aeab6b1e5dc0353b9041fea03f8b669c91b227d179e34b227d67b3b
+DIST dovecot-2.0.rc5.tar.gz 3081921 RMD160 8da8e8da9cfcd3feff2d10f06c4e2d66328b72f5 SHA1 3616954f4c8e1987dfabeb79240e1fcbb5fc02f8 SHA256 528125d2deca6539af04128ebed0ce17da714f35fd7519bfd6ea59413348b034
 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 8548 RMD160 d1f883279cca7db1cfbe7738a46ec658a0ea58d2 SHA1 8779360f729cf1ffdb08bd6837a89bd017a2436e SHA256 946f195e5434105bbdfb423599514914c08ab958f3afeac6f2e82cda62df1a20
 EBUILD dovecot-1.2.12.ebuild 8547 RMD160 c5fc0acae6570bfcf3d57c772c5fb89ecc311b0e SHA1 a7c705774a4f4683b721a5e5e8692e875be8ffda SHA256 1a11428ec920f63a58f4d70847e26cf1aded769d4c7cfb7f2e98c7bbba4de1e8
 EBUILD dovecot-1.2.13.ebuild 8549 RMD160 2dc0ad1f3ae9048b45083a05e597398b1739126a SHA1 7b91eb5cc1f643e6d4163acc3b1ca2d29b95f90c SHA256 b77f8c1c341e59b1a69db280490f534901e3c08927e74c9b360edfc0c6bfdf21
-EBUILD dovecot-2.0_rc4.ebuild 9488 RMD160 7c7cc3795496d2c36ae99f1a41096c2d37c49b4f SHA1 606096fd5f27f5b3c01225805317151df6fef57a SHA256 417c85a13950b059031965cafa10517de66f0fa041fb30e90ff031692416e3c8
-MISC ChangeLog 41264 RMD160 f7e5017d2f40464ad5e53b4be0071f83bee24a10 SHA1 7f1501f64e9e88c77b35e4203ef96419ab0d67f6 SHA256 24b516e24e41e2a0eb5c2a1a9cbfde5f59c0dc7aa7d25cc4aea9787400eed2ed
+EBUILD dovecot-2.0_rc5.ebuild 9250 RMD160 0c1400e06fb9564d4a5848e0f2b18b8a47bb8881 SHA1 66e36204eb673721e9c622319e0270ae3c5fba5c SHA256 243f0093386783ac1c97734138cbebf6036da6ceea7678e028249215d6a51968
+MISC ChangeLog 41466 RMD160 98313ce0183f9d3cf3e2db8cdb3b88f9925a4c62 SHA1 65dadb76600b9c28f04dfc813daa8dc0d547c5c6 SHA256 392e86a546e8d0edda2acd1975f12a06b500966e40d375e98701ca4d489f6c76
 MISC metadata.xml 919 RMD160 1e3a625fb64bee092b52fe671c7b51cbbc0cea80 SHA1 d4c9aa0299f149d3d552a10971d3efcc84809a1d SHA256 872564b7c2a02f4c2e042ea7b64e5ef14b0e1b63ddf8f04af36db9aa0efab372
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxjFr4ACgkQcsIHjyDViGRpbgCgh1ceW8/3RRH/kiYfas78AcKt
-ZssAoJtjVodZvKyKiAP4S8FZfN/vsFeW
-=zkqn
------END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.0_rc4.ebuild b/net-mail/dovecot/dovecot-2.0_rc5.ebuild
index 233c43ea3aa3..42259ec4a3af 100644
--- a/net-mail/dovecot/dovecot-2.0_rc4.ebuild
+++ b/net-mail/dovecot/dovecot-2.0_rc5.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_rc4.ebuild,v 1.1 2010/08/05 13:20:44 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_rc5.ebuild,v 1.1 2010/08/16 19:57:00 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="cac6acdc4d0e"
+sieve_snapshot="0592366457df"
 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
@@ -60,10 +60,6 @@ pkg_setup() {
 	enewuser dovenull -1 -1 /dev/null
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/dovecot-2.0_rc4-asneeded.patch"
-}
-
 src_configure() {
 	local conf=""
 
@@ -103,8 +99,6 @@ 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 \
@@ -124,14 +118,12 @@ src_compile() {
 }
 
 src_test() {
-	default_src_test
-	# not yet
-	#if use sieve || use managesieve ; then
-		#einfo "Beginning sieve tests..."
+	emake check
+	if use sieve || use managesieve ; then
 		# 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
+		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
+		emake check
+	fi
 }
 
 src_install () {
@@ -198,7 +190,7 @@ src_install () {
 		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 managesieve pam file
+		# 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/' \