gentoo resync : 11.05.2021

10 files changed, 134 insertions, 112 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 36cdc93df7b5..7efe21e661d2 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index cf71b7275f0e..768a3226a9de 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -11,9 +11,11 @@ AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a735
 DIST elasticsearch-6.8.15.tar.gz 149102328 BLAKE2B 0ce9ba565d751cd27721f3d49dd24761937c3476cee4896ba1a4d84e4fc238296129481f18cad64270fe8af71a043c2e8e583df14f2a084850fb10c93fcea0ef SHA512 c62c4d9d1bb83e10d3e1079f56b834f2f89b1f712c29d9ce7e81786199c71d287ecbf6df158eca56a7af711eafe13dfb276e12b34e1a0a6cf6719e1fbb44a142
 DIST elasticsearch-7.10.2-no-jdk-linux-x86_64.tar.gz 164380146 BLAKE2B 16797ed48c4cb6f91ed891014f275ad86a4852579232df1827413389fc9e505327412729f70783750252190a34b0e0d552ec0b5f25f3d0a811724191eccc6568 SHA512 bd3def00af04670ad04556c911ef8c68b639e1c3b621f36a8973d9700f95873d10bc706a4e3a98f892ac59c1b761d56035a236068d6958af772874e428940dc4
 DIST elasticsearch-7.12.0-no-jdk-linux-x86_64.tar.gz 173069694 BLAKE2B 5de74b1e6de743246cf48e32254f9646fa25c2820d0be9df886fdefe131a302ddb8906546147f0d284e2fc0faf8cc0238bf854fe1611d28bf1e7cb1518bd4e31 SHA512 205aa2a2fa2ab7eb7b54087420e0123aa97e5456e2e1f31cad9ea7b84be3f9823a2a7c47d4cf1697833e5f795359477d3a3b0ea4955a8f92583cf2228071827e
+DIST elasticsearch-7.12.1-no-jdk-linux-x86_64.tar.gz 173079845 BLAKE2B 98214508c2c1dcb631f59d9e51d5949f9a7c5d1f68ff78c8d93af04c6a21fa1e1c6e2051f04bbdb8154443d6295ad54af2016695fcb9193b7595e1486777ba98 SHA512 c91fd66668977280d7339caf6b4fef9fce5640492f0e2a65bc537c6da8397c801a3727f1ff56b7a1591b11ea47195720c588a4eba473043f829a87cd3dcc0af4
 DIST elasticsearch-oss-6.8.15.tar.gz 68240776 BLAKE2B 431d845e02f2118a98021af4422ece34274b6d0811a32c5a3e679da3f8f56ca9cd45949307268811edbb83327a4a80fb84866cbbaaf01f7d3af042412b1e1bfa SHA512 7e6a819339ac6043af218f9d97d5d68c50ac46900e4293e7fa18992f7a50b10b0ab2434e26ff0dc1546204ae7526de8ac6ef6545fc0db9c862ceeaa0d96c56f5
 DIST elasticsearch-oss-7.10.2-no-jdk-linux-x86_64.tar.gz 76383466 BLAKE2B e99c04b0d10ef5755986515c7127ebde00b58e0eba69b6a05e12bd0bffee70266bbb023680584bfe0f321d5a3cf79af89cce3a5191923ad721a9f6039ab82743 SHA512 7b63237996569ccdc7c9d9e7cc097fcb23865396eddac30e5f02543484220d2fc70a7285b430877e5e76a5d8716d9682de9fc40d5e57a08f331e82011fc59756
 EBUILD elasticsearch-6.8.15.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
 EBUILD elasticsearch-7.10.2.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc
 EBUILD elasticsearch-7.12.0.ebuild 2454 BLAKE2B e41faa9592270795a3778d345db25c8029f8872644fe456dde749df19ddb6bd9fad3bc746e1b08ee94238ec437521d28cbef7c113d6ac85218bd1c4bdd03104b SHA512 c361cc56c306005896562c34f53fadf0ac586df353f9db925ff2e9abf07e7534bf8d3b33f5c04998ca06835d265bf58f1562f8a9e7314f318868fe526699136a
+EBUILD elasticsearch-7.12.1.ebuild 2389 BLAKE2B 0a33190cd4dd3c80a69bd4356ee696639c17f8e1d8b97780bac4a12435a03cd3fcb6186e0a7f916f04dfcd0358055fb6153fe3f090f9c4cfabfc982727f2fb88 SHA512 7fb066fb4aef44bb335675a20b52857d3b1cef213401bc48fc333483bc6091f8cd52e0056e0b93e1da3bba9cc571985ece4329397c93e401c7bbd9c012642ce2
 MISC metadata.xml 611 BLAKE2B 91d02c98271689922fc5d79355a378cb29a3c88e45b089ad89afb182e50f6a0bb19fa8160e2455eb8815e9b2655cea6232ba7845cfa970b4d82529993b5447b8 SHA512 daa5f2349a139c5952f9831c9517e6af48ebe337506f77e7ddbe67fc5ad6f243ecea82c858b7687e3baef26f20e1e3f0d2453f72ce00a5985c2a618dff2a6361
diff --git a/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild
new file mode 100644
index 000000000000..e2035c21e8ff
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Free and Open, Distributed, RESTful Search Engine"
+HOMEPAGE="https://www.elastic.co/elasticsearch/"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz"
+LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre"
+
+QA_PREBUILT="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	fperms -R +x /usr/share/${PN}/bin
+	fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.4" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.8" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
+
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 74f3f6fdc050..db54281fdd8f 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,7 +1,6 @@
 AUX mc-4.8.26-file-seccomp.patch 4794 BLAKE2B f6b2ba15b2f7f57aa620fc5745816be434d357f8b4023197691f8827c1e5d6555fa542e0aa3b471036c7d60a3ab5761d261e62d3fc599fd14593c82c4cd238dd SHA512 a65b414dfbb4f934351a87496e012131b1e811cd1fd21a91c167e8db212ee7485f097d3a5a4faed2d904e50e34cb7488a6ffbbcb41bf341167f3837f891e85b5
 AUX mc-4.8.26-shadow-crash.patch 936 BLAKE2B 65bf04b92a193de03457f95b94c7eff7677cedc0886fff4d934bd4e3bf94babf3650d5e56ad54eb73e41791e67089c9a65b6628615b87609035e6b823fd317e6 SHA512 8874e98bc5a9b032ff094d3042c71bf279f42c71840920ac3221011ae991fb199050e60d47ee8a65ef82bc5b64e4c14233fd3909c49de807fabf771a953a6c6a
 DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5c03fc9e349a57a4a6f48b598c9eeed85e4cb94a18c5c5b89d4ee0e21f6d34c8cfd5e21da53551085aa3469 SHA512 f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
-EBUILD mc-4.8.26-r1.ebuild 2841 BLAKE2B ba0cf54b91292f2184b0e05203d0a407efe28eb13ff378ecd0b881bf46506d43d4a52e1d8d2218f2e864fcfad7167dbdbc0ad19030c3988fac6fd2075eaf238f SHA512 40e67c95d0a0bcf350d25a36edcc00bb850152328794b5a0a03a4243b43a31c82f910e11a10e15ef0eb40bf3f0845454802af223fb20b75fcac24aaad4ebdf17
 EBUILD mc-4.8.26-r2.ebuild 3289 BLAKE2B 32b33f2266c28eda35403d1e9d50e12a1e4e5d8867390033cad1f87e63f94752e5edab760758a8c816ad58dc32a9f5124f477362f9b25230fcf896b8c1310b5f SHA512 1bc54410a2d5728c70433deddfcadec844d17ca92c33a416ce3b631ae990ca1b62a6855eba57faa3a7ee32e7a92d3a5b7d667b6be3548cc954f222c966e05c77
 EBUILD mc-9999.ebuild 3362 BLAKE2B 28f6d8342efa7d7a5220f96037919a29c85bbae55c3379d81bccce6889e346f9589431a54f183d31991c79c000f3d931d75efd1df5fca4b842ab6e2e0ee37970 SHA512 b356eec5b771b2b977e084caf61bdc0448091caa2fd422552339c9ca56afdc7fde364dac504e8667ecce69816687e66c4d0e625f8133d1e080e7862caca96d7a
 MISC metadata.xml 773 BLAKE2B c7f3bb9bfb49c380a0493eabadcedec215df8696c5d52433aaccdffa0bf5ba3b89c77c291e19ed88c5ac29718e34eece1d3dabbc3ba6c1ec7862970f3900e204 SHA512 c5c0ca5a41a78cf746e14264b291f81ccffaa9c34a4149d27a9293cca8d304cb4844c07979b31218b250c3baeaccef2cba529c2ab43e81dc5552dca34ddbd4da
diff --git a/app-misc/mc/mc-4.8.26-r1.ebuild b/app-misc/mc/mc-4.8.26-r1.ebuild
deleted file mode 100644
index 721b003c6c97..000000000000
--- a/app-misc/mc/mc-4.8.26-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-PATCHES=("${FILESDIR}"/${P}-shadow-crash.patch)
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 58c4515194e3..ef6f4f5b6d39 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -9,5 +9,5 @@ EBUILD mosquitto-1.6.10.ebuild 2828 BLAKE2B 6f7ebe1099d6a6a606bfebf85afec716951a
 EBUILD mosquitto-1.6.12.ebuild 2826 BLAKE2B 7e4ed5867bfe471e70977a4d7e42fbeea0b8e9acc8ec82b0814682d13852cfc13973fc6d6e2cc79a3956bfa2fe422c949ecaef500954e405db98f20f3a83ee74 SHA512 34982359687d167b118db33162130938db3b04caabacf3311a219f2a6ac7bcb7b0888e06f18a7698d9f3dd47e21e0aef5f647425e559bd85c0d0b8df8a2a8272
 EBUILD mosquitto-1.6.8.ebuild 2781 BLAKE2B 83eab150d52ad54fc49731a725a7a2cbe63b6363f1b9316018b57564a54033a070a9b8d1215bacf3980ecdfc5244f82def9f24f61e343b261389501631edc6a6 SHA512 0cda010e5dd81fcd6b166eb5210e048074052ca488d91ed0ec25ba982dc70b507d0d3c0b0b7435c66a008e6e700c0d7e9641d0b3996a90b9d658e7ecf9914d5f
 EBUILD mosquitto-1.6.9.ebuild 2821 BLAKE2B d19eb74ba76ba9414085db255124a0133550a09772b445b40a2384fe50ee767c60aede6d5e255716cf46bf6bc5bc9e72d818669ff3365e9939a36781700a4b04 SHA512 bd025b3c148f7eb7483652f052750687de0bf45f06dec56c4ca8e763488d901bacc729f004eb0ef971ae9f3754be44e7696a441c9c0e901472e0622c2595f01d
-EBUILD mosquitto-2.0.10.ebuild 2588 BLAKE2B 0b278fa3c07532ff7a5d063f506946fe16e59276e6e75c796bde26fa6e0ebbda4cf96e3e1dba8fcf15df81ad7300408cb5319835aa1ed5bf0c8450a2930f3dfc SHA512 ab2bf471840ffca29ebcb472f4e09d23ea9dfd27d0c05ed5f65334f14c4ac9a1a0c2d91ac42f121a586a29c4686806a6b0d75f2a2884b486601cd50885c5d073
+EBUILD mosquitto-2.0.10.ebuild 2593 BLAKE2B 02b19d92a6e3cf15ce79d1990e1ad75d53fb22cdf145a9069746996def6b1024076a8a795e8616ae25321868cfa5090e784ae384a49f4d6c971f314ec43ddefd SHA512 c44fa14f441f0e32aec37211cc38b81f033db7f6c348d442a7842ea72257be576bc0dffb91a4c355dfd0eec86829df7afa4df52970ecf7d0614bdf5da87f9c3e
 MISC metadata.xml 611 BLAKE2B d40adc8754f0c20b5c0634b75f12df935d246c67d3a9edccb8db262888b5dd6154fbfc21c270b854e61bb0389c625e3608623dcec519e05badc96f1bbdadf38f SHA512 93161a58861a9ea1ab372495fb66bb695d3be5e59dea96418aaf1f5fad936827d7d65a154711ef8c6c9fc752a69fef20c90741ac2627dfdefb8d38d63a3121fb
diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index 7ed6b145a411..9129a115a3e4 100644
--- a/app-misc/mosquitto/mosquitto-2.0.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index f94887e96539..54aa1f7298eb 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,8 +1,9 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
+AUX tmux-fix-bindings.patch 1105 BLAKE2B f84d6e95cdeee0022aadad5895697f0003bd69178669faff688beb740130a1bf87808cf08c0c7cd51f9e4dc3fbb302c43de479fc38bc741b71fa6a22441b5e02 SHA512 01d379bc9f0ac118744323b0c5beeb80c8ee7de307bc120b4e87b2eb64a615c52846c3b66a14272c81b51755ab96f18eca08db49b40c65575bcf394ce679594c
 DIST tmux-3.1c.tar.gz 561323 BLAKE2B c6f688a854e128acffa140321a5dd00e4ca090ff79c7cbff15febbca6da9f7626c675fe1820b344637ff0fbe94ae6d0da7f111880ce5d74f97c4b6a90ceef802 SHA512 aad2e6457dd350369f245f711f1936a575d0588b72e660d10e7abc7d373da0d322903b451ad00b96a3e0e6847ca855673da6a4c5447cea91fa756edd23659397
 DIST tmux-3.2.tar.gz 646457 BLAKE2B 64896c4f76f3ea02a7fa2d9a8e6c67779777265e450d5576bc6254f824512826a3a2ce2abb9e11b82b707bd18c70688b69a162c23287d6581874752fec27a51c SHA512 63165495e838871c7f42ac1a6229ec2404acfa7d42c7a0070c89cb38712ac933676930392b0a10cbdd6059910ae46129257b90135c5846e85142e786482fd75e
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 EBUILD tmux-3.1c.ebuild 1666 BLAKE2B 4e4a0a6cbc7a1976647d5272f7a479b06667d49d496567bcfe38ac8d8575b80bb41231a8e34b98c1ec85871dba2381a8ce875250a99052309b2482446837ce2a SHA512 17cf8aa479294119573612d233a5cbba52e4027d5e6a5707f02b2cec4f8408e898a0a095f8cc7e8421bfcedc8f96c06582400f0ae5117f819c517a8abf600cb1
-EBUILD tmux-3.2.ebuild 1673 BLAKE2B 331abfa3e092d90fa73692fa06c310e69f70500ccaea3ca6ef200a88b43b1bddee5766486b850fcb9bb7bb00aec20b45f8af79aaacec0f787ea046626afc808e SHA512 11bacbb5d5e18a8dca5546b29ef09f2718ac9bfd1cc692db2a72498d7de9152ce789d39c62e3e379306b13551dddacb945ac689657a297ab5055f157b9f88751
+EBUILD tmux-3.2-r1.ebuild 1713 BLAKE2B df7ae0b6989eb54fd162cdf44890de8433cbf2bd33f7a47768eebe5abc7bc9c652eaf82f1abcd5d9dd9e0b2e2c377bbbb1e24e5aaefe3f7c2238a77075a54173 SHA512 3d08352544c41f6e3a1f56000a6b4a828e3d307334beb34f4f0a06e886bf1d075b03b26daaff4b077eea94c76f18f6ab6a6ffd79ad110ff447c71d80be3720ea
 EBUILD tmux-9999.ebuild 1675 BLAKE2B dd1f1b897f0d4f01d42a2457c3129bc770aab3071c50d62419fe1f7a417c7268498bbb3587f151deb9b969c270a07d954ef3f647c7d359959c65f53e6bfd22c4 SHA512 334b04203f906c529679e1ea082b7ed7c9756ba81a424dec393924d05b4b6643ec8d12d0e831590d33533e80ec89f2d24dc74c2bb76501146cccb86d33217019
 MISC metadata.xml 816 BLAKE2B 57b1d27728b6fb3557e53a27bcd0f116fdcfe88175f3ceee0064beaeb14568852b15275051cd6ec8ea5cc3ce9efa7e1f084d74791b60eab12a5e6c835321deec SHA512 d459641a31d19297ef85b8dddcb487221eebd25e4f3d8d0e88c7c394654e9b60e58a60433c21b32ff24226f5c4d16e9e059b5af6330bd0698367019f0740e2e8
diff --git a/app-misc/tmux/files/tmux-fix-bindings.patch b/app-misc/tmux/files/tmux-fix-bindings.patch
new file mode 100644
index 000000000000..6436302f0557
--- /dev/null
+++ b/app-misc/tmux/files/tmux-fix-bindings.patch
@@ -0,0 +1,45 @@
+From f2951bd4a560692048e68bf29a5b0a288346a7d4 Mon Sep 17 00:00:00 2001
+From: Nicholas Marriott <nicholas.marriott@gmail.com>
+Date: Wed, 5 May 2021 07:23:23 +0100
+Subject: [PATCH] Remove old shift function keys which interfere with xterm
+ keys now. GitHub issue 2696.
+
+---
+ input-keys.c | 24 ------------------------
+ 1 file changed, 24 deletions(-)
+
+diff --git a/input-keys.c b/input-keys.c
+index ffd2201c0..be83600e5 100644
+--- a/input-keys.c
++++ b/input-keys.c
+@@ -94,30 +94,6 @@ static struct input_key_entry input_key_defaults[] = {
+ 	{ .key = KEYC_F12,
+ 	  .data = "\033[24~"
+ 	},
+-	{ .key = KEYC_F1|KEYC_SHIFT,
+-	  .data = "\033[25~"
+-	},
+-	{ .key = KEYC_F2|KEYC_SHIFT,
+-	  .data = "\033[26~"
+-	},
+-	{ .key = KEYC_F3|KEYC_SHIFT,
+-	  .data = "\033[28~"
+-	},
+-	{ .key = KEYC_F4|KEYC_SHIFT,
+-	  .data = "\033[29~"
+-	},
+-	{ .key = KEYC_F5|KEYC_SHIFT,
+-	  .data = "\033[31~"
+-	},
+-	{ .key = KEYC_F6|KEYC_SHIFT,
+-	  .data = "\033[32~"
+-	},
+-	{ .key = KEYC_F7|KEYC_SHIFT,
+-	  .data = "\033[33~"
+-	},
+-	{ .key = KEYC_F8|KEYC_SHIFT,
+-	  .data = "\033[34~"
+-	},
+ 	{ .key = KEYC_IC,
+ 	  .data = "\033[2~"
+ 	},
diff --git a/app-misc/tmux/tmux-3.2.ebuild b/app-misc/tmux/tmux-3.2-r1.ebuild
index bbd5c65d4559..11298a03e488 100644
--- a/app-misc/tmux/tmux-3.2.ebuild
+++ b/app-misc/tmux/tmux-3.2-r1.ebuild
@@ -42,6 +42,7 @@ DOCS=( CHANGES README )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4-flags.patch"
+	"${FILESDIR}/${PN}-fix-bindings.patch"
 
 	# upstream fixes (can be removed with next version bump)
 )