commit: cbb3db4674e91663aad123b5f4e6a1521c9da163 Author: Daniel Campbell <zlg <AT> gentoo <DOT> org> AuthorDate: Fri Aug 4 07:31:09 2017 +0000 Commit: Daniel Campbell <zlg <AT> gentoo <DOT> org> CommitDate: Fri Aug 4 07:32:51 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb3db46
app-misc/tmux: block app-vim/vim-tmux in 2.5-r1 Fixes file collision bug already fixed in 2.5-r2 (bug 603526) Bug: 627032 Bug-URL: https://bugs.gentoo.org/627032 See-Also: https://bugs.gentoo.org/603526 Package-Manager: Portage-2.3.6, Repoman-2.3.3 app-misc/tmux/metadata.xml | 22 +++++++++++----------- app-misc/tmux/tmux-2.5-r1.ebuild | 3 +++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml index e1d25f39137..b1ac7e30666 100644 --- a/app-misc/tmux/metadata.xml +++ b/app-misc/tmux/metadata.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Shell Tools Project</name> - </maintainer> - <use> - <flag name="utempter">Include libutempter support</flag> - </use> - <longdescription> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo Shell Tools Project</name> + </maintainer> + <use> + <flag name="utempter">Include libutempter support</flag> + </use> + <longdescription> tmux is a "terminal multiplexer", it enables a number of terminals (or windows) to be accessed and controlled from a single terminal. tmux is intended to be a simple, modern, BSD-licensed alternative to programs such as <pkg>app-misc/screen</pkg>. </longdescription> - <upstream> - <remote-id type="github">tmux/tmux</remote-id> - </upstream> + <upstream> + <remote-id type="github">tmux/tmux</remote-id> + </upstream> </pkgmetadata> diff --git a/app-misc/tmux/tmux-2.5-r1.ebuild b/app-misc/tmux/tmux-2.5-r1.ebuild index 41a77598164..75e26c553b7 100644 --- a/app-misc/tmux/tmux-2.5-r1.ebuild +++ b/app-misc/tmux/tmux-2.5-r1.ebuild @@ -14,7 +14,10 @@ SLOT="0" 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" IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux" +# Blocking app-vim/vim-tmux due to file collision, fixed in -r2 +# fixes bug 627032 CDEPEND=" + !app-vim/vim-tmux dev-libs/libevent:0= sys-libs/ncurses:0= utempter? (
