gentoo resync : 02.02.2022

27 files changed, 880 insertions, 181 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 2660dd9eb7e9..418086bb6996 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 466201ec0671..c8bb851d0c55 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,9 +1,7 @@
 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.2.tar.xz 197476 BLAKE2B a3b6f1edb7beace2a54cc651f8bf5d002009a3d2791306f2b0a33c351c68d04e0a1003ab11f215333d498c50d17139b978e7f232df802f6c620bbe31997a8e1c SHA512 854fbba39064ba4b1d9728fc4943e811f0a9557f1096f32d7a6486bcb6c73379ab84c5fb8ce5288bf4dab1d1cd3e0664c492977450d4da503ce4b08abfc75fd9
 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.2.ebuild 1458 BLAKE2B df824a43b37bcda7829d3dc21e202d4aacf36d81d7b047a3de3447e1a9159ada562b1b207b06fd6dc0aecf331ea4a0bc7720e6baf493d7ddcc840d7f47cd0c30 SHA512 e32832a771c53744760704ab5a3c9bef0caed556d7dcb2e18f20c44fa1ce598a910739276145478a45a43251c2be2771592f8abacfd3eec0bc1c8d59c5cbb1f7
 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
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
deleted file mode 100644
index 8370320a1b7e..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.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/brltty/Manifest b/app-accessibility/brltty/Manifest
index f754089e9652..9273d2605e58 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,8 +1,13 @@
 AUX brltty-5.2-respect-AR.patch 260 BLAKE2B 4bdf1c41a881e59477e9472a8e9f691bccce5c837b1d1358f405df9e485aab9041b8612dfffa78d30cf90814668e8234b947b43f933d80e8e00e5c618ae8e768 SHA512 2b8de99e98e257041d7a2131775a936166f183197dc02a242cb9efaebebc19afed45292defa9567f86f8ce71e32458743b8c2d3361b1b290f6c93df88e83b1ff
 AUX brltty-6.0-udev.patch 1033 BLAKE2B d5220b3351af4191ab78f122265296ed802209d0320ebde04c3e947ba736132f5c16db8be18f3e1964c39fe61aadb535d4f84f75d070f68caeea4ca3b3c3ee05 SHA512 0512fbfcd9e9085e37b3b935f8f5a002e82fb514aa56ad807819a39d9da16fbf3bc5f45540ae1ca754160a81957f62d5c5bc8acc6295ee1af971aa9acf5b915a
+AUX brltty-6.4-respect-AR.patch 385 BLAKE2B 0029b98054c21b86bb3d03ff52a358fd08585fd10dcf43443c44857c13c17e65e8a60c1e14c06e708dbf77e55760d465a7929bf35cb37cb5758b42770cd7e4c7 SHA512 d603e195d9981a608b46ebb047536acece13c5106b46d1a4b76cc7e7aad6db2fb47d338224faaa9973295e10994fdd62a6986b0a3fd193a4808d432681d3dd60
+AUX brltty.initd 241 BLAKE2B 80969e4840d2d38af6bc310ecf18e0253ef01667517135bc5a2f92e50882c2b72e8a4763b215c62ccbfd8d2250067b44ce9a4cb5d318dd6eb48b298826d8d5de SHA512 55ea97a546a2335ee1148396df71363442b66ed4526f8adb93e88c2cf489f10a21b5361658f590b3f64eec24844235491b15349bd0e1c4533fef7b1390fc3a6e
 AUX brltty.rc 241 BLAKE2B 873b1344cc6dee3aa6272d9c8857b58a751200e77d7fa0d96f9ff992f2825267503db5fc11ea07d7064a0fa4fe78af637c41ced04212d063efb92183bb936c9f SHA512 d3b91fddbfa61e212537c58444585262d2781fa97ff7f8f4e9ab3c3ad937c680b230d805f7541e2701050e2b001d7d11f7e5937476568a3459d73bb36026f847
 AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7
 DIST brltty-6.1.tar.xz 3394852 BLAKE2B 03e6358721dcd5c3bdee3301a1ed827a690128ec339669543279c7e9a115bef6c5d8630e4af2d0b214b9c7c3eaa9001ab4c54ae7fb899cb3bc675985f51d6933 SHA512 030ef60ef7a9a60dc2fba2a64ea0a0868395eee6f2f86876b4e4111e804a05b44f798a154a69a8f5e0f6358130993c360a550f7decac0535450f9cf939231eaf
-EBUILD brltty-6.1-r1.ebuild 5617 BLAKE2B 20b6988776585a1d6d846c7c2a9a08f2e7acc40dd230ea822698d122031827f0d7d2b3e9e28a371bf1b9bc6f04c6fe81e2d5476801f806e06c67b5c40eca5251 SHA512 62107fabb16d8dfabc9462acde03cd47d2395deb8852b659bf1b116e2ed5e8ed645d62b1b91637dfe13dbb6ccf720995c3641cd95b6c63924919b0f1c68a7a5e
+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
-MISC metadata.xml 1662 BLAKE2B 46ba8439b31b6d391c93bdf34188c57179bcb3af882065b559ea41473937627802cf49a32300b47c590a0c13470fb72ed46ea272d4598e1cb8fdb2cc7b715653 SHA512 4849dc267e88460878b084ebf551dc3cabd3808aaba4e8779cd13528a7db665707e8291ed4965da6ef995a99cacb18f8b68fa54d3bd81ffcd1efe13e77aa4b8c
+EBUILD brltty-6.4-r1.ebuild 5613 BLAKE2B 13d9d17d742f6c67a69851b135537cc87161103f14008cb9913e1a8ccd71f57f9fb35d48c53b8604a1ed1a8fff08b9c8bf8295cab3e6c72822a42d4b6a8679aa SHA512 3afddcbb03ee8bedcb2ec5c86d110d3d6323904b43629cd5874d111dbc6b2f493f69e77b1a3d7a7fc358364516b1c54288d2d88f43b8b6628e802e07ca7de966
+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.1-r1.ebuild b/app-accessibility/brltty/brltty-6.1-r1.ebuild
index 5cab86b4c9c7..ca9620c7607c 100644
--- a/app-accessibility/brltty/brltty-6.1-r1.ebuild
+++ b/app-accessibility/brltty/brltty-6.1-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
@@ -17,7 +17,7 @@ SRC_URI="https://brltty.app/archive/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86"
 IUSE="+api +beeper bluetooth +contracted-braille 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/brltty/brltty-6.4-r1.ebuild b/app-accessibility/brltty/brltty-6.4-r1.ebuild
new file mode 100644
index 000000000000..2805474e8b9a
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.4-r1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+FINDLIB_USE="ocaml"
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
+
+inherit findlib toolchain-funcs java-pkg-opt-2 autotools systemd \
+	python-r1 tmpfiles
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
+HOMEPAGE="https://brltty.app/"
+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"
+IUSE="+api +beeper bluetooth doc +fm gpm iconv icu
+		java louis +midi ncurses nls ocaml +pcm policykit python
+		usb systemd +speech tcl xml X"
+REQUIRED_USE="doc? ( api )
+	java? ( api )
+	ocaml? ( api )
+	python? ( api ${PYTHON_REQUIRED_USE} )
+	tcl? ( api )"
+
+DEPEND="
+	acct-group/brltty
+	acct-user/brltty
+	dev-libs/libpcre2[pcre32]
+	bluetooth? (
+		sys-apps/dbus
+		net-wireless/bluez
+	)
+	gpm? ( >=sys-libs/gpm-1.20 )
+	iconv? ( virtual/libiconv )
+	icu? ( dev-libs/icu:= )
+	louis? ( dev-libs/liblouis:= )
+	midi? ( media-libs/alsa-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	pcm? ( media-libs/alsa-lib )
+	policykit? ( sys-auth/polkit )
+	python? ( ${PYTHON_DEPS} )
+	speech? (
+		app-accessibility/espeak-ng
+		app-accessibility/flite
+		app-accessibility/speech-dispatcher
+	)
+	systemd? ( sys-apps/systemd )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	usb? ( virtual/libusb:0 )
+	xml? ( dev-libs/expat )
+	X? (
+	app-accessibility/at-spi2-core:2
+		sys-apps/dbus
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXfixes
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.8:* )
+	nls? ( virtual/libintl )
+	python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-AR.patch
+)
+
+src_prepare() {
+	default
+
+	java-pkg-opt-2_src_prepare
+
+	# We run eautoconf instead of using eautoreconf because brltty uses
+	# a custom build system that uses autoconf without the rest of the
+	# autotools.
+	eautoconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	tc-export AR LD PKG_CONFIG
+
+	export JAVAC=""
+	export JAVA_JNI_FLAGS=""
+	if use java; then
+		export JAVA_HOME="$(java-config -g JAVA_HOME)"
+		export JAVAC_HOME="${JAVA_HOME}/bin"
+		export JAVA_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+		export JAVAC="$(java-pkg_get-javac) -encoding UTF-8 $(java-pkg_javac-args)"
+	fi
+
+	# Override bindir for backward compatibility.
+	# Also override localstatedir so that the lib/brltty directory is installed
+	# correctly.
+	# Disable stripping since we do that ourselves.
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir="${EPREFIX}"/usr/share/doc/"${P}"/html
+		--localstatedir="${EPREFIX}"/var
+		--disable-stripping
+		--with-updatable-directory="${EPREFIX}"/var/lib/brltty
+		--with-writable-directory="${EPREFIX}"/run/brltty
+		--with-privilege-parameters=lx:user=brltty
+		$(use_enable api)
+		$(use_with beeper beep-package)
+		$(use_with fm fm-package)
+		$(use_enable gpm)
+		$(use_enable iconv)
+		$(use_enable icu)
+		$(use_enable java java-bindings)
+		$(use_enable louis liblouis)
+		$(use_with midi midi-package)
+		$(use_enable nls i18n)
+		$(use_enable ocaml ocaml-bindings)
+		$(use_with pcm pcm-package)
+		$(use_enable policykit polkit)
+		$(use_enable python python-bindings)
+		$(use_enable speech speech-support)
+		$(use_with systemd service-package)
+		$(use_enable tcl tcl-bindings)
+		$(use_enable xml expat)
+		$(use_enable X x)
+		$(use_with bluetooth bluetooth-package)
+		$(use_with ncurses curses)
+		$(use_with usb usb-package)
+	)
+	# disable espeak since we use espeak-ng
+	use speech && myconf+=( --with-speech-driver=-es )
+
+	econf "${myconf[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+src_compile() {
+	emake -j1 JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}"
+
+	if use python; then
+		python_build() {
+			cd "Bindings/Python" || die
+			emake -j1
+		}
+		python_foreach_impl run_in_build_dir python_build
+	fi
+}
+
+src_install() {
+	if use ocaml; then
+		findlib_src_preinst
+	fi
+
+	emake -j1 INSTALL_ROOT="${D}" OCAML_LDCONF= install
+
+	if use python; then
+		python_install() {
+			cd "Bindings/Python" || die
+			emake -j1 INSTALL_ROOT="${D}" install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	if use java; then
+		java-pkg_doso Bindings/Java/libbrlapi_java.so
+		java-pkg_dojar Bindings/Java/brlapi.jar
+	fi
+
+	insinto /etc
+	doins Documents/brltty.conf
+	newinitd "${FILESDIR}"/brltty.initd brltty
+	pushd Autostart/Systemd 1> /dev/null || die
+	emake -j1 INSTALL_ROOT="${ED}" install
+	popd
+	pushd Autostart/Udev 1> /dev/null || die
+	emake -j1 INSTALL_ROOT="${ED}" install
+	popd
+
+	newdoc doc/Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
+	newdoc doc/Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
+	newdoc doc/Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+	dodoc Documents/{CONTRIBUTORS,ChangeLog,HISTORY,README*,TODO}
+	if use doc; then
+		HTML_DOCS="doc/Manual-BRLTTY" einstalldocs
+	fi
+
+	keepdir /var/lib/BrlAPI
+	rm -fr "${ED}/run" || die
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	elog "please be sure ${EROOT}/etc/brltty.conf is correct for your system."
+	elog
+	elog "To make brltty start on boot on an OpenRC system, type this command:"
+	elog "# rc-update add brltty boot"
+	elog
+	elog "If you are using systemd, type this command:"
+	elog "# systemctl daemon-reload"
+	elog
+	elog "Please reload udev by typing:"
+	elog "# udevadm control --reload"
+}
diff --git a/app-accessibility/brltty/brltty-6.4.ebuild b/app-accessibility/brltty/brltty-6.4.ebuild
new file mode 100644
index 000000000000..0eaf71123bbd
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.4.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+FINDLIB_USE="ocaml"
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
+
+inherit findlib toolchain-funcs java-pkg-opt-2 autotools systemd \
+	python-r1 tmpfiles
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
+HOMEPAGE="https://brltty.app/"
+SRC_URI="https://brltty.app/archive/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~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"
+REQUIRED_USE="doc? ( api )
+	java? ( api )
+	ocaml? ( api )
+	python? ( api ${PYTHON_REQUIRED_USE} )
+	tcl? ( api )"
+
+DEPEND="
+	app-accessibility/at-spi2-core:2
+	dev-libs/libpcre2[pcre32]
+	sys-apps/dbus
+	bluetooth? ( net-wireless/bluez )
+	gpm? ( >=sys-libs/gpm-1.20 )
+	iconv? ( virtual/libiconv )
+	icu? ( dev-libs/icu:= )
+	louis? ( dev-libs/liblouis:= )
+	midi? ( media-libs/alsa-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	pcm? ( media-libs/alsa-lib )
+	policykit? ( sys-auth/polkit )
+	python? ( ${PYTHON_DEPS} )
+	speech? (
+		app-accessibility/espeak-ng
+		app-accessibility/flite
+		app-accessibility/speech-dispatcher
+	)
+	systemd? ( sys-apps/systemd )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	usb? ( virtual/libusb:0 )
+	xml? ( dev-libs/expat )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXfixes
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.8:* )
+	nls? ( virtual/libintl )
+	python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2-respect-AR.patch
+)
+
+src_prepare() {
+	default
+
+	java-pkg-opt-2_src_prepare
+
+	# We run eautoconf instead of using eautoreconf because brltty uses
+	# a custom build system that uses autoconf without the rest of the
+	# autotools.
+	eautoconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	tc-export AR LD PKG_CONFIG
+
+	export JAVAC=""
+	export JAVA_JNI_FLAGS=""
+	if use java; then
+		export JAVA_HOME="$(java-config -g JAVA_HOME)"
+		export JAVAC_HOME="${JAVA_HOME}/bin"
+		export JAVA_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+		export JAVAC="$(java-pkg_get-javac) -encoding UTF-8 $(java-pkg_javac-args)"
+	fi
+
+	# override prefix in order to install into /
+	# braille terminal needs to be available as soon in the boot process as
+	# possible
+	# Also override localstatedir so that the lib/brltty directory is installed
+	# correctly.
+	# Disable stripping since we do that ourselves.
+	local myconf=(
+		--prefix="${EPREFIX}"/
+		--localedir="${EPREFIX}"/usr/share/locale
+		--includedir="${EPREFIX}"/usr/include
+		--localstatedir="${EPREFIX}"/var
+		--disable-stripping
+		--with-writable-directory="${EPREFIX}"/run/brltty
+		$(use_enable api)
+		$(use_with beeper beep-package)
+		$(use_with fm fm-package)
+		$(use_enable gpm)
+		$(use_enable iconv)
+		$(use_enable icu)
+		$(use_enable java java-bindings)
+		$(use_enable louis liblouis)
+		$(use_with midi midi-package)
+		$(use_enable nls i18n)
+		$(use_enable ocaml ocaml-bindings)
+		$(use_with pcm pcm-package)
+		$(use_enable policykit polkit)
+		$(use_enable python python-bindings)
+		$(use_enable speech speech-support)
+		$(use_with systemd service-package)
+		$(use_enable tcl tcl-bindings)
+		$(use_enable xml expat)
+		$(use_enable X x)
+		$(use_with bluetooth bluetooth-package)
+		$(use_with ncurses curses)
+		$(use_with usb usb-package)
+	)
+	# disable espeak since we use espeak-ng
+	use speech && myconf+=( --with-speech-driver=-es )
+
+	econf "${myconf[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+src_compile() {
+	emake -j1 JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}"
+
+	if use python; then
+		python_build() {
+			cd "Bindings/Python" || die
+			emake -j1
+		}
+		python_foreach_impl run_in_build_dir python_build
+	fi
+}
+
+src_install() {
+	if use ocaml; then
+		findlib_src_preinst
+	fi
+
+	emake -j1 INSTALL_ROOT="${D}" OCAML_LDCONF= install
+
+	if use python; then
+		python_install() {
+			cd "Bindings/Python" || die
+			emake -j1 INSTALL_ROOT="${D}" install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	if use java; then
+		java-pkg_doso Bindings/Java/libbrlapi_java.so
+		java-pkg_dojar Bindings/Java/brlapi.jar
+	fi
+
+	insinto /etc
+	doins Documents/brltty.conf
+	newinitd "${FILESDIR}"/brltty.rc brltty
+	systemd_dounit Autostart/Systemd/brltty@.service
+	dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	mv doc/Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+	mv doc/Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+	mv doc/Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
+	dodoc Documents/{CONTRIBUTORS,ChangeLog,HISTORY,README*,TODO} BRLTTY-*.txt
+	if use doc; then
+		dodoc BrlAPI-*.txt
+		HTML_DOCS="doc/Manual-BRLTTY" einstalldocs
+	fi
+
+	keepdir /var/lib/BrlAPI
+	rm -fr "${ED}/run" || die
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
+	elog
+	elog "please be sure ${EROOT}/etc/brltty.conf is correct for your system."
+	elog
+	elog "To make brltty start on boot, type this command as root:"
+	elog
+	elog "rc-update add brltty boot"
+}
diff --git a/app-accessibility/brltty/files/brltty-6.4-respect-AR.patch b/app-accessibility/brltty/files/brltty-6.4-respect-AR.patch
new file mode 100644
index 000000000000..1c647cfad53b
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-6.4-respect-AR.patch
@@ -0,0 +1,13 @@
+diff --git a/Programs/Makefile.in b/Programs/Makefile.in
+index f1dc9aeb5..811a73a11 100644
+--- a/Programs/Makefile.in
++++ b/Programs/Makefile.in
+@@ -687,7 +687,7 @@ $(API_DLL): $(API_CLIENT_OBJECTS)
+ 	[ ! -f lib.def ] || mv lib.def $(API_DEF)
+ 
+ $(API_ARC): $(API_CLIENT_OBJECTS)
+-	ar rc $@ $(API_CLIENT_OBJECTS)
++	$(AR) rc $@ $(API_CLIENT_OBJECTS)
+ 	$(RANLIB) $@
+ 
+ brlapi_client.$O:
diff --git a/app-accessibility/brltty/files/brltty.initd b/app-accessibility/brltty/files/brltty.initd
new file mode 100644
index 000000000000..1d93e1e533c6
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/bin/brltty
+pidfile=/var/run/brltty.pid
+command_args="-P ${pidfile} -q"
+
+depend() {
+	after dbus localmount
+}
diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index f3f6d0a7c577..32eb443cb936 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -10,7 +10,7 @@
   <flag name="beeper">support the console tone generator</flag>
   <flag name="contracted-braille">support in-line contracted braille</flag>
   <flag name="fm">support for the sound card synthesizer</flag>
-  <flag name="louis">Use braille tranlator <pkg>dev-libs/liblouis</pkg></flag>
+  <flag name="louis">Use braille translator <pkg>dev-libs/liblouis</pkg></flag>
   <flag name="midi">support the musical instrument digital interface</flag>
   <flag name="pcm">support for sound card digital audio</flag>
   <flag name="speech">speech support</flag>
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 6664e43279f0..5b8c4dfccbd6 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -6,6 +6,5 @@ AUX caribou-fix-python-env.patch 2508 BLAKE2B b27a37c5f14affb2610b6a2caca9827a4b
 AUX caribou-fix-subkey-popmenu.patch 916 BLAKE2B 5f833fded2a5d1dedf613aecd1e473f80954a730174f9509e2a3c846b790f8abe861fb65ddf683bee87b0cd99b8d18c4c6eab6413f978a295190cc5d9a355c51 SHA512 8ce9b33c09e19a24e2e8366674437afa03743637d0d1854e8c5b4f73cbd69148b8c4d59d65212c509146fd051015d7a20f9d8ff92e9c835b4d805ca6c564b5c2
 AUX caribou-fix-xadapter-xkb-calls.patch 1840 BLAKE2B c752a1e7f9cee33ed8ecdb5c9d72267e11b3881c6c1e4e7576b070088ecbe7893c9d5ef1dce8483b062ef31083441072a3b88309db523832a8b06e2254e65a82 SHA512 122b1004e601f3c669d8f8d33d4fd167d662086f54e0376f4cc6147e470b07a1345af99581313facb286c4392a2ae17b39565d36cca32fd5eeb7a44a49807999
 DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
-EBUILD caribou-0.4.21-r3.ebuild 2151 BLAKE2B 832b4c0988850899014970bd158d907c15a38fe79f2b2d7f06bc18624c09ec5b1004703a1de306a14e82981fc9c609a930110f276a13c2ef82ad46f3a8ef6b35 SHA512 f266db24f6feb28c36b70850465b2c05cbf81d2a74670cc0e0301314095d6ab95aba8a9894c43597d6d7ef7627db92f5f7d894334ae4508c81419d955e378dff
 EBUILD caribou-0.4.21-r4.ebuild 2247 BLAKE2B 04bdcc1d001a8f358b6a2c88a69052e8d0c647ace8926a3b774254f424a26f251e2b91baddb50ae621bdadc2182768e0beac82c65c4ff2f02147ea8e7a0acd42 SHA512 008c12ad32dc8f2783e0499f66c7ea0f9c6ada18c88361adb56c760da44cf95726a3fedc5726d62c37ace36ad27b7271366595f52656505dec172910236e1bbd
 MISC metadata.xml 840 BLAKE2B 671f825fbc4ae6d54e4f954841e64ac34affbec420b2bf7bf07ec8dcf9f94bf68bd614566c06018476bd5a6f6c29ed86072d1f3b6b2e84281744052c9ddc1b3b SHA512 1db29ec2266887839c007307a66e10fae1bd119e3a2eef9b3223382e2dbd0413defb864c2b4917ddf24eeaa36929100cb092e0d065dff26853e54532d88bfd30
diff --git a/app-accessibility/caribou/caribou-0.4.21-r3.ebuild b/app-accessibility/caribou/caribou-0.4.21-r3.ebuild
deleted file mode 100644
index db6f57062819..000000000000
--- a/app-accessibility/caribou/caribou-0.4.21-r3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-
-VALA_MAX_API_VERSION="0.50"
-
-inherit gnome.org gnome2-utils python-single-r1 vala
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-accessibility/at-spi2-core
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	')
-	>=dev-libs/gobject-introspection-0.10.7:=
-	dev-libs/libgee:0.8
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	>=x11-libs/gtk+-3:3[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst
-"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-libs/glib[dbus]
-	$(python_gen_cond_dep '
-		>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/gsettings-desktop-schemas-3
-	gnome-base/librsvg:2
-	sys-apps/dbus
-	!<x11-base/xorg-server-1.20.10
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libxslt
-"
-BDEPEND="
-	$(vala_depend)
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-compilation-error.patch"
-	"${FILESDIR}/${PN}-fix-subkey-popmenu.patch"
-	"${FILESDIR}/${PN}-fix-xadapter-xkb-calls.patch"
-	"${FILESDIR}/${PN}-fix-antler-style-css.patch"
-	"${FILESDIR}/${PN}-fix-python-env.patch"
-)
-
-src_prepare() {
-	default
-	vala_src_prepare
-	gnome2_disable_deprecation_warning
-}
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--disable-docs \
-		--disable-static \
-		--disable-gtk2-module \
-		--enable-gtk3-module
-}
-
-src_install() {
-	DOCS="AUTHORS NEWS README"
-	default
-	find "${D}" -name '*.la' -delete || die
-	python_optimize
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/app-accessibility/espeak-ng/Manifest b/app-accessibility/espeak-ng/Manifest
index a29f7d94178a..609b35403f3e 100644
--- a/app-accessibility/espeak-ng/Manifest
+++ b/app-accessibility/espeak-ng/Manifest
@@ -1,4 +1,5 @@
 DIST espeak-ng-1.50.tar.gz 13665536 BLAKE2B c64c2a474374d4b6fe13bf3a99f5dfb661923c13ebd6c0bc323e7f26d9d90945c7075cc5c8f4b51e5db3303632c8c9daca7a65a1883e09d7c3faf63dd725ea3f SHA512 297dd80a6cdae3e2b8acf6823475220ce89d6a5fb68ea303156ad52cb3e7388049b6921759d4ed4e3d2e2ebd19bf931259e454f74a2ac0b7ecf4ce56c1d60c0c
-EBUILD espeak-ng-1.50.ebuild 1706 BLAKE2B bafd021df493c51764ec7341c191e6f12e907886deb3deebca7a7b44e791c9bbe7bb29b50e2e259948dde0970b9fb541469601f8529132f8a1d9c8b49d3ea108 SHA512 5b98b7e7d4fc8e9bbdda58579920aca7a2352f8f88a49861790b743c767d15efbd61f196263839d3fe88549ba2668c4d083148ae456dc2b15bb68e52622be99c
-EBUILD espeak-ng-9999.ebuild 1643 BLAKE2B c37bf379661ac3fdaf2bc6078868de82d57620dcbb0ce101065f28e275c985dbf034481bb7544dbf6858e1bd283f077f4f6eac01a2dc97b3333a2ea78e315c21 SHA512 1dc4ec1cfb1b317cfe645ba7f30a09689d00bad68f367d74e4564626535f564493f890cf26efc1738b8df084fc68b94a3a31407ff3eade05c1f189fc836105c4
+EBUILD espeak-ng-1.50-r1.ebuild 1898 BLAKE2B a384af7522e1d9d48d91544986bb93f90bdafb63982ae6d10de94aa45891e921ad61d51f75397d9b31e475b180d1cc4353cd312e5495f95a3aedb9a7031ab20d SHA512 bec76f91cb05ac7395b8af13c26dbc3eae16146488e74c0191bc0b664666a67f25a89cf467f5f188d4718e057e53f10ec791be97e7628530db9d62cfde097327
+EBUILD espeak-ng-1.50.ebuild 1848 BLAKE2B c853ba207b5e6e119dd070486482eb136989866eae777ffe404f3780ea6c5484bdf6b16e763fba52602389f61620010d55b93be3ef4d2aad47071aa449268feb SHA512 3c4dbf0255ad975c69e373e20497b3eeaa9946931ab92f97b0b455a76a0d9a57c75717b109902b07471ee9cf342758a30d4556c5ea4087196831a991d1dfd3b8
+EBUILD espeak-ng-9999.ebuild 1620 BLAKE2B 5b102df468174042f218e2c5ea93bf4997f67ba5c8a0a20b70836aa5ad3b3896a21d73a11795eec07c367c76207a837308388895486f8a3faa836b4d857aec7a SHA512 f62c64049b7908c8f2282f029f89aa5762b8f03ca6b76de84e01da8d125a9388c6b35ed25f2ab3a9b2691f2de376a54f61cc1c0e57043424df52ed9999dcdefb
 MISC metadata.xml 959 BLAKE2B cf593df0a2ac774e7ba15f77fc8b9cda2907d9d721c61fa602df8653f4019ed46fdadc39353c7ca4f1dbc46245ff28c922fe2844d49c5346a1b7fa7f02005c3b SHA512 4dce4bcbaf2dbd3bbfd0f6503884dc47690d648ce04c489688818aaef15e555fb76e33a49a484e8197631b2885297541f4ef80d0074d44d3f44aeb923a3ea698
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild
new file mode 100644
index 000000000000..9b3280273ec1
--- /dev/null
+++ b/app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild
@@ -0,0 +1,82 @@
+# 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"
+
+LICENSE="GPL-3+ Turkowski 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 ) )
+"
+
+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.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild
index de70028fc38a..c9289793f7fa 100644
--- a/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-1.50.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
@@ -67,14 +67,16 @@ src_configure() {
 
 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
+	emake check -j1
 }
 
 src_install() {
-	emake DESTDIR="${D}" VIMDIR=/usr/share/vimfiles 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-9999.ebuild b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
index 941edd1d327b..9012010b2cae 100644
--- a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-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=7
@@ -13,7 +13,7 @@ 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"
+	KEYWORDS="~amd64 ~riscv"
 fi
 
 LICENSE="GPL-3+ Turkowski unicode"
@@ -31,7 +31,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
-	man? ( app-text/ronn )
+	man? ( || ( app-text/ronn-ng app-text/ronn ) )
 "
 
 DOCS=( CHANGELOG.md README.md docs )
@@ -67,11 +67,6 @@ src_configure() {
 	econf "${econf_args[@]}"
 }
 
-src_compile() {
-	# see docs/building.md
-	emake -j1
-}
-
 src_test() {
 	emake check
 }
diff --git a/app-accessibility/mbrola-voices/Manifest b/app-accessibility/mbrola-voices/Manifest
index 3a5eb988d3bc..99c9aaba12d2 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 1496 BLAKE2B 9d39e06e88a007f7522ed004161d8324a04c74ecee86734d2fb580432c34b2915d669bdde3865002083ccfce78199c10e38ed7380cf8dd20576a33a0a09aeab2 SHA512 35f373f4c02645be63f92e1f7346b661401feef0b7a9eada7a284d224bc3f7ff2b3223d51f54c412180eaac2f986c623cf229a983d78cc9de76f729e999dac2d
+EBUILD mbrola-voices-0_pre20200331.ebuild 1515 BLAKE2B d7f25cea3e0be048de8759a37af02154ff060f264d2d1b796e25e3f40f2afcafbd7bf5f96f9eb79692516eadc8e4e200e4522acf2bc8997ebfbb86d8aa46c9b0 SHA512 f986550e6dd5224ee2cc55cfe781ae75dc67077147195cd024ce3ca0f949bd4d4af7bb69082f4f41f461a225ad8e7a35f4d8b15dbaf76ac20e4712d7ae4a5999
 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 4cd6174dc0dc..506eb3a91990 100644
--- a/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild
+++ b/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.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
@@ -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 ppc ppc64 sparc x86"
+KEYWORDS="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 6177621722ad..0f905ae1fab4 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 673 BLAKE2B fea3b920dd1e2aeefa607b0801ad7b0779b5293fd2e89ba32fbf9cfc0c9e7a0890d3f0d140366945a2ae3988ab918103c44c23cab1df1aa1a791a0ab9bfa8995 SHA512 fe352a3b56198ec5451c381d8f622bd5ce315ef9272093e8b7143b1619b949082396da17c7abe5ea31bdb4feddbedad6d22f1515623d0b193a766e5ba7f7328d
+EBUILD mbrola-3.3-r1.ebuild 692 BLAKE2B fb24d5cb1aaa024b28c43680652964ec87a844e0ed8773704f315b114c950aaf4dfe1efcc682dc54347a99d88163ebffa03aa211aa8e113a9cc1f64361c16585 SHA512 799d3ea61b0cd828b3e58aaa85039676eabcee2831d27909ab4f560349d909290a3ef93513965224eef7bb8532017a5078f6365f49bcbc509321b78e03dbfde5
 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 a3bcb033ce4b..119872fbb4a1 100644
--- a/app-accessibility/mbrola/mbrola-3.3-r1.ebuild
+++ b/app-accessibility/mbrola/mbrola-3.3-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
@@ -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 ppc ppc64 sparc x86"
+KEYWORDS="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 9ed69830489c..b34c6286a27f 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,9 @@
 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
 MISC metadata.xml 641 BLAKE2B 2a9a0582cf597e46cf71f11034a17ed3146f5d2709855be3f64530c94be53bdbb7ac8e8be859969706c67e6b32e1f8a33fe97b3e54d41b27a4f6ee3807f19fd6 SHA512 4119f9cc00c1978ada19d63f559ba35bec6299732bf50e3fb724c531dae3c3052e26fb1e7ec7830c55c98ef800ff0a6ecbb01df98e3b64781ff42eb7ef9ce7fb
diff --git a/app-accessibility/orca/orca-40.1.ebuild b/app-accessibility/orca/orca-40.1.ebuild
new file mode 100644
index 000000000000..3f9e8a47727c
--- /dev/null
+++ b/app-accessibility/orca/orca-40.1.ebuild
@@ -0,0 +1,63 @@
+# 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
new file mode 100644
index 000000000000..ce740f046a7c
--- /dev/null
+++ b/app-accessibility/orca/orca-41.1.ebuild
@@ -0,0 +1,63 @@
+# 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
new file mode 100644
index 000000000000..ce740f046a7c
--- /dev/null
+++ b/app-accessibility/orca/orca-41.2.ebuild
@@ -0,0 +1,63 @@
+# 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/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 42993c5937ab..2e3867b7d1b1 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,4 +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.9.1.ebuild 2835 BLAKE2B f840d158b1303532c3fd0f41f9e40bac941d06071a125bcbef0341e75cc0197fe29a47d495b8248bc714cf2f8da3981660b95aa91d8b178fb72a7c4a23303b51 SHA512 2e0e8b16492ee0922199389e05e7d24103d4090b218378ce3f50111705084515c112d9e363f6dabc6d10dee75e4bdbb5f7c794f4b7b6562baa11798f3dff0dc9
-MISC metadata.xml 633 BLAKE2B 02656914f79915c95b816db32c5196d5018a80967c1b21de3bac872528829975699a4a33c9dd5098db62b5ad7a3f23ddb12a9ad3317b70038428e027301eb8d4 SHA512 085016246af6554aa71ac1be359a3d9efef5610598edfbba986d3b8527ef5fc5fa0533552c58f3a103dda4d79d5cc6fe4d5697b22d46ae410a42ec2e87ec1b08
+MISC metadata.xml 708 BLAKE2B fdccc4d8de7f22eb64469021786480527bd87f3718dd5746426874266b8a46dcb6cc2b7bb25a4561a523362b919e0ed77e3f829f3fe269d90060d17a69f1b2ed SHA512 770e54e5ddeacc46165b90d41dd3ea0d1060adfdfb95055a9dab778f757189b892250e66b515773ce7b4d8b1bbdd692386b4d8cb49d670af7af8dadfed5c8788
diff --git a/app-accessibility/speech-dispatcher/metadata.xml b/app-accessibility/speech-dispatcher/metadata.xml
index 01aeb7337732..0f3199f11253 100644
--- a/app-accessibility/speech-dispatcher/metadata.xml
+++ b/app-accessibility/speech-dispatcher/metadata.xml
@@ -14,6 +14,7 @@
   </maintainer>
   <use>
     <flag name="espeak">Adds support for espeak speech engine</flag>
+    <flag name="espeak-ng">Adds support for espeak-ng speech engine</flag>
     <flag name="flite">Adds support for flite speech engine</flag>
   </use>
 </pkgmetadata>
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
new file mode 100644
index 000000000000..ec934b5203c4
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 systemd
+
+DESCRIPTION="Speech synthesis interface"
+HOMEPAGE="https://freebsoft.org/speechd"
+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"
+IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="python? ( ${PYTHON_DEPS} )
+	>=dev-libs/dotconf-1.3
+	>=dev-libs/glib-2.36:2
+	dev-libs/libltdl:0
+	>=media-libs/libsndfile-1.0.2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	espeak? ( app-accessibility/espeak )
+	espeak-ng? ( app-accessibility/espeak-ng )
+	flite? ( app-accessibility/flite )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+RDEPEND="${DEPEND}
+	python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig"
+
+src_configure() {
+	# bug 573732
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+
+	local myeconfargs=(
+		--disable-python
+		--disable-static
+		--with-baratinoo=no
+		--with-ibmtts=no
+		--with-kali=no
+		--with-pico=no
+		--with-voxin=no
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with espeak)
+		$(use_with espeak-ng)
+		$(use_with flite)
+		$(use_with nas)
+		$(use_with pulseaudio pulse)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	use python && python_copy_sources
+
+	emake
+
+	if use python; then
+		building() {
+			cd src/api/python || die
+			emake \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_foreach_impl run_in_build_dir building
+	fi
+}
+
+src_install() {
+	default
+
+	if use python; then
+		installation() {
+			cd src/api/python || die
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl run_in_build_dir installation
+		python_replicate_script "${ED}"/usr/bin/spd-conf
+		python_foreach_impl python_optimize
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	local editconfig="n"
+	if ! use espeak-ng; then
+		ewarn "You have disabled espeak-ng, which is speech-dispatcher's"
+		ewarn "default speech synthesizer."
+		ewarn
+		editconfig="y"
+	fi
+	if ! use pulseaudio; then
+		ewarn "You have disabled pulseaudio support."
+		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
+		ewarn
+		editconfig="y"
+	fi
+	if [[ "${editconfig}" == "y" ]]; then
+		ewarn "You must edit ${EROOT}/etc/speech-dispatcher/speechd.conf"
+		ewarn "and make sure the settings there match your system."
+		ewarn
+	fi
+}