From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-864603-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 7BC721388C0
	for <garchives@archives.gentoo.org>; Sun, 21 Feb 2016 00:42:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9274821C0AD;
	Sun, 21 Feb 2016 00:42:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 388AF21C0AD
	for <gentoo-commits@lists.gentoo.org>; Sun, 21 Feb 2016 00:42:24 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 015E8340CA2
	for <gentoo-commits@lists.gentoo.org>; Sun, 21 Feb 2016 00:42:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C9C0C16C5
	for <gentoo-commits@lists.gentoo.org>; Sun, 21 Feb 2016 00:42:19 +0000 (UTC)
From: "Jason Donenfeld" <zx2c4@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jason Donenfeld" <zx2c4@gentoo.org>
Message-ID: <1456015341.26a14377821f2bb94c3f47723c33c6b4836fe007.zx2c4@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-misc/tmux/tmux-2.1.ebuild app-misc/tmux/tmux-9999.ebuild
X-VCS-Directories: app-misc/tmux/
X-VCS-Committer: zx2c4
X-VCS-Committer-Name: Jason Donenfeld
X-VCS-Revision: 26a14377821f2bb94c3f47723c33c6b4836fe007
X-VCS-Branch: master
Date: Sun, 21 Feb 2016 00:42:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7775a8d9-d33b-4d25-ae80-b8f02299824d
X-Archives-Hash: 1856512962830ea180e892129b9ce682

commit:     26a14377821f2bb94c3f47723c33c6b4836fe007
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 00:39:54 2016 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 00:42:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a14377

app-misc/tmux: rely on libutempter

If utempter.h is installed, tmux unconditionally links against
libutempter, and there isn't a configure switch to disable it. As such,
systems that already had installed libutempter (for use with, say, mosh)
found that there would be issues when libutempter was removed, since it
wasn't an explicit dependency of this package. Meanwhile, there were
issues with the other utempter (non-lib prefix), causing that to be a
blocker. So, the fix for both of these at once is to replace the blocker
against utempter with a dependency on libutempter, because libutempter
already blocks utempter. This simplifes things greatly.

Fixes: 566990
Fixes: 560652
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 app-misc/tmux/tmux-2.1.ebuild  | 2 +-
 app-misc/tmux/tmux-9999.ebuild | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-misc/tmux/tmux-2.1.ebuild b/app-misc/tmux/tmux-2.1.ebuild
index 9a9ea61..9862e65 100644
--- a/app-misc/tmux/tmux-2.1.ebuild
+++ b/app-misc/tmux/tmux-2.1.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 		=dev-libs/libevent-2.0*
 		>=dev-libs/libevent-2.1.5-r4
 	)
-	!sys-apps/utempter
+	sys-libs/libutempter
 	sys-libs/ncurses:0="
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"

diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 1e3c586..2709b1a 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -20,6 +20,7 @@ IUSE="debug selinux vim-syntax"
 
 CDEPEND="
 	>=dev-libs/libevent-2.0.10
+	sys-libs/libutempter
 	sys-libs/ncurses:0="
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"