| 1 |
commit: cbb3db4674e91663aad123b5f4e6a1521c9da163 |
| 2 |
Author: Daniel Campbell <zlg <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 4 07:31:09 2017 +0000 |
| 4 |
Commit: Daniel Campbell <zlg <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 4 07:32:51 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb3db46 |
| 7 |
|
| 8 |
app-misc/tmux: block app-vim/vim-tmux in 2.5-r1 |
| 9 |
|
| 10 |
Fixes file collision bug already fixed in 2.5-r2 (bug 603526) |
| 11 |
|
| 12 |
Bug: 627032 |
| 13 |
Bug-URL: https://bugs.gentoo.org/627032 |
| 14 |
|
| 15 |
See-Also: https://bugs.gentoo.org/603526 |
| 16 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 17 |
|
| 18 |
app-misc/tmux/metadata.xml | 22 +++++++++++----------- |
| 19 |
app-misc/tmux/tmux-2.5-r1.ebuild | 3 +++ |
| 20 |
2 files changed, 14 insertions(+), 11 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml |
| 23 |
index e1d25f39137..b1ac7e30666 100644 |
| 24 |
--- a/app-misc/tmux/metadata.xml |
| 25 |
+++ b/app-misc/tmux/metadata.xml |
| 26 |
@@ -1,20 +1,20 @@ |
| 27 |
<?xml version="1.0" encoding="UTF-8"?> |
| 28 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 29 |
<pkgmetadata> |
| 30 |
- <maintainer type="project"> |
| 31 |
- <email>shell-tools@g.o</email> |
| 32 |
- <name>Gentoo Shell Tools Project</name> |
| 33 |
- </maintainer> |
| 34 |
- <use> |
| 35 |
- <flag name="utempter">Include libutempter support</flag> |
| 36 |
- </use> |
| 37 |
- <longdescription> |
| 38 |
+ <maintainer type="project"> |
| 39 |
+ <email>shell-tools@g.o</email> |
| 40 |
+ <name>Gentoo Shell Tools Project</name> |
| 41 |
+ </maintainer> |
| 42 |
+ <use> |
| 43 |
+ <flag name="utempter">Include libutempter support</flag> |
| 44 |
+ </use> |
| 45 |
+ <longdescription> |
| 46 |
tmux is a "terminal multiplexer", it enables a number of terminals |
| 47 |
(or windows) to be accessed and controlled from a single terminal. |
| 48 |
tmux is intended to be a simple, modern, BSD-licensed alternative to |
| 49 |
programs such as <pkg>app-misc/screen</pkg>. |
| 50 |
</longdescription> |
| 51 |
- <upstream> |
| 52 |
- <remote-id type="github">tmux/tmux</remote-id> |
| 53 |
- </upstream> |
| 54 |
+ <upstream> |
| 55 |
+ <remote-id type="github">tmux/tmux</remote-id> |
| 56 |
+ </upstream> |
| 57 |
</pkgmetadata> |
| 58 |
|
| 59 |
diff --git a/app-misc/tmux/tmux-2.5-r1.ebuild b/app-misc/tmux/tmux-2.5-r1.ebuild |
| 60 |
index 41a77598164..75e26c553b7 100644 |
| 61 |
--- a/app-misc/tmux/tmux-2.5-r1.ebuild |
| 62 |
+++ b/app-misc/tmux/tmux-2.5-r1.ebuild |
| 63 |
@@ -14,7 +14,10 @@ SLOT="0" |
| 64 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 65 |
IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux" |
| 66 |
|
| 67 |
+# Blocking app-vim/vim-tmux due to file collision, fixed in -r2 |
| 68 |
+# fixes bug 627032 |
| 69 |
CDEPEND=" |
| 70 |
+ !app-vim/vim-tmux |
| 71 |
dev-libs/libevent:0= |
| 72 |
sys-libs/ncurses:0= |
| 73 |
utempter? ( |
Archives