summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/app-misc/tmux-2.9a
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/app-misc/tmux-2.9a')
-rw-r--r--metadata/md5-cache/app-misc/tmux-2.9a9
1 files changed, 9 insertions, 0 deletions
diff --git a/metadata/md5-cache/app-misc/tmux-2.9a b/metadata/md5-cache/app-misc/tmux-2.9a
index 4269ce318af5..8a055c662614 100644
--- a/metadata/md5-cache/app-misc/tmux-2.9a
+++ b/metadata/md5-cache/app-misc/tmux-2.9a
@@ -5,10 +5,19 @@ DESCRIPTION=Terminal multiplexer
EAPI=7
HOMEPAGE=https://tmux.github.io/
IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
+<<<<<<< HEAD
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
+=======
+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
+>>>>>>> next
LICENSE=ISC
RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( app-vim/vim-tmux )
SLOT=0
SRC_URI=https://github.com/tmux/tmux/releases/download/2.9a/tmux-2.9a.tar.gz
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=5396dfb591881895c775bc306cc3f1f4
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=2bfe173a65dca4642235d7a9ff30e937
+>>>>>>> next