add blocker on mail-filter/libsieve due to filecollision - bug #248097

Package-Manager: portage-2.2_rc24/cvs/Linux i686

4 files changed, 12 insertions, 16 deletions

diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog
index d55a4b478184..f9fa6e49e27e 100644
--- a/net-mail/mailutils/ChangeLog
+++ b/net-mail/mailutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/mailutils
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.37 2009/02/15 21:35:21 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.38 2009/03/16 09:44:22 bangert Exp $
+
+  16 Mar 2009; Thilo Bangert <bangert@gentoo.org> mailutils-0.6-r3.ebuild,
+  mailutils-1.2.ebuild:
+  add blocker on mail-filter/libsieve due to filecollision - bug #248097
 
   15 Feb 2009; Torsten Veller <tove@gentoo.org> mailutils-0.6-r3.ebuild,
   mailutils-1.2.ebuild:
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index b2054d7ade2a..68d425331946 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mail.rc 271 RMD160 aed3edf9939427b4a9c602daa0851b829634e088 SHA1 25ed72daf07c3914491731532c2b7df597e55387 SHA256 b75b4e7770be8014baceb59a768697b72db9850fc07be8897a5ac851f169329c
 AUX mailutils-0.6-imap4d-format-string.patch 469 RMD160 86afa1767beccb5cc720d65b4745f44a31cb2e73 SHA1 b231625ee1580401c701ce6f08e20a55e10e0c2a SHA256 a339bd53d12d297681f86bf065c7e74ebef07fb0caa25207a28bcc0581f326ac
 AUX mailutils-0.6-imap4d-gcc4.0-ftbfs.patch 763 RMD160 7926a88b08a23ad1fe91acd01d4d83e48db6c7b9 SHA1 056d23cac291b0ea86f015bf603ef344d16ce8df SHA256 4d83211cdedcbb65f6f74119abfb1739034a6ed7699eff3df21a8b689f41e3fc
@@ -12,14 +9,7 @@ AUX mailutils-SQLinjection.patch 460 RMD160 ac574075624823151d8e0dba16b4a598a4fd
 AUX mailutils-getline.diff 667 RMD160 731f7e4af498ef0ab0d800fe5d7ab387061594b6 SHA1 25af2f77b7dc9ba8056685545e9b36019da7dfab SHA256 3a7e33585aa82ff8a151b46ae9d89b8f388ae65d784d4cecbeb43a24c11e0fc0
 DIST mailutils-0.6.tar.bz2 2025327 RMD160 a5f7df9e363ee461135f3c7336a5877f124284ec SHA1 dc9b50aa8e22a6c84e295499ff6ac2871ccf8fb7 SHA256 a76114866ddb705dbc6a841ef8b7f603ef34640bc8d9652ccac14bafddb95a8c
 DIST mailutils-1.2.tar.bz2 2507082 RMD160 85cc53d578aa80439c6a3ec8aba87137b5fcc263 SHA1 54381259604b8736ea2bb4a2927be79e6f472416 SHA256 bc2cc54caeedda83883279d5880d22eb20eca39ecefcc7eec6ea190911c53de4
-EBUILD mailutils-0.6-r3.ebuild 3081 RMD160 d104d476e60d1215cc8222d28d16543735d5c728 SHA1 09ef5b516af97474a3c1203f75da7809f7330bdf SHA256 29b1edae8b60a27ea5395a08eadfe07e066e59bc6d2fcd7e19dcabf738904c03
-EBUILD mailutils-1.2.ebuild 2422 RMD160 be5b0c5d3cf971372377e95ab1bf92b62ce282dc SHA1 2562f639be8e9c7d896ff13253601290c23ca6b7 SHA256 935879c0541f36ccc8e8d62d8d471db3a5cb094f3a6d3c3a448a3bf1e2ec3eb8
-MISC ChangeLog 5172 RMD160 3a93d87eed76202ff5892ad2417f70b1466dd9f9 SHA1 b131a234b0888b887faff1ab43cf55acdf1f208b SHA256 8e5346e5d2b57e03c6dfdd8b71b566bf3ffd5231f28519d088d0343adc708d2a
+EBUILD mailutils-0.6-r3.ebuild 3107 RMD160 51d27334ecbb967b4ad71c6cc0f035971a98fb2f SHA1 00a8d8fa1939b4fb3fd31cea302d0298152b821b SHA256 e9d7ba3041e99e3ae398dcffcc8374433405e17417a63fc1d0d3e858577671cd
+EBUILD mailutils-1.2.ebuild 2448 RMD160 5b5f55d8cc56a9be6b3e591c529691eb16661e8c SHA1 6bcb6938619b7f146e247fc01d2c67592683ee3b SHA256 30bfb69cb4de82e004e6198595a9f420c23bcbab27049d697091ab39c31526fb
+MISC ChangeLog 5348 RMD160 3c28386ca0add8ebd0f32ded8a387ab9028ba4ac SHA1 41e271d02e0f63d42fce06e080ba56e55f5f8e96 SHA256 eb44b7322330f36eac6c2f74335801ed62409d17f998638812c188127721f96e
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmYincACgkQV3J2n04EauwrDgCglwLxPqAo1edVOMoBYQSNIJPj
-FNQAn3S4OGSHx66//1Dua/TsmNSLSU+Y
-=hBl4
------END PGP SIGNATURE-----
diff --git a/net-mail/mailutils/mailutils-0.6-r3.ebuild b/net-mail/mailutils/mailutils-0.6-r3.ebuild
index 004a092141d0..de60b00040cb 100644
--- a/net-mail/mailutils/mailutils-0.6-r3.ebuild
+++ b/net-mail/mailutils/mailutils-0.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-0.6-r3.ebuild,v 1.10 2009/02/15 21:35:21 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-0.6-r3.ebuild,v 1.11 2009/03/16 09:44:22 bangert Exp $
 
 inherit eutils
 
@@ -16,6 +16,7 @@ PROVIDE="virtual/mailx"
 
 RDEPEND="!virtual/mailx
 	!mail-client/nmh
+	!mail-filter/libsieve
 	dev-scheme/guile
 	gdbm? ( sys-libs/gdbm )
 	mysql? ( virtual/mysql )
diff --git a/net-mail/mailutils/mailutils-1.2.ebuild b/net-mail/mailutils/mailutils-1.2.ebuild
index bba344a17c34..1e4cc2896a51 100644
--- a/net-mail/mailutils/mailutils-1.2.ebuild
+++ b/net-mail/mailutils/mailutils-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-1.2.ebuild,v 1.4 2009/02/15 21:35:21 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-1.2.ebuild,v 1.5 2009/03/16 09:44:22 bangert Exp $
 
 inherit eutils
 
@@ -16,6 +16,7 @@ PROVIDE="virtual/mailx"
 
 RDEPEND="!virtual/mailx
 	!mail-client/nmh
+	!mail-filter/libsieve
 	dev-scheme/guile
 	gdbm? ( sys-libs/gdbm )
 	mysql? ( virtual/mysql )