gentoo resync : 29.12.2022

3 files changed, 107 insertions, 13 deletions

diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index a08b6a240bd9..69535ed78698 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -2,8 +2,10 @@ AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4
 AUX tmux-3.2a-Fix-crosscompiling-Marco-A-L-Barbosa.patch 662 BLAKE2B c9a0881b49e952ad70609a6748bb83f6dcc3c53476738276b283e4e33f73445ce991ea19a749d8310cf580cfe5b9ab58dc3b31718b28778e6e40c18245188ec4 SHA512 d7a351122f39c21aff6c7a21626231234919479ee1e45ffbfefa0471bb3326d0af8cd12a49897ac9c1b928ccc3336c81ad22415cbd9836a8d3b930c696a189d9
 DIST tmux-3.1c.tar.gz 561323 BLAKE2B c6f688a854e128acffa140321a5dd00e4ca090ff79c7cbff15febbca6da9f7626c675fe1820b344637ff0fbe94ae6d0da7f111880ce5d74f97c4b6a90ceef802 SHA512 aad2e6457dd350369f245f711f1936a575d0588b72e660d10e7abc7d373da0d322903b451ad00b96a3e0e6847ca855673da6a4c5447cea91fa756edd23659397
 DIST tmux-3.2a.tar.gz 648394 BLAKE2B 94527d4d1016caddab170b5bbfd181514768474898314241fb65a53a1f5ae94863bacedf90a7543690c115d15295960dfab4d5ba2ce31cd105585a73fb9b82d1 SHA512 6e52c7f5d03b2c8b8c4c8caac092a166956ba97334b426f2823d74dc5849a1d31a80145924f641f69dd2c244809e9350d9bd7070897fa2e3e1f9f086f9b2f365
+DIST tmux-3.3a.tar.gz 677448 BLAKE2B e835ce0f136175521035a684419f221864edb0a9506d7d68cbc0239b1349e78949ebd96573a9d8651a2df6d99acb433075d6e0c20d7394a53fe6b44bd9e56069 SHA512 29a846df7d93601c42a22f84f606931dc65da1f70b67d351d0425f77ea3affe3e8218b2940d42cd3dadf3cd1aa95032daad3ecb14fbff0f69939d1beae0498c7
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 EBUILD tmux-3.1c.ebuild 1638 BLAKE2B 0ab8033ed5e3093c794c163f0434e02b15fb8a03e0eec333048bc1a1ea845065cb93de1edbc40f05b3d2c39e842ca5e0037d992846021a0d5e8f82f241dbb48c SHA512 c0bb3466cf8087fdd1bc2bafa298f21fdc44792a1d2c60ec0075fe51a86eaa15913b685d5be26aca949c993023a66d2d1fca9d06c25ee3a9fbab8e7612da464a
 EBUILD tmux-3.2a.ebuild 1713 BLAKE2B eaf841e39eddde547d854a7cf96f7637417ec4084a225cff2769598b75c405a101e4005696dc0278d6c84558096b3d3a00ec9e8cb917a9ad862f4a978115f1f1 SHA512 ea9760475aaba6362b185736af49810d421dc18eeba7a1ef9b0afed706a7d78ac6465165e5e0e11586bdd7dc739d03faf8059e1991e065164648cb35f26b06ac
-EBUILD tmux-9999.ebuild 1654 BLAKE2B 655c261edaccdb712a1019c3632049c4b18bcc6697be65ea1028cf63c467628a408e4dbc10c25e50af0579b5534ff627ab3d000d6fcff2ca023910acbec6969c SHA512 17a3d4753440d247de0a5b8740588451ee253f765484d7459b9dea9eecc5908256b433d5afd806f1d5fb7ff3e986c10beca784cb991f4d9e52f039313102d4e3
+EBUILD tmux-3.3a.ebuild 1890 BLAKE2B 121d47cc10af25dd799086368f95609885412e8f8934d7db5fb4f3b98048aacce85f8bbdd0980e3e7c1816c2e643393760e190645153862fe1dc1835671980c2 SHA512 2bb0f8b9e52967e7a81e8623d11b023cec05d49e93c1f508ad960b804175480e836708b44292acb7cdbabbc780c2665f97dbed0bb16562a828002149e956bdb9
+EBUILD tmux-9999.ebuild 1890 BLAKE2B 121d47cc10af25dd799086368f95609885412e8f8934d7db5fb4f3b98048aacce85f8bbdd0980e3e7c1816c2e643393760e190645153862fe1dc1835671980c2 SHA512 2bb0f8b9e52967e7a81e8623d11b023cec05d49e93c1f508ad960b804175480e836708b44292acb7cdbabbc780c2665f97dbed0bb16562a828002149e956bdb9
 MISC metadata.xml 817 BLAKE2B 82a6ef0299449e66a441f24d6ababd640926b51a2196573d1d21076e83709db1c4e3ca9a466d8220ac4bc5fb4ae8aee02b49c8573011524e2d9509802553c092 SHA512 5cdbfe700d3c1f37fb1d958ada1078ab22d1236248872f1aad6e311ec0aad1fb32b8988acf2e1ade98ba1a6644ffc39b9a29d553271fa12d73afc27b78c8b141
diff --git a/app-misc/tmux/tmux-3.3a.ebuild b/app-misc/tmux/tmux-3.3a.ebuild
new file mode 100644
index 000000000000..0ee80bc4dec7
--- /dev/null
+++ b/app-misc/tmux/tmux-3.3a.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/${PV}/${P/_/-}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	fi
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug selinux systemd utempter vim-syntax"
+
+DEPEND="
+	dev-libs/libevent:=
+	sys-libs/ncurses:=
+	systemd? ( sys-apps/systemd:= )
+	utempter? ( sys-libs/libutempter )
+	kernel_Darwin? ( dev-libs/libutf8proc:= )
+"
+
+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
+)
+
+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 systemd)
+		$(use_enable utempter)
+
+		# For now, we only expose this for macOS, because
+		# upstream strongly encourage it. I'm not sure it's
+		# needed on Linux right now.
+		$(use_enable kernel_Darwin utf8proc)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 9e9fa7c5e753..0ee80bc4dec7 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,31 +1,34 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools flag-o-matic
 
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="https://tmux.github.io/"
-if [[ "${PV}" == 9999 ]] ; then
+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 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	fi
 	S="${WORKDIR}/${P/_/-}"
 fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="debug selinux utempter vim-syntax"
+IUSE="debug selinux systemd utempter vim-syntax"
 
 DEPEND="
-	dev-libs/libevent:0=
-	sys-libs/ncurses:0=
+	dev-libs/libevent:=
+	sys-libs/ncurses:=
+	systemd? ( sys-apps/systemd:= )
 	utempter? ( sys-libs/libutempter )
+	kernel_Darwin? ( dev-libs/libutf8proc:= )
 "
 
 BDEPEND="
@@ -36,14 +39,13 @@ BDEPEND="
 RDEPEND="
 	${DEPEND}
 	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( app-vim/vim-tmux )"
+	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)
+	"${FILESDIR}"/${PN}-2.4-flags.patch
 )
 
 src_prepare() {
@@ -59,8 +61,15 @@ src_configure() {
 	local myeconfargs=(
 		--sysconfdir="${EPREFIX}"/etc
 		$(use_enable debug)
+		$(use_enable systemd)
 		$(use_enable utempter)
+
+		# For now, we only expose this for macOS, because
+		# upstream strongly encourage it. I'm not sure it's
+		# needed on Linux right now.
+		$(use_enable kernel_Darwin utf8proc)
 	)
+
 	econf "${myeconfargs[@]}"
 }