From 7c5a09de43d72b0398763fc04118064d06c3a293 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Sun, 10 Jan 2016 11:56:46 +0100
Subject: [PATCH] app-misc/tmux: Ebuild style enhancements

* Add missing slot operators to ncurses dep
* Use REPLACING_VERSIONS instad of has_version
* Move user notice to pkg_postinst()

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 app-misc/tmux/tmux-2.1.ebuild  | 50 +++++++++++++++++++---------------
 app-misc/tmux/tmux-9999.ebuild | 39 ++++++++++++++++++--------
 2 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/app-misc/tmux/tmux-2.1.ebuild b/app-misc/tmux/tmux-2.1.ebuild
index 4ceba46ee594..9a9ea612da85 100644
--- a/app-misc/tmux/tmux-2.1.ebuild
+++ b/app-misc/tmux/tmux-2.1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 AUTOTOOLS_AUTORECONF=true
 
-inherit autotools-utils bash-completion-r1 flag-o-matic
+inherit autotools-utils bash-completion-r1 flag-o-matic versionator
 
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="http://tmux.github.io/"
@@ -17,36 +18,27 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 IUSE="debug selinux vim-syntax"
 
 CDEPEND="
-	|| ( =dev-libs/libevent-2.0*
-		 >=dev-libs/libevent-2.1.5-r4 )
+	|| (
+		=dev-libs/libevent-2.0*
+		>=dev-libs/libevent-2.1.5-r4
+	)
 	!sys-apps/utempter
-	sys-libs/ncurses"
+	sys-libs/ncurses:0="
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( || (
-		app-editors/vim
-		app-editors/gvim ) )"
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)"
 
 DOCS=( CHANGES FAQ README TODO )
 
 PATCHES=( "${FILESDIR}"/${PN}-2.0-flags.patch )
 
-pkg_setup() {
-	if has_version "<app-misc/tmux-1.9a"; 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 "older, running 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 access them."
-		echo
-	fi
-}
-
 src_prepare() {
 	# bug 438558
 	# 1.7 segfaults when entering copy mode if compiled with -Os
@@ -82,3 +74,17 @@ src_install() {
 		doins "${FILESDIR}"/tmux.vim
 	fi
 }
+
+pkg_postinst() {
+	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; 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 "older, running 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 access them."
+		echo
+	fi
+}
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index f809290ff99e..1e3c5867dabc 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-AUTOTOOLS_AUTORECONF=true
 
-inherit autotools-utils git-r3 bash-completion-r1 flag-o-matic
+AUTOTOOLS_AUTORECONF=true
 
-EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+inherit autotools-utils git-r3 bash-completion-r1 flag-o-matic versionator
 
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="http://tmux.github.io/"
 SRC_URI=""
+EGIT_REPO_URI="https://github.com/tmux/tmux.git"
 
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS=""
 IUSE="debug selinux vim-syntax"
 
-COMMON_DEPEND="
+CDEPEND="
 	>=dev-libs/libevent-2.0.10
-	sys-libs/ncurses"
-DEPEND="${COMMON_DEPEND}
+	sys-libs/ncurses:0="
+DEPEND="${CDEPEND}
 	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( || (
-		app-editors/vim
-		app-editors/gvim ) )"
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)"
 
 DOCS=( CHANGES FAQ README TODO )
 
@@ -69,3 +72,17 @@ src_install() {
 		doins "${FILESDIR}"/tmux.vim
 	fi
 }
+
+pkg_postinst() {
+	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; 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 "older, running 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 access them."
+		echo
+	fi
+}
-- 
2.26.2