summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Smith <matt@offtopica.uk>2020-02-21 15:02:17 +0000
committerJoonas Niilola <juippis@gentoo.org>2020-02-24 07:50:53 +0200
commit92a6d0711e35c82aed3b00ce1eb4995ddd8c7ceb (patch)
treef60caedc14f9b8c469260566a914a813f612257b /net-mail/mu
parentdev-lisp/roswell: add bug # to explain file collision blocker (diff)
downloadgentoo-92a6d0711e35c82aed3b00ce1eb4995ddd8c7ceb.tar.gz
gentoo-92a6d0711e35c82aed3b00ce1eb4995ddd8c7ceb.tar.bz2
gentoo-92a6d0711e35c82aed3b00ce1eb4995ddd8c7ceb.zip
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>
Diffstat (limited to 'net-mail/mu')
-rw-r--r--net-mail/mu/mu-0.9.18-r2.ebuild5
-rw-r--r--net-mail/mu/mu-1.0.ebuild5
-rw-r--r--net-mail/mu/mu-1.3.5.ebuild5
-rw-r--r--net-mail/mu/mu-1.3.6-r1.ebuild6
-rw-r--r--net-mail/mu/mu-1.3.6.ebuild6
5 files changed, 5 insertions, 22 deletions
diff --git a/net-mail/mu/mu-0.9.18-r2.ebuild b/net-mail/mu/mu-0.9.18-r2.ebuild
index 432982f12ba..e8f78f99383 100644
--- 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 f6af245b653..8a21040cf96 100644
--- 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 1eff9ba7e75..41476616e4f 100644
--- 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 44a758d9183..27f87d5b69a 100644
--- 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 dc9ae87483e..fdbb2fb3c2b 100644
--- 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"