version bump

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

5 files changed, 29 insertions, 114 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index ca1065ae8b8a..39df1ab11197 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.335 2012/01/06 21:46:27 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.336 2012/01/06 22:25:52 eras Exp $
+
+*dovecot-2.1_rc3 (06 Jan 2012)
+
+  06 Jan 2012; Eray Aslan <eras@gentoo.org> -dovecot-2.1_rc1.ebuild,
+  +dovecot-2.1_rc3.ebuild, -files/SnowballAnalyzer.h, -files/SnowballFilter.h:
+  version bump
 
 *dovecot-2.0.17 (06 Jan 2012)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 2c8523d8fd15..85ebff0ebf53 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,8 +1,6 @@
 -----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.init-r3 1609 RMD160 971a603d1507f40c5377aeedf5fd99485944c525 SHA1 329cf561d55a6dceb7bddd3fd09fb83522a9b548 SHA256 b4fb8ffb9aa7fd270d45512a657dcb5597ae5fe516b1f8e0078aa1892de8ecaa
 DIST dovecot-1.2-managesieve-0.11.13.tar.gz 405999 RMD160 9deed0637f1b5942a1b4996a343fed1b23301023 SHA1 cd5d2149250072aa8079f9db967cfeffc1b57c53 SHA256 2a9b0d6e048fa9294890ca1bee72fe3f41431aa806d0916bb1b6bbe2a8d2c976
@@ -14,30 +12,30 @@ DIST dovecot-2.0-pigeonhole-0.2.5.tar.gz 1232117 RMD160 6d8e98fccfa7c6c0eca66fd3
 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.0.17.tar.gz 3329794 RMD160 108399bdaf0e03e013b78b79e39c5c8a5dd2f62d SHA1 4c12f1a074c52b17cb64fcc73c41f0a2820a88fe SHA256 3f0d4289067d2355b4ce4a00265bf2b4bf6540bca8fdcecfc6ad20611da145d2
-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
+DIST dovecot-2.1-pigeonhole-d17f4a699ad2.tar.bz2 561774 RMD160 0b63b5c30e7f55a73f08a57ad46b6a057c80b56e SHA1 2b0f23c08ae5cb68f900f5ead806e1e8805a9fad SHA256 9d50aa1fcf339293ca99772062fc91d37cdd52514fd95360f3948c412c87f7ce
+DIST dovecot-2.1.rc3.tar.gz 3606163 RMD160 1435832d0cde74018855128554a3516f88061660 SHA1 956854d9afbc2e5c9d8525fe2c7776eafb19f7fa SHA256 ba1b7db99c87f15235643b48a24928515ee33d8764a769d7059ce9edf1dc09c8
 EBUILD dovecot-1.2.17.ebuild 8744 RMD160 1c40bc02a47f1bd32bab43c5a37129a53394bbe8 SHA1 5ecf16dbef283f4c0279aba519d129d45e7b2298 SHA256 8f086c275f79bda4f54e2c9b9758c8e636bee12e106748475acac0967238082e
 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 8774 RMD160 26546711ce3221f744f2cf1162316a069a776445 SHA1 4062e369cbb851ce7fa8aa25fc3ba2ce378531ff SHA256 cc127a8f84def8c5daf4b922bb0c2785a972f0ee29b73db914c220a36e5cfbae
 EBUILD dovecot-2.0.17.ebuild 8781 RMD160 fa99b0ea7f9fa11072ad2da89adcb67df84034b6 SHA1 4c9469527577315b82f588349f6be11df0e7951d SHA256 1bef4e795878e15f0b5a006a5e58f573d6d4ab24220eda213c86da8e7fa9fe61
-EBUILD dovecot-2.1_rc1.ebuild 9496 RMD160 1a65ba842135dfffc1ab91221e09506d908b8754 SHA1 064a7b454743c8623e16cdbbbfa286a202138cdd SHA256 d85433d7f9a12f2c102846163c54e1b7b1a4dca9098201a49b886571c79d0137
-MISC ChangeLog 52053 RMD160 b0cb22704f3a5ac468e8679272d8e233bc801639 SHA1 89b70a5ea1298b23792fe644e8f0dd1ec76cbc10 SHA256 803a2555284a5791bea37478ba749a794a2b611c86e65e892884e0f5667231fb
+EBUILD dovecot-2.1_rc3.ebuild 9352 RMD160 e668d02e059d606a2a9b8e3a861aa28baf3477ec SHA1 e0d4a2efc0a93f48455dbf03a3823135991b7e6c SHA256 79d4e4cf27cf3537d16b87f1ad8ecb1dd4682005783d655fde47232eccb9074a
+MISC ChangeLog 52249 RMD160 1948122086bf24847fd86df11dc60a824a7a3a12 SHA1 99755b9277102b91d7242fe0e736fc02d4247621 SHA256 6fc8cb288909043626ccbdcd549f588eb7032c51736cdf7cf1a9b47c79e2e9de
 MISC metadata.xml 871 RMD160 8e53e66f2ad0b595ef424cf855c108d103a87f49 SHA1 ea5616a16a1cb3394600ad17a1422383acb100f5 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPB2vEAAoJEHfx8XVYajsfDLEP/jSUseL2m97Z+9o1Q1diFPpw
-XVn5EkIA/vt18x0XUAj86LKAqGI7wO6uBWzFiw7kQwcZMFeVUGWk8G7RQJUOIHml
-aQraUUUV/3sCI388VapCYEYa0/nijj+tjF3W2uBqfM2Kexk2D40x4g4C4IXiSFfg
-fPG15tNDLgiLC7ivuDyswmQH5319kRaXCNqKThBXQI4REBunuTjC6bK+3mhvhnP3
-RHz+jQVCxfSYOWEwlN0VxKnXZ6dhp3RS3zsQFK+CyyfxqOtkPYARH4cjpsiVTEr9
-a6IdAEnbDbuWiBLWkZ4Uzccidin3x+QNaeY/BdhqA7B7VxGM6pU3GbTskFxSLEGC
-7xg2g1Ty36InAHyn/vJp3DOCucSsLAdLGM9ptWo3rganzSFvVg5ZJRXYBAmPzAqh
-4Hls+kuBtT5yFKE94hvE+o9Vn/Qkji/gZu2eOJayQXKhgL273mXJmDsqB36JyrI5
-B1GJ/FsoaSnPKyRiifNWTuCqTqTJTkxede8A9R4VutpgnLPk9d6Oy5jOPucP6W61
-Kwu5n7O1CD3jPrZJOExYQNuqQhC8TX9rBgVKajfImt6Xj2+uFyD0BQJY8dkGyIpu
-8hjRHuxmjX5vrwYBB2aiuDnMFaseEUeowhiqe45eCZwArPBtduUBCGkCxluoo0e5
-zbL7IwdBZIM9rqe6GmaD
-=awtp
+iQIcBAEBCAAGBQJPB3T3AAoJEHfx8XVYajsf0sAP/1DanZdLF5hJb0COoER2Fhgu
+j9ojx4doJmScRAuHrUzpMC5ZpfJmXNHJdHiZa6jlpzQp1gLaMXkGy2XNoIB61zfF
+LqIcvK0ANuxURIBc8q8GWPiyGQpd/cSeYI624+zm6Ot6azJMVIkbey414D/J0H3u
+ZA/h+WwRiCXwbCpOlIVtxuKxAUa9S9QMrBWP3xpoAFcnUQKe+h0b1N7NMy7giFKZ
+foC/g15nCDB08m7VERd0baqCYxKdPVDL3zHTF0/VyQcZ7XLJpdi3Ov8p3Xg0gUcP
+3zO5CxYnLGB4cTsYLtTzDZ18dQ65bSif1GD11zmZ3LwTEoov5wAg9yFiag9U/A/r
+snyydqvTKdDBiKnxln7caxUeiRdJydt2UX2+raQ7/2ROoSo3fgmg4TPUV7VNrg7u
+dpA15y2+CTFupsws2IKr3iKW/BPkpO60pE3+FKmX4rtPvDNYZcMaRmLgQ9up+Tve
+8S1sz1t8tsrNcP3AUVymv8jJpAcTlmsYCFjKm4AsludtXj7HWtJEJst8Ok9R85eK
+P8XUlWak45DV5I4btzN0JXrVjf4TnRyxV6ofafMbYIdshZlJ168gaM3lfXPv6Ps/
+COxF1oNqqZbmaMlY3C9DRBkWzXPgMybeOLFLZq6gQJ19pcOgG2muV5T5VNECWqnO
+aa65HUBYrsJifAvIhHm0
+=dTJY
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1_rc1.ebuild b/net-mail/dovecot/dovecot-2.1_rc3.ebuild
index 1fe65c14548d..9afed22c4627 100644
--- a/net-mail/dovecot/dovecot-2.1_rc1.ebuild
+++ b/net-mail/dovecot/dovecot-2.1_rc3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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_rc1.ebuild,v 1.2 2011/12/05 11:24:12 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1_rc3.ebuild,v 1.1 2012/01/06 22:25:52 eras Exp $
 
 EAPI=4
 
@@ -10,14 +10,14 @@ MY_P="${P/_/.}"
 major_minor="$( get_version_component_range 1-2 )"
 major_dash_minor="$( replace_version_separator 1 - ${major_minor} )"
 sieve_version="0.3.0"
-sieve_snapshot="b3bff60a18da"
+sieve_snapshot="d17f4a699ad2"
 SRC_URI="http://www.dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz
 	sieve? (
-	http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/{sieve_snapshot}.tar.bz2 \
+	http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/${sieve_snapshot}.tar.bz2 \
 	-> ${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
 	)
 	managesieve? (
-	http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/{sieve_snapshot}.tar.bz2 \
+	http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/${sieve_snapshot}.tar.bz2 \
 	-> ${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
 	) "
 DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
@@ -67,8 +67,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cp "${FILESDIR}/SnowballAnalyzer.h" "${S}/src/plugins/fts-lucene" || die
-	cp "${FILESDIR}/SnowballFilter.h" "${S}/src/plugins/fts-lucene" || die
 	if use sieve || use managesieve ; then
 		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" \
 		|| die "cd failed"
diff --git a/net-mail/dovecot/files/SnowballAnalyzer.h b/net-mail/dovecot/files/SnowballAnalyzer.h
deleted file mode 100644
index c82fd990741f..000000000000
--- a/net-mail/dovecot/files/SnowballAnalyzer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*------------------------------------------------------------------------------
-* 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
deleted file mode 100644
index f35a58a13634..000000000000
--- a/net-mail/dovecot/files/SnowballFilter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*------------------------------------------------------------------------------
-* 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