gentoo resync : 16.01.2021

55 files changed, 1070 insertions, 78 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 4cdf742c6fee..deab1abf7f37 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index 532866d09f31..9e4b36733177 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1,3 +1,5 @@
 DIST ddccontrol-db-20190826_p20200613.tar.gz 85044 BLAKE2B 6f80a7a53843dc29ff6158614dd36eba3d7f8172e21592776426464729b4bdcfd3bea51b8412919aa5231015f75766da51eb71f4d808b4c280c045209a4edf1a SHA512 9171193fd31c877699df9e8740cbed0a8de68acc41b614ded36022a25be27f01cf34129033ae3c219211bff54ea82882a955f587dfa87fa7571d3992ac3fa4de
+DIST ddccontrol-db-20210812.tar.gz 100719 BLAKE2B aecc9e9bf432905652e69b17b274daa07222d8f766048f29493eb0e50e07331fb5434258faad277ce21dec6475b192b4575eb1ebbd117edd25d333091ba33c8c SHA512 5bf64d69e1dd4324ce498909313b5c32a4af18d101e1536c40845f9a440f353e0ecb36d26441733c68de05be7e52dcea983325d70f4d542df85b5462ad193cb7
 EBUILD ddccontrol-db-20190826_p20200613.ebuild 820 BLAKE2B c976f2ec2a274ddb6340e71e8b1ce7c173c1519ffabde33419039369df59ab711e8c08c6da3ced31865902c2a3dcd26e3cb71e2b8be7dd96370fb9dbd9a4aabe SHA512 596d054cdb7d711c5bd0f5738e50d18aae8f03e47159b6079fa50d27076f357b350dee04d191c1e60bcda7a17ace753d7e28da9b0248cf53d18e9f344f9ad178
+EBUILD ddccontrol-db-20210812.ebuild 600 BLAKE2B c56facd5748032e4e1bdc1d53668b3cec6df1cdd8f08c9add9b1ef27441d1a03fa1ef3d7727e092ea40119317a89845747a904394c54c8960785428b6dff65a0 SHA512 b95245cd6f64a5df64c6599b14ed4b530729a77925740037607118b0a8377f9f1df7586cd6e77cebfd83a6c3526b49f53b911a86c0dd003612dd5486009cf257
 MISC metadata.xml 319 BLAKE2B a9f063aefd3004d8157559423ac0ff4b74a155e97d7663db1e9b4599cb9f98c41c185fa2e48e7342b7e2b8e90fcf9c3077e0fa201a95961a5e5975cead80938c SHA512 9f4fe27a2cdf12ce882449c566ab4ce4a5bd22afbd9794ef8aa6e01d0b15082b54783b31e1ebf92f59fad550b3d59ba6fb1d2263ec22b901a526bf80fec8cc95
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild
new file mode 100644
index 000000000000..2a5c6087bcc6
--- /dev/null
+++ b/app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="DDCControl monitor database"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+BDEPEND="
+	dev-util/intltool
+	dev-perl/XML-Parser
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	touch db/options.xml.h ABOUT-NLS config.rpath || die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index 21f233ab142b..487b9e632353 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,3 +1,5 @@
 DIST ddccontrol-0.4.4_p20200630.tar.gz 173792 BLAKE2B 7a7ef330eb471f1cbddbfd90745e212a8a66f4be6cc6a4ccb8014c41498a86a09e4bc0226a300201102c202da37c0f4b8020aa88f08b5e2acaa92ac0dc2971b6 SHA512 7aaadf98eaf24d4b040073dce6f469e6e4aaae1efde0e8f988fb9c5fb99b776b1836573c069b9d8f12eaa724d3b39df5d4f247aa47ca2b7911dc9a9df727a50a
+DIST ddccontrol-0.6.0.tar.gz 180376 BLAKE2B d844f03ae4843a710a3a7143b1270656202c261b5e412822c49c2096c150052ddb6747b62f7c1d2404cffeb13af5ed604be915061b3fd339c8dcf66473bbd791 SHA512 49e857e8ef8f2ba87dc51056b9511ce55f3e6471222cd9171a324e2ee179b8c96a8f4d90c63bb379260ccc8e1d9653964f90748d6589d298ff2bbe6982efd3e2
 EBUILD ddccontrol-0.4.4_p20200630.ebuild 1967 BLAKE2B 81f65ef049bc913f50764801f7ce5bed9cee26e20662d221fb9e061abf5c2e92ccd551b79544e6f23a807b22a6e9eac0951e6346a74471369bc868b5d188b894 SHA512 844751b33f72dabf73ad999cadd9ee40c727c0e17fa0b35a0dddc2a93a9a5ed97c50e3ca3f0f98b889276481cc5cd73c4f257544b9c1c9e7a2d159131127af58
+EBUILD ddccontrol-0.6.0.ebuild 1894 BLAKE2B 2e54c658446e131fd40ea3c9b8ddc7202bfb56ada50bf090e894fd057f93142ec8ae4bcea05ff94e576f1fab869c4f759984caeb41bbdd433c215895a611d795 SHA512 e9c9ca3ee4a37b6608ec1046f54b7f2e25c1284f3bbf6ab02829a45bb3c16d4230c510536215eb77742e510e23d6462d12688e4c0c98edf9fb77053301f03b09
 MISC metadata.xml 418 BLAKE2B 0c4f8c520b2ba661bfa763de83a97fe7c1dba5826633e42f03efebdbf9c96b5989ff59068111c9d278017b3942abbff0577217d7c2180c005fc0bc725c50d8b4 SHA512 54b3ebae0357cf2f3e2d81bb493dac58b7c23fe2b0be237128d94a9dcc2ec36c7d782b2cf0979cf15a3c9fee22cf9a4ccd5c30a4798a5c55826d9b2813abc67f
diff --git a/app-misc/ddccontrol/ddccontrol-0.6.0.ebuild b/app-misc/ddccontrol/ddccontrol-0.6.0.ebuild
new file mode 100644
index 000000000000..fe92023703fc
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.6.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Control monitor parameters, like brightness, contrast, RGB color levels via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk nls +pci static-libs"
+
+RDEPEND="app-misc/ddccontrol-db
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	app-arch/xz-utils
+	gtk? (
+		dev-libs/atk
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-perl/XML-Parser
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-kernel/linux-headers
+	doc? (
+		>=app-text/docbook-xsl-stylesheets-1.65.1
+		app-text/htmltidy
+		>=dev-libs/libxslt-1.1.6
+	)
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	# ppc/ppc64 do not have inb/outb/ioperm
+	# they also do not have (sys|asm)/io.h
+	if ! use amd64 && ! use x86 ; then
+		local card
+		for card in sis intel810 ; do
+			sed -r -i \
+				-e "/${card}.Po/d" \
+				-e "s~${card}[^[:space:]]*~ ~g" \
+				src/ddcpci/Makefile.{am,ini} || die
+		done
+		sed -i \
+			-e '/sis_/d' \
+			-e '/i810_/d' \
+			src/ddcpci/main.c || die
+	fi
+
+	default
+
+	## Save for a rainy day or future patching
+	touch config.rpath ABOUT-NLS
+	eautoreconf
+	intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+	# amdadl broken, bug #527268
+	econf \
+		--htmldir='$(datarootdir)'/doc/${PF}/html \
+		--disable-gnome-applet \
+		--disable-amdadl \
+		$(use_enable doc) \
+		$(use_enable gtk gnome) \
+		$(use_enable nls) \
+		$(use_enable pci ddcpci) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
index 434d03eb65d2..3a14d80e295a 100644
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@@ -1,3 +1,5 @@
 DIST ddcui-0.1.2.tar.gz 126766 BLAKE2B 85317b68bbd7e3e5b780ad2ba45888049f9ca70695ccfeb5d0acc2f2c8db11ee97438aa53240671f908caffd45b12a488593cd82b41c8e1acbad38f97d560ab4 SHA512 008033f23cf1dccb69b503b2f8950518e771bd4892b2df912186712859e6e66f724019beb5941d49452ae9a6080ce2730a1e11ec201931a31b3ab4735c03c724
-EBUILD ddcui-0.1.2.ebuild 853 BLAKE2B cb1bc97b03de0b47447d9e21c034f91d4ff7b7f4da9054e3b9bd37718ea40dbad70b1a105996a38ab020d24d7dea619f3fe51cdbe5b90fb526eb81f9598dd3ea SHA512 6e078a7c97b4723b22d2de3c11f2006a572b609295c5e04dd62e7c798fbd65fa8a4112b09854d7735668dd41c6c8dfc698964c11ab3ba3fd1045baf321b597d5
+DIST ddcui-0.2.0.tar.gz 598886 BLAKE2B d44e7b2226ca815c3d468a69f805b4be6359b447095e2688f98a5bde106d348dc2cbc80c31fc1de47f1bf0ebc7db4fae63e3e4f1501c10a6a7bb0c06718ad3cd SHA512 0509b2adae1b4a5c9cac3f3d598327085f183ada0fa8ef2ae85c1220704bdc50583fdc370f809b52d62eaeeae6a30146d63435ef2134a6467360eb6f90e64191
+EBUILD ddcui-0.1.2-r1.ebuild 857 BLAKE2B 9e23bdf51975d181868ebe665b11945c095f9ac01897570c87cafd6d5f1ae27b2b17a0b1e52f53e9a9a55f7e43c68b00305faa8ff00d578cf15151c9b6b6393b SHA512 d950e915c882bab1f00d4137e96297c3f6f36dd5de6222348b28228b455bfa18d342f41c7ac107c5068960616a478b23ea8d3fcdd84f209eda14649af460e413
+EBUILD ddcui-0.2.0.ebuild 759 BLAKE2B 27a28bbcc19098f2d46dbb18cad5b915f1a2a2d68a646b6432168a80e791f8f39044f0795b5248851c4b4393b46f40951c045f976e8fd963610333c97ba4f541 SHA512 68b3a9b773adc8df9652b8be937190a4c42383d28a8b2f758a03387957f95370b8e7d74f468d5be88a76e1f4fd462d2781825ce86831e73d76f9ac4131603066
 MISC metadata.xml 507 BLAKE2B 4f458118ad0f48137ac6b50871d7bc07f3b4416cbb82b264edd00726a6b9655d9ce986618da3c53a8e8855054a1e1e68045353589fdde1541c17e3f4b2e29828 SHA512 6a5c378319fc110e1338f4f6aeb5ce41c76ac521e95311c8b368b5357a2fd362038b21e46ff59dafc2cd8b0baeb55b7530b64c9f4f25513eb3eb66e528fd1e28
diff --git a/app-misc/ddcui/ddcui-0.1.2.ebuild b/app-misc/ddcui/ddcui-0.1.2-r1.ebuild
index 4319b120f3d9..dd9daddef09b 100644
--- a/app-misc/ddcui/ddcui-0.1.2.ebuild
+++ b/app-misc/ddcui/ddcui-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0"
 
 DEPEND="
 	dev-libs/glib
-	>=app-misc/ddcutil-0.9.9
+	>=app-misc/ddcutil-0.9.9:0/3
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qthelp:5
diff --git a/app-misc/ddcui/ddcui-0.2.0.ebuild b/app-misc/ddcui/ddcui-0.2.0.ebuild
new file mode 100644
index 000000000000..ec7f3ec348e4
--- /dev/null
+++ b/app-misc/ddcui/ddcui-0.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
+HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
+SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# seg fault on launch
+# https://github.com/rockowitz/ddcui/issues/34
+KEYWORDS=""
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND="
+	dev-libs/glib
+	>=app-misc/ddcutil-1.2.0:0/4
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# move docs to correct dir
+	sed -i -e "s%share/doc/ddcui%share/doc/${PF}%g" CMakeLists.txt || die
+	cmake_src_prepare
+}
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index d6dc9909f54b..5a4cbfe96a23 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,3 +1,5 @@
 DIST ddcutil-0.9.9.tar.gz 725207 BLAKE2B ad7b0b35ad4c2dae21da066e4194209579d774ded10f2dc0d8d7d3d94e70d5893c3d1f772b86ea01be510cfb8d51a657178228d028ca34ab20d344e86e0581d2 SHA512 f7b2b961c6b76ef59f336290b494cdd331556848de881d57e5240075d50733030df4c47131070f1276907d712a45f60dad6bebaa052a66621b8b5517ff293c21
-EBUILD ddcutil-0.9.9-r2.ebuild 3279 BLAKE2B 9e385198f193e3cc89feb3842e2256c25d987419a79609e51b6c1ec537a2605a26ddb2a5aa4651a81ee56bb797fcd6df2373197b2a4c46c86c1206af840106c2 SHA512 b80442c629dda9777c4c2ac77d57634da430a9945774f0dec55a31daa85a4db69049b7afbdd556db543db79e8f7cca55dd4a90c9b8e7f65da91f889689332dbc
+DIST ddcutil-1.2.1.tar.gz 801196 BLAKE2B f2db3c6a88b735ec96b03e401aea21a6dcc3ee7e6fb6c30854dacc8868adf9854f63b02153ad6627ce602d7deb51073142f910631b5c2ce86c15414a53644f7a SHA512 f80c45ed47a059c71ddf7dc56e8daf9b666120960d1911175d390f95ab9691a62cffb7ce4555ddc418e3e9cfe7a575a70778c35809cdea598d7610dac915ccbc
+EBUILD ddcutil-0.9.9-r3.ebuild 3281 BLAKE2B fa1f2dcf4f43dc5b746b3f3e3f0b3bac994f1d6be2bf5a2938f975a196c142b5c41723590566824d7887bc6067300c2e0a913e377c18002e579a73ff5bc3b889 SHA512 f0d0e919847bb907566fdc63e6639a265422b1332153b759ad456d9fb15e4360f5bbe72e67d53734372f4b6ef539bdaff9e38dd73b1fdf831be77ef45586878a
+EBUILD ddcutil-1.2.1.ebuild 2746 BLAKE2B 9f43f5583e77a0472b6210aa822c38d8285884234d0ae309c444a12ac4cc427fb44500cf1fe1190c1f8c3b8050843d918656f4444a3d8fc9430a35a076e2a0cf SHA512 ef8e04cedff182c67de5906eedea0eccb8f213d57903c82b385c10a218a261f4c2e1bbd5018ad6d4e72e9bd2101dfd6c5ab185c12d0f4ff78d7c126844a6732b
 MISC metadata.xml 1293 BLAKE2B c7fc827c0bcf7914b2c0b3f9ecec9dee145824c33a516ef3d9cd43fcd368977d9f17a76b6b8775fa773f8ce8b109d16b1e5c8b14dee5d0e9e56aa7a4024a190d SHA512 a795c9fb1479ae198446160e9a020ce911b02ffd0d51af9cd634504aca1ded4c38d3295eca0cbc6ad33506684f55cf96676c868ec349229d0dfdaa17f8afa806
diff --git a/app-misc/ddcutil/ddcutil-0.9.9-r2.ebuild b/app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
index c7b8c46d25c6..53bf5448e893 100644
--- a/app-misc/ddcutil/ddcutil-0.9.9-r2.ebuild
+++ b/app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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"
+SLOT="0/3"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="drm introspection usb-monitor user-permissions video_cards_nvidia X"
diff --git a/app-misc/ddcutil/ddcutil-1.2.1.ebuild b/app-misc/ddcutil/ddcutil-1.2.1.ebuild
new file mode 100644
index 000000000000..91a57f143aeb
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-1.2.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info udev
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="https://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/4"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="drm introspection 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 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+	usb-monitor? (
+		dev-libs/hidapi
+		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}"
+BDEPEND="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() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable usb-monitor usb)
+		$(use_enable X x11)
+		--enable-lib
+		$(use_enable introspection)
+	)
+
+	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
+		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
+			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/digitemp/Manifest b/app-misc/digitemp/Manifest
index 3a1159bb0f49..6550f5b3c124 100644
--- a/app-misc/digitemp/Manifest
+++ b/app-misc/digitemp/Manifest
@@ -1,3 +1,5 @@
 DIST digitemp-3.7.1.tar.gz 144870 BLAKE2B 5d00197ba0122772d96c3185f430119961d214f50dc07dcd5881e1aa1135283680ff38b4d92736827f5c7644b11930b9418b8467f276e832e40f4228d08d1774 SHA512 e5eaf576b544c61049a358dece7dc96d9793b751ef08645060f3b2c1a2006e2906c3aa3f97de3dab46818290d664d2e784a948b2495b538a200b6d71b03173d2
+DIST digitemp-3.7.2.tar.gz 146166 BLAKE2B 9718e5d8a135e99cfd8893f5f4d2cc40a0bcdffa4e01c4ef460d654b38d9808c75ea1efced6211672033a67be8ba7f30f34320ef8e64d47d8a88be8bbac8c997 SHA512 807934ecc743df5ee69e9a8a0f5e90e469f03e577cc80b4510e6ac4ecc61ff9c79e05642602a4f50b4acda7e1f53e33016e6c201898ab0b44c76f3f7ac028820
 EBUILD digitemp-3.7.1.ebuild 1787 BLAKE2B eab478eaee2516bee1c1282816cb4fec4042ad39b2e6ae866aa198527ddf0e1e8011078435dcd353022b4d3070da6873f0d62534e471276a7457dc42cc39f283 SHA512 8e15e866c2cb62f9021042ef4cf3e3a7e97f9da38681f8210ddd6d3e4df05f85bae4285dd02302fadce9973aafa8c49e7c7d9c4231eb2b2fff7d17e2e9222e67
+EBUILD digitemp-3.7.2.ebuild 1789 BLAKE2B bad0015092bcbbe59decc21ade8562c30ce3b0247788a4137d4521342623eb76d8753e8b006a4531033e0b58458982ab9b32a3abddc1cdc604a91f1e0ebfd709 SHA512 c3dfbce91844ac5b9639b44f4f7c22155b905197a2e861f3648e546b2fb857df27ee6b66fad77275443443b3ded1ee5763ce70c9a776a7a4f1f9bfda0ef5993c
 MISC metadata.xml 982 BLAKE2B c76e77aba3cbd377a3459302669c327abda9b437c659149c768d0d7d8a791210302115b403df09c3802a5af0bee3370e8ee6cd18306d8d29e80d56eafc391cbc SHA512 abb3db43dce3e259defefccdb71fffa2cdbb8fc21149cc1167b04c71b854e0dbbf1996f32293d4369aa9af0131e01a12fc57a4156514e956272f1ee8f9cf0606
diff --git a/app-misc/digitemp/digitemp-3.7.2.ebuild b/app-misc/digitemp/digitemp-3.7.2.ebuild
new file mode 100644
index 000000000000..c2fd1c941d08
--- /dev/null
+++ b/app-misc/digitemp/digitemp-3.7.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol"
+HOMEPAGE="https://www.digitemp.com/ https://www.ibutton.com/"
+SRC_URI="https://github.com/bcl/digitemp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="ds9097 ds9097u ds2490"
+
+DEPEND="ds2490? ( virtual/libusb:0 )"
+
+targets() {
+	# default is to compile to the ds9097u.
+	if ! ( use ds9097 || use ds9097u || use ds2490 ); then
+		echo ds9097u
+	fi
+
+	for target in ds9097 ds9097u ds2490; do
+		if use ${target}; then
+			echo ${target}
+		fi
+	done
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
+		-e "/^LIBS/s:=:= ${LDFLAGS}:" \
+		Makefile || die
+
+	# default is to compile to the ds9097u.
+	if ! ( use ds9097 || use ds9097u || use ds2490 ); then
+		ewarn "If you don't choose a component to install, we default to ds9097u"
+	fi
+}
+
+src_compile() {
+	local targets=$(targets)
+
+	for target in ${targets}; do
+		emake clean
+		emake CC="$(tc-getCC)" LOCK="no" ${target}
+	done
+}
+
+src_install() {
+	for target in $(echo $(targets) | tr '[:lower:]' '[:upper:]'); do
+		dobin digitemp_${target} && \
+		dosym digitemp_${target} /usr/bin/digitemp
+	done
+
+	if [[ $(targets|wc -l) -ge 1 ]]; then
+		ewarn "/usr/bin/digitemp has been symlinked to /usr/bin/digitemp_${target}"
+		ewarn "If you want to access the others, they are available at /usr/bin/digitemp_*"
+	fi
+
+	dodoc README FAQ TODO
+
+	for example in perl python rrdb; do
+		docinto ${example}_examples
+		dodoc -r ${example}/*
+	done
+}
+
+pkg_postinst() {
+	elog "Examples of using digitemp with python, perl, and rrdtool are"
+	elog "located in /usr/share/doc/${PF}/"
+}
diff --git a/app-misc/fmawk/Manifest b/app-misc/fmawk/Manifest
index 924b86411b60..d0e59ab4bd76 100644
--- a/app-misc/fmawk/Manifest
+++ b/app-misc/fmawk/Manifest
@@ -1,4 +1,6 @@
 DIST fmawk-1.2.tar.gz 23399 BLAKE2B f4c20c8f1569a6715710a5cef02a767152694ef7e216c9fe707c7ac57c20dd012189db14777d47a980008255c7f51b5c165cdf086c41835a7ce550b758a8f350 SHA512 86d56e1cc893c385a0bb338957a9ef698c0edef4587e6d3a21aa316fd996fa3b1416220e5c235d613876a3d19650e8e7a20bf991a4ce67ce9759a362d2aaac30
-EBUILD fmawk-1.2.ebuild 850 BLAKE2B 0c6584dbd70262c35e3a222d9d5903ab36058dc2328a9f5f90c470372f53476763500fded2b88c9143fbc75f487c95e751ce99f3bd6c8882c2704695114e39f3 SHA512 4623d9646449ea2ce4008b57b97d72d849ba25fedaf2ccbda99903113ad6ea6915f744082488e36465bb9211659f4152d390ed6302d1b433c1c3bdfc251d9ca4
-EBUILD fmawk-9999.ebuild 802 BLAKE2B 84f180c464d968452f9309242fa389548c1f48b316695494b2b6701d9721aa5568e22ce20c12e994ce1df6ffa2796e2855b46749efc2d50b0f6f4ef1f7c3b8a4 SHA512 c48247f94508f53520f0b0f065ac09ab2337255c3134d3f24faad1347802d1cb8cf9adbffa982345a11b0c4150701be062f28f686ee065ea8c9858834d6bdaf3
+DIST fmawk-1.3.tar.gz 25628 BLAKE2B e9b591941c5dbfa96414cc494b91eebfc19e9153cad7066afe216a6e1a177de5c3f3e04f09fec62bbd0adf0b3330bfc9471fcecc23b568e966e8185b7a298c39 SHA512 b1ca40c71b219cd59009c96692e1297cec75d2a61b28c330e4b80b55bde6dc6dfb071fec9dc4ae4f3e8aa7be7bbb51d444687f9500c82dba440388d41369e157
+EBUILD fmawk-1.2.ebuild 850 BLAKE2B 935055d95cf1d50f4de12b90694c1a7feee03dd50ac7750f1176a19544853d3b15063d96e71b5e759dac89b0359f79173bb28037cf87185fe85d0cf957d74d01 SHA512 e252e456465b9b9de87d1279c7e8694df049fb64df1716775d24df3cd66883b8fcd6a4fd9165eaae799b5c5b946af730ad135128d50afb730e2013673e4af3ca
+EBUILD fmawk-1.3.ebuild 802 BLAKE2B 960a8bf0a581b67b13d90de1c38ee9696993f05ff686561cde41a1107482b6ec16a33b6232eb607485af5ef29acceb8ed6ed4d52d8eeaa2e24fedd12d4e2374a SHA512 99aaaf6307c049e9f13743c44db2b31c71186399e28d1fbc3d5b7a04d3d88eda3d28a1b03497012f3125c477d5f60b1eb649223eb45ea98fe8e06d219089ad18
+EBUILD fmawk-9999.ebuild 802 BLAKE2B 960a8bf0a581b67b13d90de1c38ee9696993f05ff686561cde41a1107482b6ec16a33b6232eb607485af5ef29acceb8ed6ed4d52d8eeaa2e24fedd12d4e2374a SHA512 99aaaf6307c049e9f13743c44db2b31c71186399e28d1fbc3d5b7a04d3d88eda3d28a1b03497012f3125c477d5f60b1eb649223eb45ea98fe8e06d219089ad18
 MISC metadata.xml 689 BLAKE2B 91a0995c189c1ac4fd6852d1f49746faa8405c57476f6d6e3ea0aff99f36be3305e99b89185e102cb7ee1022bcee4c2645ff69a657ab7dd6ceed3f5dca4e2108 SHA512 893f05e792b8db41364c4a2accade8199f1f569bc521e2c078dbf2dc26f9f6d4b047d2208ed12c36f9b1e1d2a2e0ead9a3ecedd88d23f9d7eaf341d00aab41ff
diff --git a/app-misc/fmawk/fmawk-1.2.ebuild b/app-misc/fmawk/fmawk-1.2.ebuild
index 2247b8c0dff1..dac7c8432767 100644
--- a/app-misc/fmawk/fmawk-1.2.ebuild
+++ b/app-misc/fmawk/fmawk-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-misc/fmawk/fmawk-1.3.ebuild b/app-misc/fmawk/fmawk-1.3.ebuild
new file mode 100644
index 000000000000..188ad7e91e82
--- /dev/null
+++ b/app-misc/fmawk/fmawk-1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="File manager written in awk"
+HOMEPAGE="https://github.com/huijunchen9260/fm.awk/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/huijunchen9260/fm.awk.git"
+else
+	SRC_URI="https://github.com/huijunchen9260/fm.awk/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/fm.awk-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="virtual/awk"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "PDFs preview" app-text/poppler
+	optfeature "images preview" media-gfx/chafa
+	optfeature "videos preview" media-video/ffmpegthumbnailer
+}
diff --git a/app-misc/fmawk/fmawk-9999.ebuild b/app-misc/fmawk/fmawk-9999.ebuild
index 9500af6a4ee7..188ad7e91e82 100644
--- a/app-misc/fmawk/fmawk-9999.ebuild
+++ b/app-misc/fmawk/fmawk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-misc/hello/Manifest b/app-misc/hello/Manifest
index 4d380e09d020..fab20f46276d 100644
--- a/app-misc/hello/Manifest
+++ b/app-misc/hello/Manifest
@@ -1,3 +1,5 @@
 DIST hello-2.10.tar.gz 725946 BLAKE2B 0af5a3890191dff6e570e2297c20f72c8d0598cadfc2b291e2fe3612e73f7eca48b3b63032c883f11a8a5764c757625c4a736904d756d451ad0516578040290f SHA512 e301d785135c52575a8b4c35994c0316f8d366451f604eb5e74c1f907077502aebd5a1a32cd1e26cd7ca32c22f4de5623a335f8ae7e735ac977420df664f01de
+DIST hello-2.11.tar.gz 1018256 BLAKE2B 6e06e4a3a113fc24bca056197ba004fd97b2076bb2f5d660f337782c9a982a0d80e265e7e1dc22f3467257eab071fe5e252a020234839f30ce767ae5d5ee7a3b SHA512 9b1defc1dd7b6a989d3f64a1cb1c6f47276192d7bacf11282ae8683606eb613473c882c1a5e74c18d641f46584f0735981597a45ae4eb37830a5b4d955e3aec7
 EBUILD hello-2.10-r1.ebuild 470 BLAKE2B 4da043cb8d6542105fb3b7bda841d0b0c4246bba7124017ba153f95ee36da735d28b124ed4f1d979469aab64e9edc00ddb07dbe2e6e15c4cd45db07a0509f594 SHA512 f3d4bfed8c5729a4ae8fe089af1c33575f1f77127f45fd779e1a2d9962080e8d83e9e47405951485053dddca13110a55d2ad7f241c528a5b1f733af1029364a4
+EBUILD hello-2.11.ebuild 472 BLAKE2B d10fa004ad791f350db142cd955ac3b00a609fbb8b0d1722a5a23f13c5841d11875eee85437dc974722388f0bdd36a2613fd56772c97936ddaa1151de97b1f1d SHA512 cd367ab8e22ac5ca4a3ccf839dbd5803e9ec2747fb675150adfca397b575bc38e428af9c1be5ea6a7ffc17576da19e293ef4ca2084eed1d41926fd8460c1182c
 MISC metadata.xml 248 BLAKE2B cdc66ee780cce8b539d2c619893b5a5121982e3cde1ea6308f7795eac4b3d2247922b5900e7908213297c90bec9a63118312ee9349394becfc67a316aa3f5ca9 SHA512 276b07770aef3fc094cdf356ec54c492c34d515e426d47825a8a2df2331e71876b8a0f87f9549d279958e58a6624c1452092d9b185b4233a973096e1d1bd0301
diff --git a/app-misc/hello/hello-2.11.ebuild b/app-misc/hello/hello-2.11.ebuild
new file mode 100644
index 000000000000..a7800d90dec1
--- /dev/null
+++ b/app-misc/hello/hello-2.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="GNU \"Hello, world\" application"
+HOMEPAGE="https://www.gnu.org/software/hello/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog ChangeLog.O NEWS README THANKS TODO contrib/evolution.txt)
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest
index 22cd89b688b9..6fab70382b92 100644
--- a/app-misc/klavaro/Manifest
+++ b/app-misc/klavaro/Manifest
@@ -1,7 +1,11 @@
 AUX klavaro-3.0.1-datadir.patch 860 BLAKE2B c30fc29835a4cc2d5c38d2be9a6a836d6c2b762128ca8d6c9a44800d6a89cc6ac46d6bf4c0251bac14e24ea96e636eff28025e7570aa9576da6bc23fd63934cd SHA512 85c06039f4f84eff348b7dabbf6a2eaabd29c7217f608eb77cc38a17cacc13bad4afb676f19f7e08297428f543b094c9a89c7c4a465d680b5334b818f4918410
 AUX klavaro-3.0.1-out-of-source.patch 266 BLAKE2B 7244226db930cabc35bd29e6e6f1a4d84ee65c57576b7d04433f970b03d0b237eee919aefa271fdc5ccb856beca79504786fa8198a4bd3cb6936f45d05ff7ac6 SHA512 74cc5a686a2db2c5b0170b763e13861171c5ebf696b8717a6ca091f9512cb71397c14e7ae41a7ccaa09ed7f4a4e7805926d5f37eaa67ce827787b0326265250b
 AUX klavaro-3.0.1-static.patch 227 BLAKE2B 8ed9f3ee511784c75248a1cb14a06ce09e7a8fdb0b69bb9067cf8afecf225c059915eddb04aaf01a0f305f3f51e6d020b635e2942237c6d76742ad9408338f69 SHA512 30b76f6454302527d043bf3d29b97ac65cdd17bac48d394ce5b9f7c391a9640a976a54ca066b301f23a5f78b200641072513cb4f5eee5a89ac24510fa5b84104
+AUX klavaro-3.13-datadir.patch 514 BLAKE2B 0e3b3080d211634269588006e46d949b980144b837dc0a3d57fbe663dd7c63d866f7985035629155e76aabae30c451262c8260134225320ffaccf6d31ad8e34d SHA512 5b8707459ebd372834e65edb9497505823970c798fd4a1e6fedf10dd3d37c55f43ad249288b6ab012732a940a9df2e0a58d1c4915de71c984e0d8ff3a36c6271
+AUX klavaro-3.13-desktop-keywords.patch 4364 BLAKE2B 080e88df774c9e29826a1c7e7b7fbcadc96ba06e17ce29b858ec1161f0b11cea1bed84cfea8bd36a19576ed0e3c6894ded9fa9cb2598c376bb0f9981d4cc63f2 SHA512 96b1213c39b5258fef6f7a8adbbcaf1b815a2cb71d55481a7196a8eaf3dcd141c248b57f4586d036381ab1af1234f9606a15e5b91f9f6245bee04cf0b8cf9476
 AUX klavaro-desktop-keywords.patch 420 BLAKE2B 14dea4731492e2c728517053c3c9a15c99e8bca0d36f25d23a6e7dbc9a54e59b5878100ae8924ae78740ff2e7ceb4cbffae1c968eeff8039fb9f539329fd0073 SHA512 f526da8a40a7de95564f9a8edf4176b043aeb3b5ee600691f66ca27a820da1d2f0d87b6c4da45b8a3a3009aeb440a1a24a65f728174ea079e6712e08c3fe5606
 DIST klavaro-3.01.tar.bz2 1140146 BLAKE2B fcd26cc6dfabd7ae0147fc279361a890ab928e42e02837a3322eae51fc6e959b02896ce789fae6a10b2f600eeb026c45955571d5264a29950cc7183eeb22a4cf SHA512 5d58269867d2b39309e07ca9dd6c525d67acaca93dea0010332e39e8f3dd444070dbc75abad00ac4ca3fd4155f41cf871cb8ccee3dc332aa31f85c8b17d7c48b
+DIST klavaro-3.13.tar.bz2 1237015 BLAKE2B f6cf83005217e924ff1ea9a596d1154a3225298142722eb51609411f74444d73cb5d4a98fc11634185c3ca857b566d33396c841cb40f925e2d84b7180c357c57 SHA512 17765be33305a722f8d23006353c5de812075decc7931c596bd8c7efe2d93657687847f007adb4e7f758a535fd3cded36581fd1e9f5b4af7d6d3b441b7245b36
 EBUILD klavaro-3.0.1-r1.ebuild 796 BLAKE2B 97a292a8f3bc57139f3c4b19f7bee582eb53cddcf3377c9a273835ecaeffff2f21a9dd1f9b12aa2f99d33e8fcfe786ba59f6c439f2beccda8ed245157a308ee1 SHA512 5799969ba108bdac5345b6b01539ea4611d7a247c6b8128e208ec0749652181dbb792a45e0abfdc511f77cd67fec3063284823eecf00fc4b4f3bde063d20697e
+EBUILD klavaro-3.13-r1.ebuild 946 BLAKE2B 7c7eeb28abe2a0bf3df1d253148cde9b312d9939033b9ff694f462f2ddd79e160af29b677694b72a81c607b6e627e22cd9fb3b3f6e90a5f5f098270dc4bae643 SHA512 3b9d6134d7f195547e89cf9dba79e3709a41b45383f6d768af16ac2ff99aee2ec4e320f1a9550bee076df7950740e0e2defb199a8ade4b19af8b54a9804877d5
 MISC metadata.xml 245 BLAKE2B a4b272a16070570fe0ba833073cc83891b08d2ec1123961e384d4b5e1cdb945b466da642243ff3197d71fbfa784cdc0f1ad07b906056f8f4618549df6f7a08d7 SHA512 94dab4934d91e76395edcdba99cdc609a3c658d5b72d524a427389f496dc391fb4ff5351b2984c96d2283c64c4090e27a0277efe60dab5a19f8aabd10e51e255
diff --git a/app-misc/klavaro/files/klavaro-3.13-datadir.patch b/app-misc/klavaro/files/klavaro-3.13-datadir.patch
new file mode 100644
index 000000000000..24071cd7481f
--- /dev/null
+++ b/app-misc/klavaro/files/klavaro-3.13-datadir.patch
@@ -0,0 +1,13 @@
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 727d2e21dced..ee6ba6f8d70b 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -185,7 +185,7 @@ desktopdir = $(datarootdir)/applications
+ desktop_in_file = klavaro.desktop.in
+ desktop_DATA = $(desktop_in_file:.desktop.in=.desktop)
+ @INTLTOOL_XML_RULE@
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ appdata_in_files = klavaro.appdata.xml.in
+ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+ DISTCLEANFILES = $(desktop_DATA) \
diff --git a/app-misc/klavaro/files/klavaro-3.13-desktop-keywords.patch b/app-misc/klavaro/files/klavaro-3.13-desktop-keywords.patch
new file mode 100644
index 000000000000..b36da018bec1
--- /dev/null
+++ b/app-misc/klavaro/files/klavaro-3.13-desktop-keywords.patch
@@ -0,0 +1,73 @@
+From 5459092d6044ffbea644cf04ddaa4cf9a6f7c25b Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Fri, 14 Jan 2022 15:10:17 +0100
+Subject: [PATCH] Add missing semicolon at the end of klavaro.desktop
+
+---
+ data/klavaro.desktop.in | 50 ++++++++++++++++++++---------------------
+ 1 file changed, 25 insertions(+), 25 deletions(-)
+
+diff --git a/data/klavaro.desktop.in b/data/klavaro.desktop.in
+index 6c6deadb1e7a..cf2fc090fd7b 100644
+--- a/data/klavaro.desktop.in
++++ b/data/klavaro.desktop.in
+@@ -3,31 +3,31 @@ _Name=Klavaro
+ _GenericName=Yet another touch typing tutor
+ _Comment=A very flexible and efficient touch typing tutor.
+ # Translators: these are keywords related to the program. CAI above means Computer Aided Instruction. Feel free to add and/or change the keywords in your language.
+-Keywords=keyboard;typing;tutor;CAI
+-Keywords[ar]=keyboard;typing;tutor;CAI;type;لوحة المفاتيح;الكتابة;الكتابة باللمس
+-Keywords[bo]=ཡིག་འཇུག;མཐེབ་སྒྲོམ།;སྦྱོང་བརྡར།;CAI
+-Keywords[ca]=keyboard;typing;tutor;CAI
+-Keywords[cs]=klávesnice;psaní;psací stroj;na psacím stroji;výuka;učení;CUI
+-Keywords[da]=tastatur;blindskrift;øvelse;CAI;maskinskrivning;værktøj
+-Keywords[de]=keyboard;typing;tutor;CAI
+-Keywords[el]=πληκτρολόγιο;πληκτρολόγηση;εκπαίδευση;keyboard;typing;tutor;CAI
+-Keywords[eo]=tajpado;instruilo;gvidilo;ekzercilo
+-Keywords[eu]=giltzadia;mekanografiatzen;CAI
+-Keywords[fr]=clavier;dactylographie;tuteur;EAS
+-Keywords[gl]=teclado;mecanografía;titor;CAI
+-Keywords[hr]=tipkovnica;tipkanje;mentor;CAI;NPR
+-Keywords[hu]=billentyűzet;gépelés;oktató;gépírás;CAI
+-Keywords[it]=tastiera;digitazione;tutor;digitare
+-Keywords[nl]=toetsenbord;typen;blindtypen;typeles;lesprogramma;CAI
+-Keywords[pa]=ਕੀਬੋਰਡ:ਟਾਈਪਿੰਗ:ਸਿਖਿੱਅਕ:CAI
+-Keywords[pl]=klawiatura;pisanie na klawiaturze;nauczyciel;CAI
+-Keywords[pt_BR]=teclado;digitação;tutorial;CAI;aprendizado
+-Keywords[ru]=клавиатура;набор;тренажёр
+-Keywords[sl]=tipkovnica, tipkanje, tutor, računalniško podprto učenje
+-Keywords[sr]=тастатура;куцање;учење;учитељ;КАИ
+-Keywords[sv]=tangentbord;skriva;lära;CAI
+-Keywords[uk]=клавіатура;друк;швидкісний;набір;навчання;уроки;keyboard;typing;tutor;CAI
+-Keywords[vi]=bàn phím;bàn;phím;ban phim;ban;phim;luyện gõ;luyện;luyen;gõ;go;dạy;keyboard;typing;tutorial;CAI
++Keywords=keyboard;typing;tutor;CAI;
++Keywords[ar]=keyboard;typing;tutor;CAI;type;لوحة المفاتيح;الكتابة;الكتابة باللمس;
++Keywords[bo]=ཡིག་འཇུག;མཐེབ་སྒྲོམ།;སྦྱོང་བརྡར།;CAI;
++Keywords[ca]=keyboard;typing;tutor;CAI;
++Keywords[cs]=klávesnice;psaní;psací stroj;na psacím stroji;výuka;učení;CUI;
++Keywords[da]=tastatur;blindskrift;øvelse;CAI;maskinskrivning;værktøj;
++Keywords[de]=keyboard;typing;tutor;CAI;
++Keywords[el]=πληκτρολόγιο;πληκτρολόγηση;εκπαίδευση;keyboard;typing;tutor;CAI;
++Keywords[eo]=tajpado;instruilo;gvidilo;ekzercilo;
++Keywords[eu]=giltzadia;mekanografiatzen;CAI;
++Keywords[fr]=clavier;dactylographie;tuteur;EAS;
++Keywords[gl]=teclado;mecanografía;titor;CAI;
++Keywords[hr]=tipkovnica;tipkanje;mentor;CAI;NPR;
++Keywords[hu]=billentyűzet;gépelés;oktató;gépírás;CAI;
++Keywords[it]=tastiera;digitazione;tutor;digitare;
++Keywords[nl]=toetsenbord;typen;blindtypen;typeles;lesprogramma;CAI;
++Keywords[pa]=ਕੀਬੋਰਡ:ਟਾਈਪਿੰਗ:ਸਿਖਿੱਅਕ:CAI;
++Keywords[pl]=klawiatura;pisanie na klawiaturze;nauczyciel;CAI;
++Keywords[pt_BR]=teclado;digitação;tutorial;CAI;aprendizado;
++Keywords[ru]=клавиатура;набор;тренажёр;
++Keywords[sl]=tipkovnica, tipkanje, tutor, računalniško podprto učenje;
++Keywords[sr]=тастатура;куцање;учење;учитељ;КАИ;
++Keywords[sv]=tangentbord;skriva;lära;CAI;
++Keywords[uk]=клавіатура;друк;швидкісний;набір;навчання;уроки;keyboard;typing;tutor;CAI;
++Keywords[vi]=bàn phím;bàn;phím;ban phim;ban;phim;luyện gõ;luyện;luyen;gõ;go;dạy;keyboard;typing;tutorial;CAI;
+ 
+ Exec=klavaro
+ Icon=klavaro
+-- 
+2.34.1
+
diff --git a/app-misc/klavaro/klavaro-3.13-r1.ebuild b/app-misc/klavaro/klavaro-3.13-r1.ebuild
new file mode 100644
index 000000000000..48acb01a0ffc
--- /dev/null
+++ b/app-misc/klavaro/klavaro-3.13-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature xdg-utils
+
+DESCRIPTION="Another free touch typing tutor program"
+HOMEPAGE="https://klavaro.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-util/intltool
+	>=sys-devel/gettext-0.18.3
+"
+RDEPEND="
+	dev-libs/glib:2
+	net-misc/curl
+	x11-libs/gtk+:3
+	>=x11-libs/gtkdatabox-1.0.0
+	x11-libs/pango
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# https://sourceforge.net/p/klavaro/patches/16/
+	"${FILESDIR}"/${PN}-3.13-datadir.patch
+	# https://sourceforge.net/p/klavaro/patches/17/
+	"${FILESDIR}"/${PN}-3.13-desktop-keywords.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	optfeature "instructions via synthesized speech" app-accessibility/espeak
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 10b2ee1da030..de0dbbf2ac95 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -3,5 +3,5 @@ AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb
 DIST mosquitto-2.0.12.tar.gz 783859 BLAKE2B 3bac953fc7f49e19f1914186044c75d7f8b5b23e656acfb7d4c306740d0add20c08760fc206fc871c5cecf8500eb1c88acc4905bddce159d1e8f0c4e2c28b818 SHA512 acf80980f124073fd2fdd99981bde840654fb40a6b6f1d6ef483e35880b45d029cfa9390a98753de6476f4ade068266cb4c6e3c753a0362c0309a5745ac4ebab
 DIST mosquitto-2.0.14.tar.gz 787414 BLAKE2B 926e39756a0293404c8591e489e64e47cd95640d7884f2cfb687a0d548b709d8aff6d671a4941aae8b3506315d28567520c183b762639822d2d78afe323d111e SHA512 a9e4f41b9af679b30318570e86a465546024651373df10e3b132f4593b89d22d0dbac01bb7371a57132ba030a2e73971c612acb5c9ac12f5ccd06aa38d9444c2
 EBUILD mosquitto-2.0.12.ebuild 3023 BLAKE2B be6d1e74a65ffb75542f6f560411972e82fb9098c749d1c67f2d777b780e010a1eaa22a6d5ede4f42ee2f0c0b86abe11d428fc4ddd49a1411b61e5da0f801e89 SHA512 b0fb8fa9e1251ab8fab4c99b8ab1564a59ccd074655a02d6acaa6fecbd30a6d5114ed5d8aa261d184f5de8a6085af294eb6967ce1a894065ac13282c14643135
-EBUILD mosquitto-2.0.14.ebuild 3026 BLAKE2B 8abd72d5c31bea16f1f9982d9df512b255e214d8ffec63a5f6d1f2fdc368eaa191906fec61ec2c75e2210d64b948126ee297250a82b6206f46b2a3929574b7b8 SHA512 a3a5bcc9a4bfd6a51b68a1ae40d7995709ec0d17aa8d2c9d91ebabbb6f8edf637322e1a5a7cfc96daecf152e1eb35c187564981d34756d5cca8dc7b16481178a
+EBUILD mosquitto-2.0.14.ebuild 3023 BLAKE2B 7a4cf9ccc2408317a98a987d0c3a6c2e09c54e27e650691b7be52d804f84a91e572a8586d73c7e6c9c6cc702720514a397e74ac55160522e96ba605246e89288 SHA512 3bd54b5f2bf134a56be47a05dde1e1bf8b826cb8e20b107fa6095b2ed600614b3497c14543c0bf07815e9c5d83242be4f222e642706804ba2ff9c880e5dd46db
 MISC metadata.xml 612 BLAKE2B 414070cdd858c5fd76b266459ff7b2a66992e8b11e672212f78e366863cd221aa83516a546c69668217a06b087b7b81853fcdff332368355cd1ff8c1292f0c4e SHA512 64242d12473aad0f0d80865da2499679849f6b55f751d27c3cf38e0a5555a305a2cc59f8dfbe4b9d50f0a6b6bc85062b989511c7118045b2c9c3e1e0d1022747
diff --git a/app-misc/mosquitto/mosquitto-2.0.14.ebuild b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
index 056871a3f293..ba5ac5d51a0f 100644
--- a/app-misc/mosquitto/mosquitto-2.0.14.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 316c279e3444..0587f03e03b0 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,5 +1,5 @@
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
-EBUILD neofetch-7.1.0-r1.ebuild 1152 BLAKE2B b6f1dffe6170bd6da9f0406bb023b4633b90db41dc5d19d255eedea868ea5df9ed65c418932f54b03e4b9738b26da8683e2e83084ac6ad3bec926541ee6bdea6 SHA512 483f3c77a121fb1b538faec852a2d12edf43188d8e33c249ea708cac8dc1b1e4deabe0435ffbaf763c15292744a763ac7761f1f95a5af5a3c8c948d9b8d6ad82
+EBUILD neofetch-7.1.0-r1.ebuild 1157 BLAKE2B 51a9132dcdc1ec6d7b00723cc125cc30030fab0f4fa2307a4ef7d4c3bd22b720b7f0fd24e9e63f6076f2a1ab0b43992f76d1de8a8802e27b09d6c171ac173c34 SHA512 15ddd0ef83cdfb7df72677f66e4ec8b67955afd042ef4649bc40192aae8d404475c6612c97ccb4949c44cb1393c14dcaf277489c781d23cc3e87b336b6d2c540
 EBUILD neofetch-7.1.0.ebuild 937 BLAKE2B 72424ef48458c2c4c0a70900f42f597ebaf0ec659b3fadc9e860262b336d066786b078412c363394c674250d52fcb2ab267c665d2778b98cea96a1baf759134c SHA512 568336106a81b75f35e657c7f494e6b1b7683dbba29085bc28c0e7b441d288c5a013ba3c6ebd1ad62b3862ec8ad835b6fcea07eb0dcd590b907c38f4427d79aa
 EBUILD neofetch-9999.ebuild 1147 BLAKE2B 12a4fe99b0c45f980d0452a4b96288a8543beb03f94eb81195dd11a1b87129506f7d9bf5a6a54380d4b6289988e7f2098680804924fb9cf32a7386fe1e6efaa7 SHA512 753c3e6ebae6688c78246d2276dfadd37baeb004763e5d9d26cd04dcafa1b77f48304456df92e3ca78eefb0d419bde969eb438d1bd2d80674ed5d8504bb3a7ed
 MISC metadata.xml 863 BLAKE2B 3a4dbfbeea790e95fafbe9b47169bd43c127be69f21ffb2c0752ad2003304ef7628f0c95388288cf00b5d567b83626ac15cb015a8fd9c4c6cacc1137410a7887 SHA512 593a76d4beb607cf64a5dfeec978d7c6be6ad2a1dc36aefa44c2e18724d09c76133d3bab0fc5692f2bd997c86156337142b5115e7d34d4da59f91e69f44d4f30
diff --git a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
index ea69aef4419f..45db1f433387 100644
--- a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit optfeature prefix
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~mips ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/openrgb-plugin-effects/Manifest b/app-misc/openrgb-plugin-effects/Manifest
index 53055872bb93..936758118efc 100644
--- a/app-misc/openrgb-plugin-effects/Manifest
+++ b/app-misc/openrgb-plugin-effects/Manifest
@@ -1,3 +1,6 @@
+AUX openrgb-plugin-effects-0_p20220110-dep.patch 926 BLAKE2B fb1fc3fe50bcd2bd7acc07adcf371ae388185bbd735da695b43ed734b6939c9af7cc982250d6de3441d0cc9d78e7e0556e05076b0cc744a80fa428d41926dc6d SHA512 e458254ced95844dfe5f04e5e82c2f9a02acb6fc1c5302237b32629c12319c8272a89d9d530b8fa98bca702308fb3beda3a83258272d97a6dd1b669ba6d4c731
+DIST OpenRGBEffectsPlugin-a7222bdbcd3c52e13d96993a33c5648f1306aeba.tar.bz2 255129 BLAKE2B 8fc7ee994d80bd9fe8d8a76e26710ed0fec429aa8df835f6a46a64d4034a4fc2352d722c9aed26032bff33781b1f024a893d685f6883e1816872d91cd937c1d0 SHA512 386879a7a1f05cfcbcca792add1b18f2680b4fa7b139f8532e6f32d09a5194c381357d3cbb3883352c2a03280c9b0b0f1e9faef7e140c7535144c0d645832d3e
 DIST OpenRGBEffectsPlugin-a8ea7eef586d9dc341fbe67f60cb8cb4d69a9504.tar.bz2 345726 BLAKE2B e8cf741ba935521c449d3b2a326a44b709c919cb3e3694cbd07939205b8f589dcc00b46cdb1f08684e4e4d3d0a798aade7c051ebc16c3c82368fbeb94ec84fb5 SHA512 134b46090386f94fcf77c4a0a1807ac94ecb8323f318e01098a1edf9b3cf555dbc7f1c5abce484dd4aba9cea32ae7aac5abc0f5f1d26e8edee4afe197f5a254f
 EBUILD openrgb-plugin-effects-0_p20210619-r1.ebuild 1213 BLAKE2B b99b7b31f8121f66d07fd8879177cbae50a37b2845893f15e40adb320da1ab14fc0efd4bba9e4bf128eb37fc332c7b55704537b7a5e61b88370a80790fcea6a4 SHA512 8ac07fe56f39bb7adf9cf92ceddbaa40122435c495f6eaed30024b2d6da86c5ff682c76751ec096fa58933785d29b444987a7e259cb6058ee4bf3e7da4b545b3
+EBUILD openrgb-plugin-effects-0_p20220110.ebuild 1134 BLAKE2B ff99c18a76f10be64657dfd475271b1ac94ec9321fece2707dab924075044cfe75ad83b112eb77be43e46a358f37faf98befa25c48e1f3152d1a4e685b7af1c7 SHA512 7d4e50df9d092fb5f67c988bc0acb01439bdcb493bcf591382f60d5d697996dda475b2e724f0079bca93098e91e22ac83b2ed085dd3fffc44a17aea89478b69c
 MISC metadata.xml 484 BLAKE2B fd1a7614f29a1040964e8f43b99240608d34b41b1f3904e3a2b8f33c8cae130cc46dc87e9eb51aea1be82c48dd3ba377150a3b39f2a6399c27e422521ab38e18 SHA512 5b43156294061c4ff508d206e7621e31c493b403aacd648120e240c164203fc1508410f732c24b1e9df489d07d28eb21469df6c01111da413f076530838cf778
diff --git a/app-misc/openrgb-plugin-effects/files/openrgb-plugin-effects-0_p20220110-dep.patch b/app-misc/openrgb-plugin-effects/files/openrgb-plugin-effects-0_p20220110-dep.patch
new file mode 100644
index 000000000000..7ab0f2ca75f9
--- /dev/null
+++ b/app-misc/openrgb-plugin-effects/files/openrgb-plugin-effects-0_p20220110-dep.patch
@@ -0,0 +1,16 @@
+Fix dependency on app-misc/openrgb
+
+--- a/OpenRGBEffectsPlugin.pro
++++ b/OpenRGBEffectsPlugin.pro
+@@ -64,11 +64,6 @@ HEADERS +=
+     OpenRGB/qt/hsv.h                                                                            \
+ 
+ 
+-SOURCES +=                                                                                      \
+-    OpenRGB/RGBController/RGBController.cpp                                                     \
+-    OpenRGB/dependencies/ColorWheel/ColorWheel.cpp                                              \
+-    OpenRGB/qt/hsv.cpp                                                                          \
+-
+ #-----------------------------------------------------------------------------------------------#
+ # QCodeEditor                                                                                   #
+ #-----------------------------------------------------------------------------------------------#
diff --git a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20220110.ebuild b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20220110.ebuild
new file mode 100644
index 000000000000..0d8ec005a69c
--- /dev/null
+++ b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20220110.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+MY_GIT_COMMIT="a7222bdbcd3c52e13d96993a33c5648f1306aeba"
+SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/archive/${MY_GIT_COMMIT}/OpenRGBEffectsPlugin-${MY_GIT_COMMIT}.tar.bz2"
+S="${WORKDIR}/OpenRGBEffectsPlugin-${MY_GIT_COMMIT}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Plugin for OpenRGB with various Effects that can be synced across devices"
+HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=app-misc/openrgb-0.7:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/openal
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
+
+PATCHES=(
+	"${FILESDIR}/openrgb-plugin-effects-0_p20220110-dep.patch"
+)
+
+src_prepare() {
+	default
+	rm -r OpenRGB || die
+	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
+	sed -e '/^GIT_/d' -i *.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/OpenRGB/plugins
+	doexe libOpenRGBEffectsPlugin.so.1.0
+}
diff --git a/app-misc/openrgb-plugin-skin/Manifest b/app-misc/openrgb-plugin-skin/Manifest
index 95b67982fd07..61421ac52fe7 100644
--- a/app-misc/openrgb-plugin-skin/Manifest
+++ b/app-misc/openrgb-plugin-skin/Manifest
@@ -1,3 +1,5 @@
 DIST openrgbskinplugin-3d937cf5112a98052f98a106dc0f5de1eafc20ea.tar.bz2 14673 BLAKE2B e9ba7e072882a995d9d37274e612f0ad404c369bafb4e59db379f43242873f08f36adc5521277c2bac4e730c35cde561e535e30e5a37155bfe0fa408d5ba3b45 SHA512 1a23b843230da6778079873949e72280efe46c6c015eb27456283bae5d88b539d8a5f69e6f1580400e1cfa746bcd36b6a1ae597f510b0c331d16f56b6ae28670
+DIST openrgbskinplugin-ebb80f7bd0e1efaa995f60454f3c049a4607bc3b.tar.bz2 22843 BLAKE2B 30c88b143b3df829c543744b20424df24bde9dda10f770fb78d653609111801a4d1d3fe16ed3e3c15ad953f41113db5d4da40bc66f7ec57418b2e934cd9a2e32 SHA512 a70c0157072b6b638a5a4f3f48f41c73f422d0ac356174479901cd3d088faf6fe96e594b2a39b15de305e0355fd0d252dafc4a30b9216d57058ad2cde7f5a3e3
 EBUILD openrgb-plugin-skin-0_p20210601-r1.ebuild 1184 BLAKE2B 68d11b055e4d701819383b78b0183d577ade6824f89e93ff6dbf323cee0aab50ab760bae5b909507a6e7bd749ac3b3ceb3835c9c08ea38685d89585f71242dc9 SHA512 a38494698da3216c653316078fa52341cae429e994f7dd3f94c1d8b2e31384abc8f50c44b354f5088ff8a0d93ba0020f2ff11f9646deca57232d1ea569f0a3d4
-MISC metadata.xml 481 BLAKE2B b2623c595d0ae814cf36a90bbb44f70d3084fa3a550e6bcae5bed4ac363838e8793f5f2e9207c10f854662a669d6d149776d37a00150566af67cbb11df512dfb SHA512 121fc3f998aeb014428d008ef1ad03b02863ad28abcf09bfd4ee2381f2f4cce54734b1d7abde606750699fab8f828ff24feab5ae5b64975b2f57077bb609e5ff
+EBUILD openrgb-plugin-skin-0_p20211230.ebuild 1032 BLAKE2B 97359e3d6af579335e8c10c18b39b64ceb07e23b17b8eb155029aca547443a77cbcb3aba41cfdc02e701e77dc0db320a8017259416c4065f9b82752cbdc69dec SHA512 f93e8e3edfd6e5d9c3b78d52cca37bb782de6e0c2af4e2f71c8c44335e8bc3133510ecc5e6d6175820eca895f649fb65587e6d3ca9574eb9e02fcc742b6315c7
+MISC metadata.xml 481 BLAKE2B f05f1f16d6180b976f0daa79964c7abe5f9f1caee3aa25c1b328916d810438b7e76fd54297412f02c6fd172d6ca754872cd7d28349c328c8ef9cc8af7069a4be SHA512 9a6815da58c1b372a4af82f96484625334c2977a416e902b824d2be17bc7624cf9d1d69f0bc25ce85b833133b81c10e9257f30c825fdeeb230c7ce8772cf4bfd
diff --git a/app-misc/openrgb-plugin-skin/metadata.xml b/app-misc/openrgb-plugin-skin/metadata.xml
index 4c8060bdf70c..4f1ad006ed77 100644
--- a/app-misc/openrgb-plugin-skin/metadata.xml
+++ b/app-misc/openrgb-plugin-skin/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Alexey Sokolov</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="gitlab">OpenRGBDevelopers/openrgbskinplugin</remote-id>
+		<remote-id type="gitlab">OpenRGBDevelopers/OpenRGBSkinPlugin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20211230.ebuild b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20211230.ebuild
new file mode 100644
index 000000000000..16fd02edcd94
--- /dev/null
+++ b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20211230.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+MY_GIT_COMMIT="ebb80f7bd0e1efaa995f60454f3c049a4607bc3b"
+SRC_URI="https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin/-/archive/${MY_GIT_COMMIT}/openrgbskinplugin-${MY_GIT_COMMIT}.tar.bz2"
+S="${WORKDIR}/OpenRGBSkinPlugin-${MY_GIT_COMMIT}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB"
+HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=app-misc/openrgb-0.7:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
+
+src_prepare() {
+	default
+	rm -r OpenRGB || die
+	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
+	sed -e '/^GIT_/d' -i *.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/OpenRGB/plugins
+	doexe libOpenRGBSkinPlugin.so.1.0.0
+}
diff --git a/app-misc/openrgb-plugin-visualmap/Manifest b/app-misc/openrgb-plugin-visualmap/Manifest
index d5c4cb83e346..6bd536556b13 100644
--- a/app-misc/openrgb-plugin-visualmap/Manifest
+++ b/app-misc/openrgb-plugin-visualmap/Manifest
@@ -1,3 +1,5 @@
+DIST OpenRGBVisualMapPlugin-223c5ec67d256c5fa3bf7f3d572213114d93db6e.tar.bz2 54289 BLAKE2B b42b59fdc31f48d3e7be28051ccb02a2ba1befa1b1ed180a9313c8cbc50bad1c358ab5b4d8f249b488d5f32c801426078ef6c0c3c46dbec9695cb7b7cbf21d40 SHA512 eff52debcd027176a761fba71fb33d4a04802dd8f2441a86a825f3afecb268d2768edb8b03ec35ff2d17b5dc6f95dd0642e7d524fa7fcf93f0d215d712e75f3e
 DIST OpenRGBVisualMapPlugin-b603bb994719c765cc52c116c6f9f3983fc2a7b2.tar.bz2 45381 BLAKE2B e289f952a8f6553ff81a557753cbb94fb56111a6724f3141fc44a2f1abe9fa3d8e8b4eb769b54adfcb8ee6580d26378ca0b15fd83c14eb669e4682dad07729b8 SHA512 aab553dff55bc4d6990657ad9f29dbbe5ab78dfb532dba50923b32c2bb86ced8d37fc1190dca1b59f420aba7f0db81fbd0d35d49e499e19b9efa4638269a784d
 EBUILD openrgb-plugin-visualmap-0_p20210614-r1.ebuild 1269 BLAKE2B a8686bceae7030a77568409e3b9a62217e00ba55b1effb60b355fb9ea1a69de8c4becf306e97b895e4660e8a173aa24fa237332d8d9f86a332f05aa67cdce5ca SHA512 5e12191e9fc495b05352ae4ac0c8c14d30899ecabc4f3f6ddf05d20e054a0d82c18f69f87663fc704081c94275e7765e54e707d47fe8dbf0fa7f5c4853659d6f
-MISC metadata.xml 484 BLAKE2B fd1a7614f29a1040964e8f43b99240608d34b41b1f3904e3a2b8f33c8cae130cc46dc87e9eb51aea1be82c48dd3ba377150a3b39f2a6399c27e422521ab38e18 SHA512 5b43156294061c4ff508d206e7621e31c493b403aacd648120e240c164203fc1508410f732c24b1e9df489d07d28eb21469df6c01111da413f076530838cf778
+EBUILD openrgb-plugin-visualmap-0_p20211230.ebuild 1119 BLAKE2B b9713ef291781d14746fc219dd7624f4b473df4b35166c74c5443c3391f73a0cb56d5e606fdd5b5fe03416db879b7edc3fc710dc408d1cc15cd7a3f2b9c17517 SHA512 6b2acc3c6dd264b107fd37589144315b5048ab732fc13e7c7eaf63f833fa2875d085fba956d38539ff78c4667d17510406eeb19acae94e62a8fe432216a3e98e
+MISC metadata.xml 486 BLAKE2B 01cbd7cbe4d88068db283a3eb33d0a23dc100e6effa5d8eea9970c96d75073053ecc161953c0d1ae08b4400c497fc8668004c217b3dde0a3d066f24f9a8f6e7e SHA512 41e51c4089d9e9648656339df9a4ccf52b8907b22da654331b1bd804fb150e0148c1c325e1e15a1f8e2d282f9568f91a31243e9cc9e4aa688d2dfdb75259c5f8
diff --git a/app-misc/openrgb-plugin-visualmap/metadata.xml b/app-misc/openrgb-plugin-visualmap/metadata.xml
index f804d71c1bb8..7fac73257faa 100644
--- a/app-misc/openrgb-plugin-visualmap/metadata.xml
+++ b/app-misc/openrgb-plugin-visualmap/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Alexey Sokolov</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="gitlab">OpenRGBDevelopers/OpenRGBEffectsPlugin</remote-id>
+		<remote-id type="gitlab">OpenRGBDevelopers/OpenRGBVisualMapPlugin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20211230.ebuild b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20211230.ebuild
new file mode 100644
index 000000000000..b4e8d391271f
--- /dev/null
+++ b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20211230.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+MY_GIT_COMMIT="223c5ec67d256c5fa3bf7f3d572213114d93db6e"
+SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/${MY_GIT_COMMIT}/OpenRGBVisualMapPlugin-${MY_GIT_COMMIT}.tar.bz2"
+S="${WORKDIR}/OpenRGBVisualMapPlugin-${MY_GIT_COMMIT}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Plugin for OpenRGB to create virtual devices out of multiple real ones"
+HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=app-misc/openrgb-0.7:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
+
+src_prepare() {
+	default
+	rm -r OpenRGB || die
+	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
+	sed -e '/^GIT_/d' -i *.pro || die
+	sed -i -e '/RGBController.cpp/d' OpenRGBVisualMapPlugin.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/OpenRGB/plugins
+	doexe libOpenRGBVisualMapPlugin.so.1.0.0
+}
diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index cac95664db4c..11b8629f3898 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -2,7 +2,10 @@ AUX OpenRGB-0.5-build-system.patch 755 BLAKE2B bda13d7d9de39d3dd79245ff7a13e22e0
 AUX OpenRGB-0.6-pkgconf.patch 709 BLAKE2B eec83247caac6527f0c0ca80716fc3fc3266cdca9635f643968bb620be3a03f3d3030c97e0c68af8e77a03725eaa46f7393667ceb72a63a665947ae87242afc8 SHA512 0436714eb4e900caa421dba2b3fcba41826ab74ed8f2e42884c48006f4af31fe10a114e84c41212343911b5f52804a27b031410fc55fe234138905779db4cf6b
 AUX OpenRGB-0.6-plugins.patch 1002 BLAKE2B 42bb7a51876603003a8cf84759754201a92ae50b6a1d6c3b234ca7a49ad0ad00a6dd6d8dc9e068cd7d865d90cbde6a4a9794845a200e06ca5cfe530d37505dd2 SHA512 6d590398dcc65db8720577e83fe8a11a46f7b0be485f1caf227148250450d936599b4ccc47df8b6f8676676cccfcfdf5ad7f02ad76ca415eb0a9c40a58970cbb
 AUX OpenRGB-0.7-plugins.patch 1035 BLAKE2B 46025eea33f9cbef73994ea25284e05a7dc1848a7a9f2d60d9e173a5e6f40d98d1a0346d75fb5bf2bb05803bfafa1f3a94bb15a7feee25743565644370cc58fb SHA512 2a098ff5ec43347ed91ac43971e50872461a23762124ac252573b602236ced309c94e9a58b8667a52c85a06dd85eb519a1ee0aa7c8ecd577713a28d456db1c14
+AUX OpenRGB-0.7-udev.patch 515 BLAKE2B c535efa9d6fbc5b0f56eb9914ca9c23d3d431f2d98b7d3bdee60bbb0abdb67eb5e21b75be9ec9226e8de1def3136d89175f0500e83ec97b3a23ad1ec1e5929ca SHA512 11c09942811077134c78fd916ab842c39361214888d13187071a2bbf8112f995915b491fd8e8574a5cb59b02d70477ac0ecf42592d433ec24feffe194f7a0534
 DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32
+DIST OpenRGB-release_0.7.tar.bz2 28053114 BLAKE2B dfab42fca654478ab359e6e46133fc20a4bf32aca35d1b2f475d3e4e5e218f35c7e1f03be15381b0e8d874ea24254b88b8fe21548a4183b29b4c66647aeef516 SHA512 6ee605bfc91da14d34bc89fe75790f99548253e2d6aa088e20d1996577629bf15fe0fae09e65d983aa829f54cfcbd33e13f2c7d493a2776fd1723f8725b62186
 EBUILD openrgb-0.6-r1.ebuild 1831 BLAKE2B 3b56b2846aed9d03f6bbc2338063643ea50df986ed0912abbcebc85c22d44ea4d7fd87bbcc5aa9a16599697e09cc221d1ee4cfacd72317abfcce8b1ac9f66f93 SHA512 49ac7263ac9fe57e160f4743d6f712571305504bfa5a498ea17ef37dedfe48906e989f9d20a86a9d8de7dc9af7010bf6555001699f7821e780c2233cd18c8bb3
-EBUILD openrgb-9999.ebuild 1818 BLAKE2B a94c2e6b6e86c6c9b6057bd92c35988f0df5c2faaef78291717838e06b99259ddaa119301d7dbf840b2e902de2d7d1c4d1fd8a1ce2fa237c93b43ce8cd0b1d4a SHA512 510e647d927ac801ed0d03332892aff5cbaf6f353fe37a48a8ae6b24d6fde56037195d097b976ffaf9cf5c3b772d56511f4291ac399357b547c47870e665d16d
+EBUILD openrgb-0.7.ebuild 1865 BLAKE2B db8ba0bbc8b78e1d9fb4c375b3e234efda4056e2ea23069ff68d42a3bdb42f1e2b1baf03306aca93e2881605246d10bf52ef364bc3a5366a4a3e00af05cef9b4 SHA512 69782bcb0497ad92b33dda1300b80c4beb178cb7fd058f9d02d962f2eaa8ce53ce39c796ee1de2ec7a14e1356edc4332949a43f6bfdcaf7c55eb03d4be018d21
+EBUILD openrgb-9999.ebuild 1865 BLAKE2B db8ba0bbc8b78e1d9fb4c375b3e234efda4056e2ea23069ff68d42a3bdb42f1e2b1baf03306aca93e2881605246d10bf52ef364bc3a5366a4a3e00af05cef9b4 SHA512 69782bcb0497ad92b33dda1300b80c4beb178cb7fd058f9d02d962f2eaa8ce53ce39c796ee1de2ec7a14e1356edc4332949a43f6bfdcaf7c55eb03d4be018d21
 MISC metadata.xml 469 BLAKE2B 39e7ed78f80bb0d2123efb9c94032ef7df8c514e29528f658f6865ab80f3734e7767108fc787c153dfc0df6c8ffa413fc1fdddb7da25e68cd2537c3d4ddbfe81 SHA512 de37a252c6697a9dacf486e71619b0f5fe895c67d48c55c71233b0082495662120a141cae683206293781b886526e92f0b48c91c30f2a536502cb6bd1e880c9a
diff --git a/app-misc/openrgb/files/OpenRGB-0.7-udev.patch b/app-misc/openrgb/files/OpenRGB-0.7-udev.patch
new file mode 100644
index 000000000000..a2feaf1c9378
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.7-udev.patch
@@ -0,0 +1,16 @@
+Install udev rules to correct dir
+
+Revert https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/ccbe83919a70be346eea948fb2c4122ef9f34214
+
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -1246,7 +1246,7 @@ unix:!macx {
+     icon.files+=qt/OpenRGB.png
+     metainfo.path=$$PREFIX/share/metainfo/
+     metainfo.files+=qt/org.openrgb.OpenRGB.metainfo.xml
++    rules.path=/lib/udev/rules.d/
+-    rules.path=$$PREFIX/lib/udev/rules.d/
+     rules.files+=60-openrgb.rules
+     INSTALLS += target desktop icon metainfo rules
+ }
+GitLab
diff --git a/app-misc/openrgb/openrgb-0.7.ebuild b/app-misc/openrgb/openrgb-0.7.ebuild
new file mode 100644
index 000000000000..f9e079015112
--- /dev/null
+++ b/app-misc/openrgb/openrgb-0.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic qmake-utils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
+else
+	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
+	S="${WORKDIR}/OpenRGB-release_${PV}"
+	KEYWORDS="~amd64 ~x86"
+	PATCHES=(
+		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
+	)
+fi
+
+DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
+LICENSE="GPL-2"
+# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+SLOT="0/2"
+
+RDEPEND="
+	dev-libs/hidapi
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/mbedtls:=
+	virtual/libusb:1
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES+=(
+	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-udev.patch
+)
+
+src_prepare() {
+	default
+	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
+}
+
+src_configure() {
+	# Some plugins require symbols defined in the main binary.
+	# The official build system bundles OpenRGB as a submodule instead, and
+	# compiles the .cpp file again.
+	append-ldflags -Wl,--export-dynamic
+
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	dodoc README.md OpenRGB.patch
+
+	# This is for plugins. Upstream doesn't install any headers at all.
+	insinto /usr/include/OpenRGB
+	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
+}
diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index a3d6ddefcc41..f9e079015112 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic qmake-utils
 
@@ -20,10 +20,11 @@ fi
 DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
 HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
 LICENSE="GPL-2"
-SLOT="0/1"
+# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+SLOT="0/2"
 
 RDEPEND="
-	dev-libs/hidapi:=
+	dev-libs/hidapi
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
@@ -40,6 +41,7 @@ BDEPEND="
 
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-udev.patch
 )
 
 src_prepare() {
@@ -65,11 +67,5 @@ src_install() {
 
 	# This is for plugins. Upstream doesn't install any headers at all.
 	insinto /usr/include/OpenRGB
-	doins *.h
-	insinto /usr/include/OpenRGB/RGBController
-	doins RGBController/*.h
-	insinto /usr/include/OpenRGB/i2c_smbus
-	doins i2c_smbus/*.h
-	insinto /usr/include/OpenRGB/net_port
-	doins net_port/*.h
+	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
 }
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 1e7b013cc84d..7eecfc6ee6d2 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -3,9 +3,11 @@ DIST recoll-1.28.5.tar.gz 3261816 BLAKE2B 6bf9daab0f97ee6fdb4033197d3fa3f4296b2d
 DIST recoll-1.29.2.tar.gz 3871580 BLAKE2B ae6ef5628dfac67a192a3d133d5b5d8ddec079ac79be2e8aa7e744669ed0478cb41628a0ed46b4ff2364823f367815b1eb4bca0a6e4b56a9e12d4f78c6842473 SHA512 c87fc054a0c34f1b6bcc10a4f2c84268a51df02b8ba84634c51f9396befe5b2b84fc93d363876158c9d117a164613e91d9c63b228fec5e0e07d234c97c4680c5
 DIST recoll-1.31.0.tar.gz 3679099 BLAKE2B 6d02c0e0487ff02957ffc3c824152a14307e5a9ebfd472ffb84d047ce37f170ff7738b0d15ccfd6582840d22d19aa6e509ca50b98fd88d1a3730e58304cdb4b1 SHA512 1a740cdabab158737461ab8f097ece79844e1f0b64285871217049c0619df400d99db18eac8942e1986def555c5ab8364f3320eb403d150b061126cbc3be2116
 DIST recoll-1.31.2.tar.gz 3689921 BLAKE2B 01eb0ef96362e214022a96876c10246c0d183a861c1e3d791717c3d77d4244ed90bbb9041bf23a613e59b5c099092c262d1bee1760ea527fe60f01383bec8a5f SHA512 365cc152715cb89c88b4271fdda4ccf963b1c6e3088f69684cba2a494bf9b0192e4553b1412607f3acd61ec85eb2fe92c46cd258b3fc2977f9528bb0a667e6cb
+DIST recoll-1.31.5.tar.gz 3696832 BLAKE2B d2bb3199e70aa53679662aff8650a08b6d99182ee7ba11011726f704401c03899bc4d7e24c5c5cf88b2b3a99257e2f11403e29d69da87e00386f57c43db3bd2c SHA512 3a48cfb825e70ec7de6cc789f9d03f6ee6f38cb54ac8419b9038c1f35ed8954249c1ed558bd9aa781c741a0241b633c02b2aa31d6d12b30937a32b9e1da8d44f
 EBUILD recoll-1.27.12.ebuild 3477 BLAKE2B 95fa8b50e3e2036c4fb6ef72a69f394f04d5aacb9919d41c33782ae8e9688de7b993f9386b0a96e8b8b1a6ff5a0be8d49f21900b69a939e200131fdf7b439198 SHA512 e33fd31fc1e9ba7bb0eca7fe82237d94a8db3049fbf442de72f49f23bf2f7370d5b5e933a5d23a85bf93628247ee7180e3830da2c98b9b83143af09102cd01fb
 EBUILD recoll-1.28.5.ebuild 3483 BLAKE2B a38aad710cb61005bc5aef38dfafcac4a83e9c7e2016dc98fe41d695891300858cb86ea3e9d601f684a556345bbd4be1a12e42512228f0711d4a493909212440 SHA512 fb3884952862d76eb8406c42ed881bbd4230e8fbce3a79324621807852ab86b32db7eb850b4b431d60e43520548b967ec3c846b851eb8ef42c4345213c614837
 EBUILD recoll-1.29.2.ebuild 3483 BLAKE2B a38aad710cb61005bc5aef38dfafcac4a83e9c7e2016dc98fe41d695891300858cb86ea3e9d601f684a556345bbd4be1a12e42512228f0711d4a493909212440 SHA512 fb3884952862d76eb8406c42ed881bbd4230e8fbce3a79324621807852ab86b32db7eb850b4b431d60e43520548b967ec3c846b851eb8ef42c4345213c614837
 EBUILD recoll-1.31.0.ebuild 3321 BLAKE2B 17a189a77c300a00b09c77971978051ecd3eebed8a56b11b1bc795cf48ec394845cb2f270f2c7e0adc4d1da0d0aba7e03373ffe278ee3a66281ed92bd3d3f118 SHA512 c5a84fb5d0cc339c0630f8f3698597f0e4216046e324196b8118ee4bbdab061ac3cae27b310d0752cf3cbb9f92ea232e8767c56a514e6c01b36c50a27965aa1a
 EBUILD recoll-1.31.2.ebuild 3500 BLAKE2B 771d1de875c488266efb8681a362393bc2c749888f1a4e8097af6252b48fe6361a71a20087195531e244ff5316bb75b126d48e373ee1385ab49f66991a338fc6 SHA512 82d2178bff571909b5f3e711e2a27c602d5e0b87b4c657d719a33afe50c2fd448543caadd26eb6fb8172b3b5eac7af35519a29cf533b734e66c73e847205c175
+EBUILD recoll-1.31.5.ebuild 3521 BLAKE2B 9c7b418d56208a4d5787792e8a86e556308c7a3ea66296da23355c96f9d2b9eb4928d5521e6a38fe7b8c25f76209f29f454c968ca614355baa4e04110df12454 SHA512 7c3f136b3cbf2bda807a5dac5b5f95636dad6a5a598c793650d86c40e9b806aee55887434d8dc2b67ece4e52ac7155956347d1b0671b750c707f29d542484a85
 MISC metadata.xml 1413 BLAKE2B ffeeae4a0a0d5553e7ee8bffc85262eff920ca0d2ee2c8db767662f6f37c4b9702123fdf1cc1f804e9d646819d8523a360018813233ec6277d9d4d819397a67e SHA512 855cbf30c1d6216d52c1655ed20caf622ce835a6c9c0798b871206c29e946bdde2759e25f2d3003c0c8478d8cda78b28f1c3c0435db26001b0ea323858355a69
diff --git a/app-misc/recoll/recoll-1.31.5.ebuild b/app-misc/recoll/recoll-1.31.5.ebuild
new file mode 100644
index 000000000000..7d10884d0669
--- /dev/null
+++ b/app-misc/recoll/recoll-1.31.5.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info optfeature python-single-r1 qmake-utils systemd
+
+DESCRIPTION="Personal full text search package"
+HOMEPAGE="https://www.lesbonscomptes.com/recoll/"
+SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="camelcase chm +inotify qt5 session +spell systemd webengine"
+REQUIRED_USE="
+	session? ( inotify )
+	webengine? ( qt5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="
+	dev-libs/xapian:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	chm? (
+		dev-libs/chmlib
+		dev-python/pychm
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		webengine? ( dev-qt/qtwebengine:5[widgets] )
+	)
+	session? (
+		inotify? (
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libX11
+		)
+	)
+	spell? ( app-text/aspell )
+	systemd? ( sys-apps/systemd )
+	${PYTHON_DEPS}
+"
+
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+RDEPEND="
+	${DEPEND}
+	app-arch/unzip
+"
+
+pkg_pretend() {
+	if has_version "<app-misc/recoll-1.20"; then
+		elog "Installing ${PV} over an 1.19 index is possible,"
+		elog "but there have been small changes in the way"
+		elog "compound words are indexed. So it is best to reset"
+		elog "the index. The best method to reset the index is to"
+		elog "quit all recoll programs and delete the index directory"
+		elog "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
+	fi
+}
+
+pkg_setup() {
+	if use inotify; then
+		local CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang filters
+}
+
+src_configure() {
+	use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
+
+	local myeconfargs=(
+		$(use_enable camelcase)
+		$(use_enable chm python-chm)
+		$(use_enable session x11mon)
+		$(use_enable qt5 qtgui)
+		$(use_enable webengine)
+		$(use_with inotify)
+		$(use_with spell aspell)
+		$(use_with systemd)
+		--with-system-unit-dir="$(systemd_get_systemunitdir)"
+		--with-user-unit-dir="$(systemd_get_userunitdir)"
+		--disable-webkit
+		--without-fam
+		--enable-recollq
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake STRIP="$(type -P true || die)" DESTDIR="${D}" install
+	python_optimize
+
+	# html docs should be placed in /usr/share/doc/${PN}/html
+	dodoc -r "${ED}"/usr/share/recoll/doc/.
+	rm -r "${ED}/usr/share/recoll/doc" || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+	optfeature "PDF files support" app-text/poppler
+	optfeature "PDF files with OCR support" app-text/tesseract
+	optfeature "MS Word files support" app-text/antiword
+	optfeature "Wordperfect files support" "app-text/libwpd[tools]"
+	optfeature "Lyx files support" app-office/lyx
+	optfeature "GNU Info files support" sys-apps/texinfo
+	optfeature "RAR archives support" dev-python/rarfile
+	optfeature "7zip archives support" dev-python/pylzma
+	optfeature "iCalendar files support" dev-python/icalendar
+	optfeature "Postscript files support" app-text/pstotext
+	optfeature "RTF files support" app-text/unrtf
+	optfeature "TeX files support" dev-text/detex
+	optfeature "DVI files support" virtual/tex-base
+	optfeature "DJVU files support" app-text/djvu
+	optfeature "tags in audio files support" media-libs/mutagen
+	optfeature "tags in image files support" media-libs/exiftool
+	optfeature "Midi karaoke files support" dev-python/chardet
+}
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index c21192ff371c..8545d09e1771 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,6 +1,8 @@
 DIST solaar-1.0.5.tar.gz 920452 BLAKE2B 44aa0f9abd63629a5a4e737c14e468922c4aa501341717d595f045c5f40369ade6ff296120931557f1e8f04b99aa4f690454aa8f6bceaa526f370f93b312f6d6 SHA512 28603c30f0e9f2f0fe2549722062548031c69a0d9c98f732fdd8fbb51ed1d55ef033262113b2f88044a68f8b26c8c51fb0b45d4f4689fb3619e143d159618c47
 DIST solaar-1.0.7.tar.gz 1265664 BLAKE2B 6bb221d603dc74bf21ac44ca6611d817889285c8711c565b7393b875a934bf9125fc366569c1f677d657463484f2ec5fa077703f311ef2aec74e9f6813a5f1d7 SHA512 24b6b861f90d5747f150afb38b32041885b61cbf7df7794d780b311aef50d334347d5c5c722a0a7d5de3f91b96228e90e2a61dc108054452f46750a04340df83
+DIST solaar-1.1.1.tar.gz 1418025 BLAKE2B c6fd053002727a372bf9672fc22c0acc123f814003c14172f7d13e59b82ab42ecee9b71a09289b2d234874850e0921debaa069506a07d8957f52a2e9953a47f4 SHA512 c4da0c5521724c00afbc54ee9d10a4709246bb6f57635637b77e5944293b285a055b7df623e7e2a810a0764021813929e0f4fa7f21d4afc39abd516416a2bf25
 EBUILD solaar-1.0.5-r2.ebuild 1776 BLAKE2B 3413685b7eae0f5030f11f6944b36750f53eb2eaf4432c0e505390a3c695141006df4b4a8ddb66a8dae63940e42cf55f63cb0c5662ef4ea2dbdf9f556de2a5f9 SHA512 b153a3897b8e3bb0f442c7f08530c3e676631197c9367b0f6a8575287a83be285796e28854101ef9012910d8b27ab09809f3fae2d890a3f5302e9eaaf8ce4663
 EBUILD solaar-1.0.7.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
+EBUILD solaar-1.1.1.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 EBUILD solaar-9999.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 MISC metadata.xml 302 BLAKE2B 55938561021d105894875ec5158bd1a744c91039744ff789bffed4ab483eebe73450a9cd62cb4a97c984213fa2f1e8799f8b0d97bd6202e826e4609434086f5e SHA512 3bff70d27a9934d48f848cf0131e01415e13426ea705ef7721a9b59e29ff7bf32718d015de9e4a4f89f23405a8f372f038d2f0c3485cf9a7939a33ebda9d1681
diff --git a/app-misc/solaar/solaar-1.1.1.ebuild b/app-misc/solaar/solaar-1.1.1.ebuild
new file mode 100644
index 000000000000..cad0500253bc
--- /dev/null
+++ b/app-misc/solaar/solaar-1.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info udev xdg distutils-r1
+
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+if [[ ${PV} =~ 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
+else
+	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc appindicator libnotify"
+
+RDEPEND="
+	acct-group/plugdev
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+		>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+
+	')
+	x11-libs/gtk+:3[introspection]
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	libnotify? ( x11-libs/libnotify[introspection] )"
+# libappindicator & libnotify are entirely optional and detected at runtime
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+	# don't autostart (bug #494608)
+	sed -i \
+		-e '/yield autostart_path/d' \
+		setup.py || die
+
+	sed -i -r \
+		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
+		setup.py || die
+
+	# grant plugdev group rw access
+	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc docs/devices.md
+	if use doc; then
+		dodoc -r docs/*
+	else
+		newdoc docs/index.md README.md
+	fi
+	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
+}
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index ddabefcd5780..42d16d70923f 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -3,6 +3,6 @@ DIST task-2.6.1.tar.gz 836830 BLAKE2B 18531a462e9466d2bfc21af70c05ec75f504c82e67
 DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
 DIST tests-2.6.1.tar.gz 221364 BLAKE2B 6aac691ba1828abb3469dfa2a9c093b92431591ac21113f71550676f7f9c40394770ddd2c649bf6cda5655d5f1c25aa6c7ef174e9da7ea0c647109d25771dc2d SHA512 df252b252ac7e319d46ef7e72c587c52a97bf7b496ad401342611114db15b7fdab501b4fffc60ea6a8dca7820abc267120375a1aafd1da0a0c41b925e9fd62da
 EBUILD task-2.5.3.ebuild 1369 BLAKE2B 9a9697292649fccd81b763cb645879c7cd8a46ec8b7cf222ad3be528e2f9244e529fbf14a7a3151b535cfb2674daaae42a851821250f132216d305300b2a09b5 SHA512 6306303a1e824e13d14588d56f79559da8ae54dd237b64fc249dde94da842daf7ece3ea8ed7a5127261ac8e4f245adfd9de514a2d41e73c6248933c73c20a31c
-EBUILD task-2.6.1-r1.ebuild 1443 BLAKE2B f6228b9e9f3de0220452bc7e3abdd7b4a3b5983d82b2474c9c5451b8338059958f608fa3140204035e038c1e57e54bce0912e2a36e83e382e62535d1c454a10e SHA512 619f60a1cceee92bac7db6c5c60ed82268d82deb82195e5bd11a9322fe19e24ac50d587c5f4a9bcc4498b17d5c293319b34358b820b34f02ee9384382472c0c4
+EBUILD task-2.6.1-r2.ebuild 1452 BLAKE2B 10da76901d78dc09c9b0672413e51cb5c7c93b44be28a1d85302b5d3a26a4bbecb01a37f88e00e81fd59aa5374b7f6ddb9d633215127740be4d7bfe0c5f426f9 SHA512 e5052aeec3bac269c135822ca9bb5c079f4715547265937cfe7823fd9b84789a01cc53182e36f0c8c4e33df595a3af1e9d5c7efad39ea6aa24d640a0039c6ab6
 EBUILD task-2.6.1.ebuild 1363 BLAKE2B 194af9d8ec57b6ee79b11cbb1f9c8443a83b3fb27f777284515042bcdcec1a26ccbbaa258ae399dd12b53ed621ecde55e2ceb281b62519424092d323ae2f97b4 SHA512 db59c98871348a7d2baf95f36ec1cafd325287971a2bc677523c511433539e09a4d1d6a7778855e470067b252a6aed7939921219f04160e2c69d280830a87457
 MISC metadata.xml 466 BLAKE2B f2da2e60c939ef2864d1463434c7581457f8d05435cd428038f18fd00ce7cc24a92dc57430e35ff82927188f4a82f9e20f9f0da5272b7c63d0cf00901740747f SHA512 2211e19b9bec481fb3723596e8aba2c560071910c96f9225b4eb33da132a0563e36b2c6edb574c54061bcf480033cc5eecb3095b6ca1bd56fc7e8c3d38a08225
diff --git a/app-misc/task/task-2.6.1-r1.ebuild b/app-misc/task/task-2.6.1-r2.ebuild
index d4f6942da292..db350fe67469 100644
--- a/app-misc/task/task-2.6.1-r1.ebuild
+++ b/app-misc/task/task-2.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -62,7 +62,7 @@ src_install() {
 	doins scripts/zsh/*
 
 	# fish-completions
-	insinto /usr/share/fish/completions
+	insinto /usr/share/fish/vendor_completions.d
 	doins scripts/fish/*
 
 	exeinto "/usr/share/${PN}/scripts"
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index cc48bae818e9..76329b9bcb7f 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -3,6 +3,6 @@ DIST tmux-3.1c.tar.gz 561323 BLAKE2B c6f688a854e128acffa140321a5dd00e4ca090ff79c
 DIST tmux-3.2a.tar.gz 648394 BLAKE2B 94527d4d1016caddab170b5bbfd181514768474898314241fb65a53a1f5ae94863bacedf90a7543690c115d15295960dfab4d5ba2ce31cd105585a73fb9b82d1 SHA512 6e52c7f5d03b2c8b8c4c8caac092a166956ba97334b426f2823d74dc5849a1d31a80145924f641f69dd2c244809e9350d9bd7070897fa2e3e1f9f086f9b2f365
 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 1638 BLAKE2B d45c70e759fee7494d714c3a5ba1012db5a05d7617f91d49a11bb7e13c26391e7a3b5f8042f7d7921ca50db457e04c5d5732b23ac35630ccd5604bfdd1b00031 SHA512 f88694683ea9803b1786aa0f377acb450836fa47ae051e6f6f155596be7a26eedc3f9466a3dab7bb3b75a6df71992776762a32ac2a23a3df8446330c2e1bd5c6
+EBUILD tmux-3.2a.ebuild 1644 BLAKE2B b5789ed8489341373b950f0cbf118528625ee3af5a600d557ac91baf661097fbfde58a55d7485d9336c58e22cf1189bfdf9e2e6c120c4d583eba864f93f75455 SHA512 e4d1c77a83e177387ee023cda71647e5c2fad359f9f99e7b30e33e241499a680a18976cd5ebcf06852bc457b19abbe701b2b7ec5b79d924412a11993a8062b31
 EBUILD tmux-9999.ebuild 1647 BLAKE2B 1e438f3e076ecc281fa1fd71185dda46a094152191c45ce7343d1a888ac5d8fab3d3e7e84b4916ce3153ef57d431ab2065247bc57d57765aaed4641d8006733e SHA512 c1bb99f996aeb30f1faa040ab5b006aedbf7c2dfba381c62d9c95385770b5740b42681436e4c467bc58ddf6f63895f2805f3503fdff8ee571de8ad1f8403c8ca
 MISC metadata.xml 817 BLAKE2B 82a6ef0299449e66a441f24d6ababd640926b51a2196573d1d21076e83709db1c4e3ca9a466d8220ac4bc5fb4ae8aee02b49c8573011524e2d9509802553c092 SHA512 5cdbfe700d3c1f37fb1d958ada1078ab22d1236248872f1aad6e311ec0aad1fb32b8988acf2e1ade98ba1a6644ffc39b9a29d553271fa12d73afc27b78c8b141
diff --git a/app-misc/tmux/tmux-3.2a.ebuild b/app-misc/tmux/tmux-3.2a.ebuild
index e188c1d7429e..72cbaf9b1bc5 100644
--- a/app-misc/tmux/tmux-3.2a.ebuild
+++ b/app-misc/tmux/tmux-3.2a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tty-clock/Manifest b/app-misc/tty-clock/Manifest
index 8845adda61e1..17b5ab2dc10f 100644
--- a/app-misc/tty-clock/Manifest
+++ b/app-misc/tty-clock/Manifest
@@ -1,3 +1,3 @@
 DIST tty-clock-2.3.tar.gz 7764 BLAKE2B 16e764c6321407ba1a4545de6f7aeb5b1b1f3e0d94d2e05ef9a95a20bc178b11962518a946aa292f35be0a293d12e3739353d2da80358e86d4bf9c29983a81d6 SHA512 ff3cfd5c6312377128b33c7e8c2138627b996d1b17730d8a8fdf55e95f2020e591e69317459aab8383d178f3cb71af046b84eeb81cabfa9b09a27008c5f4b626
-EBUILD tty-clock-2.3.ebuild 815 BLAKE2B 50b570f75652e4155e2583d86c86cab25adee8c53f2fdf5fcc46c322f98eef508419913708d5b9c6671b80961a7655143cfeb51fb93e7537f1b1c638f8a2a0e6 SHA512 101a9f0e9a145eba6549643e01c0c4e9c42fba2ed9af8292ba8c9032d7fa819248c933333eef6bf2cc0bda507cdb9b918889aa5ea0c3faa0fe63f21c5f3dc30a
+EBUILD tty-clock-2.3.ebuild 822 BLAKE2B 9eed608a364f9a14af27b704c11b536073c92817f8ee9b8ea8dc77925cfdaa6c3b6a21c5bbf1f51c81a70eba63c684186c6df0b0ab07f1def252435a72f6cf27 SHA512 beae1c0082aa6ad8c4ab21e3283652d05d7662a3259ddcd396a01938036b75068e9fd984681a17e6593b0487d2cab7331c9460252f248d1a42cb5b3ed1671a09
 MISC metadata.xml 397 BLAKE2B dd4f4373146118d21274cc8e25e9e4ba51c4ea161635e4e73af2e80117022841439d2ade6d59f73e4abc34f6cbac27fcafe2f8067549f1b1bdd324fa12882881 SHA512 816707d2f7ae1ebf9315e84bb1271e1eeccdd8dc80f059993eefb37dd079106ea33b9ae00ba3fff48de5d9eac9b302dc39a88fa4102f8246a7e14fe2bf202fb3
diff --git a/app-misc/tty-clock/tty-clock-2.3.ebuild b/app-misc/tty-clock/tty-clock-2.3.ebuild
index 4118f7d9021e..15ecda1954e4 100644
--- a/app-misc/tty-clock/tty-clock-2.3.ebuild
+++ b/app-misc/tty-clock/tty-clock-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xorg62/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)]"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/wayland-utils/Manifest b/app-misc/wayland-utils/Manifest
new file mode 100644
index 000000000000..5f50edaf58b0
--- /dev/null
+++ b/app-misc/wayland-utils/Manifest
@@ -0,0 +1,3 @@
+DIST wayland-utils-wayland-utils-1.0.0.tar.gz 13188 BLAKE2B b05917c611a54e157e31c6e83b026c0960189c36d71361e12ec6dbc33872184fb2ea30cf04a0c57ba6a9b776e5aa51baf286f092eb8780fdd6f0462c8e36ae87 SHA512 0e5886fc74bf84396facb79bfc2fcc4fa7ababc39f861fc62d198656c65dec31150bc7fd27773dfa8add421f08ad0dd43a7d72c9e8f6f5733ac34fb8212658cc
+EBUILD wayland-utils-1.0.0.ebuild 586 BLAKE2B 9ce18f4f11779ebeafb1e8134d48031a9b9805e2e918e06b243291348e6728c9bd629dd4e2a6041b96f0813865fc3b3a62eb22bfb393724c50a106f0f7f6d6fc SHA512 f24e3cd4e376edcc180efcf100366ce6ea437f0866912fe33e5e8c833c0f2e44b521db9596941d9a10db35487107ef0f0b046aeab5b31f5af6ef5cd7309820ec
+MISC metadata.xml 254 BLAKE2B faabe41c3ba99e7d2cc606369149c06b9850314ab61f9e2a7823f06ae0db1c9fb4a7b4c006783d4c9c0a687af81b48778c6cc7a65ff72d2fbb81148fb9ddef5d SHA512 95c66b8c5eb101733216e757b9042d835962772e06ea8911afdf95e1d3b10618b5af3194f98772c5d2565a2ffa7c2f5de4d65d213a0771327e913b28c40f0caf
diff --git a/app-misc/wayland-utils/metadata.xml b/app-misc/wayland-utils/metadata.xml
new file mode 100644
index 000000000000..150b7fd3fae4
--- /dev/null
+++ b/app-misc/wayland-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>asturm@gentoo.org</email>
+		<name>Andreas Sturmlechner</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/wayland-utils/wayland-utils-1.0.0.ebuild b/app-misc/wayland-utils/wayland-utils-1.0.0.ebuild
new file mode 100644
index 000000000000..269dc0e4eaec
--- /dev/null
+++ b/app-misc/wayland-utils/wayland-utils-1.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Display information about supported Wayland protocols and current compositor"
+HOMEPAGE="https://gitlab.freedesktop.org/wayland/wayland-utils"
+SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/archive/${P}/${PN}-${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-libs/wayland-1.17.0"
+DEPEND="${RDEPEND}
+	dev-libs/wayland-protocols
+"
+BDEPEND="dev-util/wayland-scanner"
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index 443c18ac29a7..69811504700d 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,8 +1,6 @@
 AUX ytree-1.99-tinfo.patch 463 BLAKE2B 019338b07eca07f4e9e0ef1c8db2f2e44312a990028910e75cb97d1a40980584a0eb6049a0f9602f7217637f3c1a2286550f2cc7fe52afe5a22f2dcd82a9b8cb SHA512 66ae18b332134b48ec903bbce2ae4c1ca56c25f8d262e9fb23d95c14f62a266c10996ae355cab1e914a64e8f26124a7d105b34840b71da2cb2c032a2644e5141
 DIST ytree-2.02.tar.gz 124868 BLAKE2B e0b9b4251617df9d851752382e695657eb3bef5ce58deff00604ded14d6d29dad1c50b2d9f394defdabc3338bcdf491a9cec5821022e1171f2aa2b6887b274cb SHA512 31a425e9acd81921c111f1ef72f9e2d9342c04cdd9121d9cecd81893518b6f9579bfe22c3630d4d117783aed536cfafdf09866eb80bace3e5cbd59fd393e77a1
-DIST ytree-2.03.tar.gz 124768 BLAKE2B 51c0c00bd1223c8ca21289a00d1e06bd7934cf1b247baf8920d1de0c70778dfda9dddfea19dcb3e8fc601e6e50b0ac9c2aded385dd665bfa2aa9b36d30b53193 SHA512 39566827aac4c505b46deddce02fcc1fb4432442e327a40b1e3c18084db126264604adf0235970c3800a2b365a0a8b01d1f87ba6f045a2ab77f672026087a097
 DIST ytree-2.04.tar.gz 123324 BLAKE2B ec91bedb072c00000be590872c4af71c2f7b2d9b93c4fadc79f22f788975b864e99917a28c19fc7deff1f615e09f7b501c54e7942b0ccca4b38f4cffbecfd275 SHA512 9528f67cb4de6305b46e5ca4d79affab0433c357e58ed936fcf01ee16663924312e9ccb3d1bdd9009430a5a253e35ec04b7d52acaff74ff46c6a59904b90413b
 EBUILD ytree-2.02.ebuild 640 BLAKE2B e2820373acc5ac102d42ca42d43b8d781b4b7abfd0d3486776140b08ac32217875f1187e8690c55f36eee53ee243f8717c66ee5ab051728b0c8cc087b96d22af SHA512 0cb439cf671a123c3ae7dc7bf9dbfc646aa66d346ea1e4438ef25d1ebd881dab315882a8c6707d8b5111546d15b7a17a73a45ebbdf01a6502f9184dc10f715ca
-EBUILD ytree-2.03.ebuild 591 BLAKE2B b2bedeeb7551480734547adbd8be55ef7274e62c125b9917234ecefd03f0ca4ea7f2c7c0cf37c8d2ad2ff76d5988a8c5656c37323c85ab2bd58bd9b7990588ce SHA512 701d747b39162bcf6844edffb9026329c74092b741c85e6ccb466a50277434648efdfdeca67b39603506cf89a8571d0e872d4c9bd9753b78e845189c3f1bdba8
 EBUILD ytree-2.04.ebuild 598 BLAKE2B fd5d6554dc475ba3123164a289498f176d2b609df8b1783fa77e873555ee9abd0f8a0722947b148b8959f1acaaa7473773db7064874b4a083c3fad3ca6f5c1b5 SHA512 5e591e39bea7871197fcdbc40abc41bd283314b4d34fd6e5143d48452dec014438f874786b4ee89764002febb336cfcebd9200a7998e9ad335f470874ccc32c5
 MISC metadata.xml 222 BLAKE2B b5daf033ea46a708411a54d1b465effb557d4f48cef8f0f4b6872917da7e8efbc9b69db6e04f6331c7a27b473d1ea83e2bdf54247e7c6b427c94c492e62ef21d SHA512 52f592a4e8342cae9f7a982302b75c68af50523b23b4d8a13b5434b150d3c0e812ba66a13b8d5d093e59b64ccbb550640064aabd9748a200e63d170d0b6f327d
diff --git a/app-misc/ytree/ytree-2.03.ebuild b/app-misc/ytree/ytree-2.03.ebuild
deleted file mode 100644
index e0c2c496a3a4..000000000000
--- a/app-misc/ytree/ytree-2.03.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="https://www.han.de/~werner/ytree.html"
-SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-
-	default
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-	doman ${PN}.1
-}