net-mail/mu: Stop blocking mailutils

After version 2.99.99, the mailutils binary mu was renamed to mailutils
and so they can now be installed simultaneously.

Closes: https://bugs.gentoo.org/710388
Signed-off-by: Matt Smith <matt@offtopica.uk>
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Closes: https://github.com/gentoo/gentoo/pull/14731
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

diff --git a/net-mail/mu/mu-0.9.18-r2.ebuild b/net-mail/mu/mu-0.9.18-r2.ebuild
index 432982f12baa0901b2fb4da4a9a2d948edb19293..e8f78f99383351e03667d9c78828c2752452c3c0 100644 (file)
--- a/net-mail/mu/mu-0.9.18-r2.ebuild
+++ b/net-mail/mu/mu-0.9.18-r2.ebuild
@@ -14,14 +14,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="emacs"
 
-# 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
        dev-libs/glib:2
-       emacs? ( >=app-editors/emacs-23.1:* )
-       !net-mail/mailutils"
+       emacs? ( >=app-editors/emacs-23.1:* )"
 RDEPEND="${DEPEND}"
 
 SITEFILE="70mu-gentoo.el"

diff --git a/net-mail/mu/mu-1.0.ebuild b/net-mail/mu/mu-1.0.ebuild
index f6af245b6533ac4950f38f0330b1e8672768de99..8a21040cf96c7631ce43a7eb86dec0f667eb7207 100644 (file)
--- a/net-mail/mu/mu-1.0.ebuild
+++ b/net-mail/mu/mu-1.0.ebuild
@@ -14,14 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs"
 
-# 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
        dev-libs/glib:2
-       emacs? ( >=app-editors/emacs-23.1:* )
-       !net-mail/mailutils"
+       emacs? ( >=app-editors/emacs-23.1:* )"
 RDEPEND="${DEPEND}"
 
 SITEFILE="70mu-gentoo.el"

diff --git a/net-mail/mu/mu-1.3.5.ebuild b/net-mail/mu/mu-1.3.5.ebuild
index 1eff9ba7e75cae928e61b908f4653b57d7c30642..41476616e4fa4bc915994eebaeb2bb0c9e27f963 100644 (file)
--- a/net-mail/mu/mu-1.3.5.ebuild
+++ b/net-mail/mu/mu-1.3.5.ebuild
@@ -14,15 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs guile"
 
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
 DEPEND="
        dev-libs/gmime:3.0
        >=dev-libs/xapian-1.4
        dev-libs/glib:2
        emacs? ( >=app-editors/emacs-24.4:* )
-       guile? ( >=dev-scheme/guile-2.0 )
-       !net-mail/mailutils"
+       guile? ( >=dev-scheme/guile-2.0 )"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 

diff --git a/net-mail/mu/mu-1.3.6-r1.ebuild b/net-mail/mu/mu-1.3.6-r1.ebuild
index 44a758d91837f27fbae8138f1047ef41c89b22ac..27f87d5b69a217af23f11d6f705d7ab5414a00ff 100644 (file)
--- a/net-mail/mu/mu-1.3.6-r1.ebuild
+++ b/net-mail/mu/mu-1.3.6-r1.ebuild
@@ -24,11 +24,7 @@ DEPEND="
                net-libs/webkit-gtk:4
                x11-libs/gtk+:3
        )"
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-RDEPEND="
-       ${DEPEND}
-       !net-mail/mailutils"
+RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 SITEFILE="70mu-gentoo-autoload.el"

diff --git a/net-mail/mu/mu-1.3.6.ebuild b/net-mail/mu/mu-1.3.6.ebuild
index dc9ae87483e07098112a5913d28f7bdb10d5692f..fdbb2fb3c2bdfdb309b7aad70bd2e144671e307e 100644 (file)
--- a/net-mail/mu/mu-1.3.6.ebuild
+++ b/net-mail/mu/mu-1.3.6.ebuild
@@ -24,11 +24,7 @@ DEPEND="
                net-libs/webkit-gtk:4
                x11-libs/gtk+:3
        )"
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-RDEPEND="
-       ${DEPEND}
-       !net-mail/mailutils"
+RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 SITEFILE="70mu-gentoo.el"