version bump

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 98 insertions, 8 deletions

diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index a9b1dba6ef01..7c48533038a4 100644
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/tmux
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.69 2011/11/06 19:09:19 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.70 2012/01/25 09:03:16 wired Exp $
+
+*tmux-1.6 (25 Jan 2012)
+
+  25 Jan 2012; Alex Alexander <wired@gentoo.org> +tmux-1.6.ebuild:
+  version bump
 
   06 Nov 2011; Raúl Porcel <armin76@gentoo.org> tmux-1.4.ebuild,
   tmux-1.5.ebuild:
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 039b2d239a77..aa6dfaceedaf 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,19 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX tmux-1.5-darwin.patch 2180 RMD160 06e9a3dca7ed1e55573aec5bee6c746a0de04b13 SHA1 fcf370899c5213866d462f1461be0e3925969e74 SHA256 df949038aa2c12030d97991e4e330e9cc957bb135336fae69bd921879404f8bd
 AUX tmux.vim 55 RMD160 1299eac25b3e01700dba4b295c33964a607b8ee4 SHA1 820863224eda185aba4da86ffbe876e287a70f30 SHA256 ab10a475aa32e2aacba7b47e9ca38057ee2e447a953497a0349f1640167be6b7
 DIST tmux-1.4.tar.gz 259614 RMD160 d8d09ccac7c1c79244f96beccbd6d52f1cc50d1b SHA1 c0cb9b01aee9b2b5c939bacccd5c78cf6fa6773e SHA256 c7e005f32e256b8ece214b71c51947f4081af8c5f0400083e4adaac2c258bbc7
 DIST tmux-1.5.tar.gz 374093 RMD160 08eec02bcbd91b3c37a36a05167f3758e7911973 SHA1 e26132f02f344f8d6d06ae87d11f6a7aad880f67 SHA256 eb8215b57c05b765d2446d9acb2bc5edcdb3eb4ea31af89ee127a27e90056306
+DIST tmux-1.6.tar.gz 388633 RMD160 e88d1ac4751920bf5a6b52be80f332f1eb2e8694 SHA1 8756f6bcecb18102b87e5d6f5952ba2541f68ed3 SHA256 faee08ba1bd8c22537cd5b7458881d1bdb4985df88ed6bc5967c56881a7efbd6
 EBUILD tmux-1.4.ebuild 2082 RMD160 c2a6f930f85e7d172b89421de728326e32f67e83 SHA1 3a43344499f824b3f28ff52ba6689d774184a629 SHA256 ac9f733aff6e113f0eeae9cf1a848302701a01cda4d09b38f483f8d0f9b3555a
 EBUILD tmux-1.5.ebuild 2046 RMD160 0e2334c58906cdc8e87ad90f612dba69314bb28b SHA1 24d3baf29a148d09abf061b1e01b6e77b63f0936 SHA256 bd7835b1889365573c717ae3142fae445e917ff9b3f0c8bc4a868f18f05b2e47
+EBUILD tmux-1.6.ebuild 2229 RMD160 7d29f1ab2c391e4f6baa325430cbe2a141417b1a SHA1 4f44fa4fefbb5c2f0ee1864863067773adaf9c73 SHA256 986095e996336f08766d4b982db47ef646fc09c8d79b0c85608dd9f16d6a3ae2
 EBUILD tmux-9999.ebuild 1362 RMD160 5404b2e58a573cd184311bf153ccd49ec0f1e966 SHA1 c9f8f2dbcf579eb7ece463d0d73ded15cf487fa5 SHA256 833431b7d9abff42dbba622cb4b94f99900f0bf2c0442e12e2e6f1fa4dfa10f3
-MISC ChangeLog 8109 RMD160 ca386f5048df17440aa7c5a733dd7a25dfe65ed6 SHA1 a3fc52111c7bbb15a749844bc739ee4e92aa93a1 SHA256 e9439bac8b04bf02a7f8567c907330431820ead2dc68f9bf07af031a978c80bc
+MISC ChangeLog 8215 RMD160 f03b5684f36ad222c25812230a50ffdfef936037 SHA1 ab2a7aeef0d9dc0686ad287ee983086a4e4f361d SHA256 d72fd35e82d4ac19b7f7fe2f3340d9dfeeb3815eaf43e4c2726633a414caec42
 MISC metadata.xml 553 RMD160 525d334bde540803b66251b9f2e30d697f4fc327 SHA1 4e2b9280d38ed834ec9e302b1b9c85201c71fede SHA256 767126148103c206d8a942e171f2f0c572bc42fac680cb188cf304e1ec8fc3c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6222UACgkQuQc30/atMkDYdQCgnOWnWonX38jQYQGeFonwlFln
-xdgAn2hs5mZxWa+egY1kW/PRRRolRiRZ
-=GGwm
+iQIcBAEBCgAGBQJPH8XDAAoJEDZF8K7rm0r6t1kQAIWQF+kH8cPBkw0jjtKB4WII
+Lub+Vp1dLXBazzzm40UwJwk/jDAyzQzjk8uMfHO7BDg0xOiNZ48a8LQ5I4xJ45/B
+kweUnc1buia4yg+IoyIz3/ScvtLp6F0UZV+t3PnI5AaWQn2W4l7u+ENRR/xejlWE
+jfwM9WWsXfMysD3dk+MtJnwbPtzpddf4K45AvfTAp6YHRNfb408TxEtpDLJ8HSum
+wvJ/vLST6fnWKW2x5mpPD4H1mBfgq6gp3AteohXw0rmOC0HqjtkZtl404JB8Wyp8
+u935VofyWgOYPEHJta4TLJgiOTZJwKnNlju/ryd9180QcI3IH2Mr2arpqtiW//WH
+857KtdkIU/Qff2AgvWuX7KNb0sxi1Oj1M88MmzSrIQbjoocB/ZCaQ9IGDws0xnfo
+mx234M/gsL+j88nELBfok+/v+/1W593q9pN/7X0rkRZAKRSN3SR/mwfBQeb+M/F9
+/0xGMW7QaTElpZ3aC4C1HguzYknjt7djtppIPY8RvbkakIv1sFIZh+4LFGlKn6sx
+G85qm2yfPyE7pMzLiJQ8WPdqrUcA2DkXZ70uwFGoHm91RwseYX/GJsLRRIszpv19
+iH86DH7ZeM7D0rAMb8HZl+wxRp0I6NX+J0r6eUuzfXd5oQtgkG8UjcRCtqMS+j5s
+Aq1XMs6Qek/QqYISsP38
+=Vp98
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tmux/tmux-1.6.ebuild b/app-misc/tmux/tmux-1.6.ebuild
new file mode 100644
index 000000000000..e2ee165886cd
--- /dev/null
+++ b/app-misc/tmux/tmux-1.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.6.ebuild,v 1.1 2012/01/25 09:03:16 wired Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.sourceforge.net"
+SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="vim-syntax"
+
+DEPEND="
+	|| ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 )
+	sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	vim-syntax? ( || (
+			app-editors/vim
+			app-editors/gvim ) )"
+
+DOCS=( CHANGES FAQ NOTES TODO )
+
+pkg_setup() {
+	if has_version "<app-misc/tmux-1.3"; then
+		echo
+		ewarn "Commands 'up-pane', 'down-pane' and 'select-prompt' were removed in version 1.3."
+		ewarn "You may want to update your configuration file accordingly to avoid errors on"
+		ewarn "tmux startup."
+		ewarn
+		ewarn "For the full Changelog, together with details on what replaced the above"
+		ewarn "commands, visit http://tmux.svn.sourceforge.net/viewvc/tmux/trunk/CHANGES"
+		ewarn
+		ewarn "WARNING: after updating to ${P} you will _not_ be able to connect to any"
+		ewarn "running 1.2 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 tmux 1.2 to access them."
+		echo
+	elif has_version "<app-misc/tmux-1.6"; then
+		echo
+		ewarn "Some configuration options changed in this release."
+		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+		ewarn "or visit http://tmux.svn.sourceforge.net/viewvc/tmux/trunk/CHANGES"
+		ewarn "for more details."
+		echo
+	fi
+}
+
+src_prepare() {
+	# look for config file in the prefix
+	sed -i -e '/SYSTEM_CFG/s:"/etc:"'"${EPREFIX}"'/etc:' tmux.h || die
+	# and don't just add some includes
+	sed -i -e 's:-I/usr/local/include::' Makefile.in || die
+}
+
+src_install() {
+	default
+
+	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
+}