Upstream now uses autotools, #350261

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

3 files changed, 20 insertions, 38 deletions

diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index 134c2fdc06f9..a93982dff765 100644
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/tmux
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.53 2010/10/28 20:55:42 wired Exp $
+# 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 $
+
+  01 Jan 2011; Justin Lecher <jlec@gentoo.org> tmux-9999.ebuild:
+  Upstream now uses autotools, #350261
 
 *tmux-9999 (28 Oct 2010)
 
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 854d70f972c1..eb12864f3993 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
@@ -9,23 +6,6 @@ DIST tmux-1.3.tar.gz 251999 RMD160 7c895562c7810117d610c420901110c7e206bebf SHA1
 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
-EBUILD tmux-9999.ebuild 1245 RMD160 9b9f787e11d15b6143070da67c785c2e4656aca5 SHA1 2e3b6bf2c03d44f1f33069f15165fb47f0d02bc7 SHA256 fe1a936b00d27f4f10705415b112876d44fef1dd3c3e81734e8fe14efd07352f
-MISC ChangeLog 6098 RMD160 9ba9e3a28761b640790ef03b307d0c61926b376a SHA1 244671706aca4091c37acc1252b415f5d1a45cb5 SHA256 3859c499af7681d30b9fc5c6ecfed13c74f053546f0e97e9bbe79ad3b90e840b
+EBUILD tmux-9999.ebuild 1113 RMD160 817adb580f6d6d162dafc705c2559c80d32ff72a SHA1 097a5309f19c2e818e0b83566d1e96e5edbe34d3 SHA256 3b61e31f78daf17563e218cd1f0d2fbbc0b7042bbf120ed14ed254766563b950
+MISC ChangeLog 6202 RMD160 108195453468c420a601c26c0b8db3a0bb3efdfa SHA1 542cfdc32e4d3d59760a50ebbe24e48f567e9a72 SHA256 8a539f99e1550744aa25baf34f91b1244ca13c4fbb746e274c63d12084aa1f9e
 MISC metadata.xml 553 RMD160 525d334bde540803b66251b9f2e30d697f4fc327 SHA1 4e2b9280d38ed834ec9e302b1b9c85201c71fede SHA256 767126148103c206d8a942e171f2f0c572bc42fac680cb188cf304e1ec8fc3c4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iQIcBAEBCAAGBQJMyeStAAoJEDZF8K7rm0r6dikP/2eAGXuyqOo7EFsQM4YvEliL
-81pps95a690FeF3ZVYpRMI2R+swUhynEH0mITvia67ldcACK4IMFL4RT8s9LhbUw
-IvfVcJQZJfiQKzfZVFMHyJWBfygeG6qF24j8NHZHYIlGu2cAlvNIXa+Nst695OgS
-UAqW7EkkApcMv8gQfsq8+62r2EgOIVq1BXoHi3smdrEIKzWBd3GeMSh1kelsQpLw
-teSxLVBRGVMGRuCwTcEUTjkK1iuclB8xes1B0wkD+K18r624YBjCD5RE2sPjroaN
-97qzGT6ENNtaIudLlweppkNpI2FTnuojmG0cW0gMOEkK+97j3qzPQokEXBRckxvZ
-M4xipVCMarLusUvavh2YVb6Oi+7YOVd3iDDdiaiUwGhLs3tUmD4U8xwWKjg+tRNH
-9XU/nJRHwZBw7nBXIOeS5KS8GMUOn+kQjb82qVWzbUlxbYXXmDQHt4qnR+EAyeLb
-Gy0F5jgBJOGqCXVoy6l10/VSQlwK5QANOq9KVmLOGnezo2TbcRZdIt+/4256Q+/G
-CI3KpOU8EFO3Tx1wRqdkuN828ZO5I/xD7UoFi/hypDKF0C03NvUkmmXHzgcaOiT0
-x5q/SqSxkpVBNKaTj2JgMD7CVGKKa+xCyY+oWqS8yiWbDr1q8FQzUHt/9VeQ8mvh
-1Gdmh0M2UBINY9waD/5Q
-=kDAp
------END PGP SIGNATURE-----
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 34d39cb6e324..196048720b73 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,13 +1,13 @@
-# 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-9999.ebuild,v 1.1 2010/10/28 20:55:42 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v 1.2 2011/01/01 08:25:08 jlec Exp $
 
 EAPI=3
 
 ECVS_SERVER="tmux.cvs.sourceforge.net:/cvsroot/tmux"
 ECVS_MODULE="tmux"
 
-inherit cvs toolchain-funcs
+inherit autotools cvs
 
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="http://tmux.sourceforge.net"
@@ -16,35 +16,34 @@ SRC_URI=""
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS=""
-IUSE="vim-syntax"
+IUSE="debug 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 ) )"
 
-S="${WORKDIR}"/"${PN}"
+S="${WORKDIR}"/${PN}
 
-src_configure() {
-	# The configure script isn't created by GNU autotools.
-	./configure || die "configure failed"
+src_prepare() {
+	eautoreconf
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+src_configure() {
+	econf \
+		$(use_enable debug)
 }
 
 src_install() {
-	dobin tmux || die "dobin failed"
+	emake DESTDIR="${D}" install || die
 
 	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"