Make sieve compulsory - bug #382349. Bug report and solution by Agostino Sarubbo. Thanks.

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

3 files changed, 23 insertions, 19 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 12be944cf53e..e631ab8f9d05 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.177 2011/09/09 07:18:10 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.178 2011/09/10 05:54:25 eras Exp $
+
+  10 Sep 2011; Eray Aslan <eras@gentoo.org> cyrus-imapd-2.4.11.ebuild:
+  Make sieve compulsory - bug #382349. Bug report and solution by Agostino
+  Sarubbo. Thanks.
 
 *cyrus-imapd-2.4.11 (09 Sep 2011)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 079450532d90..8dbfbb607c28 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -11,25 +11,25 @@ DIST cyrus-imapd-2.4.11.tar.gz 2446611 RMD160 0bb30f7d8c655a03366a8ce59f5a708c30
 DIST cyrus-imapd-2.4.8.tar.gz 2424151 RMD160 72f9afbf7893b3449a1a76b7050ea6d7c9b003c9 SHA1 4dfc328aff482c9ebb4efdce4b140f69564880e8 SHA256 7a1ff733928276d0e42dccfb85f17e6d6d63cdc11c03e93aea19e7de798da030
 DIST cyrus-imapd-2.4.9.tar.gz 2425065 RMD160 37727502f8b080a1e3205360c048abd47e76e878 SHA1 3cc8cf54d43baeda6822f84efec6ab95f3d1c49f SHA256 d757bc95ca891acad3768a888a5022ab96ba72d49445aa12e26b5929822e4156
 EBUILD cyrus-imapd-2.4.10.ebuild 4791 RMD160 91c6db22c3d52122888bdaf5f6f65160b2296d79 SHA1 b3ba3ad270941747e0c0c078565c4df08c53e55a SHA256 f61b1e88f4674a460ea56412743ac3abc6b54b2652cff6ff994c7ddb1d0a13b8
-EBUILD cyrus-imapd-2.4.11.ebuild 4791 RMD160 63066abb777d143fff8330454cc5513bc29871f7 SHA1 3c9602c0b928c3711f36c31adad7dc10398f5c75 SHA256 acf5c614caa9d02e9efdd20c519cf498a36b4bd517afdef8d372d2773d0f3d78
+EBUILD cyrus-imapd-2.4.11.ebuild 4779 RMD160 0c095afa775384c25fb88063f433b5cdce1b1d6c SHA1 60dddded05ceb0de0d7459a8859cdb87b98a79ee SHA256 b35c2bd3026de7a958893a47e02b8c7ee70d906253b5e8d9c3f86d6fda2b61c7
 EBUILD cyrus-imapd-2.4.8.ebuild 4519 RMD160 d9b2a7936145628977ee23061b6d0ea7d591358f SHA1 6b64b524b15913bd9a2b46111e839a543383ec7a SHA256 a8d7bb8e0a3da6249f1f5856fdbfaac0d3ccc88d13031edd44618c977ffc9143
 EBUILD cyrus-imapd-2.4.9.ebuild 4790 RMD160 d8910f5165bc5fe8d756526e96985334076964d9 SHA1 45245e0fdd6db18a56b4c5f39a605b297d401334 SHA256 415e0bf765a1e786d5330829b27f6ef80e245706978b3d8d5dd36d75c3c9b34e
-MISC ChangeLog 33577 RMD160 454ff572441e49a7463f2ec0289e26b3afe69028 SHA1 9b2ebc10ec7c1eabc99ea0be8f4c620f9e35e4e5 SHA256 2fbccc1b4a2cc483bc91059bede820cd2882753cb792e836d4f9fc0f8af6761c
+MISC ChangeLog 33743 RMD160 b1399b4f6769ef90c6a960f402730b3b35d01136 SHA1 33b09f5864e742ebb8e6f1d5b8119360ba34f623 SHA256 c7051cd776494ea87e4a6597791afec9b6205751ef6ab8da420f22fccc4675a4
 MISC metadata.xml 313 RMD160 7fb6badef50f7b7a65a3336f742a748d7f9265d0 SHA1 d2eebc6334f742a084829659803295d444e47c35 SHA256 4fc55c30d8af0d3b7555b4c0d5fa85ccc60232dc786d56a25c5482079a367ecd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOab3BAAoJEHfx8XVYajsfvTwQAJslcSEguJeZgonNPSbWmkXO
-h+3nlPPQrdGzLgY0ibxH81ydoEpm7xoH4u98of405loHiHAHvvH3lwykuqg0CDMU
-QwC8LRh4H4SJA3+wCMiHnviwYy/uYBvaLK9JRwTDF9F0VXEmS0m/SLXfKPgP7af6
-Cgy84B3tTXpYwNaGPRjVRwZaia9siLVK8e0znR8hSR/QIQZeZqtQGyYQkZzNQKri
-zrx5IWItjeC0axUm/0N762FuKJVbIGUFjDWKwHZJj2m/5GSffiaVa4AtjZ+YEi61
-7QmzlfbLMM1KIotAVHytoPOL6dheARea/EQS2XGEKSW4AQYAFCaAXO9/vr8jHS0/
-kiQmeKBJo8t85IR7vpPM+mUUPujMeKyZmRurmr426SARQP3/MAjqMBK8SB0iY3IG
-OLO6HaBPk1qTTe3U4P5DlTNpg8HqQqomQ9dvQB8ze+hEHhVWqmK8kK7Yz9og0heb
-qkP/joM4eEjEvoNKWvQLG2fdxb2kU12mbw/QygOjMJwyYXjuJmF8r2gHyyDPQwJc
-TsP/9HhV5/8RIyzAWijkL1XzNjkMCNpFFTQuPJNSsOmHagbTtQJU57hx8Djwz5To
-bCws/IuUUJJWmV/trBwW2xMOsaWB16P0np2+fnU4mx0gCwsexKnP/1mMRCQSQLXW
-qk1J2ru4fNTUEWNKb+s8
-=e/qB
+iQIcBAEBCAAGBQJOavugAAoJEHfx8XVYajsf6qkP/RWyYH7k6Jq0nu5TylkCs6kj
+40O7UMoCNMA3pkLAeyhFKnGevjiZLe336t5YKNlXENfnDyouFaoUX4fI8PX/I/l7
+Rksg9XNUELiAq6cY6DRsJPjqu5VdGrTgnHbQzwBwItmIvHCd6ma+bOK9K59e9EJw
+OAibUNTKlMy1SVZWEhGGSNMgi/myW0WY0Z7MMXXXLeQRQFKcrMyl+o7mHHsC3lMr
+j4ibQF+ZCeFSykjS8sso+qnSTap11t9XpHhcMjukNx90UxDFRjKzbHoxnLi/1vSg
+2BAAXuMTP9AgATJwSuEws+kc60IRW91QAq2bZvy5Q1YYgp9zDWG5mjmED0aNyLRF
+1szkdmRVYh+/Gh+JVlkf4eB88QZtBD9M37jVbjC3Fs2DjYg8Se3uiN9+UpHHm0HC
+oq0yaFN6Z+ocjwUCTVmF6/D4XkGnFKI0ozCpepM97oynLAoPP81TDySTjt4PRmqn
+ystQxYR3i2qUFj7Pf4y2IDFTggcPPAVa20P4T/7tvanCVGAYjiHsEokvqx65t19I
+jxSMB5ZlXofAp/fxzzyopasxHXOg+xeN58DY77sPRcHx4YNXtfwY0rrB/rJtUSJq
+d8fsLZ0RNHJXqyzhhXn21aWsuYLZNpy6ZOaSae8YNyhm5pA9tmtXJ0Szb5fsS3Bj
+RfLhs19QvVKu77yaNXmN
+=uVuw
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild
index a4c9d031f6e9..552c7300df56 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild,v 1.1 2011/09/09 07:18:10 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild,v 1.2 2011/09/10 05:54:25 eras Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb kerberos mysql nntp pam postgres replication +sieve snmp sqlite ssl tcpd"
+IUSE="afs berkdb kerberos mysql nntp pam postgres replication snmp sqlite ssl tcpd"
 
 RDEPEND="sys-libs/zlib
 	>=dev-libs/cyrus-sasl-2.1.13
@@ -97,6 +97,7 @@ src_configure() {
 		--enable-murder \
 		--enable-netscapehack \
 		--enable-idled \
+		--enable-sieve \
 		--with-service-path=/usr/$(get_libdir)/cyrus \
 		--with-cyrus-user=cyrus \
 		--with-cyrus-group=mail \
@@ -112,7 +113,6 @@ src_configure() {
 		$(use_enable nntp) \
 		$(use_enable replication) \
 		$(use_enable kerberos gssapi) \
-		$(use_enable sieve) \
 		$(use_with mysql) \
 		$(use_with postgres pgsql) \
 		$(use_with sqlite) \