[gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/files/, app-misc/tmux/

2018-04-13 Thread Lars Wendler
commit: eadbf99e1da48ae7ec3b1a6fb4f6e1b24b8bdb28
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Apr 13 19:21:33 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Apr 13 19:21:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eadbf99e

app-misc/tmux: Removed old.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 app-misc/tmux/Manifest |  3 -
 app-misc/tmux/files/tmux-2.0-flags.patch   | 18 -
 app-misc/tmux/files/tmux-2.3-flags.patch   | 15 
 app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch   |  9 ---
 .../files/tmux-2.3-screen_write_copy-fix.patch | 63 ---
 app-misc/tmux/files/tmux.vim   |  1 -
 app-misc/tmux/tmux-2.2.ebuild  | 85 
 app-misc/tmux/tmux-2.3-r1.ebuild   | 90 -
 app-misc/tmux/tmux-2.3-r2.ebuild   | 91 -
 app-misc/tmux/tmux-2.5-r2.ebuild   | 83 ---
 app-misc/tmux/tmux-2.5.ebuild  | 93 --
 11 files changed, 551 deletions(-)

diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 077cc9d2edd..2871890799a 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,6 +1,3 @@
-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

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 d2c40e04b78..000
--- 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 6fa66b50833..000
--- 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 65dd2f3c1bc..000
--- a/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch
+++ /dev/null
@@ -1,9 +0,0 @@

[gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/files/, app-misc/tmux/

2018-01-26 Thread Patrice Clement
commit: db7583610d5078d645d7f55ca80b181763c43273
Author: Juanjie Xi  gmail  com>
AuthorDate: Fri Dec 22 02:09:18 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Jan 26 21:47:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db758361

app-misc/tmux: add patch against the pipe-pane unreliable bug.

Closes: https://bugs.gentoo.org/640228
Closes: https://github.com/gentoo/gentoo/pull/6596
Package-Manager: Portage-2.3.13

 app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch |  9 +++
 app-misc/tmux/tmux-2.3-r2.ebuild | 91 
 2 files changed, 100 insertions(+)

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
new file mode 100644
index 000..65dd2f3c1bc
--- /dev/null
+++ b/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch
@@ -0,0 +1,9 @@
+--- a/window.c 2016-09-29 05:31:24.0 +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/tmux-2.3-r2.ebuild b/app-misc/tmux/tmux-2.3-r2.ebuild
new file mode 100644
index 000..3bed9128b2f
--- /dev/null
+++ b/app-misc/tmux/tmux-2.3-r2.ebuild
@@ -0,0 +1,91 @@
+# 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
+}



[gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/files/, app-misc/tmux/

2016-09-30 Thread Lars Wendler
commit: fbbae198eb8921ee2bc0b7c0bb2447f309c1
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Sep 30 07:32:17 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Sep 30 07:32:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbbae198

app-misc/tmux: Bump to version 2.3

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler  gentoo.org>

 app-misc/tmux/Manifest   |  1 +
 app-misc/tmux/files/tmux-2.3-flags.patch | 15 ++
 app-misc/tmux/tmux-2.3.ebuild| 89 
 3 files changed, 105 insertions(+)

diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 0eea5ba..6ede0c3 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,4 +1,5 @@
 DIST tmux-2.1.tar.gz 462965 SHA256 
31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176 SHA512 
0faa0a60a84b777ca3cf572cf741d0e4f82a9f32d27dfeddfda41bad57830823a6d5f2323f27ba794b86e194d9f7db7028c94dc6a15bb4ac5a18508f890bdaa4
 WHIRLPOOL 
983024886bdb868bb69ccedc18e9fd62cc5a8f147d647ea43b6f20e297b9b3c45a061e542bcb590ab50cf5d3db43d22015c3a8f18bee33d9c76552bfe13424ed
 DIST tmux-2.2.tar.gz 466852 SHA256 
bc28541b64f99929fe8e3ae7a02291263f3c97730781201824c0f05d7c8e19e4 SHA512 
4d4fc316c78aab0d13f7f15098d952f01d7da7d74d46251ae2dd90440522f07c785afe984d82de2b4518fb67ea441f5a5a46c357c87ddc6ddbfba4b7f08be7bf
 WHIRLPOOL 
2e44582b994f3fe919f4ee7543f25e3fb02cc975d053b0c63bcd858a54fe3125ffe192cf6f8c7ae0345d90e8086d86930d668b29becdb4e0376579ef02e7034f
+DIST tmux-2.3.tar.gz 473944 SHA256 
55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b SHA512 
521e3734104be43837cba95d8b3d050d033708fa7469f7e7db66ae6993b002c4d9f6bafec41f3c9446eda91a4499e571019534dfa2e5a0563085b2d16e1b94af
 WHIRLPOOL 
de482076dfdb15e5ef2dcaebf60e05069bf847a30162a098bf11573f09cc996e35b9ffcd3a2784331b6fc59ae0b9bc58cbe80360a7dd844eb94ff25e546eacf2
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 SHA256 
a0905c595fec7f0258fba5466315d42d67eca3bd2d3b12f4af8936d7f168b6c6 SHA512 
fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 WHIRLPOOL 
aa83ea77c084e643f2cbf74ddf10bf6e43304b0a7c1f6af24b153844ad01732af8f45de0d8a39093f11be19ff9af20116f4aa7b9c750f3452525fcd7b31a3d8a
 DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 SHA256 
040cbb7ce19f5a256ae400061d310e0f64f58cbc525402043708b59546af2462 SHA512 
956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1
 WHIRLPOOL 
3eaa20479fccf7e20dbd7ccb8669bd8c47da90f7218fdb386fcd150c1223cc7300d68f880baa706bbdb7abf54394d44fd80479ba3fae934de9b53f40acc6286a

diff --git a/app-misc/tmux/files/tmux-2.3-flags.patch 
b/app-misc/tmux/files/tmux-2.3-flags.patch
new file mode 100644
index ..6fa66b5
--- /dev/null
+++ b/app-misc/tmux/files/tmux-2.3-flags.patch
@@ -0,0 +1,15 @@
+ 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/tmux-2.3.ebuild b/app-misc/tmux/tmux-2.3.ebuild
new file mode 100644
index ..5fdd741
--- /dev/null
+++ b/app-misc/tmux/tmux-2.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x64-freebsd ~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.0*
+   >=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 )
+
+src_prepare() {
+   # bug 438558
+   # 1.7 segfaults when entering copy 

[gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/files/, app-misc/tmux/

2016-05-18 Thread Mike Gilbert
commit: 113eb83384588cade6be59957e22b9b70be5af20
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed May 18 20:05:45 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed May 18 20:05:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113eb833

Revert "app-misc/tmux: Add 2.1-r1 and ship terminfo file."

This reverts commit baec651ecb38580f8b39c79b16e4d6a13cdbe061.

The terminfo files collide with >=sys-libs/ncurses-6.0.

Bug: https://bugs.gentoo.org/583428

 app-misc/tmux/files/tmux.terminfo.in |   6 --
 app-misc/tmux/tmux-2.1-r1.ebuild | 103 ---
 2 files changed, 109 deletions(-)

diff --git a/app-misc/tmux/files/tmux.terminfo.in 
b/app-misc/tmux/files/tmux.terminfo.in
deleted file mode 100644
index d335c47..000
--- a/app-misc/tmux/files/tmux.terminfo.in
+++ /dev/null
@@ -1,6 +0,0 @@
-tmux|tmux terminal multiplexer,
-   ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m, Ms@,
-   use=xterm+tmux, use=screen,
-
-tmux-256color|tmux with 256 colors,
-   use=xterm+256setaf, use=tmux,

diff --git a/app-misc/tmux/tmux-2.1-r1.ebuild b/app-misc/tmux/tmux-2.1-r1.ebuild
deleted file mode 100644
index f448b3a..000
--- a/app-misc/tmux/tmux-2.1-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils bash-completion-r1 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 ~x64-freebsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux vim-syntax kernel_FreeBSD kernel_linux"
-
-CDEPEND="
-   || (
-   =dev-libs/libevent-2.0*
-   >=dev-libs/libevent-2.1.5-r4
-   )
-   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
-
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   --sysconfdir="${EPREFIX}"/etc
-   $(use_enable debug)
-   )
-   autotools-utils_src_configure
-}
-
-src_install() {
-   autotools-utils_src_install
-
-   newbashcomp examples/bash_completion_tmux.sh ${PN}
-
-   docinto examples
-   dodoc examples/*.conf
-
-   if use vim-syntax; then
-   insinto /usr/share/vim/vimfiles/syntax
-   doins examples/tmux.vim
-
-   insinto /usr/share/vim/vimfiles/ftdetect
-   doins "${FILESDIR}"/tmux.vim
-   fi
-   # Make a tmux{,-256color} terminfo entry. It will not be used unless the
-   # user adds this to their .tmux.conf:
-   #
-   # set-option -g default-terminal "tmux-256color"
-   #
-   # Content of the terminfo entry is from here:
-   # https://github.com/ThomasAdam/tmux/blob/master/FAQ#L355
-   mkdir terminfo/ || die
-   tic -x "${FILESDIR}/tmux.terminfo.in" -o terminfo/ || die
-   insinto /usr/share/terminfo/t
-   doins terminfo/t/tmux
-   doins terminfo/t/tmux-256color
-}
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/files/, app-misc/tmux/

2016-01-10 Thread Justin Lecher
commit: 6d92bbe44d0a4f19290abcdd63d5a4c9b776ba96
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Jan 10 10:47:31 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Jan 10 10:47:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d92bbe4

app-misc/tmux: Drop versions vulnerable to 'Out of bounds heap read'

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564400

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher  gentoo.org>

 app-misc/tmux/Manifest|  2 -
 app-misc/tmux/files/tmux-1.9a-flags.patch | 28 --
 app-misc/tmux/metadata.xml|  2 +-
 app-misc/tmux/tmux-1.9a-r2.ebuild | 85 --
 app-misc/tmux/tmux-2.0-r4.ebuild  | 87 ---
 5 files changed, 1 insertion(+), 203 deletions(-)

diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 30c394a..c34e47a 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,3 +1 @@
-DIST tmux-1.9a.tar.gz 447938 SHA256 
c5e3b22b901cf109b20dab54a4a651f0471abd1f79f6039d79b250d21c2733f5 SHA512 
842984638dc1f7364c03393187379598f35679d535d911d5df4016944d6032e61a1bf840d7d339c6e99b30c55581d470acca85ab6ee5799b8927d18c0e9a91df
 WHIRLPOOL 
eca5cd48a263e25d24b7e2865f76bb30267e20590e9b2a905637498d7992389b9c7e0253c992780b1a6458869204cffcf93f4dba09efdfeb2f803a0f95f6553e
-DIST tmux-2.0.tar.gz 455754 SHA256 
795f4b4446b0ea968b9201c25e8c1ef8a6ade710ebca4657dd879c35916ad362 SHA512 
8a4be40ceb9b371a91107173de08348c4379b103454fa397ee326506f78a5fda1034dc7148c090c687221eddb8a2fc0c3aeb85da57841df6bcd74fb5f4f5f53d
 WHIRLPOOL 
d5c9570aafed049b1404e9243e0339202bfa33e8ca2874f304cb9a7c764b7878db19f87aa5f6b9a9476038bc3702e5d11784c8ca83eb731e61763ecb08a39fec
 DIST tmux-2.1.tar.gz 462965 SHA256 
31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176 SHA512 
0faa0a60a84b777ca3cf572cf741d0e4f82a9f32d27dfeddfda41bad57830823a6d5f2323f27ba794b86e194d9f7db7028c94dc6a15bb4ac5a18508f890bdaa4
 WHIRLPOOL 
983024886bdb868bb69ccedc18e9fd62cc5a8f147d647ea43b6f20e297b9b3c45a061e542bcb590ab50cf5d3db43d22015c3a8f18bee33d9c76552bfe13424ed

diff --git a/app-misc/tmux/files/tmux-1.9a-flags.patch 
b/app-misc/tmux/files/tmux-1.9a-flags.patch
deleted file mode 100644
index 8bf21d8..000
--- a/app-misc/tmux/files/tmux-1.9a-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
 tmux-1.9a/Makefile.am
-+++ tmux-1.9a/Makefile.am
-@@ -27,23 +27,20 @@
- if IS_GCC
- CFLAGS += -std=gnu99
- if IS_DEBUG
--CFLAGS += -O0 -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
- CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align
- CFLAGS += -Wdeclaration-after-statement
- CPPFLAGS += -DDEBUG
--else
--CFLAGS += -O2
- endif
- if IS_GCC4
--CPPFLAGS += -iquote. -I/usr/local/include
-+CPPFLAGS += -iquote.
- if IS_DEBUG
- CFLAGS += -Wno-pointer-sign
- endif
- else
--CPPFLAGS += -I. -I- -I/usr/local/include
-+CPPFLAGS += -I. -I-
- endif
- endif
- 

diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml
index 8813ec2..e9b1261 100644
--- a/app-misc/tmux/metadata.xml
+++ b/app-misc/tmux/metadata.xml
@@ -1,4 +1,4 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd;>
 
   shell-tools

diff --git a/app-misc/tmux/tmux-1.9a-r2.ebuild 
b/app-misc/tmux/tmux-1.9a-r2.ebuild
deleted file mode 100644
index 7fd1b54..000
--- a/app-misc/tmux/tmux-1.9a-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils bash-completion-r1 flag-o-matic
-
-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 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
-IUSE="debug selinux vim-syntax"
-
-COMMON_DEPEND="
-   =dev-libs/libevent-2.0*
-   sys-libs/ncurses"
-DEPEND="${COMMON_DEPEND}
-   virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-   selinux? ( sec-policy/selinux-screen )
-   vim-syntax? ( || (
-   app-editors/vim
-   app-editors/gvim ) )"
-
-DOCS=( CHANGES FAQ README TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-flags.patch )
-
-pkg_setup() {
-   if has_version "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 ~x64-freebsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux vim-syntax"
-
-CDEPEND="
-   || (