gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-accessibility
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
51 files changed, 125 insertions, 780 deletions
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index ed8b2a18173d..55459eab9796 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index 54d79e9676ef..42f75f5708ad 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,5 +1,3 @@
-DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268
 DIST accerciser-3.38.0.tar.xz 2006380 BLAKE2B 8a073e3a933386c9ae46d71535a3a49930bf8100d1458ac1875e1bcb69acc13e2331ac568c566ec6b8fe8ff9836155cc2ff20558de0e21942a29a568ff916fa5 SHA512 5740e4acfb00f5842dac8045ca9f10c85cf2ae164f3e0caf63ec303ff104002ace6de591a9b6516c4052ec0da8e48b394647f018b6c8b68a6c5ff77c4fff2904
-EBUILD accerciser-3.36.2.ebuild 1147 BLAKE2B 5ae48b87a8038579c8f1efbacfefbc5e15397d4d469ddef942ca0c9c85a4d413efb5b837063597ca2dfcb32b24829f0bf9a015b707938ae85587aa9e5a258a8f SHA512 3c5b7918d0b04f2e1000ddc2ada420b16380581909b2e5f90ddbfc79e1bed8926f2dece2ff86aef2caabdd6412f2093b2673049e3c711ecabcfab107172755c0
-EBUILD accerciser-3.38.0.ebuild 1159 BLAKE2B a43f4da724072499590589673998670fe8d475d2d9ad1b6f3c0da47854d33465ec4bea1d6decb1eea83799f481924b5fa75e33b1c8c70aab824e02b1d26cabae SHA512 94a9fb0839c322ad85eb29848000dc9b965ea2ddd11a767baac46792bfd8cde93ed9b319356a2413e778802571e4868f62186eea9ea5d32b503e8481e1766ebc
+EBUILD accerciser-3.38.0.ebuild 1157 BLAKE2B 91490806db7017c5f49670526faf068db61fbc51ee8f47fa8b721f9ffd7ce78530591f7519a7595bf7bf80f30fd4c4570aa601eb8e4d79771f11e3d6e0c2f411 SHA512 359db1b762811047cdc6977deed9fcc311d66abe8dd45cbc187208126b43bee2b04ba437c2eac646de43eb26661c12da2082bb7cb1c886131571b9787cb98af7
 MISC metadata.xml 738 BLAKE2B 916b10f5cb4aba612767ff5a617c091a36573681418c15973fbbff3328e00311306b162f504e9a12e17f04dc582f72bae21508847fec79a8d8cad4f3e18c9cb5 SHA512 78780d3254a608f95d3532de8a7438e891bd2e194ac8a255f2d224e8f4b41c2928b2efe04ae16050d0092f9e25f77800728f0be9b7cb3bcb955455532d4154e6
diff --git a/app-accessibility/accerciser/accerciser-3.36.2.ebuild b/app-accessibility/accerciser/accerciser-3.36.2.ebuild
deleted file mode 100644
index 2320e578c6e0..000000000000
--- a/app-accessibility/accerciser/accerciser-3.36.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Interactive Python accessibility explorer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
-
-LICENSE="BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.5.2:2
-	>=x11-libs/gtk+-3.1.13:3[introspection]
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-		>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
-		>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/python-xlib[${PYTHON_USEDEP}]
-	')
-
-	dev-libs/atk[introspection]
-	>=dev-libs/glib-2.28:2
-	dev-libs/gobject-introspection:=
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-	gnome-base/librsvg[introspection]
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_install() {
-	gnome2_src_install
-	python_optimize
-}
diff --git a/app-accessibility/accerciser/accerciser-3.38.0.ebuild b/app-accessibility/accerciser/accerciser-3.38.0.ebuild
index bdad92ae536b..75c56eacf543 100644
--- a/app-accessibility/accerciser/accerciser-3.38.0.ebuild
+++ b/app-accessibility/accerciser/accerciser-3.38.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
 
 LICENSE="BSD CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 76ab9fdd36de..1dad61002e2a 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,5 +1,3 @@
-DIST at-spi2-atk-2.34.2.tar.xz 96608 BLAKE2B 4a3ef71580f4eaf3ea0846c8a6909b686f7ae0c7202918f3e11de019fa7290dada5a2eb3f495ce476bb56a28787967fa87fe74d422d4144e7555541ef99911da SHA512 59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4
 DIST at-spi2-atk-2.38.0.tar.xz 97464 BLAKE2B c5a62bd157ac6dcbf19495eb8f92bd6346651b8df64e15acf4d25c1ab35790f154bead1e012714da36c700e58e164527755137a33812f3a1844aa34f0293ebf5 SHA512 2f40ecbc55b0fbaa57ade952a75583bc8fbfde234cce9248489e9ae06e0597d98c2f4c77d8279758dec29da97e06cde5708d30a1238d91bebd023b2320f38528
-EBUILD at-spi2-atk-2.34.2.ebuild 961 BLAKE2B b83a2ea3ada04488f968a36041ea0eb75fae12a8fc44b29c8c8e8b8b3e95e7506b33cb45fd2ad47231f14a72883423961d95dcbfe8b3a92869606bf3cad80e01 SHA512 46d8158b1e9639c654cdb8146dbdc26393477cb199a85309c9e06265b596d29ebd20f328021a5ad45e3156d916e6d7d2d96fd9f9cf956b21f09ee4d1d5b1790c
-EBUILD at-spi2-atk-2.38.0.ebuild 1016 BLAKE2B 00786b0ab395c80feebff82293f583c339b04524a609c8794e2b29d9751ee9354ce02711e24b741cdb058530fd7e1befe625ee8cadc1e2527a0d0c4713b3fc63 SHA512 ffa8c6f86c5ba9362d2d913a3ec3c9f7111aba0fb89db7972aaf3142a05e96b480be0866dd809e116d02a6e2ac62897617c3237c262bf6d4708a2cce7d5006cd
+EBUILD at-spi2-atk-2.38.0.ebuild 1011 BLAKE2B 56155586362e89368be18387463f626d5d6c35bd42a79df5fc35ecddbc64e322afa2e51e33a9851bc4c913631e10dc2ae99986482c52cc85580f1eb51eaadcd4 SHA512 15850bfacf0480c5d577117047133ec460cddd3e7d1df08bbeac0cf89c464eaa9e741e2884a15390b8400715d9d37427ef6c6cef82d6c0e0146e8be1beb88519
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
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
deleted file mode 100644
index b1d53279b097..000000000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
+++ /dev/null
@@ -1,43 +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-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"
-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
-	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-atk/at-spi2-atk-2.38.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
index c9814ac68781..29b6199d1674 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
@@ -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 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 54ec10755198..cc4da618be24 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,8 +1,6 @@
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
-DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f604864e24228650d4be1026dc73ce0ec5d10eec5e9958a98f0970e1292e4fc3935c8379278b10c633c87da5eb3960b94670 SHA512 99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8
-DIST at-spi2-core-2.36.0.tar.xz 186824 BLAKE2B a713d413c1ff291bf82107f6bedccd24d5e9e5312145ac7c4783fcf8366238c2d5cc4ba442fb0c71286abcd695b516861387f76c22ff9e427bd19b99bb7d5d3c SHA512 f45d7e68bfcd9b93cebc47e30febce1ae6a4d9df2fbc9d5bdc25babb123c922d0f9a229485770b2f6ed386178144c20486fa3e46195041ea65a54ab019b1cbb6
 DIST at-spi2-core-2.38.0.tar.xz 190540 BLAKE2B 6c5c479c279285460a5ff80533d600b5173fe9bedacfa1522bc37da4a305b965cec2c677eaae8be809ed1a5fd8aaef6475fd27b80510efd1c530e46368e954af SHA512 3a1eb27cff6e0dd03119b4f8361a3b6037b26c511e80e2d003d1d5c41fede6d49eb5e0ac1ee45cfb4f3ca8e53292a7e2da67df80be28e77014775e41777a96c1
-EBUILD at-spi2-core-2.34.0.ebuild 1483 BLAKE2B 68cb3833e04c5b655f99e914f50f7f677a3362874162f22e0ffee730f90771f5732f96dcf41118762afc91c57408b8576fa309a365c73bd078e7c6625204dfd2 SHA512 f377331167d7f4d5d35f1da8eeb5fdc7edfb6c0d997495d8acd6ca11a062fed0a8fa7c872e47ff228a48d2710c3252eda20a4bf201d69f9378deee43526c7c1a
-EBUILD at-spi2-core-2.36.0.ebuild 1514 BLAKE2B 7fb47431e23317a265a490710c39d8a238fd02e7387c309056554bfbf3f8a46f6ed519aa54146e6eb3db90b7ab6fd914d86490208eaf231a1ab22b1b7cbfcfcb SHA512 f46ff2f12d1c4a1c09cab0fd3463d3db46b3de143cf19099fbc2f985fab4f7242fd1519602ab081cbf3f00fa3fafdcee9f47878d74da35a050d156bdac2709a0
-EBUILD at-spi2-core-2.38.0.ebuild 1496 BLAKE2B 10c261f526ec9a4ef2b2ad4c99baab2c3db82e9899f63120883ad5a5f493e7dbe3dfca95815c542277ff360e2865f5dad9eb2f48703c3c3dae73f88a6eff9b5d SHA512 c96be9d6837274fb244282c8997c4a56c9fd4353f46fce31822e4b43aeb168e56c91ef2769dbcd899d0a0354d4a250d4dfedd91bc302012aca583dc650ebccdd
+DIST at-spi2-core-2.40.0.tar.xz 197080 BLAKE2B 56c0ca8138b5178d713851ffb9a9299544a65708a3e5bf37b1e59e515bb30fccffd8b8cc9dea1e78c32a5d1fa3d21de506ef674c5e0ab8067a8ff5df206d349a SHA512 45f9123dac27982003e4c5e357ddaf31dbe945ff334bf1a7d02e81011b841bd69c717233e8b2d33abb6cfe16320bfe5893499f25d9f603cde5d11d63315e8725
+EBUILD at-spi2-core-2.38.0.ebuild 1491 BLAKE2B 943a24eeaad62279a2e38379b0c886ebffd39c682c5d357257ae7c25016ed3eeeb46be8ef74f7b4bab3eb7824ba4499563553d660a6e31ab89c6387d0a6d89a8 SHA512 91eb3da057afd7139a09a57b24ab41075f01b72d7900e0a42e61ef325a2054eb6d0bd160417d007e693a3da5e40a20aaa3ccf584b2478677f898bb9b825d4d32
+EBUILD at-spi2-core-2.40.0.ebuild 1498 BLAKE2B ee7a8d002f0f8c3e671a3a2265dc94d25be572f13e9bb8df904b050522f522acbedc60f8d1a4f8edd0a5f8e9f58f15dba2a62ace02f5b50365a1238147ae5e73 SHA512 c62c5849be2fc2fbda8e55631757ebf98431581b1725e3fdd559fc02edd1defff5c27fb002e35e6b38f63f9b76cc6c4279366e5ce3a62386f2fc9d571d811188
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
deleted file mode 100644
index 1fed449da18d..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
+++ /dev/null
@@ -1,62 +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-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"
-
-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
-"
-
-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 meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild
index 50b823e781ab..6d76ea6b9014 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-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.40.0.ebuild
index f06cc0d3e089..a38a43100ab7 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.40.0.ebuild
@@ -11,11 +11,11 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
@@ -25,11 +25,11 @@ RDEPEND="
 "
 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 )
+		app-text/docbook-xml-dtd:4.3
+	)
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index c35913addb04..69f244943be8 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -3,5 +3,5 @@ AUX brltty-6.0-udev.patch 1033 BLAKE2B d5220b3351af4191ab78f122265296ed802209d03
 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.ebuild 5556 BLAKE2B 565885213e5369df29a289d31e0228f97ea5c05e9c8497afd637bd14ec11a520f4ff54d85779c1f2f9612ea77ff5184223ad0c777fb6c7aa6b07e43dd1f5705f SHA512 55cb781ca97c6f8db7b1e1895ce63945b95df2287a0b23e7d51479a894b9c49b215d6dce3e851b7fa1d5d2895e09cea30942900fbd98e01d43d6036439fc61f0
+EBUILD brltty-6.1.ebuild 5561 BLAKE2B 1281c04a500d036330d7a8629f60f77ce613df4fdb7113b9b40f4d458a14e5ed7f0eb68a8ab8ffda1f4a69c3c36f8b7eae77c13b435c90153d516d69e7a5f5cf SHA512 c90ea5b5687667097b04ac6496997698a58515e5826f62434eb17752a369f53322623c514f1527910697650bae724ec444152c3b6259ed3eac93dde017d87a71
 MISC metadata.xml 1661 BLAKE2B a4687ddd715019cf8273353b4a70a4981e4925f5e931859280b2f836b8f56f82708b82a1cc184a3e056febb15649987650e1312a00ac8a35efa833ae2e4d1f7d SHA512 c7904bf90031faaa478456e3f3e6c59f969e9abba2cee33ac7ad7041edaaab8ea89ca3301f4bd7a7f385507623f316fa4908ac2c6e66a94ac108bce2aad87936
diff --git a/app-accessibility/brltty/brltty-6.1.ebuild b/app-accessibility/brltty/brltty-6.1.ebuild
index 518a31f5e70f..cff7d7f3322c 100644
--- a/app-accessibility/brltty/brltty-6.1.ebuild
+++ b/app-accessibility/brltty/brltty-6.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 FINDLIB_USE="ocaml"
 JAVA_PKG_WANT_SOURCE="1.8"
 JAVA_PKG_WANT_TARGET="1.8"
 
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript \
+inherit findlib multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript \
 	autotools udev systemd python-r1 tmpfiles
 
 DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
@@ -110,7 +110,6 @@ src_configure() {
 		--includedir="${EPREFIX}"/usr/include
 		--localstatedir="${EPREFIX}"/var
 		--disable-stripping
-		--with-install-root="${D}"
 		--with-writable-directory="${EPREFIX}"/run/brltty
 		$(use_enable api)
 		$(use_with beeper beep-package)
@@ -163,12 +162,12 @@ src_install() {
 		findlib_src_preinst
 	fi
 
-	emake OCAML_LDCONF= install
+	emake INSTALL_ROOT="${D}" OCAML_LDCONF= install
 
 	if use python; then
 		python_install() {
 			cd "Bindings/Python" || die
-			emake install
+			emake INSTALL_ROOT="${D}" install
 		}
 		python_foreach_impl run_in_build_dir python_install
 	fi
diff --git a/app-accessibility/eflite/Manifest b/app-accessibility/eflite/Manifest
index c3979460357b..259bf76dccbc 100644
--- a/app-accessibility/eflite/Manifest
+++ b/app-accessibility/eflite/Manifest
@@ -2,5 +2,5 @@ AUX eflite-0.4.1-flite14.patch 1070 BLAKE2B 18faef8ed5fe227a060c33f82a8dae1cca52
 AUX eflite.rc 645 BLAKE2B af3a7b34248ce59d74d3906934083f65f6c8bc9ae1398ebd2437f038ceac8058241e96825ccc51d22a58bacb3cee3bfe7961e75fa02ce31f396356329a142ef8 SHA512 81a918cc412500ed2ccd15eede7c2e800d6a0c04916b0e86e490027543430c8c0bd84b0e0d28280d4b22f3def37d8f94cfb0ad1d1df1446650c17f8bcbe7b7ca
 AUX es.conf 213 BLAKE2B 69a936177c702eab79454f2c17d764ffa508e518abc4576eb18557f925976eb659e0f30d4a59e734525f3167fcfdd5c4967db58af60a30dc7845f5d2cd182ef2 SHA512 19e8b5aefb7aa650d1e023a8cd5cf7361acf6f390f2f3f34de1da0b9c2bdddf632bc247f4e6c8eac025118c76d64f375837c13aff8f02342f17acc974beb9547
 DIST eflite-0.4.1.tar.gz 63192 BLAKE2B 4bdd8bf689732ac56918cefc42d9443ce09d27db052f218c34d7e6b2734e12835482b5c3e3e99f9e2cfe9d1645f683e67aec1ecdbc00c8967637d65d59fd14e3 SHA512 0060980fd5bb65ad94f1609f6d87cb89b91e680228b603fa590e6ba70b51e894493dda4271dca4d8c97f38cdefbd456c3be0447e5f88a0be7ae39324baa2c796
-EBUILD eflite-0.4.1-r3.ebuild 923 BLAKE2B 09ced6e4ea120fc3ce739415e965b2f6a4378b126df5c0796b0e2eb17a5cd097d329e4b00f2dc197bf65a0e8fbe6ecd1b8bebe3308ff818936102a62445a33dc SHA512 732428514cad0c84f3ac365099a882285ccd563903826f91f7286e13cd131805dc3a8087291ff419dc68a0a3e57f179abf79e763c8aaa1754a703e6427d2d6d9
+EBUILD eflite-0.4.1-r3.ebuild 929 BLAKE2B fb2cf95b9121ecfdd16e47701f63acc7f9519b9d1965577a371d17135b8c747649f8c93d45227532338ee0ec18e10e026f63149619a04bd0c4ad995a7663ed46 SHA512 b9efdc61e56f2a938bb5c92191ce922e15c9e5b7dc0f96f085313e1a792cff1409df40eac62d431ed0484a36088d4e05fb456187ada8e48ce624a15e3d38ac34
 MISC metadata.xml 1230 BLAKE2B 903c52279480c3aa7b93f79b2b08be0288d4006962e9fac60655a0c3087287080f63d42f254bbe6b4a31488c1212a429eafc44c17bb2b22679192c103567b8b1 SHA512 12e9252ad64880f82a2c030444f2ead9139a5762d482e8cb7a0b3d19d3a9abc9039dc31aae988dcbc11d682b3135a0a7fab8e0699eb8d7a06d2b5ea0a3d3e4d3
diff --git a/app-accessibility/eflite/eflite-0.4.1-r3.ebuild b/app-accessibility/eflite/eflite-0.4.1-r3.ebuild
index f839bdb9d4f2..6b6c7c7a905a 100644
--- a/app-accessibility/eflite/eflite-0.4.1-r3.ebuild
+++ b/app-accessibility/eflite/eflite-0.4.1-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit autotools eutils user
+EAPI=5
+
+inherit autotools epatch user
 
 DESCRIPTION="A speech server that allows screen readers to interact with festival lite"
 HOMEPAGE="http://eflite.sourceforge.net"
@@ -17,7 +18,7 @@ DEPEND=">=app-accessibility/flite-1.4"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	sed -i 's:/etc/es.conf:/etc/eflite/es.conf:g' *
+	sed -i 's:/etc/es.conf:/etc/eflite/es.conf:g' * || die
 	epatch "${FILESDIR}"/${PN}-0.4.1-flite14.patch
 	eautoreconf
 }
diff --git a/app-accessibility/espeakup/Manifest b/app-accessibility/espeakup/Manifest
index 4d0fc03d18b6..98c21f8f5d03 100644
--- a/app-accessibility/espeakup/Manifest
+++ b/app-accessibility/espeakup/Manifest
@@ -3,6 +3,6 @@ AUX espeakup.rc 284 BLAKE2B 9cbc247d542afa3ed7cc8be816a96cca7673b5af0f30f91c91ec
 DIST espeakup-0.71.tar.bz2 24663 BLAKE2B b5cae80e7a6d45e599dd03680da398cc9db8eb98d0140d8e71aa5047607484401c3906386627810e3ff78a244c9c0e16383675fdd845802225fdb32c8b2a3dbd SHA512 01091560cd4843897fa6925a54b4c856fe57ed5728ddc0c091c93b1ae14eb2f4d07ab2247e40bd5a5968cc22ee3696abfe1b28f67b95aa7ab61e33667c51135d
 DIST espeakup-0.80.tar.gz 39626 BLAKE2B f36d9776b954e73fd2bc33c7ba97dd323184480549b667ac2afc4dc40a8b98089b8ced16e8b1cb33e6b4c586df27a8d6f782236ef8770bc98a530665e257edcf SHA512 1b7e2bd46c3c13a5305746d2d2810ec94a8660f561e4f679ee4779be1b22178f8ac7de42d626d649710509f7b087b9a2f94608bde203d1bcd6d353229ed9ff83
 EBUILD espeakup-0.71-r1.ebuild 1600 BLAKE2B c5d57e7b808c4780442be57b0ceae6467e8d21fe1d7f1549daa445b2992332fd5bf8e17843ef8b99f66b65e18a5d51ea8503248c6bfa25af77bf0fa72179cd55 SHA512 cc107657f59944b98da53e7ec7eb7aedac82432556d2d00a5edd656f5337b50181c17144606128abd1b78872324a076d0a277c7d51c72cb12eb4913fc19117ce
-EBUILD espeakup-0.80.ebuild 1793 BLAKE2B 942b6e71215b319d1f222c11e395e2154d1a860ae0efca1623c9203a1f44fee49553950532d453804d996b5d466cefd0894823fad2eb4e31b4c3c1022ed3cd88 SHA512 f17b4b9779d724ce1711f29eb1164a225ce212ad11f11d6e2f5fe98ddccb805c68d8c2bd98b509f9911e5a30f365091c4a3cb83b23055257a5bae1ca6062a7ba
+EBUILD espeakup-0.80.ebuild 1788 BLAKE2B 104c80fd5c5ce820a4d4a467ef86c05f4e38d21753837d29812e8c2c7b1d1ab4d1787eca01cf79eb490b8eff918c401e9c835b6fba69ee1b45e328e1167c5e5c SHA512 4d5bbcc7df2febd0fb4bc90f07e678518b30a8212a9483d6161713e32491d849921dcaee1dd959c6925d82595e993ed6a07539de9ffc9b85d0d977d250941787
 EBUILD espeakup-9999.ebuild 1793 BLAKE2B 942b6e71215b319d1f222c11e395e2154d1a860ae0efca1623c9203a1f44fee49553950532d453804d996b5d466cefd0894823fad2eb4e31b4c3c1022ed3cd88 SHA512 f17b4b9779d724ce1711f29eb1164a225ce212ad11f11d6e2f5fe98ddccb805c68d8c2bd98b509f9911e5a30f365091c4a3cb83b23055257a5bae1ca6062a7ba
 MISC metadata.xml 598 BLAKE2B 35b3b3d19a05d23031fc6eaafb3385d2489e9be3e7e1b3f303bb6ef3d4276d04e6dd5309ee65a4678407dc3d27ce0dc194702ddb35c2a325e09e924ad7118c1b SHA512 88dd258de8e3239cc819d36aa4bb8431ba6bfdbbb4e183b42ccdcdedd8bf26b9ca8a682ae024b9e878a0a7f2313f06aa8b499958c86ee136312e8ce529ffb471
diff --git a/app-accessibility/espeakup/espeakup-0.80.ebuild b/app-accessibility/espeakup/espeakup-0.80.ebuild
index 95a1e0ea06b2..df2921d1d681 100644
--- a/app-accessibility/espeakup/espeakup-0.80.ebuild
+++ b/app-accessibility/espeakup/espeakup-0.80.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	EGIT_COMMIT=v${PV}
 	SRC_URI="https://github.com/williamh/espeakup/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	inherit vcs-snapshot
 fi
 
diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index f772ca0a44e6..5c5c9ba8789d 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,10 +1,4 @@
 AUX flite-1.4-audio-interface.patch 452 BLAKE2B c4d2a9f1368ee93802e004a1573ada68e0420034dd9f48d508e9f250bded341bcaa223ae12edd202d6185c9ac14cb00f9ce43c4c805e473dafb5d06185255646 SHA512 f2eb669767c9db9c5c5a8836491d8174bfc13b53b7de575a4dfa34bcdee428fce6d3d65829a523bd96b297015f7fa5815e93f119e91bfc7ae21cff7c274961a7
-AUX flite-1.4-fix-parallel-builds.patch 599 BLAKE2B 0176441ade2c4290f8e1f700d98b9fd2a15329fdcd68c5c877c60e632c829f25f81924c0f8367009a354bb5e1f4b735a80b964192014755d13d16d06cb0ac207 SHA512 5adf675aadc3493ad70b1e7f447a1d7c0ff9c11a7dce90afbc6ccc7c811cc7226a7b1591a1a819209b26e93bf48c11cdaa8db1cfd55eb884a66b054c79590509
-AUX flite-1.4-ldflags.patch 1488 BLAKE2B 8c245691783f0c573fbed6759a59379c32eaf14d369cb04be5072f1ab8ffb97a6aa6c1faa938362454794059ed0aeca2e2517eff60ee64085e2d4b888a92310e SHA512 3672edd25ec7062b3736fa297a5805d85854c0a1668c2648b93a07d8e09c970f0f8147f788a916221e8e6a20decb8b8681e8315e07b335cb89a185f0b65f805c
-AUX flite-1.4-respect-destdir.patch 1902 BLAKE2B 115d000bfb5f1a2a5764fa47c934889312bf1b3d955c15b089b1bebe3085af8d20b176611c8428f3788b46ca80f793f9610d3562128cfa59d1df985754f44dd8 SHA512 acc37971361eda4ce91cf605e3ff7878842d605d12973c37ab80451e6a1f9dea96b54cbd39a9ca281f36f6ed6ec1e79af712692639f541c59a7cedad2af47de7
-AUX flite-2.1-Improve-internal-linking.patch 4241 BLAKE2B 9dddba5c2373d3f3bec6180bce7f702bc924a2f5704c372a680283dfdcd4fda7edc939ddd6ac0b7ba0f00678c2666bb6948d9cacd2e348d876d9af75f0c55ee4 SHA512 37b94898d0193c6ee5d5363b6902a0ba0c85d3bedef9ac6c8146f5328ba4841dad7dc5d034168186fb5d94685b81770938c450cba3f2c2c40962d4ba3f4e0b58
-AUX flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch 1796 BLAKE2B 7eaba62d5f4f72c74ff0d09615593a1d2a0ef8bdbf5005487777411ff9123e5d7c5fa1494e0131bffce206423c18e3e6bfda687e8f04a00b9c3b1ca3548b346e SHA512 9faeda9461c2545ae0d26d5b1eeefc6deea891204b92339aa1e46462feab5e3b9c479f6d40bbaa923066c994084e8a85a650e5a57eb64cbf2d4ae5e482bd23af
-AUX flite-2.1-prototype.patch 518 BLAKE2B c2d84c095d2cecc5b78d34d442981d71bead028d259b14bfe252b231ed3162974a8f4910dcf2cc1796d3515fbb9fee8562aebe602b1a50285a0abc82b365b305 SHA512 ad4b6c42a867f6d3b3fef6bfd0a663f54fb656fc3cbc8641b7d6d9eeef4297a2d418a01fd131d20b02bb6f76ce3b71b7d9ce80f3839c653035b5e6a0dc7cd2d1
 DIST cmu_indic_ben_rm.flitevox 8868578 BLAKE2B 2c916a142809999ed69a0cc6bf94ee11380f5a6d5362f347fac5c83ddd25861b7b42d2c4071c1646a26cb5bfef86552ed51d0f708b998c7e3d02fc2815df9445 SHA512 26b6bb62cd00a2c2f51abd04fc8917a2b44472abf99b09b156218fa90499056c96652a984ee9fac4820db513cd2fdba396c1ceb5d26a67e312505b73d1d2b3d1
 DIST cmu_indic_guj_ad.flitevox 11368818 BLAKE2B 972e01ab3e06d830435645eadc34bcefde9c3fdd4c302271847e2f66d5e179c88456ce80164ee1a8e2145b123af634a70929e6d9340e59189ea7e03e405c1a3e SHA512 e309cabdc2f8bd049c7b43e48a55898d1adeefbfedf2dc28785c57d9606030fd9c00769f88955d514e537f5ecdac49fd4297fb2cde5a575f2927a98b38b92829
 DIST cmu_indic_guj_dp.flitevox 10235186 BLAKE2B e609657306b1f8a99850b9d69ee6ad7d037f60537a7b5e63c8e9962001cf0c4b87771574f29570f8a58c7684d8b7293e54aba35e931c54c5a825ad59b8c6d595 SHA512 8ad73d24ebf6026daae701549b783441c522bbb0e2db958b139553446a8b488f068dc14c6136e3e98f564f27a4a62b086aa45d8dfb3cadd440d08db9e9faef3b
@@ -36,10 +30,6 @@ DIST cmu_us_rms.flitevox 12845352 BLAKE2B eb48a7bd29e70d9782e16de8ac28030639f336
 DIST cmu_us_rxr.flitevox 7645602 BLAKE2B 532ce8a72455a3d15728b799b8d9c15fcc7bc06e14bc8559fe9f8ce5ff537bfb6465f3069083ce45ff023c413ae6e7b7f19c1b19e010900f60bbdfb427d2370f SHA512 6f742bf4a94f72fb1383c60b2917f8001638c8ec2696b989c5ab2dd192cf4a08256e54fd5f8431a10ba164272e5bbfab474213b09d2dd3a2acf4bb4bdaca554e
 DIST cmu_us_slp.flitevox 7280743 BLAKE2B 99d5270f55374cad466de01b1764d1ffd072cd770d0630f30f96c13af44ac02bc841be5c7aff3fe189e1089e24544363093f4cab481ed1c018bf49c621591b4f SHA512 f19997ab1293bac785f8a8334512ae20d5c1feb20adac40fdc71da125069dedd1a8dc3c69b9247e20bc3f4db307be779e260172f5239622425603684766a5c44
 DIST cmu_us_slt.flitevox 11156032 BLAKE2B 909d4d2adf94d5b40aee4b85aefaf1e8383718f491f8cc9639e0a91baccdad42b1b8a91443e4faa51ad9e1c0e25b8474f9b97c5a8d792102f87815bcdabaf230 SHA512 a17994d46b910434803e185820ad27a18caa1195b61f64cdbba1d6992c1bd65b3425d9e4ba40c279bdb6bce53c6b3529496c28c631c1684808f6a83f10846c41
-DIST flite-1.4-release.tar.bz2 15163897 BLAKE2B 34b721ecd98a5699c352346528374df1c1e8395b815ea9026dbc6e4de7584bd93efb83d64fe1ec32bef03311c19920b18b198e2543dd2f010b0a3ca229337ad0 SHA512 eec1022077fb7a47db3848ae6944509e18a6c86a25aa24f921b8b6c2af708fc9811b287e76d96cf64fc68f8e1d0a43b7e878659f15bfcf76957eddd75e599112
-DIST flite-2.1-release.tar.bz2 14816327 BLAKE2B a23db51594ec94131112e0f007e1a9e4ee7170eaeda37ecc461c08a0e4defa0bfcde87ca01df765f0bc7b85cc6b3d4ec355830eae7dcb47d243d08b04772217b SHA512 e9ef9ca4b6920178634d94bbe6e21a8b0ec471b010b07e6cc961ed2d120acb944c8e1d268fe26188f7dfe43fb7bd4bdff7fa53b2d2f12029d37e08d0316620d2
 DIST flite-2.2.tar.gz 20233792 BLAKE2B c395c34d2739da523c4794da3a795f2febb7e9a26336c7688215f648c4aee03855c8ac7c9d3817efe3e3a41380a5e325aa8236d1b64af21f8100da3dbba2db23 SHA512 1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72
-EBUILD flite-1.4-r4.ebuild 1671 BLAKE2B a8fcd30f8638103c895476213d5b772a40b18a3c5f5f18c4c6ca1aa7b64118c05c10bd5505718a10893722b5e33c4e2eb9ffaef4f7b7f27407d8865e66ef97b8 SHA512 cf4a609fd4e685f951210ffd921f48abedc8b15795a789a7f7082dc3c2393261df8ac74680fe1073d6cd13b9be71c4be36b7186a9cf5ac8aa43918321feac593
-EBUILD flite-2.1.ebuild 4297 BLAKE2B 9acbfcc4a4ac73336cf207e41e03d86d4190a250aa83141a5062b26da9b1dedd564c14612615052a979e42fd332a7e9b2f3ff1e09b37a7c2ec28faf171a7cd05 SHA512 b5ba1519e4862f418e743493956725a3f31d0bc265925ec83483d75fdfc873446426220c0ff6986b743c80733725c9c7cc58459f48f4de2cf18292e2e6f02d41
-EBUILD flite-2.2.ebuild 4111 BLAKE2B de0e2913e613606466f53f863904b4f6d835775bdae67fcf1b00518c4a066945c2cf6bb3ca7e0c3d8e6aa01aa5af70ca16315d468c528ded66c8449479c4930f SHA512 9b2727c1b509dfea1fd9e36fff1f45073a652517761fa59a90a086943f9e49cc0298ec454a565320934cb0c99dbf211cb8b32f97d1af0c7cb5a786ccb844eb72
+EBUILD flite-2.2.ebuild 4104 BLAKE2B 7c002a9807cb490fcac82b095906a199c32c14debf8a60132119c06866abdad6ddb29297a3ea24de07788f8da98e73da92435a004e00a085f2a853489c8b68d2 SHA512 b8579b9eddc237159acee8506191905045c6dee7b39244fb36eb1374617e6b4fc2bda8de251d5364628def1c1224d984fb6362b48bf30849cf24ef4a39f22021
 MISC metadata.xml 516 BLAKE2B 3c9a2d75594c79d5ca8193c7e493e0c8b95f7af38311f8f71111733625a7ac56007d22da5fdceeb4dcc6e196c38ce95bd06052f6f9e147de46e955acfb5ea552 SHA512 1903fc594e99c15ef53d71ff7b632af7556a2056eff707042d63befae89204d7f02ad506a1990ee6e982f564bac5420f1490d5a15795c46c0d49dff520e8a8ac
diff --git a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch b/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch
deleted file mode 100644
index 270395877c53..000000000000
--- a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dec7aff03916dce6ba4c244314c60cc7b9359585 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Fri, 1 Jan 2010 12:59:59 -0600
-Subject: [PATCH] fix parallel builds
-
----
- main/Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/main/Makefile b/main/Makefile
-index 0513e59..e4d04fe 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -81,6 +81,8 @@ else
- shared_libs: nothing
- endif
- 
-+.NOTPARALLEL: $(ALL)
-+
- $(BINDIR)/flite$(EXEEXT): flite_main.o $(flite_LIBS_deps)
- 	$(TOP)/tools/make_voice_list $(VOICES)
- 	rm -f flite_voice_list.o
--- 
-1.6.4.4
-
diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch b/app-accessibility/flite/files/flite-1.4-ldflags.patch
deleted file mode 100644
index fd8f49059e76..000000000000
--- a/app-accessibility/flite/files/flite-1.4-ldflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/config/common_make_rules
-+++ b/config/common_make_rules
-@@ -68,7 +68,7 @@
- 
- FLITELIBS = $(BUILDDIR)/lib/libflite.a
- FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite 
--LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS)
-+LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS)
- 
- FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
- ifdef SHFLAGS
-@@ -123,7 +123,7 @@
- 	@ rm -rf shared_os && mkdir shared_os
- 	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
- 	@ (cd shared_os && ar x ../$<)
--	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-+	@ (cd shared_os && $(CC) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS))
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
- 	@ rm -rf shared_os
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -62,9 +62,9 @@
- LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort
- 
- $(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS) 
--	$(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS)
- $(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS)
--	$(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS)
- makescripts:
- 	@ cp -p $(SCRIPTS) $(TOP)/bin
- 
diff --git a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch b/app-accessibility/flite/files/flite-1.4-respect-destdir.patch
deleted file mode 100644
index d54771423e1f..000000000000
--- a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a0ae616d84e9f051ae8536574a9d1289e5f0c060 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Thu, 31 Dec 2009 12:57:18 -0600
-Subject: [PATCH] respect destdir
-
----
- Makefile      |   10 +++++-----
- main/Makefile |   10 +++++-----
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2d3ff09..26b2386 100644
---- a/Makefile
-+++ b/Makefile
-@@ -106,11 +106,11 @@ tags:
- 
- install:
- 	@echo Installing 
--	mkdir -p $(INSTALLBINDIR)
--	mkdir -p $(INSTALLLIBDIR)
--	mkdir -p $(INSTALLINCDIR)
--	$(INSTALL) -m 644 include/*.h $(INSTALLINCDIR)
--	@ $(MAKE) -C main --no-print-directory install
-+	mkdir -p $(DESTDIR)$(INSTALLBINDIR)
-+	mkdir -p $(DESTDIR)$(INSTALLLIBDIR)
-+	mkdir -p $(DESTDIR)$(INSTALLINCDIR)
-+	$(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR)
-+	@ $(MAKE) -C main --no-print-directory DESTDIR=$(DESTDIR) install
- 
- time-stamp :
- 	@ echo $(PROJECT_NAME) >.time-stamp
-diff --git a/main/Makefile b/main/Makefile
-index 8163e40..0513e59 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -111,15 +111,15 @@ $(BINDIR)/flite_${VOICE}: flite_main.o $(flite_LIBS_deps)
- 
- install:
- #       The basic binaries
--	@ $(INSTALL) -m 755 $(BINDIR)/flite $(INSTALLBINDIR)
-+	@ $(INSTALL) -m 755 $(BINDIR)/flite $(DESTDIR)$(INSTALLBINDIR)
- 	@ for i in $(VOICES) ; \
- 	do \
--	   $(INSTALL) $(BINDIR)/flite_$$i $(INSTALLBINDIR); \
-+	   $(INSTALL) $(BINDIR)/flite_$$i $(DESTDIR)$(INSTALLBINDIR); \
- 	done
--	$(INSTALL) -m 755 $(BINDIR)/flite_time $(INSTALLBINDIR)
-+	$(INSTALL) -m 755 $(BINDIR)/flite_time $(DESTDIR)$(INSTALLBINDIR)
- #       The libraries: static and shared (if built)
--	cp -pd $(flite_LIBS_deps) $(INSTALLLIBDIR)
-+	cp -pd $(flite_LIBS_deps) $(DESTDIR)$(INSTALLLIBDIR)
- ifdef SHFLAGS
--	cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(INSTALLLIBDIR)
-+	cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(DESTDIR)$(INSTALLLIBDIR)
- endif
- 
--- 
-1.6.4.4
-
diff --git a/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch b/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch
deleted file mode 100644
index 4b377e80c331..000000000000
--- a/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 6e3c1a2fa29c066f7d1a25037a1f61cd295ac3af Mon Sep 17 00:00:00 2001
-From: Paul Gevers <elbrus@debian.org>
-Date: Tue, 2 Jan 2018 19:58:18 +0100
-Subject: [PATCH] Improve internal linking
-
-Building packages in Debian uses a tool to link libraries together at the
-package level. It emits warnings when unknonw symbols are found. E.g:
-
-dpkg-shlibdeps: warning: symbol us_tokentowords used by debian/libflite1/usr/lib/x86_64-linux-gnu/libflite_cmu_indic_lang.so.2.0.0 found in none of the libraries
----
- config/common_make_rules |  2 +-
- main/Makefile            | 16 ++++++++++++++--
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/config/common_make_rules b/config/common_make_rules
-index 7a03785..34434fd 100644
---- a/config/common_make_rules
-+++ b/config/common_make_rules
-@@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a
- 	@ rm -rf shared_os && mkdir shared_os
- 	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
- 	@ (cd shared_os && ar x ../$<)
--	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-+	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS))
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
- 	@ rm -rf shared_os
-diff --git a/main/Makefile b/main/Makefile
-index ff422e0..47b6344 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -54,7 +54,8 @@ ALL = shared_libs \
- VOICES=$(VOXES)
- VOICELIBS=$(VOICES:%=flite_%)
- 
--flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
-+flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
-+flite_LIBS = flite $(flite_MODS)
- 
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
- flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
-@@ -65,6 +66,10 @@ include $(TOP)/config/common_make_rules
- # so make clean can remove them
- SHAREDARLIBS= $(flite_LIBS:%=$(LIBDIR)/lib%.shared.a)
- SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
-+SHAREDMODS = $(flite_MODS:%=$(LIBDIR)/lib%.so)
-+SHAREDusenMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lang.so
-+SHAREDcmulexMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so  $(LIBDIR)/libflite_cmu_indic_lex.so
-+SHAREDindicMODS = $(LIBDIR)/libflite_cmu_indic_lex.so
- VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
-                     $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
- 
-@@ -79,7 +84,14 @@ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \
-               flite_voice_list.c
- 
- ifdef SHFLAGS
--flite_LIBS_flags += -Wl,-rpath $(LIBDIR) 
-+$(SHAREDMODS): $(LIBDIR)/libflite.so
-+$(SHAREDMODS): LDFLAGS+=-L../$(LIBDIR) -lflite
-+$(SHAREDusenMODS): $(LIBDIR)/libflite_usenglish.so
-+$(SHAREDusenMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_usenglish
-+$(SHAREDcmulexMODS): $(LIBDIR)/libflite_cmulex.so
-+$(SHAREDcmulexMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmulex
-+$(SHAREDindicMODS): $(LIBDIR)/libflite_cmu_indic_lang.so
-+$(SHAREDindicMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmu_indic_lang
- shared_libs: $(SHAREDLIBS)
- else
- shared_libs: nothing
--- 
-2.24.1
-
-From d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e Mon Sep 17 00:00:00 2001
-From: Alan W Black <awb@cs.cmu.edu>
-Date: Sun, 4 Mar 2018 08:55:40 -0500
-Subject: [PATCH] get libs in the right order
-
----
- main/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main/Makefile b/main/Makefile
-index 47b6344..1da18a8 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -55,7 +55,7 @@ VOICES=$(VOXES)
- VOICELIBS=$(VOICES:%=flite_%)
- 
- flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
--flite_LIBS = flite $(flite_MODS)
-+flite_LIBS = $(flite_MODS) flite
- 
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
- flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
--- 
-2.24.1
diff --git a/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch b/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
deleted file mode 100644
index 5ddaecd65903..000000000000
--- a/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a3ff166a5a99ea97f9037a82f5c2a578348291ac Mon Sep 17 00:00:00 2001
-From: Paul Gevers <elbrus@debian.org>
-Date: Tue, 2 Jan 2018 06:20:03 +0100
-Subject: [PATCH] Only write audio data to a temporariy file in debug builds
-
-This isn't useful in regular builds and is actually a security concern,
-although it seems (see discussion in [Bug-Debian]) that this is most likely
-only reached during testsuite calls.
-
-CVE-2014-0027
-
-Original patch from Rui Matos <tiagomatos@gmail.com>
-Date: Mon, 6 Jan 2014 13:45:00 +0000
-Bug-Debian: http://bugs.debian.org/734746
-Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1048678
-Source: https://bugzilla.redhat.com/attachment.cgi?id=846118
----
- src/audio/auserver.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/audio/auserver.c b/src/audio/auserver.c
-index 800c27d..cfcad7d 100644
---- a/src/audio/auserver.c
-+++ b/src/audio/auserver.c
-@@ -67,9 +67,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
-     int q,i,n,r;
-     unsigned char bytes[CST_AUDIOBUFFSIZE];
-     short shorts[CST_AUDIOBUFFSIZE];
-+#ifdef DEBUG
-     cst_file fff;
- 
-     fff = cst_fopen("/tmp/awb.wav",CST_OPEN_WRITE|CST_OPEN_BINARY);
-+#endif
- 
-     if ((audio_device = audio_open(header->sample_rate,1,
- 				   (header->encoding == CST_SND_SHORT) ?
-@@ -116,7 +118,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
- 	for (q=r; q > 0; q-=n)
- 	{
- 	    n = audio_write(audio_device,shorts,q);
-+#ifdef DEBUG
- 	    cst_fwrite(fff,shorts,2,q);
-+#endif
- 	    if (n <= 0)
- 	    {
- 		audio_close(audio_device);
-@@ -125,7 +129,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
- 	}
-     }
-     audio_close(audio_device);
-+#ifdef DEBUG
-     cst_fclose(fff);
-+#endif
- 
-     return CST_OK_FORMAT;
- 
--- 
-2.24.1
-
diff --git a/app-accessibility/flite/files/flite-2.1-prototype.patch b/app-accessibility/flite/files/flite-2.1-prototype.patch
deleted file mode 100644
index 2fe301774d0c..000000000000
--- a/app-accessibility/flite/files/flite-2.1-prototype.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c
-index e0ae73f..f48ffe6 100644
---- a/lang/cmu_indic_lex/cmu_indic_lex.c
-+++ b/lang/cmu_indic_lex/cmu_indic_lex.c
-@@ -283,6 +283,8 @@ static int cmu_indic_get_char_type(const cst_val *indic_char)
-     return cmu_indic_offset_char[c].type;
- }
- 
-+int indic_digit_to_offset(const char *ind_digit);
-+
- static int indic_text_splitable(const char *s,int i,int len1)
- {
-     /* Returns true only if this and next chars are not both digits */
diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild b/app-accessibility/flite/flite-1.4-r4.ebuild
deleted file mode 100644
index 7ba4e221b442..000000000000
--- a/app-accessibility/flite/flite-1.4-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal toolchain-funcs
-
-DESCRIPTION="Flite text to speech engine"
-HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
-SRC_URI=" http://www.speech.cs.cmu.edu/${PN}/packed/${P}/${P}-release.tar.bz2"
-
-LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE="alsa oss"
-
-DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-release
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
-	"${FILESDIR}"/${PN}-1.4-fix-parallel-builds.patch
-	"${FILESDIR}"/${PN}-1.4-respect-destdir.patch
-	"${FILESDIR}"/${PN}-1.4-ldflags.patch
-	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
-)
-
-get_audio() {
-	if use alsa; then
-		echo alsa
-	elif use oss; then
-		echo oss
-	else
-		echo none
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i main/Makefile \
-		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
-		|| die
-	eautoreconf
-
-	# custom makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--with-audio=$(get_audio)
-	)
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-multilib_src_install_all() {
-	dodoc ACKNOWLEDGEMENTS README
-
-	find "${ED}" -name '*.a' ! -name '*.dll.a' -delete || die
-}
-
-pkg_postinst() {
-	if [[ "$(get_audio)" = "none" ]]; then
-		ewarn "you have built flite without audio support."
-		ewarn "If you want audio support, re-emerge"
-		ewarn "flite with alsa or oss in your use flags."
-	fi
-}
diff --git a/app-accessibility/flite/flite-2.1.ebuild b/app-accessibility/flite/flite-2.1.ebuild
deleted file mode 100644
index 0ecace3285d0..000000000000
--- a/app-accessibility/flite/flite-2.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="Flite text to speech engine"
-HOMEPAGE="http://www.festvox.org/flite/ https://github.com/festvox/flite"
-SRC_URI=" http://www.festvox.org/${PN}/packed/${P}/${P}-release.tar.bz2
-	voices? (
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_ben_rm.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_ad.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_dp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_kt.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_hin_ab.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_kan_plv.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_aup.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_slp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_pan_amp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tam_sdr.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_kpn.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_sk.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_ss.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aew.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ahw.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aup.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_awb.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_axb.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_bdl.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_clb.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_eey.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_fem.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_gka.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_jmk.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ksp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ljm.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_lnh.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rms.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rxr.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slt.flitevox
-	)"
-
-LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa oss pulseaudio voices"
-
-DEPEND="
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	!pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
-	"${FILESDIR}"/${P}-Improve-internal-linking.patch
-	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
-	"${FILESDIR}"/${P}-prototype.patch
-)
-
-S=${WORKDIR}/${P}-release
-
-get_audio() {
-	if use pulseaudio; then
-		echo pulseaudio
-	elif use alsa; then
-		echo alsa
-	elif use oss; then
-		echo oss
-	else
-		echo none
-	fi
-}
-
-src_unpack() {
-	for file in ${A}; do
-		case "${file}" in
-			*.flitevox)
-				cp -av "${DISTDIR}/${file}" "${WORKDIR}/" || die "Unable to copy ${file}"
-				;;
-			*)
-				unpack "${file}"
-				;;
-		esac
-	done
-}
-
-src_prepare() {
-	default
-	sed -i main/Makefile \
-		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
-		|| die
-	mv configure.{in,ac} || die
-	eautoreconf
-
-	# custom makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--with-audio=$(get_audio)
-	)
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-multilib_src_install_all() {
-	dodoc ACKNOWLEDGEMENTS README.md
-
-	rm -rf "${D}"/usr/lib*/*.a
-
-	if use voices; then
-		insinto /usr/share/flite
-		doins "${WORKDIR}"/*.flitevox
-	fi
-}
-
-pkg_postinst() {
-	if [[ "$(get_audio)" = "none" ]]; then
-		ewarn "flite is built without audio support. Enable the"
-		ewarn "alsa, oss, or pulseaudio USE flags for audio support."
-	fi
-}
diff --git a/app-accessibility/flite/flite-2.2.ebuild b/app-accessibility/flite/flite-2.2.ebuild
index ccb52bbc91ce..46870556132a 100644
--- a/app-accessibility/flite/flite-2.2.ebuild
+++ b/app-accessibility/flite/flite-2.2.ebuild
@@ -43,7 +43,7 @@ SRC_URI="https://github.com/festvox/flite/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="alsa oss pulseaudio voices"
 
 DEPEND="
diff --git a/app-accessibility/freetts/Manifest b/app-accessibility/freetts/Manifest
index 13be5b2b80d9..2591ee4933f7 100644
--- a/app-accessibility/freetts/Manifest
+++ b/app-accessibility/freetts/Manifest
@@ -1,4 +1,4 @@
 AUX jsapi-gentoo.diff 10444 BLAKE2B 0f829738e11f9cf3e852aac0483c891f4c140639e0c7037abf9117a9301f85632bfe11409191d8c137a9b2c4f9dc4251618f16c376fb6c35c9b0848f06072465 SHA512 43e53a55afb973821a7997f7989e7330e263a55eb4c1fdd4bbc6b7269ae428582f21f59b05e258f618c9f2ce88d047797e24dfdaab7465c6feca995fcbcb8ca1
 DIST freetts-1.2.2-src.zip 14111416 BLAKE2B fd3ac79ffe3ca031d40a6523a4ae900200c1b1eea0369fd1eec3233f852af8edffd81ca6c0bba628132221346d283d2138794e1f9697074fc1044944ad852e5b SHA512 a2cce0b1fd2267cc8dbd3e2ad3ec1f99526de3988443c0937405cc7b2eab9ef517001ef0b4b387e8721d3c33610cd642c6b7cf83217996a83481830de9713de7
-EBUILD freetts-1.2.2.ebuild 1888 BLAKE2B 8787e38904cc079aa3ff1d4fbe058ecc119a6c4fd0682066313ed9b1f502f55e6e569077cf00a73446491d0fda9aaa20ae2d0bba04c7ce905eb223663cb6bd07 SHA512 fdc7501c66356cc7c9fa8098d462b95aa6454e09480186ce0980b19aaaffd31babc229de7fb7ddd7a376cfbefb10087bce0ecda31e59f409373e3b5acc7b3d2d
+EBUILD freetts-1.2.2.ebuild 1891 BLAKE2B 166113be9418f3adbd08d72864765e41673a7eb9fc4605730acbeb2d4cbc6f4c4f69faad5b881e688564049135092df123a2446dc06da4e0d0711f289d1859e0 SHA512 86b7a960527ec03d1fdb5696685ba715de17c84487140d0607579e1187678890adcbffd757850ccb52167227c9feffd1c178df5a1df5be08f27f0a99a2bb4e27
 MISC metadata.xml 576 BLAKE2B dda15cfed056b8e34ebd707ac45b632b2ba322b85109a77fd8cdb3c9f2e485ec6495cee5773ec7a092e553dc51f2e1534b9778b1e35ec1f6719ce8ac56fb3406 SHA512 f4541826693d1e4b6c943c269d2702f27d60c70727f19ac6511696c723d9e56e5d4673ebb8a219a974bd1b1cfdeba9164b8084017c09fba28429b795308b25a8
diff --git a/app-accessibility/freetts/freetts-1.2.2.ebuild b/app-accessibility/freetts/freetts-1.2.2.ebuild
index 3e352ae6f055..31b68c3c7b28 100644
--- a/app-accessibility/freetts/freetts-1.2.2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
 
 JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2
+inherit eutils epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="A speech synthesis system written entirely in Java"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
@@ -22,7 +21,6 @@ DEPEND=">=virtual/jdk-1.4
 LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
-
 IUSE="jsapi mbrola"
 
 # Tests aren't present.
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index 9a0294d7369c..3fb834975c3b 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,5 +1,5 @@
-DIST kontrast-1.0.2.tar.xz 35300 BLAKE2B dbcf66706d707d2e277ab8a551533495c4005556421321b0a2a03fc046c193a931c00ed9a82160f51b44cf081550c86c8933e849158f5f1e63dd0c85c4506b96 SHA512 637b2fb65e42b208b26349e6d971827d616f647db53b5d2b5e5c7264388e723912fecb130138693060c9ec877e8a6d4dd1478f68942b6b10db024e8a4d66173c
 DIST kontrast-20.12.3.tar.xz 122468 BLAKE2B 4e29c034ba87781ffef03a37ecc7219eed488585bc47b0b3420950cdfe8fa92e9f4fd2a35dea76ac296318cb8c8be38fcf92061bca105fcfafa9dc9121afbabe SHA512 d6a4b60416f43bc1e9ba2539b13f33233c988417c7e8f05dd295d7e4946301943db9493123a07c48b0844c7aa55a22a3f1b898c3a00cccc6f6aae295d89d90c8
-EBUILD kontrast-1.0.2.ebuild 825 BLAKE2B c5bc7986fb72de0f983f68bfd7a40f5ceba96d03a9e32731b03833e3de3cc54134a0b0f24de8aab4decfc2d2b05087a90bab2d2693ba5c7e504da4c4f58c5574 SHA512 54d0b4ce21a1051ca319f35dcf0b9d7b78c75abed299f5edfa869b0e834a0cf431ed0c75e066ac6758b33d8b4dda76e3e14a9d9a43a34ece4fabe69c13206e7a
-EBUILD kontrast-20.12.3.ebuild 821 BLAKE2B 93d5a6b6fd0044dbbe4d7805511eeee4cc50c8bff88ac7fbefaac3aae59b533824212449b9c03b3284aa45097d611bc88ade4d296248b329f287e08350483e4f SHA512 b5d723ea2853345337204dfed50cd5aa84e8bef30cd284c1f867d395972e77ab4323484723a9b9383a5331de8cf687cca70aefe0e4c46e3a3c851ffa1e2cc50e
+DIST kontrast-21.04.0.tar.xz 122760 BLAKE2B f68006f325c7d6c1cf292b48b2bebca09939cd51c1a16a31df80b57dcf03f95c3336707f2d9d21b6dc5cbef092e5efe739598d0939566b71212067d05012a97d SHA512 0df076b365353b916206748801641805a674ac1a0420ce26f197a7083f77c70550a8728d4f5f6f98ae79e162bfb611f4ce4b4171897c002718785c77aa9a693e
+EBUILD kontrast-20.12.3.ebuild 818 BLAKE2B 562dfa96e3c00fc4116afd6afbe8aa5ba8c08a002e0adcb2a3fcce8dcff34cb87f9566e9aa938b1f88e64e05ef9c04f43996c43ab79948d44217158edc07ec8d SHA512 c90ad346af3af04db95d879bae74c53453889e6a346f8de6021a14cf7296f9bab479ad83bd1fed9d415aa872a8509bd8494916dee420dee54ea9c005b04e9849
+EBUILD kontrast-21.04.0.ebuild 810 BLAKE2B 9baf23fa8ebe453897ca3d1ce889b1ca454384c45bba4394f7a1c8c9257f6e4a96fb2e31084e2651bb61a4647e371caa1a76aefdcc899064dcd4fb03808dff53 SHA512 20b6dabcf222bc246af5f88a8e569614b8a348ae713ed9a8300571db41f32a6a83fd3c47a61ee2c4d3cb601c576202b21c375170b9a9bbe951c7f9b61fb67a7c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-accessibility/kontrast/kontrast-20.12.3.ebuild b/app-accessibility/kontrast/kontrast-20.12.3.ebuild
index 9b6816598745..777e33b412de 100644
--- a/app-accessibility/kontrast/kontrast-20.12.3.ebuild
+++ b/app-accessibility/kontrast/kontrast-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kontrast"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-accessibility/kontrast/kontrast-1.0.2.ebuild b/app-accessibility/kontrast/kontrast-21.04.0.ebuild
index feb46a2b2d8e..8c36d8b5e785 100644
--- a/app-accessibility/kontrast/kontrast-1.0.2.ebuild
+++ b/app-accessibility/kontrast/kontrast-21.04.0.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.70.0
-QTMIN=5.14.2
+KDE_GEAR="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
 HOMEPAGE="https://apps.kde.org/en/kontrast"
 
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
 LICENSE="GPL-3+"
 SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -31,4 +29,6 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	kde-plasma/xdg-desktop-portal-kde
+"
diff --git a/app-accessibility/mbrola/Manifest b/app-accessibility/mbrola/Manifest
index d8228c9b4b27..2e2ff71cb9c5 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 2651 BLAKE2B 3a4701410f5ae127e2c251a695c6e96f175b9974ae4bd15e2be261cdda582aa468f271a2624080b4104a33fe1af83288c4e02e5848473b28be8537be9d38127e SHA512 7e9df77ef04eea2a5acff483274236c8fece0fdb4c7ddda29213660bdd51f8c674a423f5e78ec48400ca0f18fac8d57a483427acc79b5b50662e76cdb9c57fbc
+EBUILD mbrola-3.0.1h-r6.ebuild 2652 BLAKE2B 7012ae6d8eee190816a5d59387fc177c5895b472a6d1dbaad9d5a2b270dd2bdffa69f28ebac3ac77323ce23653d58a0f3cf9d7ef59a689cdcdccb63c911663ea SHA512 90faedb6610c6a9b955f91f463297f7116a3696ee50bdf12728c9492c369eb42b5cc7b4a8b78fcb64c31b6449f03276069bb5fc9acdcb4fb6e57d3be2d9c0aa2
 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 730368dddfd7..f02fbb87b8fd 100644
--- a/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
+++ b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 RESTRICT="strip"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 QA_PREBUILT="/usr/bin/mbrola"
 
diff --git a/app-accessibility/nfbtrans/Manifest b/app-accessibility/nfbtrans/Manifest
index a263c74f9e2a..0736dc758edd 100644
--- a/app-accessibility/nfbtrans/Manifest
+++ b/app-accessibility/nfbtrans/Manifest
@@ -1,6 +1,6 @@
-AUX nfbtrans-7.74-gentoo-fix.patch 309 BLAKE2B 8246335ca9643e3202347445214c932fc000317e375678c6adb6a619afc169b2eaccb83ed9eebce4d7ecc19d7d11d00351f27d9d7c6122225cadb518f9c5519a SHA512 7f739a15ab8edd8853702b897e9b00f34256f62b98ae2cb0a17bea487b81f4925f85f0eab77c119a8182965b69c18b6369954121620af288da27bc8f9b122167
-AUX nfbtrans-7.74-getline-fix.patch 957 BLAKE2B 0efd12522c9eec47146f2d084b9c4198be339f06f4a9fe5a98fa097abc34ab60800863a9f7e1b1b80220bb6015b759bfd3a874588005b2c6af9f725439f0c3c8 SHA512 35a57c029f2c54f04fe0e9be66df39da11e7415095959c2d13b5b9e66b223d15c9b72f4a392092dc4075e4753fad542f33f2cb59e83702378505e3ecc6885cbc
-AUX nfbtrans-7.74-respect-ldflags.patch 692 BLAKE2B 36afb2c45f7982fd21df2d23fcae9f32d05ce629b1e24275aa1e2bf8c9f64808b2700fe94b62cfd14716c7ef509ecee0dbef72cfa23576bc6791e414cbc6eb59 SHA512 d93ec7be4119c4b129558d0d6c688cca9edc25129c487250f57071916bc41ab2306fccafae5e7d4b9e911250527be01dfefbcb87c111743f5a6829cd14a3ec82
+AUX nfbtrans-7.74-gentoo-fix.patch 237 BLAKE2B 79966d78a265660633d8e6ad89c2f10a30c94ff5cfaff0cb9e336f0bcdc7d40b2c031b5f69c6b470e1407fd785325bbfdf5c446c3cd3f7766693fd364a20e397 SHA512 9ecd42454f7ef9f00e0a3c1a4eccd8a3dd3df02bb0653acf5fd9b570b2d7d49f126b0db19a3f571d0d1130d73670d317bea42b0e1d894ff785ad8b8f6dc3cef7
+AUX nfbtrans-7.74-getline-fix.patch 880 BLAKE2B 67afefad755a077d949cb492a37af44f275693be3291218882a475059103fc8cf526d67a153c671b51a6f8e80e72ebb4b739e68680285f6b70c2a044f962c078 SHA512 bec4b16259ffb15a396542525ddb5dd8a72da5d4a73b108ee41dd005d00c978d3991d69a5b4cacc963c27a8b186305c619fc3c41860d40fbcaa41843d2fc168d
+AUX nfbtrans-7.74-respect-ldflags.patch 620 BLAKE2B 672883ec0b74c2eb0657756d56f2ee862c676844192a293e4139d0dd76548b6e6c047eb530e96f66eb4e398ffc4304c124d50ba59ebcf440cde59ad219c39ec3 SHA512 65f6c0752ea4ca8badfad0322b8709f7f55cb1e55a57ba2bc4edb0a748584a9c725a9cf9836a67df02d7b9b158f8b46ddae711a1b5d368ed56728a2495272eb1
 DIST nfbtr774.zip 470847 BLAKE2B 54dd9b612c6dda0734d5b21c1ed8b0d428663d2b442406cb36276afd1a6c0b742ddcb4848954a0bbdd29cb300dab6a55dd9b3bafeb603b08ef6a7e678c0d9a86 SHA512 58fa72c53d88d11fa005572f4e2ebd81d21afaec2fac0e986bfad66b42c194ec3573199e2f2b863725001c1cb777b60881605a1533f7eb73e31e24a244673c2c
-EBUILD nfbtrans-7.74-r2.ebuild 929 BLAKE2B 5f88036d7a450d51c1ff094b6294dd57c3ca2b65206cd328d752158ec2ca4eefbf252cf2cd6e2007743575e09b15a4c0bf4ff85d2643b66eb3195f50c788fdf3 SHA512 0ae4e262332f93b69c6525da0647d711bd70c62df894a09c0576abecc0ee3c8690dcbac301af7ad955080c97c4c529ce32fde87489105c413207049abf76763f
+EBUILD nfbtrans-7.74-r2.ebuild 924 BLAKE2B 9c7f88e573ad76d1a2deb29486acda7f04ec0328930a3d66cb4c3bfaafe8fb44e0d17f6f0ebd651e241241afa8bf91d51d8512468ec9aecaf006ad86d6357777 SHA512 3714e597237398e6ea5271d3e12081f41f548f396de4ecd5a47b6c1fd3d6e5c2d67e556658020a32e00cfc4cd2f79f47f1319dfa67a09132fa214d9b7c3be957
 MISC metadata.xml 345 BLAKE2B 73e4cf90f6b94e74e7fcf0e89ecca76f346b0ea8f2651a42617b136b47aec01457a21406ce360f4924e1d8bdf9027763e6198e1a363be471e2a81401f6f6f1d2 SHA512 d034cf8435010ee64e6186cb7e14f559d3e43eec3b3b31e0cec4da133c65cd8c34a00cc4c66958fb13fc1470ef0fa5307331032cde328a443b877be6f3d4c44c
diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch
index 7040de343db0..5dbdcd504fd7 100644
--- a/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch
+++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch
@@ -1,5 +1,5 @@
---- a/nfbtrans.c	2004-09-21 19:52:34.341784094 -0500
-+++ b/nfbtrans.c	2004-09-21 19:54:07.005727168 -0500
+--- a/NFBTRANS.C
++++ b/NFBTRANS.C
 @@ -6,7 +6,7 @@
  #define LINT_ARGS
  #define DOS
diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch
index 14c13c063246..fba828479ed0 100644
--- a/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch
+++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch
@@ -1,7 +1,5 @@
-diff --git a/nfbtrans.c.orig b/nfbtrans.c
-index e697393..9a2944e 100644
---- a/nfbtrans.c.orig
-+++ b/nfbtrans.c
+--- a/NFBTRANS.C
++++ b/NFBTRANS.C
 @@ -534,7 +534,7 @@ void compact_line(char *);
  void length_error(char *);
  void do_lop_op(foptype *);
diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch
index 61c991c8a368..37434681833a 100644
--- a/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch
+++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2017-06-13 11:08:23.428114301 -0500
-+++ b/Makefile	2017-06-13 11:09:01.084376256 -0500
+--- a/Makefile
++++ b/Makefile
 @@ -28,10 +28,10 @@
  djgppall: nfbtrans.exe
  
diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
index c458fcee9dcd..8509d2d383e6 100644
--- a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
+++ b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
@@ -1,41 +1,43 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="braille translator from the National Federation of the Blind"
+DESCRIPTION="Braille translator from the National Federation of the Blind"
 HOMEPAGE="http://www.nfb.org/nfbtrans"
 SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip"
+S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-DEPEND=" >=app-arch/unzip-5.50-r2"
-RDEPEND=""
-
-S=${WORKDIR}
+BDEPEND=" >=app-arch/unzip-5.50-r2"
 
 PATCHES=(
-"${FILESDIR}"/${P}-gentoo-fix.patch
-"${FILESDIR}"/${P}-getline-fix.patch
-"${FILESDIR}"/${P}-respect-ldflags.patch
+	"${FILESDIR}"/${P}-gentoo-fix.patch
+	"${FILESDIR}"/${P}-getline-fix.patch
+	"${FILESDIR}"/${P}-respect-ldflags.patch
 )
 
 src_prepare() {
 	mv MAKEFILE Makefile || die
 	mv SPANISH.ZIP spanish.zip || die
-	emake lowercase
+
 	default
+
+	emake lowercase
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) \
+	emake \
+		CC="$(tc-getCC)" \
 		LIBS= \
-		CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" all
+		CFLAGS="${CFLAGS} -DLINUX" \
+		LDFLAGS="${LDFLAGS}" \
+		all
 }
 
 src_install() {
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 0f317247be55..32588d34006d 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,5 +1,5 @@
-DIST orca-3.36.5.tar.xz 3578288 BLAKE2B d9711720b7a104bc86c97f1821566dd710f0bd318a5409fc5bd5624e7f35a81e9cd0a3d9fd1337c58b09d1ed8fe1c9eeb5b0822e45f7a711a44405bcb8f54db6 SHA512 87756ab5ea962c715f1a00ba80a30cf2e812bab87cf6f13b437b45b39bb763b684fe69b8847a3ed543c398f79a4d2d3ed33b61f88414f432b473c0892453a4f0
 DIST orca-3.36.6.tar.xz 3465112 BLAKE2B 227610b5a01027c292cf9a99ecc54f76ad6053d6923325825ed5f81183b39e1e38e70e7a7d88561f0b0c4d212f16465542d57bf4aeed2fa893b8893fa1d3dd49 SHA512 be2752267d46077310eccc4d76dc5e87ce8e1715cc33ff6f8f15b83c9891a2ba98a2d681f893c88df5b0c5ffd8a1ebadc3a4286debf0ff14ba17803d20f902db
-EBUILD orca-3.36.5.ebuild 1645 BLAKE2B 816bc6cfc1719fb015c01dba7bc1c103df390f9e6566f7b1171bd18dd1f6bbfb4ee83ce83d4fa4ef9340462f45bcfced71aea1b646e1c74c152f3943be57b395 SHA512 6ea41caf03cdee346e64ae7310fd7e6c12164b1d55f39cf4a16644973f3afe336d25ff88f980fac56690e420541fcb755ca87840fa977d2762adddab5d7e682b
-EBUILD orca-3.36.6.ebuild 1647 BLAKE2B 1c07c61e50560e9eca0b2c85be5aa91be3efae8ab752f3d19af2418e4c7545ad76181794cfaa2a5414219d1f232d350698465d27c05e888a892708614e3ec3a3 SHA512 d88bcaddbf3d2c7c31e1eea7bf48fc2b8f41da608a435d7ecd7c18cc44f10ee9b57b70098aca8dc3898767f219d9319fd9985a06d699bfc1eb380498eafa48ab
+DIST orca-40.0.tar.xz 3603368 BLAKE2B 3ac99f32ee496004e568ce61d5862591556bedfd8dc7ef1b707b62b120f1349ae38bbd427b0d3cc67c7be7334bcc46b067ee44a45c51bcdbdf15ee78c0243f64 SHA512 16e15b1cb4b5a2a3d14ddf9e9277e6b0c65e2ab0a7370fd8bfb830bee9d208ef6b5b3d0c19cc2ff6107f3b0cd41e8ae00881033645f7a309ca3ce65aebd73a1b
+EBUILD orca-3.36.6.ebuild 1645 BLAKE2B 816bc6cfc1719fb015c01dba7bc1c103df390f9e6566f7b1171bd18dd1f6bbfb4ee83ce83d4fa4ef9340462f45bcfced71aea1b646e1c74c152f3943be57b395 SHA512 6ea41caf03cdee346e64ae7310fd7e6c12164b1d55f39cf4a16644973f3afe336d25ff88f980fac56690e420541fcb755ca87840fa977d2762adddab5d7e682b
+EBUILD orca-40.0.ebuild 1599 BLAKE2B 2e759ada8f599ae4d947fd9b799156626326cfe7c713b3cc7ad79ef15ac139f32452d429237bd32ac3d2a1dcb396940015a2b9f8e6190f37df75aab31db2a540 SHA512 3307672f4f21a3a711f7a4cf4176c47c1a49d933b60f05d10ddba103ffafb844d1c6809b6f4a35688f5fcc610e39d9a6f239850772989c4314a0cb7ddbc00033
 MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
diff --git a/app-accessibility/orca/orca-3.36.6.ebuild b/app-accessibility/orca/orca-3.36.6.ebuild
index c5e5d2354c84..11bf35d7d34e 100644
--- a/app-accessibility/orca/orca-3.36.6.ebuild
+++ b/app-accessibility/orca/orca-3.36.6.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-accessibility/orca/orca-3.36.5.ebuild b/app-accessibility/orca/orca-40.0.ebuild
index 11bf35d7d34e..f866c6fab92a 100644
--- a/app-accessibility/orca/orca-3.36.5.ebuild
+++ b/app-accessibility/orca/orca-40.0.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit gnome2 python-single-r1
@@ -13,12 +12,12 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="${PYTHON_DEPS}
+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
@@ -36,7 +35,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		')
 	)
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	dev-libs/atk[introspection]
 	$(python_gen_cond_dep '
 		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}]
@@ -46,7 +45,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-libs/libwnck:3[introspection]
 	x11-libs/pango[introspection]
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
diff --git a/app-accessibility/powiedz/Manifest b/app-accessibility/powiedz/Manifest
index d1f4e7469974..5d24fc07e99b 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 9a1f420e5e9183df2507699df796c809f12e15b49d194a030cabd7d128333eac72ef5deba84d60e177a108c2c37c09bde2d4bbffac4f9a9b7da896c323927381 SHA512 cff8e94e85d0fe907004e3dae303b7fdf917d52a0c3976782ae0a458f16f1c6bc56579fee9aef550c6666dddfadeb92233f20006d8cbaf202a6d6d17ae2aaaf5
+EBUILD powiedz-1.0-r2.ebuild 622 BLAKE2B da58bbca961390b42e4203e79d90b5d880cff915cce7186933db4006c04368ec32cbda3f7efa3af0bba31c06b4e4118e82ff07866fe153d3db429b5a226220bd SHA512 a37149198ab2da92ab8cb51dbef985a0b96c73bca1994994aca72b59b7c0b04190bf28bb752802f4cbc668d9d4a4f39657a8f88736b0d27f78ceb52c7cb113e6
 MISC metadata.xml 393 BLAKE2B 934a4030dd96c98a6614bed171bab10582d885d3aeeefb793bb9c5aff190f3a8c59713c085e962dd9b2c56453be49fcdf5ba37c4e2f25dc619740403f93041f5 SHA512 e667c596590296dc51b7125efdc97da72a5e4c4d7e83469b1fa0975f066fb3c78ce4dc91032f3401e01fa107e1f3fec165c9adbe9572aa3163f2dcb7380fc116
diff --git a/app-accessibility/powiedz/powiedz-1.0-r2.ebuild b/app-accessibility/powiedz/powiedz-1.0-r2.ebuild
index d24bcb534adc..335ec19afe5d 100644
--- a/app-accessibility/powiedz/powiedz-1.0-r2.ebuild
+++ b/app-accessibility/powiedz/powiedz-1.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Polish speech synthesizer based on rsynth"
 HOMEPAGE="http://kadu.net/index.php?page=download&lang=en"
@@ -13,7 +13,6 @@ S="${WORKDIR}/${PN}"
 LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0-dsp-handle-fix.patch
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index f5f810aa3a94..34b6edc06c20 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,4 +1,4 @@
 AUX speech-dispatcher-0.9.1-fno-common.patch 13112 BLAKE2B 6a4125117852cfe250bed1a9936af67a2a83303ecced615febd89b9b14918dda94a78862cdcceb95fcea3ea7ed30a12d799afbc21264ff386c94f9f867eb8136 SHA512 b957ebbfd8a6a9cfe2b85cba85b77dc813e76212721d63d42b3881ed17993d7b4a8c720d4c431c8e2eb3ea60996e411402732c735948f37fa84a9fdcfa2683fc
 DIST speech-dispatcher-0.9.1.tar.gz 1662222 BLAKE2B 03c3d79a9cbbe7e549f638992fb276ab2270a45a057708721666257699479b3feb81daddf26d8032ba3f7b9ab6b836c7f582ee22a532ff018c99820af3864d87 SHA512 35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2
-EBUILD speech-dispatcher-0.9.1.ebuild 2827 BLAKE2B 4f7150a3e9a555add31242a143cf076a69eaf2eecc1b04154e44ca7e500639de9b9d58940ca230b8a8ac1e6f1b1b9be11811040d55776b4dc10063063c496ea2 SHA512 95465db6451ff5da483176e5a2cb5294fae151db88052fd3ca563569866462cd52ae63b59c6449210eb8fad2c493b5ed5fcdb52cef96ecdbfb956266e1c6135e
+EBUILD speech-dispatcher-0.9.1.ebuild 2828 BLAKE2B 01d2d7f843bfa265281abc6c45189cfea16f83e621a0ad3752460e0cbeba7033cc432567da36736448701a2fc6383d7dc40d221e8f138d2edab0e1b9a6e811e7 SHA512 ea3fe9738fdcc917ed36831d24284ef22c309bb638b8df677b970522c9d971d930bf8165c3a2ebba9d55cd85267bb7b5d02970efe13b8df7349a257f2007d83f
 MISC metadata.xml 632 BLAKE2B 2a60d2e822db36bf3f0547d97ccaad05d6bcce11afa71534b108358f1d71f857f200907f01c31c3083a5196e43eb681c06e2991a086c91731daced3f56282c2d SHA512 db94cba99bd2c9bbfe98b1647ac53a3861cbd697df791bea025e2a713a5991ca6929f2bc82a985ba38eef4a2571515d96aac6558fe143b68e24713490c12dd0a
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
index 374ad96d24ce..d12f3352aa29 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit python-r1 systemd
 
 DESCRIPTION="Speech synthesis interface"
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 2dc0f2a57670..d29c61199a65 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -4,6 +4,6 @@ AUX speech-tools-2.5.0-fno-common.patch 1003 BLAKE2B 6b4dcdf205f2e986e659efda4d5
 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
 DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7
-EBUILD speech-tools-2.1-r4.ebuild 3050 BLAKE2B 55f937d6a041b5008b7e182502fd9fbd325497219207c2ed90221629f848aaaa500e3310e190d9123c976d33bb0fe111ba6600de43b7cd2cb6905b80aec893ce SHA512 9ff9c6888c37d184eb3ce3bfab898579145e50d45e6624a1560ecfa0ecc479e24a8ec430e664cdcc62382b90843ae918059c4ec28526cc1286a477cc86a1466e
-EBUILD speech-tools-2.5.0.ebuild 3757 BLAKE2B bee264c810d542b78ef9d780976f3aa1100b8ae1de6607db6081b78e7b2bbb8abf4db69c0cc1a988d6d23ae89cf1df63aed2aa01ae879c7d61ab1a5ec54fb447 SHA512 7bdca463250497882905e469c1d7cef96a84501482957ddf5f763b3d040da824f44d6b02c623f9cb387788888706fe9b0e58e7fa1a3a7301454419dd21350f21
+EBUILD speech-tools-2.1-r4.ebuild 3055 BLAKE2B 91ff2e524213950a0775e7db6933feef960594fd80847cf08849dcff0b71a1be89a74b0fe20c9944422d48abace3f8aa83e9a1bd150c7f36399521049a26dcd1 SHA512 4a89616b573de9bdbfad9bd952d29675edc9c1fca30b1a2870359bf7bea5e7e244a1cb4f1d9553c9d023c4589b5ccb5285d7847fe63cc2daeb6a9b32940baa96
+EBUILD speech-tools-2.5.0.ebuild 3774 BLAKE2B 05ba61033b3cc1d62be2b19aa05890a7ff250b899e53df39a5a260b2a2264eeb96e779bd7e31a064836d70adb324b6296edce564b8aa90942b12c06df0ba7c28 SHA512 2f7608d4d48f54d499f0cfed95bf08d48ca40d01a9950090fa9f0c635d7c996a3bf1e8327c80bf5e8fe4f7322ae59cda815ac9b922824cb25f7d53bda72b192c
 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 4a54649722d2..2f487ae007ac 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit eutils epatch flag-o-matic multilib toolchain-funcs
 
 MY_P=${P/speech-/speech_}
 PATCHSET="r3"
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
index 8a41ef402844..f14ff35bfac3 100644
--- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=${P/speech-/speech_}
 PATCHSET="r3"
@@ -12,25 +12,25 @@ DESCRIPTION="Speech tools for Festival Text to Speech engine"
 HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz
 	https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"
+S="${WORKDIR}/speech_tools"
 
 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 openmp X"
 
 RDEPEND="
 	media-libs/alsa-lib
 	sys-libs/ncurses:0=
 	nas? ( media-libs/nas )
-	X? ( x11-libs/libX11
+	X? (
+		x11-libs/libX11
 		x11-libs/libXt
 	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/speech_tools"
-
 DOCS=( README.md lib/cstrutt.dtd lib/example_data )
 
 PATCHES=(
@@ -67,14 +67,14 @@ src_prepare() {
 	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
 		main/siod_main.cc || die
 
-	#WRT bug #309983
+	# bug #309983
 	sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
 		"${S}"/config/systems/sparc_SunOS5.mak || die
 
 	sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \
 		-e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \
 		-e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \
-		config/compilers/gcc_defaults.mak
+		config/compilers/gcc_defaults.mak || die
 }
 
 src_configure() {
@@ -95,8 +95,14 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" LDFLAGS="${LDFLAGS}"
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CC_OTHER_FLAGS="${CFLAGS}" \
+		CXX_OTHER_FLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {
@@ -135,6 +141,6 @@ src_install() {
 	done
 
 	# Remove bcat (only useful for testing on windows, see bug #418301).
-	rm "${D}/usr/bin/bcat" || die
-	rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die
+	rm "${ED}/usr/bin/bcat" || die
+	rm "${ED}/usr/$(get_libdir)/speech-tools/bcat" || die
 }
diff --git a/app-accessibility/yasr/Manifest b/app-accessibility/yasr/Manifest
index 0e88931a8fe2..d4c560465721 100644
--- a/app-accessibility/yasr/Manifest
+++ b/app-accessibility/yasr/Manifest
@@ -3,5 +3,5 @@ AUX yasr-0.6.9-gcc43.patch 830 BLAKE2B 12f6cfb9cd4761eddbe7b1fa5063fa122916858a6
 AUX yasr-0.6.9-gettext019.patch 210 BLAKE2B 055cf2d8a4e8321be0303a5dfb7cb1004d6e1e6f78bb46530806317c598ea2d5661daa93c7dd104cd1e94272ed0bed6e2011cc212158f6aca8c9311d248424cf SHA512 8183f356c48b9a71c74bbca6aaf01845fd6575f7ebdf266e4fbd3a023c1dd3e3f87821598a24dc15c9e11244ca7b969480d33283ad9920e8ab97cfc5ba1a9572
 AUX yasr-0.6.9-remove-m4.patch 412 BLAKE2B 41487fd7799a02b4abd0a30db012ff3d7c30a78e450be3f0b6daaa2612b75ac20ca6810a55a47a9a31e2a6e6abd82a0947d116bb8ea30b38f1dbd6f7c9fa07f6 SHA512 960559acb69be73f5f93162a0d2cded594c332ee4dc50fea92eaae58cfa64c9d473d86289643e1fac50663c0b90145d3fdd9c67a423ee93cd0fd67bd40689409
 DIST yasr-0.6.9.tar.gz 235768 BLAKE2B fbc9e9933b608644465e10e6418c6471fdd85497b98d19e7c66402a5d9075aaea78384c009e01d691899ae41268cfcd81a1f907d9cf6ee88863cf524335504f0 SHA512 107af558fce20bd79b81d68915032e511aa44df33a37b82ee2e82fb0d60ee14759d9b4dfe8634fdf1926c8b5c57e89aad1966e2dba243b725e72f783fe123df4
-EBUILD yasr-0.6.9-r1.ebuild 1217 BLAKE2B 50751a4ef1135a66c6588aad351591621d0e1c9f7ff9d615f5fda424e6b5a5d1ee30da70a7b53a75a4cd18052e46a5bf85adc552b83230749c5f86c12e208ea2 SHA512 65e5108414d119aebc5933cd75982f6ef3b338ab3350d4961466879e11cfcd1b765a6634daba00f4c21230e8492ea049bf2603c63fa81519c8117540f61691a9
+EBUILD yasr-0.6.9-r1.ebuild 1255 BLAKE2B b39844e32c1d47f6b8820f43ecbf4ed1e716bf4840d466712c533b8f895ee144b15ca7be4ae3984196baf01a3054e85c709563d295e8787e99591cb8e690cbe9 SHA512 89e3cef5d979eb6f9f6dcc2b4f6153e1f496000e83f0f4442b0895ee09e8ca296217c708fa324b3d79e53fe8e722b6ef42d4e888210d1ca0535d6fd54051c0dc
 MISC metadata.xml 343 BLAKE2B 996f4f22178b37cf20289679145ed57ce54dd1c4cfe90eb0bb77ed527b8e605241bdc7183418157b6795fcea0a4a340e2683dcfc44bc72a7fbafc047af16c490 SHA512 ec1a6eb820455bbb6d1dca0aba4e60e1e47e91725ea2091480f96a52cc98b1779b0c6bd2927142bc9bed45a45d51de22c84626531ee287303fce14ff9bd1a8f0
diff --git a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
index b9e8c1573d6e..3d1abf962f25 100644
--- a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
+++ b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND=""
-DEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.9-automake113.patch
@@ -26,8 +25,12 @@ PATCHES=(
 
 src_prepare() {
 	default
-	local x=/usr/share/gettext/po/Makefile.in.in
-	[[ -e $x ]] && cp -f $x po/ || die #330879
+
+	if use nls ; then
+		local x="${BROOT}"/usr/share/gettext/po/Makefile.in.in
+		# bug 330879
+		[[ -e $x ]] && cp -f $x po/ || die
+	fi
 
 	rm -r "${S}"/m4 || die
 
@@ -50,5 +53,5 @@ src_configure() {
 pkg_postinst() {
 	elog
 	elog "Speech-dispatcher is configured as the default synthesizer for yasr."
-	elog "If this is not what you want, edit /etc/yasr/yasr.conf."
+	elog "If this is not what you want, edit ${EROOT}/etc/yasr/yasr.conf."
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /app-accessibility
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)