gentoo resync : 12.07.2021

17 files changed, 28 insertions, 286 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 067bb833b3e2..2083a5ffa15b 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index 27d469a179ed..6594b504cb49 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,3 +1,3 @@
 DIST asciinema-2.0.2.tar.gz 50058 BLAKE2B db04e21f41b76a7b2be1ca119b2c0a2ff29c9e525c35180d2506722b12c7d139087d0a102bd984cecd7d69e2da0ce8ac0f4bc83c631bc1373fecc8de2d29f107 SHA512 27ae831494c2532270940c3e0fedc87ebbdc1e9d8d24c37d1b63d3f74d9722d38e867fa1b46656249e5b0a84ed7ed32bb21da65f06e9c6a8b787aebdce2068f3
-EBUILD asciinema-2.0.2-r1.ebuild 732 BLAKE2B 0dedb0252028b762e95d81678c8b5df0e16f5994675ae4dffc18c707bc086c7a215aa40752bc4352dd3149208390e3ca4d633e735942fbb7f775085c442e6c49 SHA512 ad99e2a494f5b81640cfa734ae9782a73402fa704d1a1ac777182b4e2f3346e54f00c76aff98e69413fe1c73d89c76487d8ba6d0fd378ca2ff8a7ef5c5836dad
+EBUILD asciinema-2.0.2-r1.ebuild 739 BLAKE2B e4315322a7b6d6a34ae76b19807380bde3c5322ffdfc9d4faec6779038c019014b976af2f0620f9f6b6a14ad87dc63b835b52af9437544808aeed4a587529275 SHA512 cdfb7139c4fb88e97477e01154ce1c34ab5301cbfb5b9c474aa78a60027ba4627c4d643a62af9feb92b7bbd6798eb027fc25a24e810efb986eb9c46a0b0c7037
 MISC metadata.xml 352 BLAKE2B a3fc1910fe080d3617e64abfa1d758ac162556451fbdf1500b5b7b5ae0ecc703004483f2e0a322bccabe2857319faf3ad011f75ddf676c950b5fe59a5feeda1e SHA512 382168389e0950d78c6df79b6ad6dcf8bdf54fc9f877b23dd1e69c3983e931590c82a26694279b83834121af33a4aa8915a9c1907da2bd617b895a2cb4c31d74
diff --git a/app-misc/asciinema/asciinema-2.0.2-r1.ebuild b/app-misc/asciinema/asciinema-2.0.2-r1.ebuild
index 7d2ce682dbad..54afa0fd7a8d 100644
--- a/app-misc/asciinema/asciinema-2.0.2-r1.ebuild
+++ b/app-misc/asciinema/asciinema-2.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 9c624ce87cdb..9792b786a81a 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,7 +1,3 @@
-DIST ddcutil-0.9.1.tar.gz 656853 BLAKE2B e4f11253176587cb5ee3c9647a01ab04d5a92ce4ca7a4098378318fc069e635e43c3716ace316498f64ceaaa00aa90db3b5f409b74b8d7089a7c25254c0e360d SHA512 b2d5866606a4bc081d89180e910822f2a2a653a2782e3df582536ddc86c7d3dc02309dbb41f8d566f6ebdc5d82d3aa11792a04c28b3d83552b024dfd59891fda
-DIST ddcutil-0.9.5.tar.gz 681534 BLAKE2B 6746c239738d4f8eb7fe56323816fadee9b8fa9ad2b66a8242782e0b2688182c0140b40b9eddb3b54ad32c7ff7d1f0cf9a28c5477a48d90cc39431ed82f5d443 SHA512 6249ebdbb398ad5a6c32f3891be8bf5328114b1ed08afd75adf4b67f10a40f19451e188ce5cd88b3153a18f317e394146a34258a7d2298f126be227d7e1c25e8
 DIST ddcutil-0.9.9.tar.gz 725207 BLAKE2B ad7b0b35ad4c2dae21da066e4194209579d774ded10f2dc0d8d7d3d94e70d5893c3d1f772b86ea01be510cfb8d51a657178228d028ca34ab20d344e86e0581d2 SHA512 f7b2b961c6b76ef59f336290b494cdd331556848de881d57e5240075d50733030df4c47131070f1276907d712a45f60dad6bebaa052a66621b8b5517ff293c21
-EBUILD ddcutil-0.9.1.ebuild 2680 BLAKE2B 1d5a6ec7d867528aa82ea1c401a7b9f5e4e70da6f2f616ae9781851e0a1f320b266ca3b436631103c0e0f104dce55f55cafe131f910cb921e25522484b0946c0 SHA512 6da340c08a14dee704b9a6af2d889f55155414f16afaf3ba63669beaa090865f4049d2a938fcd6d76c45f947fe5a72cc01e1ff7df8aac70b6bd62dc52b3a4b5b
-EBUILD ddcutil-0.9.5.ebuild 2775 BLAKE2B 6d40485ba8b5ded81e0c3e378126b93e9b7cb8bbc71e86a516322a8b3d564275059c15b0f5f493601abec201f8b7ddeae30820d4bbef73591f26236bb9a26f24 SHA512 31b73b8e481f278275cdd4a488d49076f2a5da74927d34f9da012e3b13152925e1106543ba1d9695118fe3732a8ad5dc72ffcb45a1aa1200536b8a1a1fc58be6
-EBUILD ddcutil-0.9.9.ebuild 3224 BLAKE2B e41980da150d93833005be9c4b1463a7ed4db0e3e3213ae100d059ec3375a558bec66c6c771837cd7d9141a47e47e9b7746fbd0deddac978f7254f273efb07f4 SHA512 08a769977bfd8b6e45cd7d7e2463d3b3d62dc3594493621b0ca5ba1dad062af8c05c74c174f1ab1302b80354e301a5d1818def7e1d08977bfb5cd7516c553e0e
+EBUILD ddcutil-0.9.9-r2.ebuild 3272 BLAKE2B 3a5be51ba9d9b5ea5ffa34401f7ad3e452d080f18d96fb131d196e30f6f09d6cf503c28126baf4adec590cb6802eee2ce4db4b23b77afdf8f5aeeeb50eedbd08 SHA512 433b4e4fb43f3a0989924d9500a0ba09e268cd039b384e2dabd969fd76930ce6858cc9a20dd46bb80906a463d6caff1543a5eb0011a486619c21ed0ed6308be0
 MISC metadata.xml 1292 BLAKE2B 0b413e4a4f24a9ee9639994005ad818952e2ad1763c78cb254646d8d4a052f6c36dcc4709254fb4441d51c193f209f8d467a02537c0c1fd4c32c9bebf1bd8d13 SHA512 d70a5879bf4bbd599ac415bf4df1b1abf59f24c04d3ee3932c72207f97ada739e2fca73600e0c5694f16c91a87db6917903d374a45d867b087e82ed814a7a130
diff --git a/app-misc/ddcutil/ddcutil-0.9.1.ebuild b/app-misc/ddcutil/ddcutil-0.9.1.ebuild
deleted file mode 100644
index a0f3bc6bf4da..000000000000
--- a/app-misc/ddcutil/ddcutil-0.9.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info udev user
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="http://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Bug 607818.
-	replace-flags -O3 -O2
-
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable usb-monitor usb)
-		$(use_enable X x11)
-		--enable-lib
-		--disable-cffi
-		--disable-cython
-		--disable-swig
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		enewgroup i2c
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			enewgroup video
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
diff --git a/app-misc/ddcutil/ddcutil-0.9.5.ebuild b/app-misc/ddcutil/ddcutil-0.9.5.ebuild
deleted file mode 100644
index 06560df4d338..000000000000
--- a/app-misc/ddcutil/ddcutil-0.9.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info udev user
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="http://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	sed -i -e "s#usr/local/bin#usr/bin#" data/etc/udev/rules.d/45-ddcutil-usb.rules || die
-}
-
-src_configure() {
-	# Bug 607818.
-	replace-flags -O3 -O2
-
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable usb-monitor usb)
-		$(use_enable X x11)
-		--enable-lib
-		--disable-cffi
-		--disable-cython
-		--disable-swig
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		enewgroup i2c
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			enewgroup video
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
diff --git a/app-misc/ddcutil/ddcutil-0.9.9.ebuild b/app-misc/ddcutil/ddcutil-0.9.9-r2.ebuild
index 08aaa306dd03..2517c6fbb733 100644
--- a/app-misc/ddcutil/ddcutil-0.9.9.ebuild
+++ b/app-misc/ddcutil/ddcutil-0.9.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools flag-o-matic linux-info udev user
+inherit autotools flag-o-matic linux-info udev
 
 DESCRIPTION="Program for querying and changing monitor settings"
 HOMEPAGE="http://www.ddcutil.com/"
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="drm introspection usb-monitor user-permissions video_cards_nvidia X"
 REQUIRED_USE="drm? ( X )"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
 	sys-apps/i2c-tools
 	virtual/udev
 	drm? ( x11-libs/libdrm )
@@ -25,13 +26,17 @@ RDEPEND="dev-libs/glib:2
 		virtual/libusb:1
 		sys-apps/usbutils
 	)
+	user-permissions? (
+		acct-group/i2c
+		usb-monitor? ( acct-group/video )
+	)
 	X? (
 		x11-libs/libXrandr
 		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {
 	# This program needs /dev/ic2-* devices to communicate with the monitor.
@@ -50,7 +55,7 @@ pkg_pretend() {
 src_prepare() {
 	default
 	eautoreconf
-	sed -i -e "s#usr/local/bin#usr/bin#" data/etc/udev/rules.d/45-ddcutil-usb.rules || die
+	sed -e "s#usr/local/bin#usr/bin#" -i data/etc/udev/rules.d/45-ddcutil-usb.rules || die
 }
 
 src_configure() {
@@ -88,7 +93,6 @@ src_install() {
 
 pkg_postinst() {
 	if use user-permissions; then
-		enewgroup i2c
 		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
 		einfo "users to the i2c group: usermod -aG i2c user"
 		einfo "Restart the computer or reload the i2c-dev module to activate"
@@ -96,7 +100,6 @@ pkg_postinst() {
 		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
 
 		if use usb-monitor; then
-			enewgroup video
 			einfo "To allow non-root users access to USB monitors, add those users"
 			einfo "to the video group: usermod -aG video user"
 			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index ad855e8e952f..82ed14dc9010 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -2,5 +2,5 @@ AUX gnote-3.38.1-cstddef.patch 988 BLAKE2B 8281bd3b515d642b57e49e365b76b134a3ccc
 DIST gnote-40.1.tar.xz 3420216 BLAKE2B a84604b25301fb0332da161a7f1f258542f1dfa16a02f34e700280e87393a3eb6d9005a5ed18204b91d0fccea2f6e44738789ab57dae543707650bfce55165c8 SHA512 6f4286fef18b060bb46c1c9f43772df7d9d913d6d1e3e3801e38e277fa660aa213e46f4a825788795f153821f705bbea22df7d1ff90ee949752497274455ad37
 DIST gnote-40.2.tar.xz 3422560 BLAKE2B d7d7fa862e02c1d889c736ae733db503a06db93cfc79c12bd1efa89acbe4a5825d0cf0cab00cfa916566002c1b838d118b37f5b0204f20ac9fcab2f892cccf52 SHA512 e1dc3ed4fb7b7c4f346a4a1e63a2e357b197375caf5d1d2026c159cfda012ace76ad598ecaf8e7d7649fb80abedc0cd4febd369160ddaf4510cfcc6b41185aed
 EBUILD gnote-40.1.ebuild 1561 BLAKE2B d408ae3b6729f5b9bf8e780898224abfbbe4057caa5c50d739c9fbff644f4071ccffa8017a83ced5cd2ef6dbb8aa82ec9fa2116e84b41a1fad30626f0ae772ea SHA512 11d3a079ee001ab75c7df3c382e5dc58de58db141eb5010f694f86c203f6ce4eb2ae96001738a497bc36572d83e04cf4e03e11c58a0cc07efbcc4694c694831b
-EBUILD gnote-40.2.ebuild 1570 BLAKE2B dd6ea67038343f856cf83a0703d48258bc6663d976c9c3bf8340700d96b9e5ce2fb6da643c26f2832f6b8f231359650087b21e42752aa3cf4d2f8ac0e27da064 SHA512 e45dcb0f2fb161700ff2fc4b6dd7c7a2fa7d1003c1262623ea79f750d43af6cb30c6c29ea0861afa242afbe28fe30b80caec34fd346db5ccfa92a4513fa317f7
+EBUILD gnote-40.2.ebuild 1568 BLAKE2B b45867338d8aa2d9ccbe8ba81c8b9ed96bfdee5d606bf7801c28c3e7fc0dede36e9d2db8b1e50b69e8f01029a74a0734dc55f222606f44893d6d102fbbcbc62e SHA512 c0c3b450534489287888f921b0192c1859d5d0f84fd73fe287a1c989d2fee09ddf5dd9d4ff70ce24f234a9d10be99c409c5b1cb7ef433a5777c3189fed82793e
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-40.2.ebuild b/app-misc/gnote/gnote-40.2.ebuild
index 3ad729fd57d2..5fad20f2707b 100644
--- a/app-misc/gnote/gnote-40.2.ebuild
+++ b/app-misc/gnote/gnote-40.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug"
 
 # Automagic:
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 749d089649b0..a5bb34cb9600 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,5 +1,4 @@
 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.2a.tar.gz 648394 BLAKE2B 94527d4d1016caddab170b5bbfd181514768474898314241fb65a53a1f5ae94863bacedf90a7543690c115d15295960dfab4d5ba2ce31cd105585a73fb9b82d1 SHA512 6e52c7f5d03b2c8b8c4c8caac092a166956ba97334b426f2823d74dc5849a1d31a80145924f641f69dd2c244809e9350d9bd7070897fa2e3e1f9f086f9b2f365
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
diff --git a/app-misc/tmux/files/tmux-fix-bindings.patch b/app-misc/tmux/files/tmux-fix-bindings.patch
deleted file mode 100644
index 6436302f0557..000000000000
--- a/app-misc/tmux/files/tmux-fix-bindings.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 7ff13c0f2820..5b19a55f0f7e 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -6,5 +6,5 @@ DIST tracker-miners-3.1.2.tar.xz 4068980 BLAKE2B ae396ab4bbfd9043c0514f815fa5968
 EBUILD tracker-miners-2.3.5-r1.ebuild 4728 BLAKE2B 5c6b74b18dbe2aebb821d1d2c193c67e3503ee9fc1f9681f1ebc2858b57499a05ffab60cc0f55570f6594ef0d1238628d3777a4d5941ca982013424674d16133 SHA512 d0091dac5a17251612eeaf422bd7f4a62c2dde7be38c936295a8ed3ab98dd0d69a1dd610b8a4b121e2419fd28ec23a4559da4c3895f0188e04095612e64d6b08
 EBUILD tracker-miners-2.3.5.ebuild 5001 BLAKE2B b683e12c111b42c22a1703d14490809af17d54e1bc2943c2f208706eee6b715261a2e39a923d4d622a224f402c32bbae41e0eff45065dcd63848358976c1694d SHA512 ab5f4f7bcb7577ee88d96c19ebace33c85e4b71b54bcaf903a54e837d99e59575ae0c426bf61f9e93e2a85053c4e9609d80d514d2ce85ca1e343bf2ced27f8f5
 EBUILD tracker-miners-3.1.1.ebuild 4668 BLAKE2B 7e785ea49f4e2f4e2e19c9b76889c99eec0a1c642073dfb08b454307c8cc44ed57bfe5cd000e119e3e528da3f4decb5c32f712720d474a2a6e5141ef317422b2 SHA512 c2138579041f5327730ad5522c576a8f68e63b67d684d5ca7c90c416b79f0e94eb9ad355efa621888eb72c6cd335a7045f843c4a2ff91476ba085113b3ebb77c
-EBUILD tracker-miners-3.1.2.ebuild 4678 BLAKE2B 597142a5e3198eb2bfe44e0366e5433cc39ffe32cad39a71a29775409412e4d3c9c442710374b963e3eb9f0c5ac8f6c5fe7b23863b080554b64a46a826bd18b7 SHA512 75f6fb9c37ed38fbe14cfa26a2121b582c0b3b573618ddba9a6373f6cdea1929766b5c877a3fae162a091de525ab4020b6d9a682ed5bfc4dc89b2fda36c1a050
+EBUILD tracker-miners-3.1.2.ebuild 4675 BLAKE2B db61ac9bcbde15ab93549b367443b4cee697b0cc3b05675a88b09ace2ef15afd425cfb104290730975482fd54ce21ee128fcea4c6eabe76984e01a239444a982 SHA512 372f8a746bfc51ae8103eab9f47bb9f64cc66ba3188afa55359a94d09ea43c68c2bd255afbf727401615872e2fa1ff5a8be2dc80717d205c673c61e4f34b887d
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild b/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
index 452c580cc45f..c11b348c2830 100644
--- a/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +pl
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index dee98745ecce..0c36c8997ec2 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -4,5 +4,5 @@ DIST tracker-3.1.1.tar.xz 1434784 BLAKE2B fa73420736e82bc7a43ef9dd9dce9096e50a22
 DIST tracker-3.1.2.tar.xz 1429356 BLAKE2B 2401ee4d73aef29a40ff9c9f917fdf4709884bc26b7e8c5ae52b0e009bfd1934a122a78adea2fe6950480f4ccacb89d11388b4553bd4c0c68f5738118d34d3a1 SHA512 3c5feb658d7d3e35bcc61ef216e59b069df661d6f13de6f26e71da35bd0ca78878099d1ae507da82860d955954f971ab68d5a3b86a3132781c3f03a12dec1f0c
 EBUILD tracker-2.3.5.ebuild 2591 BLAKE2B aa8a651907b383dd6b52ce9097ed0fdab39434245538141b76a8e6fe6bc1bcbc79cfffd607acfa67883cea86b6e55433e4cf5ed552aa97d53ab10d534b07205f SHA512 5578c76065635b94c67319261f7b66d4f222bf12c922b157c880bfc3a15a7ac47d1c389888550981f083417cfea3768aa609f914889eedd2004e973afaac12e8
 EBUILD tracker-3.1.1.ebuild 2506 BLAKE2B 2f2319a938386cefe0a31ea8d11d2770ba2c28fce0e72483fb090052336a8ce49a9eb02b16f740e5c258c972d6da9601895e8e6443b16d07c8288e45ab508c4b SHA512 5e3aa5b23f710302c24eaa681a9ee83d947810489ef7836728cbe780e9beecb7f6b6428b746ce40d223f51d2c8a7704d144ddb595f76842806f7ec39a29bf8ac
-EBUILD tracker-3.1.2.ebuild 2516 BLAKE2B c6c098875b00e9dfdb9c9104c266e41c7dea4154631cdbdb41e24e7d4f285b51dc1446927cd779c8bd525ca7abbefe32b1c449213cf86d70086bf64285267d47 SHA512 55b66a1618c4837d88b93e320c40e9fcc7fa3c3381ec0fc2d6bcfe66f3f502ba8edc6e1885c1cdb8ca0a822157b69fa8d9c21d44f65ab3620c5e2bb7119468bf
+EBUILD tracker-3.1.2.ebuild 2513 BLAKE2B 76f03a1250b2997419d6df2a207078eba08f011b7b026c141fc01d5d4b966aa000ef9b762da1ca253f7d1f972b30697390b07271e0c5a1a4ca8ed0524672f110 SHA512 9f377223909a43993fb091e16153159996b62e6e0ad8669da6b5519efa3c5d5227aa30322b11b7a431cfd5efb077075a8afdb645ef302c2278711e95df4c367b
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-3.1.2.ebuild b/app-misc/tracker/tracker-3.1.2.ebuild
index 3071ccc4456e..8b0fe7d06283 100644
--- a/app-misc/tracker/tracker-3.1.2.ebuild
+++ b/app-misc/tracker/tracker-3.1.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +miners stemmer test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/ttysnoop/Manifest b/app-misc/ttysnoop/Manifest
index 5c33499194a7..ee0137e1eec0 100644
--- a/app-misc/ttysnoop/Manifest
+++ b/app-misc/ttysnoop/Manifest
@@ -1,5 +1,5 @@
 AUX pinkbyte_masking.patch 960 BLAKE2B b42c754ea33c41bfa1c6ca5c529af30c1fe05473accbb4be195e1d5d30944e4a38e4175226b16cd9d3560707135b9cc8056374b3e87a4a937515fd8cae8e8764 SHA512 20e6d3d8d909bdd9795e52c5e46ed6ca60a6a8448027cf011d8f77a2201fb44d49ba5b73d8a9e3c682c187fd88efb30ded531a2efb8183ae764cf6d2a5bfa38c
 AUX ttysnoop-makefile.patch 1085 BLAKE2B 6578ff063cc6b4e3d48085761deffdb8de1b98324f6c8ae08fbd46bb9b45cf968bbf5e9d14930ae23666c08656f10d695ef5022f384875122917b8c4c63373a5 SHA512 eab5831d6d744e5fb9f5a3105c773872f0c6995a917169c162bccf829ce9dbd63dcd28360ee99faf08cf7aaec034df02d73c21d7dae0f004779ac66519aab419
 DIST ttysnoop-0.12d.k26.tar.gz 9376 BLAKE2B 114c260de72c4909b97fb47d3ec8b22cf2406df433f708299098df7a7b1315ada8babd81c62ae3a12775fb2393c6548d24457df85523663223960390bb2891c1 SHA512 9ac90ce08e170442718ca4871b7cb569acd8a594e63a56a6889ff0852be93a6ae8e7a212ba1064e74286043dad5a27af5d8588cb3b1ea297db4bf7fa10c66665
-EBUILD ttysnoop-0.12d.ebuild 765 BLAKE2B 9efaac8d581419cdb97b2e0282345317035691cdd3e3f7fb069ee388d4336c01f4b4bb2b4e14d9d546f1db19803d4a6f23e2ea5a0faf4df769ef3633c49cd1fd SHA512 3a6aaee1f956f5d329c6969f2128a16363e68735d6e3dfd6fa36b04e39d6387c869287125c9b98fd95ea300835523f808d71ce57bd30cd7c675655dd8b6af49e
+EBUILD ttysnoop-0.12d-r1.ebuild 814 BLAKE2B d58940e47748747cfb7e36949745d665159befc5193ca8b92c283a0aad66d827d2f5bcb799f04449798374cc3d77421cdfc04548edeae847e7e16c6cea0ebe61 SHA512 19b7c35233b2c4b43681fce4db2553f67fdb9f2b70cf235b4bc3fe11703c9b5dd77fd7e7d23d851273f3cb8b0ac61d87cf2c1d525fb42b793ff05e6851f128e6
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/app-misc/ttysnoop/ttysnoop-0.12d.ebuild b/app-misc/ttysnoop/ttysnoop-0.12d-r1.ebuild
index ccbb8cd23f2c..d58b8e138ac6 100644
--- a/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
+++ b/app-misc/ttysnoop/ttysnoop-0.12d-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,12 +10,14 @@ inherit toolchain-funcs
 DESCRIPTION="Tool to snoop on login tty's through another tty-device or pseudo-tty"
 HOMEPAGE="http://sysd.org/stas/node/35"
 SRC_URI="http://sysd.org/stas/files/active/0/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/${MY_P}"
+RDEPEND="virtual/libcrypt:="
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/pinkbyte_masking.patch