- Version bump

- Remove old
(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r7 sparc64)

5 files changed, 70 insertions, 42 deletions

diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index 66cdb9317d0e..68cd8f3b39de 100644
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/tmux
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.5 2008/11/18 00:41:57 tcunha Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.6 2009/01/18 17:49:16 tcunha Exp $
+
+*tmux-0.6 (18 Jan 2009)
+
+  18 Jan 2009; Tiago Cunha <tcunha@gentoo.org> +files/tmux.vim,
+  metadata.xml, -tmux-0.4a.ebuild, +tmux-0.6.ebuild:
+  - Version bump
+  - Remove old
 
 *tmux-0.5 (18 Nov 2008)
 
diff --git a/app-misc/tmux/files/tmux.vim b/app-misc/tmux/files/tmux.vim
new file mode 100644
index 000000000000..baac50adab16
--- /dev/null
+++ b/app-misc/tmux/files/tmux.vim
@@ -0,0 +1 @@
+au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml
index 5ddb363a3b82..28e34d461099 100644
--- a/app-misc/tmux/metadata.xml
+++ b/app-misc/tmux/metadata.xml
@@ -6,9 +6,9 @@
 		<email>tcunha@gentoo.org</email>
 	</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 programs such as
-<pkg>app-misc/screen</pkg>.
+		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
+		programs such as <pkg>app-misc/screen</pkg>.
 	</longdescription>
 </pkgmetadata>
diff --git a/app-misc/tmux/tmux-0.4a.ebuild b/app-misc/tmux/tmux-0.4a.ebuild
deleted file mode 100644
index 000f1c3a2c98..000000000000
--- a/app-misc/tmux/tmux-0.4a.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-0.4a.ebuild,v 1.3 2008/10/24 21:17:59 pvdabeel Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.sourceforge.net"
-SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake DEBUG="" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dobin tmux || die "dobin failed"
-
-	dodoc NOTES TODO || die "dodoc failed"
-	docinto examples
-	dodoc examples/*.conf || die "dodoc examples failed"
-
-	doman tmux.1 || die "doman failed"
-}
-
-pkg_postinst() {
-	elog "NOTE that tmux doesn't support \\\033_string\\\033\\\\\\ for window"
-	elog "titles. If you're using BASH unset PROMPT_COMMAND."
-}
diff --git a/app-misc/tmux/tmux-0.6.ebuild b/app-misc/tmux/tmux-0.6.ebuild
new file mode 100644
index 000000000000..6f151e1df686
--- /dev/null
+++ b/app-misc/tmux/tmux-0.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-0.6.ebuild,v 1.1 2009/01/18 17:49:16 tcunha Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.sourceforge.net"
+SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="vim-syntax"
+
+DEPEND=""
+RDEPEND="vim-syntax? ( || (
+			app-editors/gvim
+			app-editors/vim ) )"
+
+src_compile() {
+	emake CC="$(tc-getCC)" DEBUG="" || die "emake failed"
+}
+
+src_install() {
+	dobin tmux || die "dobin failed"
+
+	dodoc CHANGES FAQ NOTES TODO || die "dodoc failed"
+	docinto examples
+	dodoc examples/*.conf || die "dodoc examples failed"
+
+	doman tmux.1 || die "doman failed"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/tmux.vim || die "doins syntax failed"
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/tmux.vim || die "doins ftdetect failed"
+	fi
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.6"
+	PREVIOUS_LESS_THAN_0_6=$?
+}
+
+pkg_postinst() {
+	if [[ ${PREVIOUS_LESS_THAN_0_6} -eq 0 ]]; then
+		ewarn "The 0.6 release changed some commands and options"
+		ewarn "(such as: mode-keys, remain-by-default, set, setw, and"
+		ewarn "utf8-default), thus it will break current configurations. For"
+		ewarn "more information, please refer to the files located in"
+		ewarn "/usr/share/doc/${PF}."
+	fi
+}