| 1 |
commit: 92a6d0711e35c82aed3b00ce1eb4995ddd8c7ceb |
| 2 |
Author: Matt Smith <matt <AT> offtopica <DOT> uk> |
| 3 |
AuthorDate: Fri Feb 21 15:02:17 2020 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 24 05:50:53 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a6d071 |
| 7 |
|
| 8 |
net-mail/mu: Stop blocking mailutils |
| 9 |
|
| 10 |
After version 2.99.99, the mailutils binary mu was renamed to mailutils |
| 11 |
and so they can now be installed simultaneously. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/710388 |
| 14 |
Signed-off-by: Matt Smith <matt <AT> offtopica.uk> |
| 15 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/14731 |
| 17 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 18 |
|
| 19 |
net-mail/mu/mu-0.9.18-r2.ebuild | 5 +---- |
| 20 |
net-mail/mu/mu-1.0.ebuild | 5 +---- |
| 21 |
net-mail/mu/mu-1.3.5.ebuild | 5 +---- |
| 22 |
net-mail/mu/mu-1.3.6-r1.ebuild | 6 +----- |
| 23 |
net-mail/mu/mu-1.3.6.ebuild | 6 +----- |
| 24 |
5 files changed, 5 insertions(+), 22 deletions(-) |
| 25 |
|
| 26 |
diff --git a/net-mail/mu/mu-0.9.18-r2.ebuild b/net-mail/mu/mu-0.9.18-r2.ebuild |
| 27 |
index 432982f12ba..e8f78f99383 100644 |
| 28 |
--- a/net-mail/mu/mu-0.9.18-r2.ebuild |
| 29 |
+++ b/net-mail/mu/mu-0.9.18-r2.ebuild |
| 30 |
@@ -14,14 +14,11 @@ SLOT="0" |
| 31 |
KEYWORDS="amd64 x86" |
| 32 |
IUSE="emacs" |
| 33 |
|
| 34 |
-# net-mail/mailutils also installes /usr/bin/mu. Block it until somebody |
| 35 |
-# really wants both installed at the same time. |
| 36 |
DEPEND=" |
| 37 |
dev-libs/gmime:2.6 |
| 38 |
dev-libs/xapian |
| 39 |
dev-libs/glib:2 |
| 40 |
- emacs? ( >=app-editors/emacs-23.1:* ) |
| 41 |
- !net-mail/mailutils" |
| 42 |
+ emacs? ( >=app-editors/emacs-23.1:* )" |
| 43 |
RDEPEND="${DEPEND}" |
| 44 |
|
| 45 |
SITEFILE="70mu-gentoo.el" |
| 46 |
|
| 47 |
diff --git a/net-mail/mu/mu-1.0.ebuild b/net-mail/mu/mu-1.0.ebuild |
| 48 |
index f6af245b653..8a21040cf96 100644 |
| 49 |
--- a/net-mail/mu/mu-1.0.ebuild |
| 50 |
+++ b/net-mail/mu/mu-1.0.ebuild |
| 51 |
@@ -14,14 +14,11 @@ SLOT="0" |
| 52 |
KEYWORDS="~amd64 ~x86" |
| 53 |
IUSE="emacs" |
| 54 |
|
| 55 |
-# net-mail/mailutils also installes /usr/bin/mu. Block it until somebody |
| 56 |
-# really wants both installed at the same time. |
| 57 |
DEPEND=" |
| 58 |
dev-libs/gmime:2.6 |
| 59 |
dev-libs/xapian |
| 60 |
dev-libs/glib:2 |
| 61 |
- emacs? ( >=app-editors/emacs-23.1:* ) |
| 62 |
- !net-mail/mailutils" |
| 63 |
+ emacs? ( >=app-editors/emacs-23.1:* )" |
| 64 |
RDEPEND="${DEPEND}" |
| 65 |
|
| 66 |
SITEFILE="70mu-gentoo.el" |
| 67 |
|
| 68 |
diff --git a/net-mail/mu/mu-1.3.5.ebuild b/net-mail/mu/mu-1.3.5.ebuild |
| 69 |
index 1eff9ba7e75..41476616e4f 100644 |
| 70 |
--- a/net-mail/mu/mu-1.3.5.ebuild |
| 71 |
+++ b/net-mail/mu/mu-1.3.5.ebuild |
| 72 |
@@ -14,15 +14,12 @@ SLOT="0" |
| 73 |
KEYWORDS="~amd64 ~x86" |
| 74 |
IUSE="emacs guile" |
| 75 |
|
| 76 |
-# net-mail/mailutils also installes /usr/bin/mu. Block it until somebody |
| 77 |
-# really wants both installed at the same time. |
| 78 |
DEPEND=" |
| 79 |
dev-libs/gmime:3.0 |
| 80 |
>=dev-libs/xapian-1.4 |
| 81 |
dev-libs/glib:2 |
| 82 |
emacs? ( >=app-editors/emacs-24.4:* ) |
| 83 |
- guile? ( >=dev-scheme/guile-2.0 ) |
| 84 |
- !net-mail/mailutils" |
| 85 |
+ guile? ( >=dev-scheme/guile-2.0 )" |
| 86 |
RDEPEND="${DEPEND}" |
| 87 |
BDEPEND="virtual/pkgconfig" |
| 88 |
|
| 89 |
|
| 90 |
diff --git a/net-mail/mu/mu-1.3.6-r1.ebuild b/net-mail/mu/mu-1.3.6-r1.ebuild |
| 91 |
index 44a758d9183..27f87d5b69a 100644 |
| 92 |
--- a/net-mail/mu/mu-1.3.6-r1.ebuild |
| 93 |
+++ b/net-mail/mu/mu-1.3.6-r1.ebuild |
| 94 |
@@ -24,11 +24,7 @@ DEPEND=" |
| 95 |
net-libs/webkit-gtk:4 |
| 96 |
x11-libs/gtk+:3 |
| 97 |
)" |
| 98 |
-# net-mail/mailutils also installes /usr/bin/mu. Block it until somebody |
| 99 |
-# really wants both installed at the same time. |
| 100 |
-RDEPEND=" |
| 101 |
- ${DEPEND} |
| 102 |
- !net-mail/mailutils" |
| 103 |
+RDEPEND="${DEPEND}" |
| 104 |
BDEPEND="virtual/pkgconfig" |
| 105 |
|
| 106 |
SITEFILE="70mu-gentoo-autoload.el" |
| 107 |
|
| 108 |
diff --git a/net-mail/mu/mu-1.3.6.ebuild b/net-mail/mu/mu-1.3.6.ebuild |
| 109 |
index dc9ae87483e..fdbb2fb3c2b 100644 |
| 110 |
--- a/net-mail/mu/mu-1.3.6.ebuild |
| 111 |
+++ b/net-mail/mu/mu-1.3.6.ebuild |
| 112 |
@@ -24,11 +24,7 @@ DEPEND=" |
| 113 |
net-libs/webkit-gtk:4 |
| 114 |
x11-libs/gtk+:3 |
| 115 |
)" |
| 116 |
-# net-mail/mailutils also installes /usr/bin/mu. Block it until somebody |
| 117 |
-# really wants both installed at the same time. |
| 118 |
-RDEPEND=" |
| 119 |
- ${DEPEND} |
| 120 |
- !net-mail/mailutils" |
| 121 |
+RDEPEND="${DEPEND}" |
| 122 |
BDEPEND="virtual/pkgconfig" |
| 123 |
|
| 124 |
SITEFILE="70mu-gentoo.el" |
Archives