app-misc/tmux: Install bashcompletion file, #450896

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

7 files changed, 106 insertions, 23 deletions

diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index 81545ae4524e..34089822cce7 100644
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/tmux
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.87 2012/12/28 17:58:30 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.88 2013/01/08 15:12:29 jlec Exp $
+
+*tmux-1.7-r1 (08 Jan 2013)
+
+  08 Jan 2013; Justin Lecher <jlec@gentoo.org> tmux-1.6.ebuild,
+  tmux-1.7.ebuild, +tmux-1.7-r1.ebuild, tmux-9999.ebuild, metadata.xml:
+  Install bashcompletion file, #450896
 
   28 Dec 2012; Jeroen Roovers <jer@gentoo.org> tmux-1.7.ebuild:
   Stable for HPPA (bug #449000).
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index f6be619b9b57..83b56e6e399f 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -4,15 +4,16 @@ Hash: SHA256
 AUX tmux.vim 55 SHA256 ab10a475aa32e2aacba7b47e9ca38057ee2e447a953497a0349f1640167be6b7 SHA512 5307bf7d27209ce143d7a57856440ba0462783f5b047b00ec5a5046f1b72110e62ef8bca47b67807cb9e9ffcede06c512f6136d825260f735cc32a63706c9e5e WHIRLPOOL fa0019bcfcbe46aa9d383f8778ea4b7d8ec94f7b58f9c38b07c9b6649ea17363f2436e684d83c0c262711e30b62f90fe7f65d87e3a2c9dc5b391633f75a5d7ca
 DIST tmux-1.6.tar.gz 388633 SHA256 faee08ba1bd8c22537cd5b7458881d1bdb4985df88ed6bc5967c56881a7efbd6 SHA512 5c7b311d011f2f2027926a615d4300e97fd22f3ae32b0c364fdf935ff02124c59d1d0c48e7e9d572229c7600b6583fd679f4b960a5af872305f005d27350ad9c WHIRLPOOL 5acbd3ed4b6e60a8a08f1ab4117ac9002108d37a13cb3f64925fc2a986fd86b83037cfa1a7016bb65099a0bb00cb37329ad338b8913d48590f2ab8b3ee1755cd
 DIST tmux-1.7.tar.gz 407164 SHA256 68346bda11cf7d86591e663b94b98576332ac88c2890df26acb080f4440f9e7b SHA512 d2002858ab6c974e6a6c7dc31db20cd6271170cba9e7314216dfcea6670ae09c5112a4313b77bd21d14a906c89723fc9f6c20cea528e7320e2857ec4d71c725b WHIRLPOOL 8a40e42f3e3a3da4b32be32d65c4eb1e1e68e74482d039af6faef1669a349b0667d388d711bed0a1b3e6daf71b97ae1210718fd12a8f3dfdae8cf7f190805fc8
-EBUILD tmux-1.6.ebuild 2257 SHA256 af615384974ca2cc1fd5f78b0063a31adb19bc686d4e8702f10a1f24fa739ea6 SHA512 7f0274d16981635170a4cf35864e448029fcb9ec98647d9d3b5c07926672dd12ef814c0fe1f2d0e2b8b1e26cc7ea49588d46033d9ddd22dc68b5bd34ce64a274 WHIRLPOOL 134c2e9db34bfb29cd75786145a99cb18061e309bdca0edf479e131d4ea6bde26d7351ecc859f9a5c104225062e74fdf3946b653f91ccacd4fc2013ee850ffeb
-EBUILD tmux-1.7.ebuild 1766 SHA256 0fa33c9542a906abc92d3386cd3b469be540b6ae967e7649813fd722a5bf57fc SHA512 82cb78d8dbb28fd7c59f2b5e82b1816407598aa2b4fc2ace81b53bc59cf6d4876a1189b2d9ccd2de8ed6c38553d770fc80084e262224dd79eaf233df06b3cb04 WHIRLPOOL 86d2b4c9f4c902b9f601f92ea2951a8c1686f5504fac51eb56bc3d7e2fe597bbed7169142d94e7026a0d46e0e9154515dcb4cc89f8218755620baad9f87b9238
-EBUILD tmux-9999.ebuild 1204 SHA256 0d92e3e22130f2ad90a2d18e73a4ef37a49c5c21dad263303bc80d6388af9d30 SHA512 fc35dce8930cf341752a52f1394b5fbf1deec9e5f4ec8376ecaa0dad5c8badfbe5d9d8f554a7b8244318e91e3997c80b8d23ff2cd3cc1f6adcd38510681a91e9 WHIRLPOOL e83a42829d858004af3977d64a062a65aee777ff91412f6191dcc08a34d9767cdfe453414d1ccaf497e9e152b297349fc38635b345775d0d5fdc25d499282233
-MISC ChangeLog 9841 SHA256 a1c768bcd80fd129e30b8081ed5dd6f752c2b1943fca19f579155e2d529471d1 SHA512 8ddfbbbd5a9b4ef217387e5472eb42951dbc34de67520fad8014775685a4319e1ae2a61983619fb5594e3ace047c3cef7c0877a827839066f608479ae6a2d41a WHIRLPOOL 77abb0561998fdbcc11e129235ac1f5199ebba0636e96f24f666eab36646b5f4301bf42eaf0fb327570b9ec637aa223bb11fa45de50c170e14152dc54df192b1
-MISC metadata.xml 553 SHA256 767126148103c206d8a942e171f2f0c572bc42fac680cb188cf304e1ec8fc3c4 SHA512 1346cfa2350670bc0f00f04cc3b663d5295f023d0c418761cfdcb24fa9211f11f0759c0c4d78e97d9697a001eae4bf401d38eae7b77c52b7c3eb524ddb09153c WHIRLPOOL 49b96d39cf405794f9deffb7a266675896fc18d49f5f8da5fea947d705f10e36c270c0c962cad0010691a91fbb7bdc172c3c881640638ace8319baab55443c91
+EBUILD tmux-1.6.ebuild 2334 SHA256 e52f58759908949820fa4718954b9b7368960317767262cc9e33e5fe64187c8a SHA512 2e91fa3af24f64d7a3a77f206c0718de97ef5cc5958365e586853e5d43f3d1f9f88beb119b429396e0fd8c3c4de271ab71d197df496ab9e97e01d095d73807ad WHIRLPOOL 481e606ab313a3702d62a0d0493ad1b164ccb549e2e21c3008da046df0fdaa9d366b20fd1e03695fdcb48de0f57b91e43a7feb1b899d0fa50a1f9668efb20b32
+EBUILD tmux-1.7-r1.ebuild 1852 SHA256 8dd760528f1694ea9999c93202ad0b2e5af2c86099dfdba010052c6accd8aa12 SHA512 8d61200e85b2e70cee7e0f70a79a7a08ce70eec3eb6ee802cfbf7cfadf056be2cc64a58915faa95aa550fa9a660b6635bdac8f80125e84a0e1c9e5f465fa37d0 WHIRLPOOL 6bcfd9c9e400b79b473e6fa0d977c1111ddb3cbe9a59fdac70aafeccc8cd71bf762e75006bdfeaf278ec55920ae4b9235c7cabc2fe6cd3f61108e44f16e6aa02
+EBUILD tmux-1.7.ebuild 1848 SHA256 c9eaf5493b6380ded3b36c4f61faf28f94a645d12768d980bcae3371cdda48cd SHA512 c03c64c0ff4e3eec7d258a80e813d6f0249cd9e316e698f03031c7b0fb44fa6498cbd169c8c2fd004dc9d070f4d9aa0ac468b99f411d01834f7b2e632ad52b60 WHIRLPOOL 4758f4f7e3f4cbde0f41927770e56101f553737788a7ea87dab01fafa7e2680a3bc01720b8b9c0dc7cdd5c331e2d1bccf36a994c7ed0e89fcc373280766d023a
+EBUILD tmux-9999.ebuild 1271 SHA256 98234e4bf2ca7c4af2db3e1776b08cf38f923274f6e7c2b3ae0523a4b5bf6be4 SHA512 57423580ebb425637010a8a50e74b4558732c0196e789c557bec300e4d03a269ba9abba70908e2f4d49da3e708f6d2284bd75ec7fb248aca20be532d24ce40bb WHIRLPOOL 692e8fbf50f359aa150d2eb38d04f9fc56a8a11cc32cb5164bdc38dff23b120f9a1d0b899d2d078ae6fb92179ba89cf22ad97942aceebd520b0d6f01459b0782
+MISC ChangeLog 10046 SHA256 6dce6fa0c9710d0f2c13f02fde719758bc56354be8c579935c41654c72e84863 SHA512 1b724c11f64f93c71773fd2f5da457299342d7d8d23e02bb89e074d53356b8a1ef90ec3f83a76b2dfb73ba45ba90cebd8d18293c026e7af451a51d6cc4a00224 WHIRLPOOL 452ced942055e73d911f2bcb5bb54af4b434a8204fe2ec94cc71f7d8b69312efc3d84252cf86cd12f624628acb30009417a0a640f0606726037f0549d0933e2e
+MISC metadata.xml 561 SHA256 e830ad48fa3fa353f2239d9d7e6ee9b09f23df299fbac5abca85611d37d6524a SHA512 4717b3a2f2371c155ab1a46970064a5477979e86433d5d2da1e367b123fd343bbcb81c188ace482cb59b3eea2381f151e1865d4f444d3ee6bdd4cd158efcf048 WHIRLPOOL 50c293608e026dfd5c9ddc9399d6342c9074e0246c66475af0e72b48a91853ce9d253b8db39f069187cd0cdaa007d6cdd537d3943a5c8d54bf4539c08d72919d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDd3ccACgkQVWmRsqeSphNMwwCdHPv3pbPRtNUy2eNznJttCadG
-GuwAn3szawm/EPhrPP/ZW99GbOX9m2eu
-=VGyS
+iEYEAREIAAYFAlDsN14ACgkQgAnW8HDreRYuNgCbBb0pSPD3uKroZbzShCm1xXgF
+Q2EAn3vEjg69QTvcLaR/ZUocw59jV9uQ
+=9XFX
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml
index 293ae1e3988c..a88ed84b3bba 100644
--- a/app-misc/tmux/metadata.xml
+++ b/app-misc/tmux/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
-	<maintainer>
-		<email>wired@gentoo.org</email>
-		<name>Alex Alexander</name>
-	</maintainer>
-	<longdescription>
+  <herd>shell-tools</herd>
+  <maintainer>
+    <email>wired@gentoo.org</email>
+    <name>Alex Alexander</name>
+  </maintainer>
+  <longdescription>
 		tmux is a "terminal multiplexer", it enables a number of terminals
 		(or windows) to be accessed and controlled from a single terminal.
 		tmux is intended to be a simple, modern, BSD-licensed alternative to
diff --git a/app-misc/tmux/tmux-1.6.ebuild b/app-misc/tmux/tmux-1.6.ebuild
index 7e47646fdef8..3efef5fa0104 100644
--- a/app-misc/tmux/tmux-1.6.ebuild
+++ b/app-misc/tmux/tmux-1.6.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.9 2012/10/13 17:23:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.6.ebuild,v 1.10 2013/01/08 15:12:29 jlec Exp $
 
 EAPI=4
 
+inherit bash-completion-r1
+
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="http://tmux.sourceforge.net"
 SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
@@ -58,6 +60,8 @@ src_prepare() {
 src_install() {
 	default
 
+	newbashcomp examples/bash_completion_tmux.sh ${PN}
+
 	docinto examples
 	dodoc examples/*.conf
 
diff --git a/app-misc/tmux/tmux-1.7-r1.ebuild b/app-misc/tmux/tmux-1.7-r1.ebuild
new file mode 100644
index 000000000000..6f3b23ace857
--- /dev/null
+++ b/app-misc/tmux/tmux-1.7-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.7-r1.ebuild,v 1.1 2013/01/08 15:12:29 jlec Exp $
+
+EAPI=4
+
+inherit bash-completion-r1
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.sourceforge.net"
+SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="vim-syntax"
+
+COMMON_DEPEND="
+	>=dev-libs/libevent-2.0.10
+	sys-libs/ncurses"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	vim-syntax? ( || (
+		app-editors/vim
+		app-editors/gvim ) )"
+
+DOCS=( CHANGES FAQ NOTES TODO )
+
+pkg_setup() {
+	if has_version "<app-misc/tmux-1.7"; 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 "running 1.6 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.6 to access them."
+		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
+
+	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-1.7.ebuild b/app-misc/tmux/tmux-1.7.ebuild
index d9c36a4f8d2f..42ea55f3b20d 100644
--- a/app-misc/tmux/tmux-1.7.ebuild
+++ b/app-misc/tmux/tmux-1.7.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.7.ebuild,v 1.3 2012/12/28 17:58:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.7.ebuild,v 1.4 2013/01/08 15:12:29 jlec Exp $
 
 EAPI=4
 
+inherit bash-completion-r1
+
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="http://tmux.sourceforge.net"
 SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
@@ -49,6 +51,8 @@ src_prepare() {
 src_install() {
 	default
 
+	newbashcomp examples/bash_completion_tmux.sh ${PN}
+
 	docinto examples
 	dodoc examples/*.conf
 
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 8bce0eec35b8..4dceae6a4bf2 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.6 2012/10/13 17:34:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v 1.7 2013/01/08 15:12:29 jlec Exp $
 
 EAPI=4
 
-inherit autotools git-2
+inherit autotools git-2 bash-completion-r1
 
 EGIT_REPO_URI="git://tmux.git.sourceforge.net/gitroot/tmux/tmux"
 
@@ -44,6 +44,8 @@ src_configure() {
 src_install() {
 	default
 
+	newbashcomp examples/bash_completion_tmux.sh ${PN}
+
 	docinto examples
 	dodoc examples/*.conf