From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36802139694 for ; Fri, 4 Aug 2017 07:33:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C0361FC006; Fri, 4 Aug 2017 07:33:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4DC8F1FC006 for ; Fri, 4 Aug 2017 07:33:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 262963418C7 for ; Fri, 4 Aug 2017 07:33:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6824F74C9 for ; Fri, 4 Aug 2017 07:33:03 +0000 (UTC) From: "Daniel Campbell" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Daniel Campbell" Message-ID: <1501831971.cbb3db4674e91663aad123b5f4e6a1521c9da163.zlg@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/tmux/metadata.xml app-misc/tmux/tmux-2.5-r1.ebuild X-VCS-Directories: app-misc/tmux/ X-VCS-Committer: zlg X-VCS-Committer-Name: Daniel Campbell X-VCS-Revision: cbb3db4674e91663aad123b5f4e6a1521c9da163 X-VCS-Branch: master Date: Fri, 4 Aug 2017 07:33:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e1201f85-ebd9-4baf-8d5b-2fb6fa322bc6 X-Archives-Hash: 4e00a26e140940dccb1e20f03ade4ebb commit: cbb3db4674e91663aad123b5f4e6a1521c9da163 Author: Daniel Campbell gentoo org> AuthorDate: Fri Aug 4 07:31:09 2017 +0000 Commit: Daniel Campbell gentoo 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 @@ - - shell-tools@gentoo.org - Gentoo Shell Tools Project - - - Include libutempter support - - + + shell-tools@gentoo.org + Gentoo Shell Tools Project + + + Include libutempter support + + 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 app-misc/screen. - - tmux/tmux - + + tmux/tmux + 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? (