app-misc/tmux: Use pkg-config to detect ncurses, #456644

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 125 insertions, 10 deletions

diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index a6d87379a85c..d4698624aaa0 100644
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/tmux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.91 2013/02/05 03:34:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.92 2013/02/13 09:35:36 jlec Exp $
+
+*tmux-1.7-r3 (13 Feb 2013)
+
+  13 Feb 2013; Justin Lecher <jlec@gentoo.org> +tmux-1.7-r3.ebuild,
+  +files/tmux-1.7-terminfo.patch:
+  Use pkg-config to detect ncurses, #456644
 
   05 Feb 2013; Tim Harder <radhermit@gentoo.org> tmux-9999.ebuild:
   Update EGIT_REPO_URI.
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 1012684ea8f3..47283be29761 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX tmux-1.7-terminfo.patch 722 SHA256 6143e2d71fac90f0905d65c5c00e45c37d521a9c2a4cef545f93d43c809a2670 SHA512 0cbf05e0b56ce96d0f9a66dbff97fa154a4c5b47ad871e6d46e763a887cb6dfd0b531ba876ac73c88a3e1b8dfbc7096aa8b176e8720a74fec732dd5731bb5119 WHIRLPOOL e46d9cfe1e8f0474b956bd6bbf9b8e6ae4d14471e30bdc372fbf19f093751a6de8d67d7e093878e3009970608fbb66b8c64dd32641f623adbe137ab5ed6d0ba1
 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 2343 SHA256 566b1adcec2bda6e2644ad14db0a18eac91218d8159c91f2c9a66a4323d027c9 SHA512 cb0ab07c79a05b51091f58989f1f2f90525fa7ddf0a8feaab19aea062368f54a116acbcaecd5f78f81c03183f545daf4fecb9f5cd421a14aa2d1fb6938851835 WHIRLPOOL ac2a5f7df3a32d6614e5262dcf067e54f8acb7080ea450503fff27752b0cfbad406f2fe56b980bcbef2d2523f2ecc79c8df19e3aaaf06b019698152d084d3450
 EBUILD tmux-1.7-r1.ebuild 1861 SHA256 fd0034726e7660d0069b8dca71674d29b70495871ad4a3e99cd813e6c3b93407 SHA512 66e27d11830b836201c635bb25be49b789cda5c84cc18ca25b31f8e849f839df6d04b9d4f265591de2c890464692350c0118a23b2dc07c572ff63e1f037b7462 WHIRLPOOL 22d0eeae1347e1c28f3d804e1d790e0da28770aa7c7a013363c9c05a1b0182b0b0e9b94b5ee1583cd8bcff76f4d7ecffde1dbadf405f4c9af86d7c2141b0988e
 EBUILD tmux-1.7-r2.ebuild 1974 SHA256 358d24fca620008e09b9de831fadf2bd7af683cfbd40d55f1ef4dfea5f75d560 SHA512 f1c290ef73356fe4bfef135318518200515f95f7d9d8c3ca470fa425146650179ede80713d60feee6bfd03acd1626767c5698faf974cdbf37cf13d8499cd15f0 WHIRLPOOL c198be001958065139f93eac2f21e40bd3f654d7932053eb5dd99513e0f95224ae0a4db0a6cc4e115b53fc9064dd6e495d93988dc6909407efd53ce9322542dd
+EBUILD tmux-1.7-r3.ebuild 2115 SHA256 6a6809fb18f3769c796ce722096090746e95895d1ed09818cdf7b04be328fdf9 SHA512 6bbdc34e5e2eb0099fdc2296640490e618c1731e7adad4a897bd7549c56a7074e649a84512657769c2906377e15595834634144907a9f4cb150d475aba68d9d3 WHIRLPOOL cd8408a1f0bf8e3fd9ad0297ca828626c3c172d283da167c298c4bc0ced05e1e1c71080bcce186752f6d1d5d5e3eed5fdb4c47df5bfb02f974348411c8b4468b
 EBUILD tmux-1.7.ebuild 1857 SHA256 fc6a6150c7b8471496a15294d9835562863816f976f3704e10bba19e23d84380 SHA512 7deb8ac78b8f34e548930550f40ea67cdce9f36b27d3730ccb9afd968783a865b946d4771e07c3199c6a22bf32e5bdf0bd68d91f78fd3c9848708d3fe4195b18 WHIRLPOOL 5583fb709484cc898c89bd95b631b631e4a36c571c9bb6f0e60286ed5cbd15a49e45ccd11c2b831a016cacdf066b5bc82e960cff00b44b574fea5265be0d40f1
 EBUILD tmux-9999.ebuild 1286 SHA256 60fcbeac5650db45f71983a794e16dd413d642bdf2eccd1032adf25a0a485d34 SHA512 a8ae053687bcd96e031c32db13d72a54d72986762c6e1a18f6f921655b0bb28723fb9e4bf675b09f663f8532d6efe4b4536722fcf405d7037810f57b163d7bd1 WHIRLPOOL ca32770ce4634ae4d1a153b69f0bb6a213321966233c498c04163bb70868db4ff20f6ee60e45383cedf9f98ac624c8438473be8a016f7aebd7560a3707682d1c
-MISC ChangeLog 10475 SHA256 229a375c06e1fe0bfb4d6ed9c53099a5b15ad6bbb76f74baae12c1ff016d38e9 SHA512 78cd6e31edf715b0b91b6e368a8fbdf729753d5ce54c9e5984045d55c9d2d0ac2b1cb4d67639bc6ad429cf14c4ef0c211cb1b5231142031ccc1d686967b88dcc WHIRLPOOL 02cd2837c850c52d5ef4a3abcac4ab38b043beb4e3fba5be85c4fc805547e237bd5e6b616d6024ed1e410e9990fb4cd681a0361739eacf57f97c0a983eb7d3c8
+MISC ChangeLog 10645 SHA256 214ba7322bf8bee9c0013811eb10e8898e137a4101789363a0843ffd82b87417 SHA512 18b1bc19ed6900e1fa372cbb74e134b6bc9dbce629cb034d3aed94e46380f142f763bbbb870c715110a58ea2658849c721c582668be1a102829d14355b06ba63 WHIRLPOOL e9208be4e4ac0a2f080d22f7251bcee8020752d77091e22f5d0bb581f8b1b658b6070f2ab7f083ff69ea3841323cef78a8eeac0ffe6ac235625cd7781a9436d0
 MISC metadata.xml 561 SHA256 e830ad48fa3fa353f2239d9d7e6ee9b09f23df299fbac5abca85611d37d6524a SHA512 4717b3a2f2371c155ab1a46970064a5477979e86433d5d2da1e367b123fd343bbcb81c188ace482cb59b3eea2381f151e1865d4f444d3ee6bdd4cd158efcf048 WHIRLPOOL 50c293608e026dfd5c9ddc9399d6342c9074e0246c66475af0e72b48a91853ce9d253b8db39f069187cd0cdaa007d6cdd537d3943a5c8d54bf4539c08d72919d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJREH27AAoJEEqz6FtPBkyjSE0H/1WneHpbphyYi3Ve9HKQ/ZL5
-rzyg3UC9CehEVcOmpFkQ5H57Wr3Hydr9uH2LNhXv9lT4Ik57cMvLa5g7KeUgmFh5
-gLDp4Amw0KMcRUTsg+ZBnxGsq1MAVP8RRF8JYh75rbrztircCxKF4/0lhuyIqm3d
-8lAKI6TojvFkiK417EtfKX2sZktfUpcphuFYkEO1LeEHfrLF0YohWIu/sxWCaf3n
-fUFw+gjmdCIvvLl+I0BWRgmk7ip8sBkwGqSBqj58zDC0ABhXv/8zDyzjrDL5KdH1
-ubVSz8fNHqtBnc+/7f8HeUBU3DfWCCcWjDhOnwTTNUnf6VNc2xXcqZcsu4r06bs=
-=PKOu
+iEYEAREKAAYFAlEbXo0ACgkQgAnW8HDreRYSqQCfSjTlHt0IqyDx9UKLwhKgBAaT
+xUAAnA2t22rdqDirfAllHKye0cWaz4UU
+=410y
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tmux/files/tmux-1.7-terminfo.patch b/app-misc/tmux/files/tmux-1.7-terminfo.patch
new file mode 100644
index 000000000000..0cd430664a5d
--- /dev/null
+++ b/app-misc/tmux/files/tmux-1.7-terminfo.patch
@@ -0,0 +1,35 @@
+ configure.ac | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f78cfc3..ac40bf9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -127,11 +127,22 @@ if test "x$found_libevent" = xno; then
+ fi
+ 
+ # Look for curses.
+-AC_SEARCH_LIBS(
+-	setupterm,
+-	[terminfo curses ncurses],
+-	found_curses=yes,
+-	found_curses=no
++PKG_CHECK_MODULES(
++	CURSES,
++	ncurses,
++	[
++		CPPFLAGS="$CURSES_CFLAGS $CPPFLAGS"
++		LIBS="$CURSES_LIBS $LIBS"
++		found_curses=yes
++	],
++	[
++		AC_SEARCH_LIBS(
++			setupterm,
++			[terminfo curses ncurses],
++			found_curses=yes,
++			found_curses=no
++		)
++	]
+ )
+ if test "x$found_curses" = xno; then
+     AC_MSG_ERROR("curses not found")
diff --git a/app-misc/tmux/tmux-1.7-r3.ebuild b/app-misc/tmux/tmux-1.7-r3.ebuild
new file mode 100644
index 000000000000..92e598582dff
--- /dev/null
+++ b/app-misc/tmux/tmux-1.7-r3.ebuild
@@ -0,0 +1,76 @@
+# 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-r3.ebuild,v 1.1 2013/02/13 09:35:36 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils bash-completion-r1 flag-o-matic
+
+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 ~s390 ~sh ~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 )
+
+PATCHES=( "${FILESDIR}"/${P}-terminfo.patch )
+
+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.am || die
+
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	autotools-utils_src_prepare
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	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
+}