Version Bump, bug #548944

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 139 insertions, 59 deletions

diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index bb59c170e334..0fd55fb03bec 100644
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/tmux
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.116 2015/01/05 08:41:22 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.117 2015/05/10 07:09:00 jlec Exp $
+
+*tmux-2.0 (10 May 2015)
+
+  10 May 2015; Justin Lecher <jlec@gentoo.org> +files/tmux-2.0-flags.patch,
+  +tmux-2.0.ebuild, -files/tmux-1.7-terminfo.patch, tmux-9999.ebuild:
+  Version Bump, bug #548944
 
   05 Jan 2015; Yixun Lan <dlan@gentoo.org> tmux-1.9a.ebuild:
   revert to arm64 testing keyword
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 3b288817085b..d30c797dc374 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,28 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX tmux-1.7-terminfo.patch 722 SHA256 6143e2d71fac90f0905d65c5c00e45c37d521a9c2a4cef545f93d43c809a2670 SHA512 0cbf05e0b56ce96d0f9a66dbff97fa154a4c5b47ad871e6d46e763a887cb6dfd0b531ba876ac73c88a3e1b8dfbc7096aa8b176e8720a74fec732dd5731bb5119 WHIRLPOOL e46d9cfe1e8f0474b956bd6bbf9b8e6ae4d14471e30bdc372fbf19f093751a6de8d67d7e093878e3009970608fbb66b8c64dd32641f623adbe137ab5ed6d0ba1
 AUX tmux-1.9a-flags.patch 703 SHA256 723c48adc0857f6a58ac770be923a625383ea68e13c48ef794b3472e553dd88f SHA512 26b87b658a6c97b95d3be37a164cce073c5fc4de9b94763b490d1028cef83c034bf777fd43b0e71403ecd4e79f43773a2f5fde8045f980bb738f63c9384aab23 WHIRLPOOL 49b08eb4c642d26fe8e4bed2a73515319842b8328d173f108b4834b184f317f7cd09be2d840ca82e5d548438df7060e23767f57ad1f25dca1394127b052160f2
+AUX tmux-2.0-flags.patch 584 SHA256 17dba9f233ca99e31d0619a47ca1cfd1f78bc429bfc9564e3fbc0174b39b61e7 SHA512 029a29182f5998c19883f24eab980d16f2e89c72f4150354e0a1101f9092491e836952fb9442e511508f47fd701c8cc8171f29c6ff097248894b6696d108f6dd WHIRLPOOL 026220084ff52382a168053b67bc5133b6d0d455059108ff85f58bb98eaab1656d1d76cd2c7814b9a7fde75e30cf79dfdf65c6c4429aa51852dfb9e6afef13e4
 AUX tmux.vim 55 SHA256 ab10a475aa32e2aacba7b47e9ca38057ee2e447a953497a0349f1640167be6b7 SHA512 5307bf7d27209ce143d7a57856440ba0462783f5b047b00ec5a5046f1b72110e62ef8bca47b67807cb9e9ffcede06c512f6136d825260f735cc32a63706c9e5e WHIRLPOOL fa0019bcfcbe46aa9d383f8778ea4b7d8ec94f7b58f9c38b07c9b6649ea17363f2436e684d83c0c262711e30b62f90fe7f65d87e3a2c9dc5b391633f75a5d7ca
 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
 EBUILD tmux-1.9a.ebuild 2236 SHA256 830f40fa72f61c3f523c56765cd6305bcb585f66c801525df74762830f342ffd SHA512 ab35fd05a976b0325f3f1b41a750eac31012d1b8d7966cf4e96dc8dcbaa79134676c34f9e0e67f0851f84d51df9a6661e8bfc42a871ab1804bdb314a2ed6fe8b WHIRLPOOL 1a9215c105501bea632f7c7f3eea7813e14c75297ef688d0343bb3dadee1b2b4e31e68bfdfbd417d41f4eb3f0b8a2a616026883ca069d04e888ab1b546b287aa
-EBUILD tmux-9999.ebuild 1498 SHA256 02b04bddb043aadb58f529de84de5b8c0b3ad0a7fb0e1ea6250a44356affd906 SHA512 d8617780153cb5fa0a9e7f9315a6e2a30cdf874addd828cfc028c6bb372cf235cfd983a89b3139d62f94119404e9327d61a05506d796027d60af648a56c8252d WHIRLPOOL 692a8c4f5f33975103fdbcbf26c2bb41aec2fce7c5e3d06d139e1bbea2e18a8cee10badafbc1b07aa5bcb3b538044fefaad3642ac8beb13e6f94a4a62c443e65
-MISC ChangeLog 13408 SHA256 8955a6b86f6e1f60f26e659662914f91fce4810d6f6c55f7bd4e0cf947ec4cd7 SHA512 180e425fad43d4d65323893ae73481a487058364f0bfd2bfed0933d07be4bc1cca6569af161b24bc28cd41772af1d7ce63827fabd09489fea038b3e1d9633541 WHIRLPOOL 56080e3082df71d6ad85c6199f70ed3d1c2a3ed15d7d837ba18f8703386ac50e1a1ed1ac7a30ca6053a808789acf144897e1555e9cc1e4757e0a5953f6c3c110
+EBUILD tmux-2.0.ebuild 2243 SHA256 ab55c7d6a1fcd6b092b633a51b7c7a24849626250332627e4bd75d2ebb29149f SHA512 70d941dd05af3e5bc2dfa09f6d1acbcc754c08204128ff50d5dbcd8db6c08c41af79a3e50c5a2c2825b7a745463abc39c5431dbccbcc592ac81611b9cdadcc22 WHIRLPOOL c573a3b4ac2ca51bf7d88408803eca6680bb5aeb86365484c6fac1c71b9e591088b95f0d32307f9da5487d9a8a04d67d9f965ed57fa2b5126cf2636f8d96b2bb
+EBUILD tmux-9999.ebuild 1511 SHA256 f4f5bf0731786b7d744a4cbf58cbbc8691b6459d1b5276825d52ee6ec876fea1 SHA512 a80664d50a670141130fe7594fa8b4ed622f58b0d45472799590cbf56f67044eb18d3dafdd7f372c40ab8c2e693dd7901a3332516a7012c8f9fb985b126d9fe9 WHIRLPOOL 2b6f1139ac40b26a56796997928d1646ba866517871e238edee04cfe6c23b591c829079cb30e0d16de042c70dfee1af8d9f7f2a88e4fba11a1e23384003b4763
+MISC ChangeLog 13608 SHA256 6f0828564803b610e27fd94661d5f3036d460e1708a29c9ce17c65401de6566d SHA512 25a5fcd4ea4263deb3370af456286cc6d536ec626e40e6b0dbeffef87ec876289925c965e3d7a0b6e314f57a7265a49e275ebde676e0f9bd748fd5ff903fca50 WHIRLPOOL ab0cc6b765c6ecec3e07feca6985c2d829bdb99b3c6ffb9a501acede143ea3d35fd4cf40a5862c77d7b9bb3a74afa9fe761e01d5cea21b2d30a02db03a0a8872
 MISC metadata.xml 561 SHA256 e830ad48fa3fa353f2239d9d7e6ee9b09f23df299fbac5abca85611d37d6524a SHA512 4717b3a2f2371c155ab1a46970064a5477979e86433d5d2da1e367b123fd343bbcb81c188ace482cb59b3eea2381f151e1865d4f444d3ee6bdd4cd158efcf048 WHIRLPOOL 50c293608e026dfd5c9ddc9399d6342c9074e0246c66475af0e72b48a91853ce9d253b8db39f069187cd0cdaa007d6cdd537d3943a5c8d54bf4539c08d72919d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUqk44AAoJEJIMDbyqvv1V5FEP/2eWZE+VDJ19fcqx9VKIUkl6
-1f+yAZ88apJ3GY01d/V1zJ76hPe93/yXW/sjpM/l8pUfMvfZaizDXWkpunBxc5MP
-SqiQ5xX84NSabr+uuDrHkLd+0QjpJ9xGQUprGxK6QgbBeBRIFBr1ICWWp5o2JkGT
-puGzG5bq4ItMQSM+CjTA1zwPvFerVczJc/XCG5DirX3NfRQN/8X108G+CL5cXykE
-6cJ0imqU5hUMpLDJbkDikg/6f6nsR6AtuQCTsib56q7CgP2c2xyE4xLwXhozQcMf
-Xm0HiHCf4LzSJXRE3c89+SKSPTpRtt/uq1Qqr3fx60C4/J+aW3j7TAmyQ6AewXqe
-yqD0g1olDDlfX3PtDxSfQeEyhUsYO/RfmY6MFniP86iS4lC+OcbQSLOO+7oe+zfh
-HIxFW4CfIG2JlJTRQcBjcNHk8lemAu5pIQk3hHRWeQfVeBCBvK4vmnyeF12i7g2j
-xuZ9+Qf67tttWQZV9dGHrBLyoA+5ZBShzKKJxZzeBRWkkEqLoz4nplo/qDz/jyIV
-HRdpAvnerCtYSI9Fvoa4V/amukPPOWxFonY43AAbbgqYz5nkngbQhNXX644e/ubX
-PSBFBJixre6Pj56GkOkK30gA/TQscAPOjDcYuQJiL+5ZY6yPgfVqlsw7km+D9A1C
-1X0+9ZeqOyidLSR+hj4h
-=XNoq
+iQJ8BAEBCgBmBQJVTwQNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViroaAQAJC+WIufAE1f8M6vp3leA9AZ
+h3LzEae5H5zZDA23dA+z7fojzYPEQ63pjMVoE762XBbZp8TrPfLAEbVjHbSxZ9YN
+1TLFnoh1R9FZovkCFVwLG2MvfjK5UELudpE/h0rW2UBA9zATAsxuDftY8uy0ie9F
+j8jRMtcAlvRXMSIXxvEVxlQb1Jhj62oooA8bHpVVNDC7OG6zj2N04OikzWcWTxCS
+XKudscHZNJXQmc8SbIcX41TQ3HGrc3wqxAhLYqL59jhokwdQgbIpyYYHXavsexFf
+Uxuj9BVJiMSKz4S+886JhiLHVTF+KnnTbx/MtB9pKPJLWdEUkwfU6IsUhLsDlxNa
+EVKPM/GsZ0TpgITFVM5dLDESHqkx/qoLDl6sz1FEFvTaxzmXaRvSjZrR6eqmWmvB
+KvRGh/hdPJoHPEFNxW39ypvgM+YWC0G/daeAuP+kWOEqKcitPyrQYeZD1Z0OBsOl
+hBW+JvU9yEmNXA0ckBpEISIeP242Wxl/McSog9qeNLZbIkHM+s9KpfIIrHjkOHQZ
+zlAytX6SdsZ3qqx0OY7/2aMbZ72UP7uDL+LIvd8TA8wYRj4MGJwflatPQlHM30n+
+w0Z3wtcrhlESCoG2qO/tUX/D1vuEoz7hOSoeO0sllmfIDroC65cXWEyRHUtLf1bV
+UgslM91rhfaPHDRdqLY/
+=wxTI
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tmux/files/tmux-1.7-terminfo.patch b/app-misc/tmux/files/tmux-1.7-terminfo.patch
deleted file mode 100644
index 0cd430664a5d..000000000000
--- a/app-misc/tmux/files/tmux-1.7-terminfo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
- configure.ac | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f78cfc3..ac40bf9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -127,11 +127,22 @@ if test "x$found_libevent" = xno; then
- fi
- 
- # Look for curses.
--AC_SEARCH_LIBS(
--	setupterm,
--	[terminfo curses ncurses],
--	found_curses=yes,
--	found_curses=no
-+PKG_CHECK_MODULES(
-+	CURSES,
-+	ncurses,
-+	[
-+		CPPFLAGS="$CURSES_CFLAGS $CPPFLAGS"
-+		LIBS="$CURSES_LIBS $LIBS"
-+		found_curses=yes
-+	],
-+	[
-+		AC_SEARCH_LIBS(
-+			setupterm,
-+			[terminfo curses ncurses],
-+			found_curses=yes,
-+			found_curses=no
-+		)
-+	]
- )
- if test "x$found_curses" = xno; then
-     AC_MSG_ERROR("curses not found")
diff --git a/app-misc/tmux/files/tmux-2.0-flags.patch b/app-misc/tmux/files/tmux-2.0-flags.patch
new file mode 100644
index 000000000000..d2c40e04b788
--- /dev/null
+++ b/app-misc/tmux/files/tmux-2.0-flags.patch
@@ -0,0 +1,18 @@
+ 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/tmux-2.0.ebuild b/app-misc/tmux/tmux-2.0.ebuild
new file mode 100644
index 000000000000..1a4b5e86cc2a
--- /dev/null
+++ b/app-misc/tmux/tmux-2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-2.0.ebuild,v 1.1 2015/05/10 07:09:00 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils bash-completion-r1 flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.sourceforge.net"
+SRC_URI="mirror://sourceforge/tmux/${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.10
+	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 "<app-misc/tmux-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
+}
+
+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
+
+	# remove generated files
+	rm -r compat/.{dirstamp,deps} || 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
+}
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 693388c495ef..82f55f626f06 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v 1.13 2014/11/02 08:10:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v 1.14 2015/05/10 07:09:00 jlec Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=true
 
 inherit autotools-utils git-r3 bash-completion-r1 flag-o-matic
 
-EGIT_REPO_URI="git://git.code.sf.net/p/tmux/tmux-code"
-
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="http://tmux.sourceforge.net"
+SRC_URI=""
+EGIT_REPO_URI="git://git.code.sf.net/p/tmux/tmux-code"
 
 LICENSE="ISC"
 SLOT="0"
@@ -32,7 +32,8 @@ DOCS=( CHANGES FAQ README TODO )
 
 src_prepare() {
 	# respect CFLAGS and don't add some includes
-	sed -e 's:-I/usr/local/include::' \
+	sed \
+		-e 's:-I/usr/local/include::' \
 		-e 's:-O2::' \
 		-i Makefile.am || die