gentoo resync : 14.04.2018

11 files changed, 7 insertions, 477 deletions

diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index ac4e15cdaa30..54f2d9b252b2 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,20 +1,9 @@
-AUX tmux-2.0-flags.patch 584 BLAKE2B 3202e29756f9cc3f7f7538f11ddefdf795af316af71cd2a0b7c043223a424181b929d5cc58c05c31412503fd053cff6fe9a096d49412b6860adb363df4ac0b03 SHA512 029a29182f5998c19883f24eab980d16f2e89c72f4150354e0a1101f9092491e836952fb9442e511508f47fd701c8cc8171f29c6ff097248894b6696d108f6dd
-AUX tmux-2.3-flags.patch 438 BLAKE2B 9f2b67ddfbd13c25830f95272053935d669252f746dabd30db5c4e01b148c22d2e848e09062058c71bc93d1a83f77f8e1bb2fbcb92f61cd35a4ff2305e92edca SHA512 2fed56091a92ba4e4c9e49144099d8a9dbdd2f157562f65b547a5ae864d82e7123acba46dd380bb9d470a5cb5f681702f5b6bdf230f411ed727095c0b9c38bfa
-AUX tmux-2.3-pipe_pane-fix.patch 208 BLAKE2B 08eb18d22eff0bcfc97f0656d5d2c8395ce9d4d61ba140d6b0006ec01c544ec0bbf9018a5b6e08dba5a66085921d5df87eee0b606614f7d810901ff50e99438d SHA512 bd2376434f6e7dd344587363d0d788559e24cfbfed96def3331d79e9830916b8a7882e62ac9838caafb132fb88e56a2587e50a93eaa22444542bb8e381da2d23
-AUX tmux-2.3-screen_write_copy-fix.patch 1955 BLAKE2B bb7796c21165d99fa0348ae8970a548a6fc34966b1b2ea896a8af48631b367e29e5c3ac2b6da45e4bd1c639f072b3390369c98ba47920b234ff9535133fc16eb SHA512 c4ad6ce33dbf7ce47a811da1172a5c29475a7e2479f8e662d263a6206ff73781cce99018c976d151e8dec25e7f1cf07fa0c93bf0634f35484651d2ee17efaea8
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
-AUX tmux.vim 55 BLAKE2B 91b883af5b048d04637a893d11615af24c02671ce45b9d114939cef3b8e76f5f826646e10bc68dd7c92af96ddb9ef0bf7bc25b976e645b9b8bb3eb2c8db47f55 SHA512 5307bf7d27209ce143d7a57856440ba0462783f5b047b00ec5a5046f1b72110e62ef8bca47b67807cb9e9ffcede06c512f6136d825260f735cc32a63706c9e5e
-DIST tmux-2.2.tar.gz 466852 BLAKE2B 78bc503955686a1b8aa80c0686aa2b05c32bb54078c0dd5c3bcf0c3e2ac8ff0383ceb63218974b2da688506bd44e8ebfd48a05a66ba9322b446cc44c11952932 SHA512 4d4fc316c78aab0d13f7f15098d952f01d7da7d74d46251ae2dd90440522f07c785afe984d82de2b4518fb67ea441f5a5a46c357c87ddc6ddbfba4b7f08be7bf
-DIST tmux-2.3.tar.gz 473944 BLAKE2B 348bb0492332d2c52d11be2aa128552ca374feb8ac2cf91d395fe5896d1fd791e62c3a526df7c744ef888eaaa1aa91ffa110dcc5626b72169aac7dc7f7293dd2 SHA512 521e3734104be43837cba95d8b3d050d033708fa7469f7e7db66ae6993b002c4d9f6bafec41f3c9446eda91a4499e571019534dfa2e5a0563085b2d16e1b94af
-DIST tmux-2.5.tar.gz 475717 BLAKE2B c702949c7490b637ca99dc6b98d92af917e437374159153c6b955821d056fcbe676441974f42cb271db4dc69746765bb83e5a86a7d51e35d900a1a4f77e60ead SHA512 c0e8365a553d034e347f2f7a0d64f04e2be4307a75a9f72c8218fc56b72e531f3f37fe4a8f0e8d70801f5f62ee250ab7e9978abd6d101d273f76b4a1a92b08e0
 DIST tmux-2.6.tar.gz 481000 BLAKE2B adbd276261f3f4be9d67c6c0fbad28a90eabbecfa68ebbc104fe56acaa9b7bd005060b854ce0a0e669fdf41dd058bfa8450a85a78f71f7248a44d25458f7d3bc SHA512 20a1ae8b8494c5b42757902322f3877731c2cc330c9c00f097a317785d25252b7ebaa8bbab9fc17843299e80cb2914aaac0a664715a85c50f7ea489d23753832
+DIST tmux-2.7.tar.gz 487585 BLAKE2B 9c56da03bd12b358fcbed82def9680c34e1e485f906cf9b90a501e53b109c43d1ee843972d26e677de2c34830e599edee022dc1c17e1e5c935ed232caacb2b01 SHA512 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1
-EBUILD tmux-2.2.ebuild 2126 BLAKE2B 08176ade022eab5db71d0e371a8b668dd8565b7f5056ed12ae644e93bdd6f518de0275fd64043221639ee0d4638eeeafd3a1dee7e5c34df007b4bb4ac9c1bec2 SHA512 cd6f0142fefd2f72d92ed12a68f812e8fec73254c1e729edf4fc9326f85e5f8be6b1253b88a5e927d6633dcd1f828385e10b643818f167319cc073276be5dec5
-EBUILD tmux-2.3-r1.ebuild 2234 BLAKE2B 3bb0de689495b69f479ad605480a0c93a13cbdbd526bd5121f158af133f382a25fed90ae83cd10c733e3bd120fe899d91cfe5b7a93b89d349d0adf1a6ce4157e SHA512 2dd1c25573817c6ea2bb2667a0f9f3fb63d46ce547e0a3487dd62c7bcdfbd5cb1cc610d9d324e816eeed8ffa5d66212b80a1a5caaa477ee7baa6fa2b629342c0
-EBUILD tmux-2.3-r2.ebuild 2242 BLAKE2B 75da9813dc3ab1ecb854a15c8c06e84b88feb51bf21f876eaf385040ef07071be1dff7f34c6f9b62402a85f042f0088c4da088b1b882fbafbe292c4d7ec01d1f SHA512 ac9454dafba18b5f76c0f77a620ece677b8d195cb6f50fc57116bea4985e7c01e692d758ac42eb3a20d7c2c18f73c8bfcc2460f9535fc2c80180d3efb1462e6e
-EBUILD tmux-2.5-r2.ebuild 2073 BLAKE2B 1c3ee0f7eb1e2a26f5c7a0bc73442dcdd160d1bdd9a7bdad62a2397854b8ad08b4c055b985df9d8ba3d1bcf49033c30ff28443f8f7abbae55b54a622035c13d0 SHA512 fa557f19858c312918d6190cbd029dcbfec05a494236027e3be78bd8be8843823f5112150387986709881577b0bb3fc66bba42a4001729456136dd89739844d5
-EBUILD tmux-2.5.ebuild 2263 BLAKE2B f03e993159487bd92fe3e328d5f79d7bb3bc6b75ab3ecabae51dc64b156db260c7e2242a173e77a32a16dc14ab6276feec77cf7d94f2145c98d6209e9a8fed4d SHA512 d5abbfd108431a47bab4195e9397d0b2748fd59c0036c0c71caa34b741069eb0a5a3d14fe98d0874d312e740a5831a7df3aecc0de2eb3163842663a94638a389
 EBUILD tmux-2.6.ebuild 2139 BLAKE2B 2a1aad8d0517a69544dfd377b515408ce47b47a27f60eefd65d76c66f3eabf40638e99d3c833497c531ccdc40886ec0b902615944aae21cbcaee7f5aee4e59c6 SHA512 2f2dea7908ccb6455599e041e16a2a9aec7c8b4131d5a8f623ba4bddbbf5524ed308a5572ec7baaaac6e4819dbfa7fc87d821c8f0c1681a50bf7eeb48ea572af
+EBUILD tmux-2.7.ebuild 2148 BLAKE2B efbd209b875e90251bfb1aaa961621f48d61c4f9cd21b66db5b6b1f99c197db575591a8a79659b90dc60f8e4824ab58b219499ce3af4247f91891833828f2d88 SHA512 39434193a3fb90dc3efd2565188c2fac105bb136b0a7b889acc3b50632697251a3bd4274ec025b00174e385345a0ba9eba96d970cf0e7cd2e3f5315109e95fd9
 EBUILD tmux-9999.ebuild 2349 BLAKE2B e4f633dc28e278873941f66efb8adfff9735fd04ad98e505b474dfa657303033ba8cf1cc22f64f7e66ef248c2621858461bf133b2aaad9ee817ae80eba4de847 SHA512 0fd75b67ac3e782f9c6aec6e36bafd69f025555c493961da7945994b0cb3dc1d8991d5a41ad68f85bd176564427e0b5f21ffc53ee9a4db41d50caa043ac0dec2
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/files/tmux-2.0-flags.patch b/app-misc/tmux/files/tmux-2.0-flags.patch
deleted file mode 100644
index d2c40e04b788..000000000000
--- a/app-misc/tmux/files/tmux-2.0-flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- Makefile.am | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 63e20b1..a2fec1e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,9 +25,8 @@ endif
- # Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly
- # different flags.
- if IS_GCC
--CFLAGS += -std=gnu99 -O2
-+CFLAGS += -std=gnu99
- if IS_DEBUG
--CFLAGS += -g
- CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
- CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
- CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
diff --git a/app-misc/tmux/files/tmux-2.3-flags.patch b/app-misc/tmux/files/tmux-2.3-flags.patch
deleted file mode 100644
index 6fa66b508333..000000000000
--- a/app-misc/tmux/files/tmux-2.3-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- Makefile.am |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
---- tmux-2.3/Makefile.am
-+++ tmux-2.3/Makefile.am
-@@ -23,9 +23,8 @@
- 
- # Set flags for gcc.
- if IS_GCC
--CFLAGS += -std=gnu99 -O2
-+CFLAGS += -std=gnu99
- if IS_DEBUG
--CFLAGS += -g
- CFLAGS += -Wno-long-long -Wall -W -Wformat=2
- CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
- CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
diff --git a/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch b/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch
deleted file mode 100644
index 65dd2f3c1bc9..000000000000
--- a/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/window.c	2016-09-29 05:31:24.000000000 +0800
-+++ b/window.c	2017-12-22 09:38:43.709617000 +0800
-@@ -981,7 +981,7 @@
-
- 	input_parse(wp);
-
--	wp->pipe_off = size;
-+	wp->pipe_off = EVBUFFER_LENGTH(evb);
- }
diff --git a/app-misc/tmux/files/tmux-2.3-screen_write_copy-fix.patch b/app-misc/tmux/files/tmux-2.3-screen_write_copy-fix.patch
deleted file mode 100644
index b8383274da2a..000000000000
--- a/app-misc/tmux/files/tmux-2.3-screen_write_copy-fix.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 30086e504c8a5389b96b72b81ac8dbefe19e0cf1 Mon Sep 17 00:00:00 2001
-From: nicm <nicm>
-Date: Wed, 5 Oct 2016 22:00:29 +0000
-Subject: [PATCH] screen_write_copy tried to be clever and clear the line if it
- reached the end of the source, but it was wrong and causes problems that are
- only showing up now we are more aggressive about skipping redundant screen
- updates. Remove the optimization entirely as more trouble than it is worth to
- fix (and it'll have to go when BCE is done anyway).
-
----
- screen-write.c | 34 +++++++---------------------------
- 1 file changed, 7 insertions(+), 27 deletions(-)
-
-diff --git a/screen-write.c b/screen-write.c
-index 3977517..3a1fc8c 100644
---- a/screen-write.c
-+++ b/screen-write.c
-@@ -394,38 +394,18 @@ screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px,
- {
- 	struct screen		*s = ctx->s;
- 	struct grid		*gd = src->grid;
--	struct grid_line	*gl;
- 	struct grid_cell	 gc;
--	u_int		 	 xx, yy, cx, cy, ax, bx;
-+	u_int		 	 xx, yy, cx, cy;
- 
- 	cx = s->cx;
- 	cy = s->cy;
-+
- 	for (yy = py; yy < py + ny; yy++) {
--		gl = &gd->linedata[yy];
--		if (yy < gd->hsize + gd->sy) {
--			/*
--			 * Find start and end position and copy between
--			 * them. Limit to the real end of the line then use a
--			 * clear EOL only if copying to the end, otherwise
--			 * could overwrite whatever is there already.
--			 */
--			if (px > gl->cellsize)
--				ax = gl->cellsize;
--			else
--				ax = px;
--			if (px + nx == gd->sx && px + nx > gl->cellsize)
--				bx = gl->cellsize;
--			else
--				bx = px + nx;
--
--			for (xx = ax; xx < bx; xx++) {
--				grid_get_cell(gd, xx, yy, &gc);
--				screen_write_cell(ctx, &gc);
--			}
--			if (px + nx == gd->sx && px + nx > gl->cellsize)
--				screen_write_clearendofline(ctx);
--		} else
--			screen_write_clearline(ctx);
-+		for (xx = px; xx < px + nx; xx++) {
-+			grid_get_cell(gd, xx, yy, &gc);
-+			screen_write_cell(ctx, &gc);
-+		}
-+
- 		cy++;
- 		screen_write_cursormove(ctx, cx, cy);
- 	}
diff --git a/app-misc/tmux/files/tmux.vim b/app-misc/tmux/files/tmux.vim
deleted file mode 100644
index baac50adab16..000000000000
--- a/app-misc/tmux/files/tmux.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
diff --git a/app-misc/tmux/tmux-2.2.ebuild b/app-misc/tmux/tmux-2.2.ebuild
deleted file mode 100644
index fdc80fec9998..000000000000
--- a/app-misc/tmux/tmux-2.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-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"
-
-CDEPEND="
-	>=dev-libs/libevent-2.1.5-r4:=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)
-	sys-libs/ncurses:0="
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-DOCS=( CHANGES FAQ README TODO )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-flags.patch )
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug) \
-		$(use_enable utempter)
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
-}
-
-pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.3-r1.ebuild b/app-misc/tmux/tmux-2.3-r1.ebuild
deleted file mode 100644
index 1c3c6889b8b4..000000000000
--- a/app-misc/tmux/tmux-2.3-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-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"
-
-CDEPEND="
-	>=dev-libs/libevent-2.1.5-r4:=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)
-	sys-libs/ncurses:0="
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-DOCS=( CHANGES FAQ README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-flags.patch
-
-	# usptream fixes (can be removed with next version bump)
-	"${FILESDIR}"/${P}-screen_write_copy-fix.patch
-)
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug) \
-		$(use_enable utempter)
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
-}
-
-pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.3-r2.ebuild b/app-misc/tmux/tmux-2.3-r2.ebuild
deleted file mode 100644
index 3bed9128b2f8..000000000000
--- a/app-misc/tmux/tmux-2.3-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-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"
-
-CDEPEND="
-	>=dev-libs/libevent-2.1.5-r4:=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)
-	sys-libs/ncurses:0="
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-flags.patch
-
-	# usptream fixes (can be removed with next version bump)
-	"${FILESDIR}"/${P}-screen_write_copy-fix.patch
-	"${FILESDIR}"/${P}-pipe_pane-fix.patch
-)
-
-src_prepare() {
-	default
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug) \
-		$(use_enable utempter)
-}
-
-src_install() {
-	default
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
-}
-
-pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
-		ewarn
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		ewarn
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.5-r2.ebuild b/app-misc/tmux/tmux-2.5-r2.ebuild
deleted file mode 100644
index 092a05aeac5f..000000000000
--- a/app-misc/tmux/tmux-2.5-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.gz"
-
-LICENSE="ISC"
-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"
-
-CDEPEND="
-	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 ) )
-	)"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-		app-vim/vim-tmux
-	)"
-
-DOCS=( CHANGES FAQ README TODO example_tmux.conf )
-
-PATCHES=(
-	# usptream fixes (can be removed with next version bump)
-	"${FILESDIR}/${PN}-2.4-flags.patch"
-)
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm -v aclocal.m4 || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.5.ebuild b/app-misc/tmux/tmux-2.7.ebuild
index 021ab3b915f0..33446641593b 100644
--- a/app-misc/tmux/tmux-2.5.ebuild
+++ b/app-misc/tmux/tmux-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,12 +15,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
-	>=dev-libs/libevent-2.1.5-r4
+	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 ) )
 	)
-	sys-libs/ncurses:0="
+"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
@@ -32,7 +33,7 @@ RDEPEND="${CDEPEND}
 		)
 	)"
 
-DOCS=( CHANGES FAQ README TODO )
+DOCS=( CHANGES README TODO )
 
 S="${WORKDIR}/${P/_/-}"
 
@@ -71,11 +72,6 @@ src_install() {
 
 	dodoc example_tmux.conf
 	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
 }
 
 pkg_postinst() {