gentoo Easter resync : 12.04.2020

25 files changed, 195 insertions, 25 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 81e29239bf6f..8b8caa866556 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index c10d6c007052..db6818f9a1ac 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,5 +1,7 @@
 DIST at-spi2-atk-2.32.0.tar.xz 94952 BLAKE2B 972bb32590a51549eb8b0b3c46a068e95cc43783f0f0e31ca3663ff1669196a88def63342c01d056d45d6f4fb4bcc2127b50a49be37fd45d33aa1daeadca5172 SHA512 095ceaa33d5b35f1f4f81a31bea00487c054493cb29d4fdbcf74331ec8d1b9570dc7cb93e1cc06da9ea3f5805e7a3a9e7bf80cfdbce86a1822c2a46327109393
 DIST at-spi2-atk-2.34.0.tar.xz 96116 BLAKE2B 242b29b988d97b06ca85495be77f9c4cf1c621d9ff977cd73ea37f97b42fc636474df34429e7397fb3f91d3d11b14ce1b3de5d68c0b30f85877f444c78389564 SHA512 515ad4d0a000fa47a7848f3ea9f95f8e0c582f9d9876725deb8e521c60e290f73655445456e6c238f382cb8773b56db2795c221029ec931bad68395326b6bb04
-EBUILD at-spi2-atk-2.32.0.ebuild 993 BLAKE2B 74d5ca20ab2be38b6fd287125699f209759c3c3be671e3b7e0e8ed80862c6cbd7e44d416dac6b59746e72e16c8fdbbda707b86bfac918daaaeafc31fa899f8aa SHA512 e051670bcebb3a64dddec3c8ed98c0a4ab56b231d077c75d658ab6d501e68154a593aa8865706c6b935a9e8bde4f209b3e0c6795e1efd11df12bd4e028ac9443
-EBUILD at-spi2-atk-2.34.0.ebuild 1004 BLAKE2B cbf4a24cadcb494e391d73952ec8b3f19cbc0d14dd285f2625629579e209798b60033d2adbaa368c65f6d1657e221d35010a47ff5a71dbe499c66ae3e34c6a99 SHA512 874549badfc3ae3cb0f78696b36c3c11ee47a52c31d73f0dd1c577b9560dd4bc0a8365fe34655aa2e1f1c02891335ea0027179174bdc6b9fba69cfed56ce6acd
+DIST at-spi2-atk-2.34.2.tar.xz 96608 BLAKE2B 4a3ef71580f4eaf3ea0846c8a6909b686f7ae0c7202918f3e11de019fa7290dada5a2eb3f495ce476bb56a28787967fa87fe74d422d4144e7555541ef99911da SHA512 59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4
+EBUILD at-spi2-atk-2.32.0.ebuild 990 BLAKE2B bb6cfc5c0d313cf14d34c347d30631be9b7e29a580c91418dd9f4f07f32926f9b1bfafc142b9916cbc8e5c5d28c0f20815d1657dedc21750e0306729ea22ac4d SHA512 604f26faf87462148d4126c758ef3d2f2aeee503636cb2825fa7dc4a995772e5ae369157001958222b0d80e6e5df62a49b42abb62fc5fa13124f64085166fab5
+EBUILD at-spi2-atk-2.34.0.ebuild 1000 BLAKE2B 01778f220e8f9d2fee40e9ac7eb1f1f5a2afa468f87f023287989e1ac9c1927d8693e9b5419ffc3f9b25c6105af3151c211767fc4cb535ba9bafdc1ccd7e1c76 SHA512 73ca486ca0dc4b34ee3267427a29411b8bf755f40e6f6b6b696e55b2ead8310d0c8fd59c6f648744c314b16caf3bf8e89d270ead07d0f56d2bd8b6f6c91b7477
+EBUILD at-spi2-atk-2.34.2.ebuild 1000 BLAKE2B 01778f220e8f9d2fee40e9ac7eb1f1f5a2afa468f87f023287989e1ac9c1927d8693e9b5419ffc3f9b25c6105af3151c211767fc4cb535ba9bafdc1ccd7e1c76 SHA512 73ca486ca0dc4b34ee3267427a29411b8bf755f40e6f6b6b696e55b2ead8310d0c8fd59c6f648744c314b16caf3bf8e89d270ead07d0f56d2bd8b6f6c91b7477
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
index cd11d7751d1d..56116f115112 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
index 8e6420357ff1..c6a01cab85b6 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
new file mode 100644
index 000000000000..c6a01cab85b6
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson multilib-minimal virtualx xdg
+
+DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.33.3[${MULTILIB_USEDEP}]
+	>=app-accessibility/at-spi2-core-2.33.2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/libxml2-2.9.1 )
+"
+
+multilib_src_configure() {
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 3bec385e4ac6..41c7f86ca928 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,6 +1,8 @@
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
 DIST at-spi2-core-2.32.1.tar.xz 188952 BLAKE2B a12e234b19a38b0fcffbabb8430ef49dc538b38831cc22bbafc7f5d499082007909a82e785184d052f3a62853474cbc4838125540026a6d0e2ac2181e98a6a4c SHA512 cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca
 DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f604864e24228650d4be1026dc73ce0ec5d10eec5e9958a98f0970e1292e4fc3935c8379278b10c633c87da5eb3960b94670 SHA512 99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8
-EBUILD at-spi2-core-2.32.1.ebuild 1486 BLAKE2B 7d5f24a05cce4206650de3a40685fe23632eed18e262b042c7517ee1f3faa8581b76c28ea7a61bff1310b4fdae741b078e95ee3eda453840a47e216913dafee5 SHA512 07cdfe8ee52d2c1883a35a8ade5f9cf677525684d623c9f6cf8396b71efc16610111e49fa946caab0b7cee66205240b80887618f73284bc02a713194ab4398e5
+DIST at-spi2-core-2.36.0.tar.xz 186824 BLAKE2B a713d413c1ff291bf82107f6bedccd24d5e9e5312145ac7c4783fcf8366238c2d5cc4ba442fb0c71286abcd695b516861387f76c22ff9e427bd19b99bb7d5d3c SHA512 f45d7e68bfcd9b93cebc47e30febce1ae6a4d9df2fbc9d5bdc25babb123c922d0f9a229485770b2f6ed386178144c20486fa3e46195041ea65a54ab019b1cbb6
+EBUILD at-spi2-core-2.32.1.ebuild 1487 BLAKE2B 4bd13b2aedf9f19e533a481caa0af51687741cdd2b03dfc54fef7b1df09e6ea08b3491f22f4f66b304eb99b553c9ba880765b2b15b3cdf53d714d65a5e1675ef SHA512 617d3f33c40a9c7e438cd14695d9b04f5bd556b91673e74c227020b8a0096c3ab53f5640273cad90ab435c16be5346471158fc5d1adee0a75f46ccfe32ef2283
 EBUILD at-spi2-core-2.34.0.ebuild 1522 BLAKE2B 984d61b0604193e018161d33f41130965d4740f83285a19ff054461ee2b8bec6952daf9d183fd6ff1327eaf0b59dd6fe3798a6e299a0e31054c20c1639cbccac SHA512 71c45e02d51f45c33ba2ef7f32465985affcf31d10a9dd7240595b308aeef59018319a723582431c96d37373c83b354719b3ac405edf2ac4cb6264f95f0343fc
+EBUILD at-spi2-core-2.36.0.ebuild 1553 BLAKE2B 988a03cb8d41c2cd971496bbe521e159358aebf147893af2934b7df181530f855d0e8ec3e94a379bf1f7b09d90dad0c2bff050d859e9ef99bb7cfd000deefd7e SHA512 8abb98534daa9533b52cd1723c6de9981e6597af21eac90b4d24d851689d5a0c7264f97625d9af1e13bc172a2f4dd0890ba9434c13bb07185c18b15fd3db2e7b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild
index 012fe8139f86..3b35954bef94 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
new file mode 100644
index 000000000000..67e6586b1007
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson multilib-minimal systemd virtualx xdg
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="X gtk-doc +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+RDEPEND="
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.36: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/meson-0.50.0
+	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[${MULTILIB_USEDEP}]
+"
+
+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)"
+		-Ddocs=$(multilib_native_usex gtk-doc true false)
+		-Dintrospection=$(multilib_native_usex introspection)
+		-Dx11=$(usex X)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index f9b6a728bace..1af2c1a60e7e 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -7,6 +7,6 @@ AUX brltty.rc 241 BLAKE2B 873b1344cc6dee3aa6272d9c8857b58a751200e77d7fa0d96f9ff9
 AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
 DIST brltty-6.0.tar.xz 2879976 BLAKE2B 31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265 SHA512 07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06
-EBUILD brltty-5.2-r1.ebuild 5219 BLAKE2B c3a1416bddb009cecf6dc089bc056b3670c30e458d3c59cac3e7e8441435cab55f72b6c825590520fd34b8a92fefbca3d60d1c3bb853837511de7ec0ffae18d3 SHA512 9274696430baed6d265e5bb69439d29852a2097e8e776e2935a686aedfab14a8b98b85c3e08cc4a202446a68bc44bf1a90615a4ef232f1256e45dbd510546abc
-EBUILD brltty-6.0-r1.ebuild 5568 BLAKE2B d4a1fb7b33cf644117f65cb9a9c99f0829379f5cd6e417b0da045f68209e7992527cbe7e2d4bc7ed3b4e996e61d18bcfb550b21a6da17e6b876a092bf203a4d0 SHA512 7181962442e74ddc56f23d9430f76f8037695d744e68d41be13c9d3ab1d8adeb723286f692a71910304ff26bfb1e37e53987f49eb2f26d935f89a884da86ad82
+EBUILD brltty-5.2-r1.ebuild 5215 BLAKE2B ad5879f375ea36d40a0316c8b5ab300b3c600e802cc3cafbef79072e199c3700c569a7d7c2570d4c3a2c5dedac610bfb179abaa61c04f16da0d33e40efcd3ec6 SHA512 af1e9eb9635767db69a1c1ce028ec22ca2889e5195e66900e284d1722c8daec99c4954741e504f1080a6096eef6974766eb5b850230a009952686b53612b41ab
+EBUILD brltty-6.0-r1.ebuild 5562 BLAKE2B 7839402da950493fb41fe59c7cbf08693a16099c586af095c6da9429d547e41728073b8018346a2b752afdb504a12391c386dbd99bb67c9dad95091df0007f0c SHA512 2d6825b895705618e965474478202e73441e2a74a1291f3901a4dd4c0bd972df87e542218dba59e4fc9e402dc6d71fcd452451c2f0376af59b31363c469358b3
 MISC metadata.xml 1661 BLAKE2B a4687ddd715019cf8273353b4a70a4981e4925f5e931859280b2f836b8f56f82708b82a1cc184a3e056febb15649987650e1312a00ac8a35efa833ae2e4d1f7d SHA512 c7904bf90031faaa478456e3f3e6c59f969e9abba2cee33ac7ad7041edaaab8ea89ca3301f4bd7a7f385507623f316fa4908ac2c6e66a94ac108bce2aad87936
diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 6f2cfc46a783..64b28132085c 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://brltty.app/archive/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
 IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
 		java +midi ncurses nls ocaml +pcm python usb +speech
 		tcl X"
diff --git a/app-accessibility/brltty/brltty-6.0-r1.ebuild b/app-accessibility/brltty/brltty-6.0-r1.ebuild
index 751c3942a0a4..f5c8a4a1f32c 100644
--- a/app-accessibility/brltty/brltty-6.0-r1.ebuild
+++ b/app-accessibility/brltty/brltty-6.0-r1.ebuild
@@ -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 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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/epos/Manifest b/app-accessibility/epos/Manifest
index c5bd72b65b3b..9d6b05d68013 100644
--- a/app-accessibility/epos/Manifest
+++ b/app-accessibility/epos/Manifest
@@ -6,5 +6,5 @@ AUX epos-2.5.37-gcc47.patch 333 BLAKE2B 0ad7975a408e97aab6761b362063b61b2d914e07
 AUX epos-2.5.37-gcc7.patch 593 BLAKE2B 10d992f2f886318904dbbaab4707f453ee846e469415b9467ff0e05d586466b5bc176f41b5805f744dc7873fd7223372a59909fedc946cd9d950efd7b4bc7c8d SHA512 b19d218dc3387efb2e9ea8d444692821c53a9cc77ab8541ad7b95a280478983fd8644fbe8dca305539c487c06c60a2b67dae09bd1e3776e3f2a07cb26631b46c
 AUX eposd 442 BLAKE2B ac420143183e28654de3289fe0d27c9582a2b53024048c7beb4fce4287d38ef0f585cd9a449f92d999bfcf4c382ea8f86d25750655d222e87e2f28416fad076d SHA512 3a60ab455b7c00ece42a759fb98bc3e9948134839f709ed16123e39a323f24fa166907f981f65510d83f2fcc52697a2535cfafb4e7ccbb0f3d8c116123f662ed
 DIST epos-2.5.37.tar.gz 976240 BLAKE2B 9304ea32f9506f130d13f5c1d14ad2dcc448cf978d0f7cd26f6bc97397f4590bd5456c9a529dbb941eb53f19cd64b849a1cbf5aee402a8eb171dbacfc85ada03 SHA512 870718a5e7b5048eafd62c478963de92fe8a90b3e755f79ea665dc33ad762c0ec4ebaf7c99d5f2be8983a0deacba284ae07b24d9a31bdd1a1eff5924327255ef
-EBUILD epos-2.5.37-r2.ebuild 935 BLAKE2B 8183e2d52af01246767e63ccb111a429ed22366032ce3970014b76fad8152437757492e25be36c7bade01495453aefab4af014d902e7ead7cbd9153d55ef2be4 SHA512 00e0e2fd254d7eda4ee49e37fa492dc88bcc43e734c09f367ace14f81f88d24c439c379958c72a08e91bdf6394074eac7d5b020d5ca1e19c2da6cdb809fe096d
+EBUILD epos-2.5.37-r2.ebuild 937 BLAKE2B de7d55a88f3a9ad7513f72dce06ea35f479ba1b247c165ae5547f5e6c5ff64f9ff75f4ec0f767ddc5a13899a07a18788f318961786e1782d7be0690ed3b5f753 SHA512 c7b6abb527e2eac102f2d18a83e5c9db26490143f33be0a99f88eb5371589c662078368343552221e5146a01e3cecfc6f33bebf1ce51815ecd0d3a178f822107
 MISC metadata.xml 343 BLAKE2B 77d619d13082c8c8248f671c4e29031867028a05373e9ae48950a1d88540f3b1e5529739ef6e1a1479e04e3e6abd4556d1fd8cf39e5f10481d97110ecb0373d6 SHA512 0a3cbb37dfe8c2627ad7082f9f910c949d9f2477068ad7c68bb17658f0331bc7c736e84c452afa2204eb7fbd01c2edd68583800fcaec6962e456743999b0457d
diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild
index 0f1c8b1f6b49..89a3e1ef5923 100644
--- a/app-accessibility/epos/epos-2.5.37-r2.ebuild
+++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND=">=app-text/sgmltools-lite-3.0.3-r9
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index f5c12debd16a..68f2af1d952c 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -1,7 +1,7 @@
 AUX espeak-1.48.04-gcc-6-fix.patch 531 BLAKE2B e17d5304b52ab2e805f63d685f05bf5343a9fd1b64876091b64469ec652296a5de2d04e40b639bd1acb455e133330bfbc270e0d3293b4c487ca174e97d2d4837 SHA512 92966a8f3ef3a4cca2b208216ae9ecd65efdb67001b4ed8c0868bc95bc87fec88826f7554a5239c97269dc673cec8ac70f36c9f3fe186f0a5e6eca924e0bb681
 DIST espeak-1.47.11-source.zip 2813649 BLAKE2B 0ebeabcfd8193dd0d37c43974616f5fc4d769bde7b0a730b37456cd1ab580ab84b5bc141804f4c25d7bff6f4b401fe46764e0117cd9c4a55e2216de6965c17b7 SHA512 77c3989fbd0e4aadae0da2d7f1c587854895ae103633704ee5b4042b0618897d01edffa80b1f13e6cbf356f2f31beaf4fdb7e90e4ab641d5286d559aaefe932b
 DIST espeak-1.48.04-source.zip 3019245 BLAKE2B a29da5eab832fa76b180049765f7fa671ebf47c0a68ee2cdfb0f4466846d97b2bf7b8f07dba747e236a27c9b077000bfd471e35b9744ffac7c9014679f5c04fd SHA512 f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa
-EBUILD espeak-1.47.11-r1.ebuild 2167 BLAKE2B 575ef30069d45a2206243a38e0663a8ed0eb5f21e00070b7c8f3e5ac00c657b25917b66cdc3cb62cc798bc8b05c7cfab8c438c0fe8ed7e7363d18cd6ffda4576 SHA512 a3fe2bbe758273afb2a6df11c3178ab631a6a459f977366a2c66a85b28512df9d8ac2226ddca82dafb1cd43ced1a6a2b93d7d4c2029edb90dc628f2b9bfe1b4c
-EBUILD espeak-1.48.04-r1.ebuild 2230 BLAKE2B c1f940ac7d23c6dd085947bd4533903a91f2050e2adfd283bf56bae8328363f4bb65b6f6bdf75f04cf2ffa57cfb8f1f3bdf1e49c80d1007db30cb51d296a6b33 SHA512 8ff66386626f0919c8bc54442a251612e8ca4521522c3a89169417ed66c11c7def44fc3792bae85ab9cecf57bf88a8447e11b8c49da797b8232ca9a4951126fc
+EBUILD espeak-1.47.11-r1.ebuild 2168 BLAKE2B 2135fbf742dc9c1222a01dd3c571387d17b4feb8cd8230e54a76492440e6d25672363887caa55b0ff672479052ac421aeb94aefe085a8cd95bfba9f73651f30b SHA512 b2cd30ce382ec869c04a310d7de495feed225e2e8ba6a54eba7a61515f26633bd96cbe096c03c4153c5678fa695100ed03b613ad62a5810a0c18879c09e50449
+EBUILD espeak-1.48.04-r1.ebuild 2231 BLAKE2B 5d52c5d706fc4b94e109c1a230300c38987f7e0c93de96995e60f84e0de2727372fa06bdf850f951f78fc8d247b10c366aefd5795b7c034c468b552a54d9a7be SHA512 0a88d6efe82d6b340a053f2871cbf60e36f579b6bfde6c82e63f765a14593174e5b8e3692f027b64f710d6d55bd49d6cd503779a606a0713559092c5f19e5e0b
 EBUILD espeak-1.48.04.ebuild 2184 BLAKE2B 6b64fb9c609d35c708e6caac07671efa7faa0ee6ef20857283991898b76b8752ec1325c3011468d90c1a46574b33d3cd5f6e630617cf2e2f50abdd344d7c0b53 SHA512 25f0d32cc339ffe486127cc65e455cb5c5d757f3bd919c1a070af17645b09982fe70b5ab6932433701e040096f3adcc65d3ed93c65dcb80ba5c8e52b5d437659
 MISC metadata.xml 425 BLAKE2B a6169a58eac6bcb96da0494648d79f9d5de93430a267d7530f98204562da315deee7ac12f33b0b31e00bd25d190d63a89d00496f6f571ff9cbeb20bb9ee1e9bc SHA512 b3022c321c69fc77c743a0ef402af1801d426e3b72e84754100a4197a5a82df99bfe85b05411d0510e93a262b91d10d63189ff878af91383583e718b8e468f77
diff --git a/app-accessibility/espeak/espeak-1.47.11-r1.ebuild b/app-accessibility/espeak/espeak-1.47.11-r1.ebuild
index 871a512758aa..1682a370839d 100644
--- a/app-accessibility/espeak/espeak-1.47.11-r1.ebuild
+++ b/app-accessibility/espeak/espeak-1.47.11-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Speech synthesizer for English and other languages"
 HOMEPAGE="http://espeak.sourceforge.net/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="portaudio pulseaudio"
 
 COMMON_DEPEND=" portaudio? ( >=media-libs/portaudio-19_pre20071207 )
diff --git a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
index db6bbc470177..ffc6b42f28eb 100644
--- a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
+++ b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Speech synthesizer for English and other languages"
 HOMEPAGE="http://espeak.sourceforge.net/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="portaudio pulseaudio"
 
 COMMON_DEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )
diff --git a/app-accessibility/mbrola/Manifest b/app-accessibility/mbrola/Manifest
index 8b4649258bb6..d8228c9b4b27 100644
--- a/app-accessibility/mbrola/Manifest
+++ b/app-accessibility/mbrola/Manifest
@@ -22,5 +22,5 @@ DIST sw2-140102.zip 5629399 BLAKE2B ea0b340dc4b0cf3fa7cbb170d2eb51d7a3f1c383de1e
 DIST us1-980512.zip 6562915 BLAKE2B 72d884f6f8a83a07786363be8cd919748334bae52637e18b7970eebc53c3f267b3f65ff16f4440298c2a166733a38585ad498c40a2bedd7ddf793ce75d044a9e SHA512 e2b1eb7325e9fe0b58f3b0e265899b0da1cf5ec1cb183f241bf73ba670528b56cd091277f432446e6651d81dca21f2b2ea8a84622dd655d125cedda0447cdb62
 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 2649 BLAKE2B 2744a3a082a35b18dedb27573c27a46df7cb02acc47db8c641c973c812f758ee4c892c942366e1d461379da7859d4c323a87e84a35fc341fa9405dc3ec57a6a7 SHA512 5b4e21ffd36812f72fe67f98fed68dccd9e92c8f48bba7ba6f54524f4b165474aece236a44c6300800a7c13cbc34a1cf3ed95b7310d1490705a7ca717f197a74
+EBUILD mbrola-3.0.1h-r6.ebuild 2651 BLAKE2B 3a4701410f5ae127e2c251a695c6e96f175b9974ae4bd15e2be261cdda582aa468f271a2624080b4104a33fe1af83288c4e02e5848473b28be8537be9d38127e SHA512 7e9df77ef04eea2a5acff483274236c8fece0fdb4c7ddda29213660bdd51f8c674a423f5e78ec48400ca0f18fac8d57a483427acc79b5b50662e76cdb9c57fbc
 MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
index a825165455a7..730368dddfd7 100644
--- a/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
+++ b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
@@ -37,7 +37,7 @@ S=${WORKDIR}
 
 LICENSE="MBROLA"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 RESTRICT="strip"
 
 DEPEND="app-arch/unzip"
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 8d7a17319e8d..1d88b4983678 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,5 @@
 DIST orca-3.32.0.tar.xz 2512032 BLAKE2B eae6c726e5e7361b7d60f0907f8c62c476895d681cf424940586e6308bcde147094a9557243aae6ecffef142bd556cb3cb30839955403e0958f123672400bf0a SHA512 015aa26ddaffa53d646e5d708ffed9e771beebbe925c27b963cbd3c3a2b36f730c0668cac6b89a371cd81cf8a570eb591711ba923fa4d013e00e31667749cf20
+DIST orca-3.34.2.tar.xz 3509556 BLAKE2B 4e73517660b837cec6d4dc12e3b2e57dec526f22aa407ababee2cb12c3aa8807184649b6962f26551926b1b3f8c49230054b4ef5583e15eeeb94685aaaf3ca13 SHA512 b685bd8e417d74ccc0d0ce6b15b3220e5079320198886f568147480f107f7d0273cbd412fdc2c6cc509d3210b36c40aecb50e167d43120f6770ce02a0891ad20
 EBUILD orca-3.32.0-r1.ebuild 1581 BLAKE2B bd8534d0c6911aea40b693d08fc631dc98b555e133c032f994ba58b42e54300ded38f6f2eda728737af7c112447304f91be7bdc11a9acb1db3a0197b2a7a1adf SHA512 40c66ce3bf75bd9172a8462c759f820331f8cc94a092e06da2daa788328c4089bf6180ccd4310d1410ec43762fe7744d8c62b03d155d864001ea9702bc815033
+EBUILD orca-3.34.2.ebuild 1585 BLAKE2B 0f93ea3e8ca1c9e70bcb06d3e8fd374d0d1ed2e375382587ba378c9161a0fd2a81f7b25ac03bf37d0c55a23f1de2bba5cc17bee6962f9ea81e188a9be8f2cdf3 SHA512 8361700f025cbf3a5f13480070d5236fcf951bdd7a730470e6d32bbdf204716855d225746a76495f03a1d84dc33574c4a7318f689600176daf78c6a04c791172
 MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
diff --git a/app-accessibility/orca/orca-3.34.2.ebuild b/app-accessibility/orca/orca-3.34.2.ebuild
new file mode 100644
index 000000000000..0b1b19b52459
--- /dev/null
+++ b/app-accessibility/orca/orca-3.34.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_6 )
+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 ~sparc ~x86"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-atk-2.32:2
+	>=app-accessibility/at-spi2-core-2.32:2[introspection]
+	>=dev-libs/atk-2.32
+	>=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_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}]
+	')
+	braille? (
+		$(python_gen_cond_dep '
+			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}]
+			dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/atk[introspection]
+	$(python_gen_cond_dep '
+		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyatspi-2.32[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with braille liblouis)
+}
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 4b3277cf1f9e..49b66855b76f 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,4 +1,4 @@
 DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375
-EBUILD speech-dispatcher-0.8.7-r2.ebuild 2684 BLAKE2B 65379ca35dac41069fef08863767d136f6c581296047f273c6b8a43d5a5e3e8b5a8de7fe3cff95942c7f92a0520b7bd3564dd64170d33267cae696797e32f8f7 SHA512 9e266ad0ef61c7fa6ad4255f2c7b3a1f9af29695cd8fb81a7545e46484dd57cdea2020912b156a5bc8ef9fddc25956b51050fb46d24dad0d2b9c4bfab97cc91c
-EBUILD speech-dispatcher-0.8.7-r3.ebuild 2696 BLAKE2B 60c75d191fe2475abafeb904141019751bdc2d17af6fbfde95abae5e1b5fd322ea22592db33e790c8cd52c10c77234abafdda082774dafe26e2013296d5684c5 SHA512 0a3555c8e8a09e2ebcd300be1bdba6ac84948ea5e320274c4e92c8cb1cafff9ef0a2e436adfb00d04114bacd5578593c3fde9718802b9268cf9268b6b9b4a433
+EBUILD speech-dispatcher-0.8.7-r2.ebuild 2685 BLAKE2B 22ae5148d6c3c4b9a19acc2427b15911cf1e9cf67f59d0e29e01b3a10e923f570850e40f126bf5f2239724c616cead6839f06b09f8972472e843ddeab188cc8b SHA512 4b5ecf6786ec702f7eebc80f6107e12b277cc1bdaa9f185e86046d5b2655b9364d281d77039c9b6291f2c340d5e103a0015e6713c1c67cd11462e3973929489e
+EBUILD speech-dispatcher-0.8.7-r3.ebuild 2696 BLAKE2B 7c4d2cfe83ece59af0af6d4c651fb96d37ae474a4417a57a3b242a41dae60caecefe0a7b6f9eb2c202c6b697a5ea01ccd50d848e51fbcc1f1503f0ca95ea0b19 SHA512 e506b6cd40a87d3acf11ca86ea02ab58c28489bb810e16ba347b640c1da5cb915bf904ca80cbb5ceb24119766e29b35c8a53f6e4bc56f83a85b2095d01b00e06
 MISC metadata.xml 632 BLAKE2B 2a60d2e822db36bf3f0547d97ccaad05d6bcce11afa71534b108358f1d71f857f200907f01c31c3083a5196e43eb681c06e2991a086c91731daced3f56282c2d SHA512 db94cba99bd2c9bbfe98b1647ac53a3861cbd697df791bea025e2a713a5991ca6929f2bc82a985ba38eef4a2571515d96aac6558fe143b68e24713490c12dd0a
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r2.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r2.ebuild
index de997adbb26a..9ab5bb701011 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r2.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa ao +espeak flite nas pulseaudio python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild
index e71d2da5bf07..97ccf4e91d72 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa ao +espeak flite nas pulseaudio python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 0d461a2c17bd..0179460d073f 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -2,5 +2,5 @@ AUX speech-tools-2.1-gcc7.patch 612 BLAKE2B ded8216c1e7c49821fd1bd738f1c0d508afb
 AUX speech-tools-2.1-underlinking.patch 565 BLAKE2B 1be43841d09fe456874323a02d63253dae37dfe6f6969f7d9941c8a39d0ad9127e8fd1b87f5b6e59fcc505f2c9e2bc988b4f572ccbb01418d11ca0fda88b262d SHA512 4091b64da995f2f859f8debd7c6b7c20bf3a788c91d8aa7651f3c6f89445c9fc60b60923a3056de678ec17faee41839917131b9a3176e53c0afc11e24fe92e47
 DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3
 DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
-EBUILD speech-tools-2.1-r4.ebuild 3049 BLAKE2B 9337c7b504d58db6f3fdd3d36709e6c84fa262adf04327e2c17988d73a74bbfd87fb186929ce9c784eda76b019ec6a39e1466c819f1313831ca7ff8c33e46fb6 SHA512 b1ff9cd4dcc1717d4e87c88f59b1368cc735baf9b592682512491ed9fcd879215fb550876a9d82b3ed2c3d677d43622961fa1ba13c0a252fc7dcb9125db68e2e
+EBUILD speech-tools-2.1-r4.ebuild 3050 BLAKE2B 55f937d6a041b5008b7e182502fd9fbd325497219207c2ed90221629f848aaaa500e3310e190d9123c976d33bb0fe111ba6600de43b7cd2cb6905b80aec893ce SHA512 9ff9c6888c37d184eb3ce3bfab898579145e50d45e6624a1560ecfa0ecc479e24a8ec430e664cdcc62382b90843ae918059c4ec28526cc1286a477cc86a1466e
 MISC metadata.xml 482 BLAKE2B 2638ba066698967011156e0333f367bed8b4a6ffcf765afe64d976724264db09fa2dfb8c6a10f35e3bc298d0b1e9604f8081a74d130a7afbf4ddd019dfffab8b SHA512 1752986ddb186ab10d069dce7ee81c7d0077673a06682e15f4e66a5a87cb29ba4e126a2a627f5f43e388a1d180e243d5362cceae943b1f90b35f54c19de1d2ee
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
index a633997505e0..4a54649722d2 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
 
 LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="nas X"
 
 RDEPEND="