[gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/

[Patrice Clement]

commit:     9c708259c59e0b607623bcde274183543a73472a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 31 18:41:36 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Feb  1 08:46:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c708259

app-misc/tmux: fix vim-syntax USE flag meaning.

Install app-vim/tmux-vim, which contains tmux vim files, instead of
plain app-editors/vim.

Closes: https://bugs.gentoo.org/667550
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-misc/tmux/Manifest                             |  1 -
 .../tmux/{tmux-9999.ebuild => tmux-2.7-r1.ebuild}  | 27 +++++++-----------
 .../tmux/{tmux-9999.ebuild => tmux-2.8-r1.ebuild}  | 33 ++++++++--------------
 app-misc/tmux/tmux-9999.ebuild                     | 12 ++------
 4 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 9441c0d9fa5..576c077169f 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,4 +1,3 @@
 DIST tmux-2.7.tar.gz 487585 BLAKE2B 9c56da03bd12b358fcbed82def9680c34e1e485f906cf9b90a501e53b109c43d1ee843972d26e677de2c34830e599edee022dc1c17e1e5c935ed232caacb2b01 SHA512 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37
 DIST tmux-2.8.tar.gz 637609 BLAKE2B d95fbdbc79c2c512908f82778816aa8540bf2fe26509c91f46c8c64c8c13c9ea41487e3a816cc11274d4cc2868d16622c87efe978a65b08201c9a1c48e3c8c4b SHA512 d938854994e77f7941a31db79e25706150253feeba5e655a8fa853864e3073d2ee0ea218f972e7c7b9c814d8e8c63c2d9ef9b70ed1c6f8e993a900add4b995b5
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1

diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-2.7-r1.ebuild
similarity index 71%
copy from app-misc/tmux/tmux-9999.ebuild
copy to app-misc/tmux/tmux-2.7-r1.ebuild
index 30b2bd54a86..22c5ad91fd7 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-2.7-r1.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools git-r3 flag-o-matic versionator
+inherit autotools flag-o-matic versionator
 
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="https://tmux.github.io/"
-SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b
-vim-syntax? ( https://raw.githubusercontent.com/keith/tmux.vim/95f6126c187667cc7f9c573c45c3b356cf69f4ca/syntax/tmux.vim -> tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca )"
-EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
@@ -31,32 +29,28 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
+	vim-syntax? ( app-vim/vim-tmux )"
 
 DOCS=( CHANGES README TODO )
 
+S="${WORKDIR}/${P/_/-}"
+
 PATCHES=(
-	"${FILESDIR}/${PN}-2.4-flags.patch"
+	"${FILESDIR}"/${PN}-2.4-flags.patch
 
 	# usptream fixes (can be removed with next version bump)
 )
 
-S="${WORKDIR}/${P/_/-}"
-
 src_prepare() {
 	# bug 438558
 	# 1.7 segfaults when entering copy mode if compiled with -Os
 	replace-flags -Os -O2
 
 	# regenerate aclocal.m4 to support earlier automake versions
-	rm -f aclocal.m4 || die
+	rm aclocal.m4 || die
 
 	default
+
 	eautoreconf
 }
 
@@ -66,7 +60,6 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable utempter)
 	)
-
 	econf "${myeconfargs[@]}"
 }
 

diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-2.8-r1.ebuild
similarity index 66%
copy from app-misc/tmux/tmux-9999.ebuild
copy to app-misc/tmux/tmux-2.8-r1.ebuild
index 30b2bd54a86..dda8486cd79 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-2.8-r1.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools git-r3 flag-o-matic versionator
+inherit autotools flag-o-matic
 
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="https://tmux.github.io/"
-SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b
-vim-syntax? ( https://raw.githubusercontent.com/keith/tmux.vim/95f6126c187667cc7f9c573c45c3b356cf69f4ca/syntax/tmux.vim -> tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca )"
-EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P}.tar.gz"
+SRC_URI="https://github.com/tmux/tmux/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
@@ -31,32 +30,25 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
+	vim-syntax? ( app-vim/vim-tmux )"
 
 DOCS=( CHANGES README TODO )
 
+S="${WORKDIR}/${P/_/-}"
+
 PATCHES=(
-	"${FILESDIR}/${PN}-2.4-flags.patch"
+	"${FILESDIR}"/${PN}-2.4-flags.patch
 
 	# usptream fixes (can be removed with next version bump)
 )
 
-S="${WORKDIR}/${P/_/-}"
-
 src_prepare() {
 	# bug 438558
 	# 1.7 segfaults when entering copy mode if compiled with -Os
 	replace-flags -Os -O2
 
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm -f aclocal.m4 || die
-
 	default
+
 	eautoreconf
 }
 
@@ -66,7 +58,6 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable utempter)
 	)
-
 	econf "${myeconfargs[@]}"
 }
 
@@ -80,7 +71,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
+	if ! ver_test 1.9a -ge ${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}/"

diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 30b2bd54a86..103653e26eb 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,7 @@ inherit autotools git-r3 flag-o-matic versionator
 
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="https://tmux.github.io/"
-SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b
-vim-syntax? ( https://raw.githubusercontent.com/keith/tmux.vim/95f6126c187667cc7f9c573c45c3b356cf69f4ca/syntax/tmux.vim -> tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca )"
+SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
 EGIT_REPO_URI="https://github.com/tmux/tmux.git"
 
 LICENSE="ISC"
@@ -31,12 +30,7 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
+	vim-syntax? ( app-vim/vim-tmux )"
 
 DOCS=( CHANGES README TODO )