gentoo resync : 25.04.2020

5 files changed, 99 insertions, 15 deletions

diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 5f38451e3289..792f63311975 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,8 +1,10 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
 DIST tmux-2.9a.tar.gz 510915 BLAKE2B 6a3dcdb66419fdd40818c18c3a16adf83fa67b3f5d4cc60953b64d62d2e3e139cad0612eef4233d3d5fa76aaae93e437c8394aa118791c87cb0670f1ddc65eae SHA512 aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
 DIST tmux-3.0a.tar.gz 546377 BLAKE2B 1e784d98e1f18e7850e92d8d5f849ee1b8bcbf62b9323b6eb4007e038bd84480b3a171c93c88954701487ef228db8717bac886f51dd21efdf2766e676b0c16e3 SHA512 f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b
+DIST tmux-3.1.tar.gz 561086 BLAKE2B 8857a788283cee6ac7a63f3241186ba37092729873f2026686d497be3d66ec9650c54d453d8577c195081c2f6c0434e51af686035fd5397ca84ec830347f4a1a SHA512 32f8bc03ee2071449c106f9c895164e8ffbb9cc720607d90e7ef397374c991c571294a918689bd9017ed7045fcff9e36d45ebb4b7454d93836f85bcc0333462b
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-EBUILD tmux-2.9a.ebuild 2300 BLAKE2B 5d753fcb742bc73cf2aa43fa3baee480edd0ce7ce450f03e6cc94c90c887472afa82e04a6885788cf5174372838e6a09e45a7434700b4adc0de102a159d26abb SHA512 170c4737306f8296ef0a66176159b32888e154ad6717e701f309fb31d895154cdf69f3128b199aff78535f022133ba4ade59a5c8194a1c7233fd52f9d52561a3
-EBUILD tmux-3.0a.ebuild 2318 BLAKE2B 08b667153881d780a012b20835340c00720348a1961ba83d396a2b91504e865d27de7cb740f40b16d8c182720c073f39b5fdbeec6cf8111c73aea586bb47eb90 SHA512 f6300ca1171f116e1e4c44a5779528b289fa1b510bf723740ca6da1bb0cfb7e5e1fc293f5d4c7c492435e64b448101bca2221b31663c99a83c39b78a14995a54
-EBUILD tmux-9999.ebuild 2327 BLAKE2B c4bcb63981638dfc026f8058eb94d5c0aed5ca21a3987ed7f1daeadcd3d1dd9250ad22efe438bf93042931de80c6f2a989d7ebd9880716b961f03ded44e02c61 SHA512 0bc8ec9cd27f70235e9f362282d923458734b25546ce2aa494c2a979d626642b8b0be2df8a739e3a1c61988b1379afe070b16e376d9618d41b4feb308b3b3dcf
+EBUILD tmux-2.9a.ebuild 2200 BLAKE2B f6ce1bbb62dcd2881919d6214175c3e416b24015693e1db4af49300709dcc3d0550a53d798e6e2f8757a24061aad4734865c24bbe80f4c3f9ed9009620dc2b12 SHA512 fa607107790ced2bbcf33bef3a08976f1b56a7a7b3a296d0930ecd25786c4cd07e68dcadfe460e227b8c846f85b53a4a6fec9af68c1fdf9da354a47dbe97a8fa
+EBUILD tmux-3.0a.ebuild 2218 BLAKE2B f0b7f6f6fcbba2548ccb42775f35d9f59b2bbb07a1fd004e83383970fadca0ae61859e24d2fcd11de8995dedc4fff2d54dbafa75bdc8d0a30f5572d6ecbaa7db SHA512 e275057fc5ee6f6ac4923b8cf95f7c4c861a2488153efedab6996f6f19b63ab890b58c9db1e403f2bd2893c6e41773413152543567d8c8ffd1d0e5fadd057b0a
+EBUILD tmux-3.1.ebuild 2227 BLAKE2B 415fec09c9e35b9301869c0bbcd75f0b68f8290e0d513478f6935dc332e35ac8e8557aa3247c84b2fb0dc9942db1fb9eba060f5be48442fba44c5c0f79685744 SHA512 f4024e103a77e20e952e4622e4ca8940d43d72f9d324fd7ca31e00826c23a03e8a8ce07f0552dca8031c8bab5875827d656159b7c6fe7f097508863f4172e29f
+EBUILD tmux-9999.ebuild 2227 BLAKE2B 415fec09c9e35b9301869c0bbcd75f0b68f8290e0d513478f6935dc332e35ac8e8557aa3247c84b2fb0dc9942db1fb9eba060f5be48442fba44c5c0f79685744 SHA512 f4024e103a77e20e952e4622e4ca8940d43d72f9d324fd7ca31e00826c23a03e8a8ce07f0552dca8031c8bab5875827d656159b7c6fe7f097508863f4172e29f
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
index ec46f9d71b89..0db3987a85cf 100644
--- a/app-misc/tmux/tmux-2.9a.ebuild
+++ b/app-misc/tmux/tmux-2.9a.ebuild
@@ -25,10 +25,8 @@ IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 DEPEND="
 	dev-libs/libevent:0=
 	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)"
+	utempter? ( sys-libs/libutempter )
+"
 
 BDEPEND="
 	virtual/pkgconfig"
diff --git a/app-misc/tmux/tmux-3.0a.ebuild b/app-misc/tmux/tmux-3.0a.ebuild
index 4c2b37a6aab4..11f6e03eece7 100644
--- a/app-misc/tmux/tmux-3.0a.ebuild
+++ b/app-misc/tmux/tmux-3.0a.ebuild
@@ -25,10 +25,8 @@ IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 DEPEND="
 	dev-libs/libevent:0=
 	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)"
+	utempter? ( sys-libs/libutempter )
+"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/app-misc/tmux/tmux-3.1.ebuild b/app-misc/tmux/tmux-3.1.ebuild
new file mode 100644
index 000000000000..1f43a539b177
--- /dev/null
+++ b/app-misc/tmux/tmux-3.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	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"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P/_/-}.tar.gz"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+
+DEPEND="
+	dev-libs/libevent:0=
+	sys-libs/ncurses:0=
+	utempter? ( sys-libs/libutempter )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )"
+
+DOCS=( CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4-flags.patch"
+
+	# upstream fixes (can be removed with next version bump)
+)
+
+src_prepare() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+		$(use_enable utempter)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
+
+pkg_postinst() {
+	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}/"
+		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 9b59adfc622f..1f43a539b177 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -25,10 +25,8 @@ IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 DEPEND="
 	dev-libs/libevent:0=
 	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)"
+	utempter? ( sys-libs/libutempter )
+"
 
 BDEPEND="
 	virtual/pkgconfig