Version Bump, removed old

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

6 files changed, 113 insertions, 71 deletions

diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index a93982dff765..98f1a6215b7b 100644
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,12 @@
 # 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.54 2011/01/01 08:25:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.55 2011/01/07 14:06:29 jlec Exp $
+
+*tmux-1.4 (07 Jan 2011)
+
+  07 Jan 2011; Justin Lecher <jlec@gentoo.org> -tmux-1.1.ebuild,
+  tmux-1.2.ebuild, tmux-1.3.ebuild, +tmux-1.4.ebuild:
+  Version Bump, removed old
 
   01 Jan 2011; Justin Lecher <jlec@gentoo.org> tmux-9999.ebuild:
   Upstream now uses autotools, #350261
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index eb12864f3993..ed8eee17e291 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tmux-1.2-locale.patch 628 RMD160 2f9902fdabd4349a3861e2d8f2e6fa43c363f271 SHA1 f7c6fe2e2e2fb18809a964be65d034d9bb60e944 SHA256 64ef3fadd3aef308c0ab0cac62ac1926d769651a7b6c30697f4c7a80db020404
 AUX tmux.vim 55 RMD160 1299eac25b3e01700dba4b295c33964a607b8ee4 SHA1 820863224eda185aba4da86ffbe876e287a70f30 SHA256 ab10a475aa32e2aacba7b47e9ca38057ee2e447a953497a0349f1640167be6b7
-DIST tmux-1.1.tar.gz 230955 RMD160 9f03922c0be46e9259202ed2fdc0834dcf01581c SHA1 8dc57a70605930bbe61664bd52ed2c8081ea5a1c SHA256 b3626ecb74185c5764be658fd359c3fe29ffbe5d1936de81d6628b686558436a
 DIST tmux-1.2.tar.gz 241779 RMD160 47ac2b3606841189c6b75412bb67d6625073b035 SHA1 57a784dc998710a719ee3e13dcd29541611c009e SHA256 af3f2678ae631ab3f7973b646aff2f8757e9e00935a5984c23058da4f723491d
 DIST tmux-1.3.tar.gz 251999 RMD160 7c895562c7810117d610c420901110c7e206bebf SHA1 4d132a5fa25ef049e023f154824f39b0d7e72ab0 SHA256 72c2d6f1c30fb4ccbd29b530a7d8a08e67c9c2d87ac8d67e3806561670fc0362
-EBUILD tmux-1.1.ebuild 1165 RMD160 07bc82e5cc648ecf3fbbec0b5088f349b4f6b2a8 SHA1 2c174da3f9a550430e1f6ae7b52e1846383f5d74 SHA256 1e750bc7788b81675cc9b037728e78de9eb5a232ec1d3b6c5ee3afddd96afd3d
-EBUILD tmux-1.2.ebuild 1327 RMD160 684e2c8efffb38d810d55833107998279be58f83 SHA1 8743bc3e555af1c5568b7f217aed86b49da98c2e SHA256 3603927e67d75d5fc0379536db7e2ed42d34a6ce6d00f5c2e8f25a158ab2c054
-EBUILD tmux-1.3.ebuild 2003 RMD160 f12ce51b4e35e22d4d0c11357964a4b42adb752d SHA1 9d070dbbbcaae5f6a1dcdd508a5cfdd9f2d753aa SHA256 a266cc4a7abb9fc2c8b055c6dfbd032ca83ed454d66309c9543ca6e23f5794b4
+DIST tmux-1.4.tar.gz 259614 RMD160 d8d09ccac7c1c79244f96beccbd6d52f1cc50d1b SHA1 c0cb9b01aee9b2b5c939bacccd5c78cf6fa6773e SHA256 c7e005f32e256b8ece214b71c51947f4081af8c5f0400083e4adaac2c258bbc7
+EBUILD tmux-1.2.ebuild 1328 RMD160 5029d97b4795c98bc22b1e0c3b4c35965443da21 SHA1 c96caed68a0b6bc010803fc55c6181d2b30b2a33 SHA256 2a4979c7462829c755e360b6edf3954fe1446f2634cf05d8dbdcd4e02dc1939e
+EBUILD tmux-1.3.ebuild 2000 RMD160 1536d213fddb6f469982d1e04903e7a387bf0d47 SHA1 e936ad523f7969d7aa5185bdf34317fd21832d62 SHA256 832514a3e3153305f5744f3567b15a268e222b05d18cb96f44f1cffb6966d599
+EBUILD tmux-1.4.ebuild 2003 RMD160 bcd02ca980b18a21968dbbfb464d7019c6475192 SHA1 03107e39cafd68a67ba46564ad5016410e0c628a SHA256 2dee0027c53a4f1d6db5e5e2925ff5493bb7951bdc6d4bae839b2088288e422d
 EBUILD tmux-9999.ebuild 1113 RMD160 817adb580f6d6d162dafc705c2559c80d32ff72a SHA1 097a5309f19c2e818e0b83566d1e96e5edbe34d3 SHA256 3b61e31f78daf17563e218cd1f0d2fbbc0b7042bbf120ed14ed254766563b950
-MISC ChangeLog 6202 RMD160 108195453468c420a601c26c0b8db3a0bb3efdfa SHA1 542cfdc32e4d3d59760a50ebbe24e48f567e9a72 SHA256 8a539f99e1550744aa25baf34f91b1244ca13c4fbb746e274c63d12084aa1f9e
+MISC ChangeLog 6375 RMD160 da46529ad86c280f85c984056d22f14a7b5e3907 SHA1 793eaf8f56ec3e1a0190b85b51164f8521d198f0 SHA256 1dc3f137839d0ac802630b8e9852a84776fda141efe0f63b77b257ecdb47befb
 MISC metadata.xml 553 RMD160 525d334bde540803b66251b9f2e30d697f4fc327 SHA1 4e2b9280d38ed834ec9e302b1b9c85201c71fede SHA256 767126148103c206d8a942e171f2f0c572bc42fac680cb188cf304e1ec8fc3c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0nHesACgkQgAnW8HDreRYQYACcCG4hLillk59DowJ4SbJbjocs
+aYUAoJgHZf0W228yzzGjGveBvBO5t5V5
+=kQlZ
+-----END PGP SIGNATURE-----
diff --git a/app-misc/tmux/tmux-1.1.ebuild b/app-misc/tmux/tmux-1.1.ebuild
deleted file mode 100644
index e2509ecbae6d..000000000000
--- a/app-misc/tmux/tmux-1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.1.ebuild,v 1.7 2010/07/24 16:54:56 jlec 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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND="vim-syntax? ( || (
-			app-editors/gvim
-			app-editors/vim ) )"
-
-src_compile() {
-	# The configure script isn't created by GNU autotools.
-	./configure || die "configure failed"
-	emake CC="$(tc-getCC)" || 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
-}
diff --git a/app-misc/tmux/tmux-1.2.ebuild b/app-misc/tmux/tmux-1.2.ebuild
index 652e2c434bff..82c050fc4199 100644
--- a/app-misc/tmux/tmux-1.2.ebuild
+++ b/app-misc/tmux/tmux-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.2.ebuild,v 1.11 2010/08/25 20:58:13 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.2.ebuild,v 1.12 2011/01/07 14:06:29 jlec Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="vim-syntax"
 
-DEPEND="<dev-libs/libevent-2
+DEPEND="
+	<dev-libs/libevent-2
 	sys-libs/ncurses"
 RDEPEND="${DEPEND}
 	vim-syntax? ( || (
diff --git a/app-misc/tmux/tmux-1.3.ebuild b/app-misc/tmux/tmux-1.3.ebuild
index 66d5bec8075a..1b4d439cdb68 100644
--- a/app-misc/tmux/tmux-1.3.ebuild
+++ b/app-misc/tmux/tmux-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.3.ebuild,v 1.7 2010/10/10 17:50:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.3.ebuild,v 1.8 2011/01/07 14:06:29 jlec Exp $
 
 EAPI=3
 
@@ -15,13 +15,30 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="vim-syntax"
 
-DEPEND="<dev-libs/libevent-2
+DEPEND="
+	<dev-libs/libevent-2
 	sys-libs/ncurses"
 RDEPEND="${DEPEND}
 	vim-syntax? ( || (
 			app-editors/vim
 			app-editors/gvim ) )"
 
+pkg_setup() {
+	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 1.3 Changelog, together with details on what replaced the above"
+	ewarn "commands, visit http://tmux.cvs.sourceforge.net/viewvc/tmux/tmux/CHANGES."
+	ewarn
+	ewarn "WARNING: after updating to tmux 1.3 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
+}
+
 src_configure() {
 	# The configure script isn't created by GNU autotools.
 	./configure || die "configure failed"
@@ -48,19 +65,3 @@ src_install() {
 		doins "${FILESDIR}"/tmux.vim || die "doins ftdetect failed"
 	fi
 }
-
-pkg_setup() {
-	ewarn
-	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 1.3 Changelog, together with details on what replaced the above"
-	ewarn "commands, visit http://tmux.cvs.sourceforge.net/viewvc/tmux/tmux/CHANGES."
-	ewarn
-	ewarn "WARNING: after updating to tmux 1.3 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."
-	ewarn
-}
diff --git a/app-misc/tmux/tmux-1.4.ebuild b/app-misc/tmux/tmux-1.4.ebuild
new file mode 100644
index 000000000000..fe36d729c0e3
--- /dev/null
+++ b/app-misc/tmux/tmux-1.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.4.ebuild,v 1.1 2011/01/07 14:06:29 jlec Exp $
+
+EAPI=3
+
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="vim-syntax"
+
+DEPEND="
+	<dev-libs/libevent-2
+	sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	vim-syntax? ( || (
+			app-editors/vim
+			app-editors/gvim ) )"
+
+pkg_setup() {
+	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 1.3 Changelog, together with details on what replaced the above"
+	ewarn "commands, visit http://tmux.cvs.sourceforge.net/viewvc/tmux/tmux/CHANGES."
+	ewarn
+	ewarn "WARNING: after updating to tmux 1.3 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
+}
+
+src_configure() {
+	# The configure script isn't created by GNU autotools.
+	./configure || die "configure failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || 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
+}