gentoo resync : 20.03.2022

27 files changed, 199 insertions, 278 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 418086bb6996..418348e63549 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index c8bb851d0c55..4c58e44b651b 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,7 +1,5 @@
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
 AUX at-spi2-core-2.42.0-fix-disabling-x11.patch 1017 BLAKE2B 7db683a92ff8587444a34a6c4ad12be8e8a31b26128c843f6c89fa42b1604d55e25a72855272930082c3a1ca2b73f2d3a51ae5274770aa0cc0c530f691e062be SHA512 22ff6474e7fdcee3e00c979e56d23b40f8625236f0cc885171ded9434af6ea12900d29577fbdf08cd655919b9b623c172bca4dada7f2b9d15a57c900b326c333
-DIST at-spi2-core-2.40.3.tar.xz 197528 BLAKE2B bc248d57d51cea6ae6dd6c737d85f10599a9c177a3a59f95ffc8f96f74b7da057f75e2b961c281650795ba8d5387a9439b00a0f277731af3d490cc8f34c3ab1a SHA512 85adf3da0a369d7f3481646a495a9c4c3337da3ae6a20ce8c924f8621d3d6ed1d9461bfac0e821dfe86e4ad6b930e4fd65d24c26401cbea644ef4951e5dda5ce
 DIST at-spi2-core-2.42.0.tar.xz 198016 BLAKE2B 9b14d7d0f5845c7510f7b256a05f5e30c3d3d893a9ae63eee81b3d378dfa9f6ebaa9853f60b23734929692efc4b8c652d4bd7bd035bd989fe0006975bdbea427 SHA512 befcab94b3aa99471723238d9666fc6667041b058a2bac3b012cfa15a91950996431296f33c921764e0ec4ffd0cc41ebe00be461a8460d6f4d2bafff19a38e10
-EBUILD at-spi2-core-2.40.3.ebuild 1457 BLAKE2B 40ec75db6ff2913254e9a0554a8b8d3903f06d3b5ce8064705ef60dd081146ab0a6a5c81821b4b10f23566b250c01d63f0ce64da58818f62a51648df690d5097 SHA512 b304db6a07e8add0cc3da2d898bf2a12d3714617d57aed783e97637e1ff63b813943a18a69a8c3c2b46d865a9a89b7eed0b7fdd4fc7d29e19c10bfd1f82d658b
-EBUILD at-spi2-core-2.42.0.ebuild 1518 BLAKE2B ebab3d2dbb43ff0126001b32bc577869b37b8d2245650a2d86e0c890a240ef46b5f532cbfa2773d5d4566eec715e19d172e505dbcf35063f5b5494e26e362b7f SHA512 40e67cacf459990898e3bbceb43e9d7e050890e6031845da3d0a696a915ae7f5a8f1ea6678d35d155655adcd77cafaa08e802ff1c43fde770b4a05e7d7c90d69
+EBUILD at-spi2-core-2.42.0.ebuild 1510 BLAKE2B f9ccee7e9bf28fc0c9865284cdf2fd76215d6cc90a7130c17ee21eb67d56998594a130530a467758ccf095c2de5ed560e1686ea1751b8b22f73040fc173c6ea8 SHA512 d4da094c2b88c0eb26a41c89bde4be1793888a50cb43c88dd4801bca5c02d24e744d19ce73f5c3dab5f07b15d6426a85c2f8530068f05acc46899dfb39d776fe
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.40.3.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.40.3.ebuild
deleted file mode 100644
index 1300b42379cd..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.40.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson-multilib systemd virtualx xdg
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="X gtk-doc +introspection"
-REQUIRED_USE="gtk-doc? ( X )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
-		$(meson_native_use_bool gtk-doc docs)
-		-Dintrospection=$(multilib_native_usex introspection)
-		-Dx11=$(usex X)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild
index bc190c2de667..50059a5040db 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.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 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
 REQUIRED_USE="gtk-doc? ( X )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 9273d2605e58..0a5d302e6ea4 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -8,6 +8,6 @@ DIST brltty-6.1.tar.xz 3394852 BLAKE2B 03e6358721dcd5c3bdee3301a1ed827a690128ec3
 DIST brltty-6.4.tar.xz 3669296 BLAKE2B 2824b212c7e4fea0f65c7ae111432071805aa63117a7e9a9932d7720ef2157f1e6fd33e3e91e4515c7131bd066db8f910969fb186d2007b63bc83efcbe2332b1 SHA512 384848d05f78732952079d6f5170046927fcb35f400ece71ca897415a793c0aa1047934f8cd5e9e781536fb0b7cb71273283f3bba21e59f082ba8f6f2416352e
 EBUILD brltty-6.1-r1.ebuild 5612 BLAKE2B 5622e19bd95f3d30a0797aac52e3e28efabaa4e20c6f274dbb437ab600d270a1004b1ffc5df3bb91e5b1a0441245dd77aedcad06c539c717d51fb656f7aa5e56 SHA512 dd317fc0e49568a6119c1715c21baa531cf88ba68055f9b35e28ac1b5e1baba64e73bba5ea0c26243903ea7b373a7076a0150ba42783328816ef1c268bf3e682
 EBUILD brltty-6.1.ebuild 5601 BLAKE2B e26efd68d25484109eac679fe9ee28a86da220089f5a642ac412096476727d967f594465c31e2001e5119b5b35e0ac2a092c428844c4e79bec3a923a385a5019 SHA512 a1e938b5e8648286c03ad10164cbae3b3f07ff9faebc6c09f38f4ebc0c4ce6ac8890d6e9ee222af854a603003773de73583b1fdde96b1d54256ced864cdb71b2
-EBUILD brltty-6.4-r1.ebuild 5613 BLAKE2B 13d9d17d742f6c67a69851b135537cc87161103f14008cb9913e1a8ccd71f57f9fb35d48c53b8604a1ed1a8fff08b9c8bf8295cab3e6c72822a42d4b6a8679aa SHA512 3afddcbb03ee8bedcb2ec5c86d110d3d6323904b43629cd5874d111dbc6b2f493f69e77b1a3d7a7fc358364516b1c54288d2d88f43b8b6628e802e07ca7de966
+EBUILD brltty-6.4-r1.ebuild 5622 BLAKE2B 580cac180bd882f2c700f2de2b0f8b8377bdd49394821d2d27a140388dda0d9f6c7d8856d9009be81e8c12704ff8cc7fb240cfd61ab02c95d6e663fbcb6108d2 SHA512 a6207bc6bd484c25e450636e3f661e699143ec0d0e6ea3180522c901dcec23af5386dd1255a5cc9ce213833bfdecae2d7930821fd403bdb66de2e0ad8d3d9f86
 EBUILD brltty-6.4.ebuild 5372 BLAKE2B 892ce75770f4795a469fc939bbd102643cb00edbd4fd8e1179d969c4a81d0ba15f88dfe75624fca08bebb5603b6d30f05f6b3a2f14ad8c8caa0325e53b939237 SHA512 60d4da4739317681fb772ce6fe04c9614c409da7c8552ce9de87dc41046d1bee93f981328d6793599ebbaa55392fa2226005aa5c793b305856378163cafab435
 MISC metadata.xml 1663 BLAKE2B 8e06dbd802713f8ec58dc4fed6aee6ffed135df23776e0c3d6ef7885ee4f8a221d1b0a8c605150d59511dcf11f673ed2f388d5c11ac35c9c54d51392d57c3e7d SHA512 b0dc1e72a17fc4ebf7c9abb4cd545f6e65d963e775d8f8c7c140d6c2ca325f20ab3ba4ef70404978f37bf6ff8c6da6f34f0d2afa95e44a5c7fd34e835c07253c
diff --git a/app-accessibility/brltty/brltty-6.4-r1.ebuild b/app-accessibility/brltty/brltty-6.4-r1.ebuild
index 2805474e8b9a..db4783baac44 100644
--- a/app-accessibility/brltty/brltty-6.4-r1.ebuild
+++ b/app-accessibility/brltty/brltty-6.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://brltty.app/archive/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86"
 IUSE="+api +beeper bluetooth doc +fm gpm iconv icu
 		java louis +midi ncurses nls ocaml +pcm policykit python
 		usb systemd +speech tcl xml X"
diff --git a/app-accessibility/espeak-ng/Manifest b/app-accessibility/espeak-ng/Manifest
index 609b35403f3e..f2daba358c9e 100644
--- a/app-accessibility/espeak-ng/Manifest
+++ b/app-accessibility/espeak-ng/Manifest
@@ -1,5 +1,8 @@
+DIST espeak-ng-1.50-ieee80.patch.xz 8128 BLAKE2B f9ae3b64d52f18b0dd4bb1ff1832d89fc22c319bccf3f7ada61628569857fded15a426703d035737b829fc8580707876ad09527380890f73df919740b40aa046 SHA512 4183fd13c902bdda27ac7e86fb4e4573ce85ca015aaea757aed27a869e4067a58c99b8f4d3e289710d1359d4fa289c2a4e6d5803845cd454c3dc59f79f4e2e80
 DIST espeak-ng-1.50.tar.gz 13665536 BLAKE2B c64c2a474374d4b6fe13bf3a99f5dfb661923c13ebd6c0bc323e7f26d9d90945c7075cc5c8f4b51e5db3303632c8c9daca7a65a1883e09d7c3faf63dd725ea3f SHA512 297dd80a6cdae3e2b8acf6823475220ce89d6a5fb68ea303156ad52cb3e7388049b6921759d4ed4e3d2e2ebd19bf931259e454f74a2ac0b7ecf4ce56c1d60c0c
 EBUILD espeak-ng-1.50-r1.ebuild 1898 BLAKE2B a384af7522e1d9d48d91544986bb93f90bdafb63982ae6d10de94aa45891e921ad61d51f75397d9b31e475b180d1cc4353cd312e5495f95a3aedb9a7031ab20d SHA512 bec76f91cb05ac7395b8af13c26dbc3eae16146488e74c0191bc0b664666a67f25a89cf467f5f188d4718e057e53f10ec791be97e7628530db9d62cfde097327
+EBUILD espeak-ng-1.50-r2.ebuild 1992 BLAKE2B d72d4eedf8462cabdc1d8fb457ac63531c30e4351a73e314bce6ce423806b0d0a81b553cee06e1166cf7e61ecde4d8936be9532ea357e3e0496fe2000c31f347 SHA512 17d2b986304f39ed6463df5c30e404ee5640c2db3c561f32808f739f2c0b45ac934eca30d3089c6c426bf9c7fd65be1912e4343cb1718bc37ad1d62ef88ff5cb
+EBUILD espeak-ng-1.50-r3.ebuild 2006 BLAKE2B c203ea4c7198fc339d237ff67c0268d33e214ad535027e17336c5ce83e415e2f641a6700a3a92342405802e1d8e05a1a289e4cff89c6445f034686cb7c1ed179 SHA512 f275d8ab856f05c6552ad25d1697bdeee3a8cc6e742c55cd43d1f11c1d6a2336b9badc35bcb0abe9d7a54a72762e5a032452791de0584eb64361f43957d49865
 EBUILD espeak-ng-1.50.ebuild 1848 BLAKE2B c853ba207b5e6e119dd070486482eb136989866eae777ffe404f3780ea6c5484bdf6b16e763fba52602389f61620010d55b93be3ef4d2aad47071aa449268feb SHA512 3c4dbf0255ad975c69e373e20497b3eeaa9946931ab92f97b0b455a76a0d9a57c75717b109902b07471ee9cf342758a30d4556c5ea4087196831a991d1dfd3b8
-EBUILD espeak-ng-9999.ebuild 1620 BLAKE2B 5b102df468174042f218e2c5ea93bf4997f67ba5c8a0a20b70836aa5ad3b3896a21d73a11795eec07c367c76207a837308388895486f8a3faa836b4d857aec7a SHA512 f62c64049b7908c8f2282f029f89aa5762b8f03ca6b76de84e01da8d125a9388c6b35ed25f2ab3a9b2691f2de376a54f61cc1c0e57043424df52ed9999dcdefb
+EBUILD espeak-ng-9999.ebuild 1671 BLAKE2B 78b9b4df33c646806087bf397236adfebe88ab586fff70fbff275b47f92ad7299d9cd23331deb776073eab23b0e41fc4a80bf9bffe2dc3debc2300bc081a76bc SHA512 69dbb52ceeac40e0a55696a3680b46c69e760c24f629cd00453ed7d342bba63bc9ddfad3e57a73473e7824c48e6236022adb32a05a195f484370fd8800c9c50d
 MISC metadata.xml 959 BLAKE2B cf593df0a2ac774e7ba15f77fc8b9cda2907d9d721c61fa602df8653f4019ed46fdadc39353c7ca4f1dbc46245ff28c922fe2844d49c5346a1b7fa7f02005c3b SHA512 4dce4bcbaf2dbd3bbfd0f6503884dc47690d648ce04c489688818aaef15e555fb76e33a49a484e8197631b2885297541f4ef80d0074d44d3f44aeb923a3ea698
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.50-r2.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50-r2.ebuild
new file mode 100644
index 000000000000..5e780ba05fea
--- /dev/null
+++ b/app-accessibility/espeak-ng/espeak-ng-1.50-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Software speech synthesizer for English, and some other languages"
+HOMEPAGE="https://github.com/espeak-ng/espeak-ng"
+SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${P}-ieee80.patch.xz"
+
+LICENSE="GPL-3+ unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
+
+COMMON_DEPEND="
+	!app-accessibility/espeak
+	mbrola? ( app-accessibility/mbrola )
+	sound? ( media-libs/pcaudiolib )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sound? ( media-sound/sox )
+"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( || ( app-text/ronn-ng app-text/ronn ) )
+"
+
+PATCHES=( "${WORKDIR}"/${P}-ieee80.patch )
+
+DOCS=( CHANGELOG.md README.md docs )
+
+src_prepare() {
+	default
+
+	# disable failing tests
+	rm tests/{language-pronunciation,translate}.test || die
+	sed -i \
+		-e "/language-pronunciation.check/d" \
+		-e "/translate.check/d" \
+		Makefile.am || die
+
+	# https://github.com/espeak-ng/espeak-ng/issues/699
+	# fixed in master
+	sed -i -e "s/int samplerate;/static int samplerate;/" src/espeak-ng.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args
+	econf_args=(
+		$(use_with async)
+		$(use_with klatt)
+		$(use_with l10n_ru extdict-ru)
+		$(use_with l10n_zh extdict-zh)
+		$(use_with l10n_zh extdict-zhy)
+		$(use_with mbrola)
+		$(use_with sound pcaudiolib)
+		--without-libfuzzer
+		--without-sonic
+		--disable-rpath
+		--disable-static
+	)
+	econf "${econf_args[@]}"
+}
+
+src_compile() {
+	# see docs/building.md
+	# The -j1s from compile/test/install may be droppable in next release
+	# (after 1.50). Several bugs have been fixed upstream in git.
+	emake -j1
+}
+
+src_test() {
+	emake check -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" VIMDIR=/usr/share/vimfiles install -j1
+	rm "${ED}"/usr/lib*/*.la || die
+}
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.50-r3.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50-r3.ebuild
new file mode 100644
index 000000000000..016fdf386418
--- /dev/null
+++ b/app-accessibility/espeak-ng/espeak-ng-1.50-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Software speech synthesizer for English, and some other languages"
+HOMEPAGE="https://github.com/espeak-ng/espeak-ng"
+SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${P}-ieee80.patch.xz"
+
+LICENSE="GPL-3+ unicode"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
+
+COMMON_DEPEND="
+	!app-accessibility/espeak
+	mbrola? ( app-accessibility/mbrola )
+	sound? ( media-libs/pcaudiolib )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sound? ( media-sound/sox )
+"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( || ( app-text/ronn-ng app-text/ronn ) )
+"
+
+PATCHES=( "${WORKDIR}"/${P}-ieee80.patch )
+
+DOCS=( CHANGELOG.md README.md docs )
+
+src_prepare() {
+	default
+
+	# disable failing tests
+	rm tests/{language-pronunciation,translate}.test || die
+	sed -i \
+		-e "/language-pronunciation.check/d" \
+		-e "/translate.check/d" \
+		Makefile.am || die
+
+	# https://github.com/espeak-ng/espeak-ng/issues/699
+	# fixed in master
+	sed -i -e "s/int samplerate;/static int samplerate;/" src/espeak-ng.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args
+	econf_args=(
+		$(use_with async)
+		$(use_with klatt)
+		$(use_with l10n_ru extdict-ru)
+		$(use_with l10n_zh extdict-zh)
+		$(use_with l10n_zh extdict-zhy)
+		$(use_with mbrola)
+		$(use_with sound pcaudiolib)
+		--without-libfuzzer
+		--without-sonic
+		--disable-rpath
+		--disable-static
+	)
+	econf "${econf_args[@]}"
+}
+
+src_compile() {
+	# see docs/building.md
+	# The -j1s from compile/test/install may be droppable in next release
+	# (after 1.50). Several bugs have been fixed upstream in git.
+	emake -j1
+}
+
+src_test() {
+	emake check -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" VIMDIR=/usr/share/vim/vimfiles install -j1
+	find "${ED}" -name '*.la' -delete  || die
+}
diff --git a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
index 9012010b2cae..d55d1a306616 100644
--- a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
@@ -13,10 +13,10 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-LICENSE="GPL-3+ Turkowski unicode"
+LICENSE="GPL-3+ unicode"
 SLOT="0"
 IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
 
@@ -72,6 +72,6 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" VIMDIR=/usr/share/vimfiles install
-	rm "${ED}"/usr/lib*/*.la || die
+	emake DESTDIR="${D}" VIMDIR=/usr/share/vim/vimfiles install
+	find "${ED}" -name '*.la' -delete  || die
 }
diff --git a/app-accessibility/espeakup/Manifest b/app-accessibility/espeakup/Manifest
index 36818f413490..e5ed0bdc8ffd 100644
--- a/app-accessibility/espeakup/Manifest
+++ b/app-accessibility/espeakup/Manifest
@@ -4,6 +4,6 @@ AUX espeakup.rc 284 BLAKE2B 9cbc247d542afa3ed7cc8be816a96cca7673b5af0f30f91c91ec
 DIST espeakup-0.80.tar.gz 39626 BLAKE2B f36d9776b954e73fd2bc33c7ba97dd323184480549b667ac2afc4dc40a8b98089b8ced16e8b1cb33e6b4c586df27a8d6f782236ef8770bc98a530665e257edcf SHA512 1b7e2bd46c3c13a5305746d2d2810ec94a8660f561e4f679ee4779be1b22178f8ac7de42d626d649710509f7b087b9a2f94608bde203d1bcd6d353229ed9ff83
 DIST espeakup-0.90.tar.gz 25170 BLAKE2B f91a70bad0d985d313852b9e5f72dea4330ab23050ca6904ae5895d513088031f34d878cd64d97dcf2cf02dddc3e9fdabd0826cac98634829019ed3267e27bd8 SHA512 0731835a04063c5eac8ed0ed37cd92cc5d2dd1c58cbd94e158b7dfbb7bc0e2f84a6484fffd9009bf2920652a36fb737044b2e1fb67fb1679ee7150855bc9a15e
 EBUILD espeakup-0.80.ebuild 1788 BLAKE2B 104c80fd5c5ce820a4d4a467ef86c05f4e38d21753837d29812e8c2c7b1d1ab4d1787eca01cf79eb490b8eff918c401e9c835b6fba69ee1b45e328e1167c5e5c SHA512 4d5bbcc7df2febd0fb4bc90f07e678518b30a8212a9483d6161713e32491d849921dcaee1dd959c6925d82595e993ed6a07539de9ffc9b85d0d977d250941787
-EBUILD espeakup-0.90.ebuild 1541 BLAKE2B 893e1735def696fb426ddec066d77d637d32287fc2c13b850f3b33b8ef6d98c78ef22a85d9328b29ea96d8ceb091f80ae182984e29e16aae1454457f0843de6c SHA512 47e45ee933131e503a49753295968aac1a804668fe0243b07dc1de1d197da5d877c58f223f5270adc8dac4c70adef46409d84494e34e70732bd4f3bfa205d435
+EBUILD espeakup-0.90.ebuild 1539 BLAKE2B 9df3713c274de33314d133052eff999edaadd21c82b0e2898514d2923c86acf768e536917322f8b0fff68b3f020f44c83e756be47d132588e3906929a63ea551 SHA512 353c3670e762c4f4e1955816f4c537258696a9b9aca4412b5973ed3d95872272d478ef9c62c68b9017319a3dea8cd980ba3e19412c5474c513b7e253d0ca3fc8
 EBUILD espeakup-9999.ebuild 1378 BLAKE2B e034765de92d5c9c7807bc8cecf182de60c325a6b2335c52591ff7c8ada34d4cf435391a845fbca647db9e37a83111f242d8460d5590dbcf7ff3c8542c31dd03 SHA512 dbc866791605e127856f87dec7db5f18b1266fe31b9dd486c0d3bc97c8a55f4357d6827c3d8da13829ad1d355d22e2964cdec89d72b32485debc149291b1f60a
 MISC metadata.xml 604 BLAKE2B bd610ade0064025744641858af26947682b042d4872847d6150a2112b4dec2cc5dff3468d5442b9ce7bfd2981351ed5b86c083a67990981ebbdd7707f76b380b SHA512 d15cce58fdaf12d6cf33100c91d0f4d95b9df08ff4433f559e425a5b59fa9ccdcab06a3af870b1d805c32fdcef7ef065d11a63b15999798bb4250b09618d9a21
diff --git a/app-accessibility/espeakup/espeakup-0.90.ebuild b/app-accessibility/espeakup/espeakup-0.90.ebuild
index 91bb36b6e689..35a599a7a198 100644
--- a/app-accessibility/espeakup/espeakup-0.90.ebuild
+++ b/app-accessibility/espeakup/espeakup-0.90.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
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/linux-speakup/espeakup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 inherit linux-info meson
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index 54995eefec99..2469a6046b69 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,5 +1,5 @@
 DIST kontrast-21.08.3.tar.xz 125632 BLAKE2B 8734de15fcfd542d037cde92e6a80060e9c6628cd69d3cfee1f1f4c9b8938647d83924381966600ac9978acfa14723e0920c98f3ce2e666ddfdb624b8cc5f010 SHA512 193d372cdcecb3b90a352fb2deb24528d004c44e50c834e02a63c562eb97bd1f528fd81254bfc3ab7152edcc9894129eae7c6e1826a9ae42bc5ab22bf9a660c9
-DIST kontrast-21.12.1.tar.xz 124940 BLAKE2B 5b69216e1e8e040a4ce317d107a2138175da83ffba21ad2f5bf6a749516de453ff5bdaa96ee2f13f62b141faab1f433956954e12360364d60d114c3a271a0143 SHA512 2100145a49828d8dc4baddfbb4a2b073187e67a99b7211621744363fd837819cc02ca687f469d03152fd25ced0f772c1f92449f4f35df51994c85ef7359da923
+DIST kontrast-21.12.3.tar.xz 125760 BLAKE2B b72d78961d22fc0eb51c0a64f9a7381ef9e87709d9fc24a08c3b08c60ad8102eadbc97943e72b1153f950654f442f97190d1e34c3beb24f4f8ea070f923dba55 SHA512 36d084f0801d393a0d7bdd771d23163a192e6d0e50f6499b9080e3928f5f3982dcee81c3e3453f8de2ece721c508479928fdff4a971cfef945acadd917e19581
 EBUILD kontrast-21.08.3-r1.ebuild 842 BLAKE2B 0f58b885b95066a8095e5379734fa81108bb21d7c16674c7b27797b10f2a6ff8cb03b1eef3350215a502701402c0fb2672eb72f9195672416a2f8eab53abab05 SHA512 4b05775123f53b74caf013947d3f6fa6743aadfb0eead7f1f2351d3bd95b7cc7f3ab2bceb4adb1d668b8084c6e43d197ef4bad1c4f38787ec6ae49866266d8d5
-EBUILD kontrast-21.12.1.ebuild 773 BLAKE2B 91fd63764685849c5dc563a25731fe8e0ad2fa614b306dfb2b9bf62f1bfe24b841383f0d00e567aea96785de5d35f893119422b7f728cca4153974ac3a18aa5c SHA512 d852a0a5f721cc73c2c7ee80335a567f44b04be4c9e0a794a3513d16e0c5df94255f9cf01753f81904c2749f09bd54fa354bf7ee01586210ba3867f714c5bd47
+EBUILD kontrast-21.12.3.ebuild 773 BLAKE2B 91fd63764685849c5dc563a25731fe8e0ad2fa614b306dfb2b9bf62f1bfe24b841383f0d00e567aea96785de5d35f893119422b7f728cca4153974ac3a18aa5c SHA512 d852a0a5f721cc73c2c7ee80335a567f44b04be4c9e0a794a3513d16e0c5df94255f9cf01753f81904c2749f09bd54fa354bf7ee01586210ba3867f714c5bd47
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-accessibility/kontrast/kontrast-21.12.1.ebuild b/app-accessibility/kontrast/kontrast-21.12.3.ebuild
index 6f3a3c8cca37..6f3a3c8cca37 100644
--- a/app-accessibility/kontrast/kontrast-21.12.1.ebuild
+++ b/app-accessibility/kontrast/kontrast-21.12.3.ebuild
diff --git a/app-accessibility/mbrola-voices/Manifest b/app-accessibility/mbrola-voices/Manifest
index 99c9aaba12d2..3061c55229c9 100644
--- a/app-accessibility/mbrola-voices/Manifest
+++ b/app-accessibility/mbrola-voices/Manifest
@@ -1,3 +1,3 @@
 DIST mbrola-voices-0_pre20200331.tar.gz 583211254 BLAKE2B c8cb55597759a65f0e5f1be6197575b424ec4831444acfcb42fa17b8eb98672990195dd9305e93c66d488fb2b6c492286970e953c198c2038ea23c5b71d75ba2 SHA512 8476e80984279fddab1bda07e9352bee9f11499dc5b59652cd4bc0385b08a83259c080748e7040fa10cc03c9b0f1e1d1a39f80ddd782073c92f49fadc9af9585
-EBUILD mbrola-voices-0_pre20200331.ebuild 1515 BLAKE2B d7f25cea3e0be048de8759a37af02154ff060f264d2d1b796e25e3f40f2afcafbd7bf5f96f9eb79692516eadc8e4e200e4522acf2bc8997ebfbb86d8aa46c9b0 SHA512 f986550e6dd5224ee2cc55cfe781ae75dc67077147195cd024ce3ca0f949bd4d4af7bb69082f4f41f461a225ad8e7a35f4d8b15dbaf76ac20e4712d7ae4a5999
+EBUILD mbrola-voices-0_pre20200331.ebuild 1520 BLAKE2B 28e8e9363a07d7e30ec4d6219075d2876b09a733181a4fb44c92cb49a3821e3b8996a241f841b094cab89e262b16e1bb406f40dac3fe1da743c3b72d8fef52f6 SHA512 da799b78ec7e2b15120205c538da3550fd243f5beb9ee756aa9f39d139706b9f5cd6ea2c28bf7ba4e984e0853b715c3ab7c5822a1c21e2439605c33c783127cd
 MISC metadata.xml 294 BLAKE2B a2178f1afcd52307613168ffb05f2bd0c38e2a6cc0086be43bd53d5390c9912660758bfde1454be47691887eaca3dfd055352c3a2fd6de51491811ce4db97af5 SHA512 3765effd60e0e9aaa77d9449e4d8e26733e43c6ae6921dd9e0a6ab130a82271761a7cd2508d44fb31f8b3623d3805f4810cb3028dd5f1fe1379b41df45c33a5f
diff --git a/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild b/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild
index 506eb3a91990..c4eac836e63d 100644
--- a/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild
+++ b/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/numediart/mbrola-voices/archive/${GIT_COMMIT}.tar.gz
 
 LICENSE="MBROLA-VOICES"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 # This maps the l10n values to the appropriate voices
 declare -A voicemap
diff --git a/app-accessibility/mbrola/Manifest b/app-accessibility/mbrola/Manifest
index 0f905ae1fab4..cb720d272274 100644
--- a/app-accessibility/mbrola/Manifest
+++ b/app-accessibility/mbrola/Manifest
@@ -25,5 +25,5 @@ DIST us1-980512.zip 6562915 BLAKE2B 72d884f6f8a83a07786363be8cd919748334bae52637
 DIST us2-980812.zip 6387442 BLAKE2B 73502264a3900255f91edf5e3b92baff706205a72002faaed6b3a8eb0a7e0e32c21e14870cfa07a546c8bea6112b5433ca64b09b455070c49aaf2f059591025f SHA512 a8aea10bc08f6c66e863994a5238fc2caba1d308f5c9ef35ccd18d01eb92a38fcbc0b96593a56bd7abd2f714fe722aa6b3e2c3141da92a4c8c06e81efb843ac6
 DIST us3-990208.zip 6195800 BLAKE2B cf58531738ed412f75ff3c6d9788db8afd3468c10e5c07775b893516f399e3d14ef2bd5ebc5bb57ebb363d3c077924a496984f680e2ab9c45d05efc70642df19 SHA512 dbc6b0cdc3040ec3747f25a15dd17f35f0e97c40a153ae44e43a7e8030302e7e7c8710b10fe8184cc38f907de07a187ac0a7e3816be2230ce969aa014641d0ae
 EBUILD mbrola-3.0.1h-r6.ebuild 2652 BLAKE2B 7012ae6d8eee190816a5d59387fc177c5895b472a6d1dbaad9d5a2b270dd2bdffa69f28ebac3ac77323ce23653d58a0f3cf9d7ef59a689cdcdccb63c911663ea SHA512 90faedb6610c6a9b955f91f463297f7116a3696ee50bdf12728c9492c369eb42b5cc7b4a8b78fcb64c31b6449f03276069bb5fc9acdcb4fb6e57d3be2d9c0aa2
-EBUILD mbrola-3.3-r1.ebuild 692 BLAKE2B fb24d5cb1aaa024b28c43680652964ec87a844e0ed8773704f315b114c950aaf4dfe1efcc682dc54347a99d88163ebffa03aa211aa8e113a9cc1f64361c16585 SHA512 799d3ea61b0cd828b3e58aaa85039676eabcee2831d27909ab4f560349d909290a3ef93513965224eef7bb8532017a5078f6365f49bcbc509321b78e03dbfde5
+EBUILD mbrola-3.3-r1.ebuild 697 BLAKE2B 29cfba0bbbbcb460c83b18ac7a1fd35750b859df6bfdeec522b260d9d819b595bafa42b49088427f65a73abc6b6e64c24a22792300d606f2e5e043cf6a3afbad SHA512 57aa235459af2ec5fbfb7d89658094461e772127e7d9f4d419d246f3b5b8847ffdacb04409572da7b80ce5b35dac8b186b32f61cb9cc8677ca9ba6114c18d93c
 MISC metadata.xml 376 BLAKE2B 8b18614ef8276c8e76fcc9b4796957e8f327d558ff889f5f267097ec1ec66b223917c875a160d9471ac7d732eeb0a517ac9404369e778a9de4be016227a9ab8d SHA512 b50ee97dc26e7856b3d7daec1d93406b72dc366e400a25ee5ee709af9deeda724348af617e3ec5e518fe3ab0f95300a79e7cf68f53f2433eaa72f8aa7d871b14
diff --git a/app-accessibility/mbrola/mbrola-3.3-r1.ebuild b/app-accessibility/mbrola/mbrola-3.3-r1.ebuild
index 119872fbb4a1..2c07d5549f66 100644
--- a/app-accessibility/mbrola/mbrola-3.3-r1.ebuild
+++ b/app-accessibility/mbrola/mbrola-3.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/numediart/MBROLA/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="app-accessibility/mbrola-voices"
 
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index b34c6286a27f..e8764673fc71 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,9 +1,3 @@
-DIST orca-40.0.tar.xz 3603368 BLAKE2B 3ac99f32ee496004e568ce61d5862591556bedfd8dc7ef1b707b62b120f1349ae38bbd427b0d3cc67c7be7334bcc46b067ee44a45c51bcdbdf15ee78c0243f64 SHA512 16e15b1cb4b5a2a3d14ddf9e9277e6b0c65e2ab0a7370fd8bfb830bee9d208ef6b5b3d0c19cc2ff6107f3b0cd41e8ae00881033645f7a309ca3ce65aebd73a1b
-DIST orca-40.1.tar.xz 3603308 BLAKE2B e934e54d598a70ec22014a0749ce8b6cc2cb8d27c9fbb8d2488b0d088ebe175dd21a96e51ccb9eccba0254bf4664bc36796cdd2c965d1721562cf1a83d0e3fc7 SHA512 4e3bec3151abe81bb7d07717dba94e7a998ec269af430e2a5ef999b6c39606066df7f4161861a0e7c019626d9c609f4de154814d9af3b60e6bc8a1565e0fa075
-DIST orca-41.1.tar.xz 3635644 BLAKE2B 8951111e0eb6e89709c4fbf98ab92cc503995c8dddfe150b925ce18f638377feb6786419bba394cd8652f4d39254f64d179a223b48c0faef8fa20b070fcbbe11 SHA512 4f6534025d70231b6c43cfe1f6d8d5c8f33b4727a0bc83417e65c564364a63a64d44d61be2786166814dbd7b1b7bad38f69b008ce119ca45b0fc9be0f512549b
 DIST orca-41.2.tar.xz 3637836 BLAKE2B bebe1d6e37b88f8e1c97c2ee2a599185c2c14d88fc7d12805bb5a7623b1323ad8688cb846b6e733ef02d58390eb390d1dcd2150a0ed50c8109a7468d62f525c2 SHA512 a2d208193aaac48bf12ca22732b338cdcb5299edc7e7b5c75c88f8dee6ad69762287dbb36c25661c08f904b3848a2ca0e60f2d7153e41594944fab509ff3ef07
-EBUILD orca-40.0.ebuild 1561 BLAKE2B d84ac5e6b4e6544f2f9e174fc6c11016bfa59470dd0f555591cf7eef9455ab9988b88a75c002ac40a81a470ce70198b4306e2ff8549bfa5dc08e6a209b18527e SHA512 3d87784d98b449981d20541dc324c048b4e59acaf4e5ff8edc9f617c66ca4c2145aeafba1b7a33322c71cd3fbf22d2e14987f5cb94231bef193c8e2359ec4471
-EBUILD orca-40.1.ebuild 1564 BLAKE2B 083720fe5675b73c25e5850024d02dcd8b94c8178996770b8f7ea2e0e78205bfc242cfd16be093cd0ab16e6a162d6dc6294ffa150b264c26bf732127f7b54bba SHA512 3e53301f0e0e082919400ef0594f42727b5f67b0ba28ce5ea31e22cbe11e5fbdbee5ccf401dbf8df27b2c311fb058a3ac9ee7a22e6fa12d059cc2d7978c1e56e
-EBUILD orca-41.1.ebuild 1558 BLAKE2B bbb5cc664fb273f430848ba6fce518dbbe554f5d0fadf5039424f5677a7ebbe4e9dfebf5592e6c378a8f76c2d3f913aa6c8a44092d48f4b6021ab95875630583 SHA512 d9235297a23e44f97678601d67f672f03a545fa01922a29322ae91daf0dbac8039f40ef864f5313d8a7fa83651717be3ffcd177cf85c5458bb70a0f81b0a42ca
-EBUILD orca-41.2.ebuild 1558 BLAKE2B bbb5cc664fb273f430848ba6fce518dbbe554f5d0fadf5039424f5677a7ebbe4e9dfebf5592e6c378a8f76c2d3f913aa6c8a44092d48f4b6021ab95875630583 SHA512 d9235297a23e44f97678601d67f672f03a545fa01922a29322ae91daf0dbac8039f40ef864f5313d8a7fa83651717be3ffcd177cf85c5458bb70a0f81b0a42ca
+EBUILD orca-41.2.ebuild 1562 BLAKE2B 23c0907b11da9aca993aed45ea94f9bed04553d421fcf76bd241d582f3189943edb8d7e9dd7d09ce158573b06bd71a231126e854cab047a31a2323a52da7d484 SHA512 9ce417d9e0175bf2dd5790a85bfdc6feec6a00b919b18c6dc9ea28d4b899860cc41e8e949f1a2d441dd3d9cf0ff79442bf62b8afc6b12dbe933ff5b6ead149ce
 MISC metadata.xml 641 BLAKE2B 2a9a0582cf597e46cf71f11034a17ed3146f5d2709855be3f64530c94be53bdbb7ac8e8be859969706c67e6b32e1f8a33fe97b3e54d41b27a4f6ee3807f19fd6 SHA512 4119f9cc00c1978ada19d63f559ba35bec6299732bf50e3fb724c531dae3c3052e26fb1e7ec7830c55c98ef800ff0a6ecbb01df98e3b64781ff42eb7ef9ce7fb
diff --git a/app-accessibility/orca/orca-40.0.ebuild b/app-accessibility/orca/orca-40.0.ebuild
deleted file mode 100644
index eef6921180fc..000000000000
--- a/app-accessibility/orca/orca-40.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.34:2
-	>=app-accessibility/at-spi2-core-2.36:2[introspection]
-	>=dev-libs/atk-2.36
-	>=dev-libs/glib-2.28:2
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
-	')
-	braille? (
-		$(python_gen_cond_dep '
-			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-			dev-libs/liblouis[python,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	dev-libs/atk[introspection]
-	$(python_gen_cond_dep '
-		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-		>=dev-python/pyatspi-2.36[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-	')
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with braille liblouis)
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize
-}
diff --git a/app-accessibility/orca/orca-40.1.ebuild b/app-accessibility/orca/orca-40.1.ebuild
deleted file mode 100644
index 3f9e8a47727c..000000000000
--- a/app-accessibility/orca/orca-40.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.34:2
-	>=app-accessibility/at-spi2-core-2.36:2[introspection]
-	>=dev-libs/atk-2.36
-	>=dev-libs/glib-2.28:2
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
-	')
-	braille? (
-		$(python_gen_cond_dep '
-			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-			dev-libs/liblouis[python,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	dev-libs/atk[introspection]
-	$(python_gen_cond_dep '
-		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-		>=dev-python/pyatspi-2.36[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-	')
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with braille liblouis)
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize
-}
diff --git a/app-accessibility/orca/orca-41.1.ebuild b/app-accessibility/orca/orca-41.1.ebuild
deleted file mode 100644
index ce740f046a7c..000000000000
--- a/app-accessibility/orca/orca-41.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.34:2
-	>=app-accessibility/at-spi2-core-2.36:2[introspection]
-	>=dev-libs/atk-2.36
-	>=dev-libs/glib-2.28:2
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
-	')
-	braille? (
-		$(python_gen_cond_dep '
-			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-			dev-libs/liblouis[python,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	dev-libs/atk[introspection]
-	$(python_gen_cond_dep '
-		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-		>=dev-python/pyatspi-2.36[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-	')
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with braille liblouis)
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize
-}
diff --git a/app-accessibility/orca/orca-41.2.ebuild b/app-accessibility/orca/orca-41.2.ebuild
index ce740f046a7c..3e8ea706bcd3 100644
--- a/app-accessibility/orca/orca-41.2.ebuild
+++ b/app-accessibility/orca/orca-41.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-accessibility/powiedz/Manifest b/app-accessibility/powiedz/Manifest
index af72ff3322ff..5a056f5696ca 100644
--- a/app-accessibility/powiedz/Manifest
+++ b/app-accessibility/powiedz/Manifest
@@ -1,5 +1,5 @@
 AUX powiedz-1.0-dsp-handle-fix.patch 291 BLAKE2B 9f03a4359d8503ea772a13abe837bf6a1893cfc726f100710c40e3b3b9f10e5a2228a6bd1ef8624d200f0fa4947ac9de2d4c07e307a1534e7c1e2cd48ab7e2ce SHA512 99577f0de3961588c3d9d3036f7a19a260ba296fe28fb6379f2eee19ae09fa8691e5e47a09698146f8a73f4b6bc9b4c5c15df9f8d06e270c435c1984b1154e4d
 AUX powiedz.desktop 171 BLAKE2B 79d4483d3ef56bdcfa69731200d43ac394b875c5b00e4e3231d3720086f7f43d0155485f8c1e64f33d04e6bc6ceeb320d6a25f081a5c0fc1fd862fc8f040c323 SHA512 9f3be0578e15ce176edead31ba24c5576614689f9ede473a485c5478f0ad823f21bf411bd13f95799c042f31878aa91f246e9150ebaf299c28ad44d022ad72c0
 DIST powiedz-1.0.tgz 68672 BLAKE2B e6a96ec5f7dcdfc9508d4805e11209f0e7432abd329257710d813a94d8075c0893294a9abd75b811576290ef0b9fc9fcec29cbe04d9ab9ec4537b4bebfedf0ba SHA512 1a572ead0c6358b52ef4b5efc66dd633b2c7cb35c97bc911ce46f54fd84f626ca73b4be9951fb48688abaac4fab41f0a5087dbd89fecc91fc9e42f944e188eb3
-EBUILD powiedz-1.0-r2.ebuild 622 BLAKE2B da58bbca961390b42e4203e79d90b5d880cff915cce7186933db4006c04368ec32cbda3f7efa3af0bba31c06b4e4118e82ff07866fe153d3db429b5a226220bd SHA512 a37149198ab2da92ab8cb51dbef985a0b96c73bca1994994aca72b59b7c0b04190bf28bb752802f4cbc668d9d4a4f39657a8f88736b0d27f78ceb52c7cb113e6
+EBUILD powiedz-1.0-r2.ebuild 624 BLAKE2B 73fc78730976d2d8da2a98bd7d53230667440a28cbe007e49be70054461e2cc66c828656fab27f95e8af3bc5ef5e5ca217bbbff26ad1d424d3a822af50a1e92f SHA512 0b8b81442a034d3e2666e80ae1f2b9d69b4c880bff3d448526dae90821949a5050652199b27f6a54ee3816e6a9f5d13ef02c021bb8f4cbc50b03c1955d402028
 MISC metadata.xml 394 BLAKE2B 960167ed9f6c5104c03fe0f984e6ebcb05297eaf55ed7a1cc04ffaa2bed98632833813cdb233b5bbd28993cb36fe091a1583137b32fd43f628f36ba11cb2720d SHA512 a6af6207c406103d535a38715e4fa50c8e9fbf4ff14496be1e474fe0b6a122f39139bc4db5416422145fd6b9e2a4acf74009d457ce2a8531fe0862b11948c126
diff --git a/app-accessibility/powiedz/powiedz-1.0-r2.ebuild b/app-accessibility/powiedz/powiedz-1.0-r2.ebuild
index 335ec19afe5d..4372509bec17 100644
--- a/app-accessibility/powiedz/powiedz-1.0-r2.ebuild
+++ b/app-accessibility/powiedz/powiedz-1.0-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
@@ -19,7 +19,7 @@ PATCHES=(
 )
 
 src_compile() {
-	emake -f Makefile_plain LDLIBS="-lm" CFLAGS="${CFLAGS}" DEFS="" CC=$(tc-getCC)
+	emake -f Makefile_plain LDLIBS="-lm" CFLAGS="${CFLAGS}" DEFS="" CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 2e3867b7d1b1..b3b91a4c09cd 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,6 +1,6 @@
 AUX speech-dispatcher-0.9.1-fno-common.patch 13112 BLAKE2B 6a4125117852cfe250bed1a9936af67a2a83303ecced615febd89b9b14918dda94a78862cdcceb95fcea3ea7ed30a12d799afbc21264ff386c94f9f867eb8136 SHA512 b957ebbfd8a6a9cfe2b85cba85b77dc813e76212721d63d42b3881ed17993d7b4a8c720d4c431c8e2eb3ea60996e411402732c735948f37fa84a9fdcfa2683fc
 DIST speech-dispatcher-0.11.1.tar.gz 6548489 BLAKE2B fd4e05c51b80991bdd5d27ecf967946cfde98f978462e909f193c14eab51f3cae047d281c3e2896b3ddeeb4e045ceb72f51e5dbfaf3f9ea8a818f8146cb5e625 SHA512 859911d7db5660423bc7911eacbe8e7a9c3104df97478cbbca48ca5fd6ec018113172d49bc66781680433c77b4d2af43578c9b0f11409e2ba7ac618deb31d7cf
 DIST speech-dispatcher-0.9.1.tar.gz 1662222 BLAKE2B 03c3d79a9cbbe7e549f638992fb276ab2270a45a057708721666257699479b3feb81daddf26d8032ba3f7b9ab6b836c7f582ee22a532ff018c99820af3864d87 SHA512 35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2
-EBUILD speech-dispatcher-0.11.1.ebuild 2780 BLAKE2B bd5a50f275810b40ab5dbe8cdafc4f02a9f9f75e3e54ce34c467a0b01cc7da55c1ac5b39f1106acaddb2371bb42b46008caea1a92d8f909e50347ceaa40b7ce9 SHA512 abf31bba90e083069c9a0382b6397553d492e4510dea624d02019346c95565910c0cb0149882ae4d3ee6eabb8bec51a8a356c306ad3037ba0a8eb160ab55eb50
+EBUILD speech-dispatcher-0.11.1.ebuild 2780 BLAKE2B 3d4fe1236ae1beb218002bb66bb9e1c4e1e418f6e17c4bcc034dbf166edd20fdfe0e454c4750b9fdcdc80d948fad85705cd2793b913cd70e6221f15df16b01b4 SHA512 1bdf036643d5eb632f0909a4378f0acbd9e6fe918446d829a382f505f3add6b7f405ba5115c0f386526416d67d53f6d82a649586d9d85108d3ee8d63803b2210
 EBUILD speech-dispatcher-0.9.1.ebuild 2835 BLAKE2B f840d158b1303532c3fd0f41f9e40bac941d06071a125bcbef0341e75cc0197fe29a47d495b8248bc714cf2f8da3981660b95aa91d8b178fb72a7c4a23303b51 SHA512 2e0e8b16492ee0922199389e05e7d24103d4090b218378ce3f50111705084515c112d9e363f6dabc6d10dee75e4bdbb5f7c794f4b7b6562baa11798f3dff0dc9
 MISC metadata.xml 708 BLAKE2B fdccc4d8de7f22eb64469021786480527bd87f3718dd5746426874266b8a46dcb6cc2b7bb25a4561a523362b919e0ed77e3f829f3fe269d90060d17a69f1b2ed SHA512 770e54e5ddeacc46165b90d41dd3ea0d1060adfdfb95055a9dab778f757189b892250e66b515773ce7b4d8b1bbdd692386b4d8cb49d670af7af8dadfed5c8788
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
index ec934b5203c4..600860f99b64 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"