summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kahle <tomka@gentoo.org>2012-11-07 21:26:39 +0000
committerThomas Kahle <tomka@gentoo.org>2012-11-07 21:26:39 +0000
commitc9e1d51bc54384e606b0db3fce5defc3f680aa81 (patch)
treed8c3088649f9e9f8034e79454a3fa314f967e645 /net-mail
parentapp-misc/dtach: Backport fix for CVE-2012-3368, #426496 (diff)
downloadgentoo-2-c9e1d51bc54384e606b0db3fce5defc3f680aa81.tar.gz
gentoo-2-c9e1d51bc54384e606b0db3fce5defc3f680aa81.tar.bz2
gentoo-2-c9e1d51bc54384e606b0db3fce5defc3f680aa81.zip
block net-mail/mailutils (bug 441818)
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC)
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/mu/ChangeLog5
-rw-r--r--net-mail/mu/mu-0.9.9.ebuild9
2 files changed, 10 insertions, 4 deletions
diff --git a/net-mail/mu/ChangeLog b/net-mail/mu/ChangeLog
index 1e2bd8a74afa..a3322bf7a3d2 100644
--- a/net-mail/mu/ChangeLog
+++ b/net-mail/mu/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-mail/mu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mu/ChangeLog,v 1.13 2012/11/06 20:00:16 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mu/ChangeLog,v 1.14 2012/11/07 21:26:39 tomka Exp $
+
+ 07 Nov 2012; Thomas Kahle <tomka@gentoo.org> mu-0.9.9.ebuild:
+ block net-mail/mailutils (bug 441818)
06 Nov 2012; Thomas Kahle <tomka@gentoo.org> mu-0.9.9.ebuild:
Depend on gmime:2.6 per bug 439842
diff --git a/net-mail/mu/mu-0.9.9.ebuild b/net-mail/mu/mu-0.9.9.ebuild
index 17ddf980b4c4..c91a970bf15b 100644
--- a/net-mail/mu/mu-0.9.9.ebuild
+++ b/net-mail/mu/mu-0.9.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mu/mu-0.9.9.ebuild,v 1.3 2012/11/06 20:00:16 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mu/mu-0.9.9.ebuild,v 1.4 2012/11/07 21:26:39 tomka Exp $
EAPI=4
@@ -16,8 +16,10 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc emacs gui"
-# Without webkit-gtk there is no pdf-preview functionality, everthing
+# Without webkit-gtk there is no pdf-preview functionality, everything
# else works as of 0.9.8.5
+# net-mail/mailutils also installes /usr/bin/mu. Block it until somebody
+# really wants both installed at the same time.
DEPEND="
dev-libs/gmime:2.6
dev-libs/xapian
@@ -25,7 +27,8 @@ DEPEND="
gui? (
x11-libs/gtk+:3
net-libs/webkit-gtk:3 )
- emacs? ( >=virtual/emacs-23 )"
+ emacs? ( >=virtual/emacs-23 )
+ !net-mail/mailutils"
RDEPEND="${DEPEND}"
SITEFILE="70mu-gentoo.el"