gentoo resync : 14.07.2018

236 files changed, 5984 insertions, 610 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 712d346cde27..98ec2b76ad76 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/SphinxTrain-1.0.8 b/app-accessibility/SphinxTrain-1.0.8
deleted file mode 100644
index 6898f9ffd5a4..000000000000
--- a/app-accessibility/SphinxTrain-1.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=app-accessibility/sphinxbase dev-lang/perl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
-DESCRIPTION=Speech Recognition (Training Module)
-EAPI=5
-HOMEPAGE=http://cmusphinx.sourceforge.net/html/cmusphinx.php
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD-with-attribution
-RDEPEND=app-accessibility/sphinxbase dev-lang/perl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/cmusphinx/sphinxtrain-1.0.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a52bed11534400b1901760bc1bcc9dd9
diff --git a/app-accessibility/SphinxTrain/Manifest b/app-accessibility/SphinxTrain/Manifest
new file mode 100644
index 000000000000..abb0d27f72af
--- /dev/null
+++ b/app-accessibility/SphinxTrain/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxtrain-1.0.8.tar.gz 8925803 BLAKE2B e268c00843445cb69ae2a88f93fb4aa640556179417d44f6297d87f7e509418778b4808885bb19ab163efbd71565a3b6d75d269b420e9e366c0c6553a04b3053 SHA512 465d2c4ade9acc7b49c1d975449c38ac01d5a3ff332f9841be66cd8ca9d2f0b68fd36cc8a46384c8b510042efa91c3887a080481e84f2d0deb9775a598835f2b
+EBUILD SphinxTrain-1.0.8.ebuild 912 BLAKE2B ab54f33eb611fe0d0947c3438f6e37b17ec6817a06e536f02b1081cd6df2e3b0667a1caae0042bae56f58c6eb2a6c0fc906eb3252027e9511ff75560f2c1d671 SHA512 0749bae26704e502550088fea9f1d4f6d34910c4668828c6ddc10a571fe2befc1e41f5444ed1ecbef71586858231f04ebf16b5debb0617091099624111293f4a
+MISC metadata.xml 664 BLAKE2B f54b84c050180c61b490f0121a80e503bd138286516eaa1b58ca9dbda4805736955811deabd467aaa9b1ae2d93e857761ce1b41333a90f5fd337364268daca78 SHA512 1175faeff9cb4d6e0d231a613f0768d839e94d68b499193d218430894fc7ad7374e2028e0f07d707178394d9ef5322e7c061a179b70b69ee79b2bddf35f5195c
diff --git a/app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild b/app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild
new file mode 100644
index 000000000000..6b11a50e8c74
--- /dev/null
+++ b/app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib python-single-r1
+
+DESCRIPTION="Speech Recognition (Training Module)"
+HOMEPAGE="http://cmusphinx.sourceforge.net/html/cmusphinx.php"
+SRC_URI="mirror://sourceforge/cmusphinx/sphinxtrain-${PV}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="app-accessibility/sphinxbase
+	dev-lang/perl
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/sphinxtrain-${PV}
+
+src_install() {
+	default
+	dodoc README etc/*cfg
+
+	python_fix_shebang "${D}"/usr/bin/sphinxtrain
+	python_optimize "${D}"/usr/$(get_libdir)/sphinxtrain/python/cmusphinx
+}
+
+pkg_postinst() {
+	elog "Detailed usage and training instructions can be found at"
+	elog "http://cmusphinx.sourceforge.net/wiki/"
+}
diff --git a/app-accessibility/SphinxTrain/metadata.xml b/app-accessibility/SphinxTrain/metadata.xml
new file mode 100644
index 000000000000..fa02e6314d59
--- /dev/null
+++ b/app-accessibility/SphinxTrain/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
+	SphinxTrain is CMU Sphinx's training package.
+</longdescription>
+	<longdescription lang="ja">
+	SphinxTrainはCMU Sphinxの調教パッケージです。
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">cmusphinx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/accerciser-3.22.0 b/app-accessibility/accerciser-3.22.0
deleted file mode 100644
index b4a2140e63c5..000000000000
--- a/app-accessibility/accerciser-3.22.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=dev-python/pygobject-2.90.3:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.1.13:3[introspection] dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection:= >=dev-python/ipython-0.11[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/yelp-tools >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Interactive Python accessibility explorer
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Accerciser
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=BSD CC-BY-SA-3.0
-RDEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=dev-python/pygobject-2.90.3:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.1.13:3[introspection] dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection:= >=dev-python/ipython-0.11[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/accerciser/3.22/accerciser-3.22.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d824645ab9e59e46288f40f698baa5e7
diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
new file mode 100644
index 000000000000..46f8b4ae75a8
--- /dev/null
+++ b/app-accessibility/accerciser/Manifest
@@ -0,0 +1,3 @@
+DIST accerciser-3.22.0.tar.xz 3060756 BLAKE2B a648c764c5f101f323458c692cb4171704b7b710558f4103b57d87ca58c2d0d9c03cad72de1d3be9483d317ad94c95e43bb2437515093d6ffd93089a58e5fab1 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1
+EBUILD accerciser-3.22.0.ebuild 1444 BLAKE2B 45d8eaa83e454788c4381b3adefbe7ef993ba6fc060d8f7579b5b49b30689ef7a3827ff44de5afb56df3013bd4f87817070ce28b3442278a0fd08c4d053b4889 SHA512 573256cf8ca8e33c0b6f12d3e6693dab5a9ff32a6e0191172148a6d544db2a10c2e5e5f5af93ab61a1679bdb37638a35c5621b6bc5ea8c96551506a6b310bbcb
+MISC metadata.xml 738 BLAKE2B 916b10f5cb4aba612767ff5a617c091a36573681418c15973fbbff3328e00311306b162f504e9a12e17f04dc582f72bae21508847fec79a8d8cad4f3e18c9cb5 SHA512 78780d3254a608f95d3532de8a7438e891bd2e194ac8a255f2d224e8f4b41c2928b2efe04ae16050d0092f9e25f77800728f0be9b7cb3bcb955455532d4154e6
diff --git a/app-accessibility/accerciser/accerciser-3.22.0.ebuild b/app-accessibility/accerciser/accerciser-3.22.0.ebuild
new file mode 100644
index 000000000000..a91ed1fc9645
--- /dev/null
+++ b/app-accessibility/accerciser/accerciser-3.22.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-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
+	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3.1.13:3[introspection]
+
+	dev-libs/atk[introspection]
+	>=dev-libs/glib-2.28:2
+	dev-libs/gobject-introspection:=
+	>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
+	>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Leave shebang alone
+	sed 's:@PYTHON@:/usr/bin/python:' -i src/accerciser.in || die
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		python_doscript src/accerciser
+	}
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/app-accessibility/accerciser/metadata.xml b/app-accessibility/accerciser/metadata.xml
new file mode 100644
index 000000000000..b361a7a06606
--- /dev/null
+++ b/app-accessibility/accerciser/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription lang="en">
+Accerciser is an interactive Python accessibility explorer for the GNOME desktop. It uses AT-SPI to inspect and control widgets, allowing you to check if an application is providing correct information to assistive technologies and automated test frameworks. Accerciser has a simple plugin framework which you can use to create custom views of accessibility information.
+
+In essence, Accerciser is a next generation at-poke tool.
+</longdescription>
+</pkgmetadata>
diff --git a/app-accessibility/at-spi2-atk-2.22.0 b/app-accessibility/at-spi2-atk-2.22.0
deleted file mode 100644
index 9938eabe01d3..000000000000
--- a/app-accessibility/at-spi2-atk-2.22.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-accessibility/at-spi2-core-2.17.90[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=dev-libs/libxml2-2.9.1 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gtk module for bridging AT-SPI to Atk
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2+
-RDEPEND=>=app-accessibility/at-spi2-core-2.17.90[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<gnome-extra/at-spi-1.32.0-r1
-SLOT=2
-SRC_URI=mirror://gnome/sources/at-spi2-atk/2.22/at-spi2-atk-2.22.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c4ef3224eb2d2db4da09c09f466528f
diff --git a/app-accessibility/at-spi2-atk-2.24.1 b/app-accessibility/at-spi2-atk-2.24.1
deleted file mode 100644
index 5987a78bf33f..000000000000
--- a/app-accessibility/at-spi2-atk-2.24.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-accessibility/at-spi2-core-2.17.90[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=dev-libs/libxml2-2.9.1 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gtk module for bridging AT-SPI to Atk
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2+
-RDEPEND=>=app-accessibility/at-spi2-core-2.17.90[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<gnome-extra/at-spi-1.32.0-r1
-SLOT=2
-SRC_URI=mirror://gnome/sources/at-spi2-atk/2.24/at-spi2-atk-2.24.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a1b9d6d3d2ad194fbe19315746269a1c
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
new file mode 100644
index 000000000000..f3a2881d6ff5
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -0,0 +1,14 @@
+AUX at-spi2-atk-2.20.0-tests-data/test-collection.xml 877 BLAKE2B 0f79324108e90b69c0ecd0d86e888bfcef817ae833c0cc63eb4b8866379961e12e93e204e37d1d114efe924e1ce8fcba5244f8fb2225b1f0845c5db5c871b941 SHA512 b9ecedf2551b4cf61a70863b807c064460f0b29c8c60b9a76adb151bcd0c65a466f5e827ef31ae6f6101eb68b89ffad4b5670598b79bcd3533804414c6ee5987
+AUX at-spi2-atk-2.20.0-tests-data/test-document.xml 369 BLAKE2B 283e6b8498d415ca6115267e5e1184b940e626bc6e55f996ff95955bb453b82529b4b2035bedda34acb1cf699a8811df7b15176fcdd218599299085ffd1be1c0 SHA512 1c840c308794dc3000167629af3a230e962c30955a31b48e5e44e3865d35d8ddefd052d3bfecf38d1a54ad5691945ffbdef9f0fb9caa3bf8b8d1fac7c4cb2205
+AUX at-spi2-atk-2.20.0-tests-data/test-editable-text.xml 434 BLAKE2B 746346ba6f8159c206adeb96a0bc0422b35e5e380e1f3164ec0010ce464261a3104da14eaa16414d305c46b5032d2a64d5111d7ff3bcc6fc9aa1220ea17bbf39 SHA512 b15bff81787556b22df0db4ff076f2c048cacb20b56bd322066c48457510df3906161eddc2292061a189462bb3e16422a0d859b2d5c402ddf90886d8028512aa
+AUX at-spi2-atk-2.20.0-tests-data/test-hypertext.xml 342 BLAKE2B a82cfa63441ad7f19eea85e243b5929f25eed089a8b51eeed19017d967763b6bf449bea0060c73f612952e6777da780b3555424f139693fc4cdaed6be001bf3f SHA512 3af7a51f182252ed7e234c2296c19f4ab1fc2fb6685bec7cf74489443d0ca694ce04d721dcb440f274f37fe07773f6b70952ff56e882d3d83129cf696a835edd
+AUX at-spi2-atk-2.20.0-tests-data/test-image.xml 452 BLAKE2B 6b581c08fee191f0741665186e6f555ba3386f0342a7eb01884d0ce67969874136e7d741fc262aab85fda6931901f0874d3fff567e65c2590a350bfc939710d0 SHA512 841e18395864d66658abfb7ca1fe45a781456da456e5084f13e0ecb7e8e9262db6e67bdbc1eb38df313fa016261ef8843fcca236cc97be903d91f503c26b5af0
+AUX at-spi2-atk-2.20.0-tests-data/test-selection.xml 770 BLAKE2B 6ef23ab1eee641b9b58f5c0c4e75e0f43dd7139bf4dd34c48bc224500ef9c843eb451796f2d57e59a8f133f7bad02c630b056d6562588713982c7f77a3cd833f SHA512 6771c5866050fcd0ba1397be23d0cfda6bd9c85b244511fbc85fe563d85c3fe8a2250bd63d764658e76960718cc10443a5eb04908748b6492bff8863e85c74f3
+AUX at-spi2-atk-2.20.0-tests-data/test-table.xml 3651 BLAKE2B 9172ab97658e676e6c5da9294bf4efdcecf3993696f8175eee05aef757bfe77ff13572e4d35b05eee29dd85626a83753a127a15a794c827f2a791772de42b068 SHA512 6c9a17ca1c548a9f3981101c2dcee35447d20e19dd117d7b7e5e3d557807adecbc8a589b317ef693366fcd4bdcc8988ba6ebcb7b3b3fa78a447a692ae43a5fb2
+AUX at-spi2-atk-2.20.0-tests-data/test-text.xml 561 BLAKE2B cbfe3f97aafc4f2408fac8877fd7cdc60bf4c0235c1ae3ad3b22422d281cec98d31ec7763f6a8c82a105a72df9e2b7e89cebba978f072847615851f48781b598 SHA512 ccb09491bb24d744633d88b555af94fa86739d1b226e9ad7fc15cb7ac3dec67a8cbe1a3c8b8d7272a681a978b1a72842bb88b2dd20567c3aa69b3d5797f6499a
+AUX at-spi2-atk-2.20.0-tests-data/test-value.xml 289 BLAKE2B 0d8a8421e4443aab9a97bd2a66878dd8584006785c5c3910ac283bf64f76ab3fe69f4aa5dbad6a1f53d37a8a40984b24f73291cae8975f386c97a4ac298bbc8d SHA512 d099f5ac14396a6d6093efe1dd44f8455a1a737a41f208f728480de662d280d4fb17f846cf9c86966230315a344023fbb2c36c3511699d45f22208a16551bc33
+DIST at-spi2-atk-2.22.0.tar.xz 306148 BLAKE2B 3606f96ca89dcc23700c2aaa67da9daf51709113b5d5a15d4864e565dd559e4136007f125801de08e9c6bc6c14d7b1c39e8307340c1758a6145aeb0caeb0a5c9 SHA512 9b815eecbe01164df8a3341a3b0e1fe57a4f333964a0836f89f54712512a32d69c333c0c099eb194716d081f5460bb6e6d2c852f7218df51549e88e75880f284
+DIST at-spi2-atk-2.24.1.tar.xz 308576 BLAKE2B 92b96c54cd5a2dbd8a3dddbaa3188b3396ef8e4631cc9438e4ba57da27672d509babae3415c66d2c6afc74855ff0536d4cc6f24a8cecf66478021d350b3572a1 SHA512 5dbc186c7ea4f7f34aa0acaf90f683e549162caa274ba5b5818ae9992b52f1b475923d9818870978e87e3dacdf1018db31810d2d53b39bb4f068bcb64a423f23
+EBUILD at-spi2-atk-2.22.0.ebuild 1305 BLAKE2B 5eb5cf35564ecdf2dc0bed7bcdfb0f7cea1a89d9ff7d0aa711a6b0eb257350c54ec16380d121c12c69df23d9b064f2eb77b61d7da58dce4e888963566cf4bac4 SHA512 e9a31fbdabb3ed984bb7909faa53c4ea34915d551b2e24791282610819989168da73215586d470b4862620d334b68b0bd8832370c6a1b36b0482bdbbbdd225cf
+EBUILD at-spi2-atk-2.24.1.ebuild 1306 BLAKE2B c3b8890fb027deb246f4d01c87a509048e2577d52f96ce11fe50dccb609ee03e7de18f6ad5ad1011d887abf36d74cd8f374acc03c4ca1a5a7f113521e28ce765 SHA512 c001739b0fea62ff2d3c44f3a1dd5652235999a57dec9a57889794f74dded67725655f81df611774b3efdc2f453e9da8dde2ac516690487b2a32f40da69f1bbd
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.22.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.22.0.ebuild
new file mode 100644
index 000000000000..a2e617415d76
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.22.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.17.90[${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/libxml2-2.9.1 )
+"
+
+src_prepare() {
+	# Upstream forgot to put this in tarball, upstream #770615
+	cp -n "${FILESDIR}"/${PN}-2.20.0-tests-data/*.xml "${S}"/tests/data/ || die
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure --enable-p2p $(use_with test tests)
+}
+
+multilib_src_test() {
+	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
new file mode 100644
index 000000000000..258e2b15667f
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.17.90[${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/libxml2-2.9.1 )
+"
+
+src_prepare() {
+	# Upstream forgot to put this in tarball, upstream #770615
+	cp -n "${FILESDIR}"/${PN}-2.20.0-tests-data/*.xml "${S}"/tests/data/ || die
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure --enable-p2p $(use_with test tests)
+}
+
+multilib_src_test() {
+	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml
new file mode 100644
index 000000000000..7086ede8554c
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible description="first child" name="obj1" role="alert">
+		<state state_enum="modal"/>
+		<state state_enum="multi-line"/>
+	</accessible>
+	<accessible description="second child" name="obj2" role="animation">
+		<accessible description="first prechild" name="obj2/1" role="arrow">
+			<relation relation_type="2" target_name="obj2"/>
+			<state state_enum="modal"/>
+			<state state_enum="multi-line"/>
+		</accessible>
+		<accessible description="second prechild" name="obj2/2" role="canvas"/>
+	</accessible>
+	<accessible description="third child" name="obj3" role="check box">
+		<state state_enum="modal"/>
+		<state state_enum="multi-line"/>
+		<accessible description="first prechild" name="obj3/1" role="check menu item"/>
+	</accessible>
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-document.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-document.xml
new file mode 100644
index 000000000000..7363a622e76d
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-document.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+      <accessible description="first child" name="test" role="alert"/>
+      <accessible_document description="image child" name="my_document" role="text">
+         <document page_numer="7" page_no="2"/>
+      </accessible_document>
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-editable-text.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-editable-text.xml
new file mode 100644
index 000000000000..ae8084c2cc4b
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-editable-text.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible_editable_text description="first child" name="obj0" role="entry">
+		<text_edit_node text="test text"/>
+	</accessible_editable_text>
+	<accessible_editable_text description="second child" name="obj1" role="entry">
+		<text_edit_node text="second test text"/>
+	</accessible_editable_text>
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-hypertext.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-hypertext.xml
new file mode 100644
index 000000000000..1b6be6d4b1f3
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-hypertext.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible_hypertext description="first child" name="obj0" role="alert">
+		<hypertext text="This is article about know downhill portals href='dh-zone.com' href='pinkbike.com'" />
+	</accessible_hypertext>
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-image.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-image.xml
new file mode 100644
index 000000000000..b678ac250745
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-image.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+      <accessible description="first child" name="obj1" role="alert"/>
+      <accessible_image description="image child" name="obj0" role="image">
+         <image image_description="image description" width="100" height="50" x="500" y="50" image_extents="png" image_locale="image_locale"/>
+      </accessible_image>
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-selection.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-selection.xml
new file mode 100644
index 000000000000..2fc173334492
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-selection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible_selection description="first child" name="obj1" role="alert">
+		<accessible description="first prechild" name="obj2/1" role="arrow">
+			<state state_enum="selected"/>
+		</accessible>
+		<accessible description="second prechild" name="obj2/2" role="canvas" selected="1">
+			<state state_enum="selected"/>
+		</accessible>
+		<accessible description="first prechild" name="obj2/1" role="arrow"/>
+		<accessible description="second prechild" name="obj2/2" role="canvas"/>
+		<accessible description="first prechild" name="obj3/1" role="check menu item">
+			<state state_enum="selected"/>
+		</accessible>
+	</accessible_selection>
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-table.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-table.xml
new file mode 100644
index 000000000000..9d6cb502d74c
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-table.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible_table description="first_child" name="obj0" role="table">
+		<accessible description="table caption" name="caption name" role="caption"/>
+		<accessible description="table summary" name="table summary name" role="heading"/>
+		<accessible description="first column" name="col1" role="table column header">
+			<accessible description="first column header" name="column 1 header" role="header"/>
+		</accessible>
+		<accessible description="second column" name="col2" role="table column header">
+			<state state_enum="selected"/>
+			<accessible description="second column header" name="column 2 header" role="header"/>
+		</accessible>
+		<accessible description="third column" name="col3" role="table column header">
+			<accessible description="thrid column header" name="column 3 header" role="header"/>
+		</accessible>
+		<accessible description="first row" name="row1" role="table row header">
+			<state state_enum="selected"/>
+			<accessible description="first row header" name="row 1 header" role="header"/>
+		</accessible>
+		<accessible description="second row" name="row2" role="table row header">
+			<accessible description="second row header" name="row 2 header" role="header"/>
+		</accessible>
+		<accessible description="third row" name="row3" role="table row header">
+			<state state_enum="selected"/>
+			<accessible description="third row header" name="row 3 header" role="header"/>
+		</accessible>
+		<accessible description="fourth row" name="row4" role="table row header">
+			<accessible description="fourth row header" name="row 4 header" role="header"/>
+		</accessible>
+		<accessible_table_cell description="table cell 1" name="cell 0/0" role="table cell">
+			<table_cell cell_x="0" cell_y="0" row_span="2"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 5" name="cell 1/0" role="table cell">
+			<table_cell cell_x="1" cell_y="0" column_span="3"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 9" name="cell 2/0" role="table cell">
+			<state state_enum="selected"/>
+			<table_cell cell_x="2" cell_y="0"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 2" name="cell 0/1" role="table cell">
+			<table_cell cell_x="0" cell_y="1"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 6" name="cell 1/1" role="table cell">
+			<table_cell cell_x="1" cell_y="1"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 10" name="cell 2/1" role="table cell">
+			<table_cell cell_x="2" cell_y="1"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 3" name="cell 0/2" role="table cell">
+			<table_cell cell_x="0" cell_y="2"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 7" name="cell 1/2" role="table cell">
+			<table_cell cell_x="1" cell_y="2"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 11" name="cell 2/2" role="table cell">
+			<table_cell cell_x="2" cell_y="2"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 4" name="cell 0/3" role="table cell">
+			<table_cell cell_x="0" cell_y="3"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 8" name="cell 1/3" role="table cell">
+			<table_cell cell_x="1" cell_y="3"/>
+		</accessible_table_cell>
+		<accessible_table_cell description="table cell 12" name="cell 2/3" role="table cell">
+			<table_cell cell_x="2" cell_y="3"/>
+		</accessible_table_cell>
+	</accessible_table>
+</accessible>
+
+
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-text.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-text.xml
new file mode 100644
index 000000000000..ab72522afd53
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-text.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible_text description="first child" name="obj0" role="text">
+		<text_node text="text0 it works!." x="100" y="33" width="110" height="30" bold_text="on" underline_text="off"/>
+	</accessible_text>
+	<accessible_text description="second child" name="obj1" role="text">
+		<text_node text="First sentence./n Second sentence." x="66" y="44" width="550" height="40" bold_text="off" underline_text="off"/>
+	</accessible_text>
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-value.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-value.xml
new file mode 100644
index 000000000000..83172d5f8b8a
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-value.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible_value description="first child" name="obj0" role="alert">
+		<value_node min="1.1" current="2.1" max="3.1" step="0.1"/>
+	</accessible_value>
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/metadata.xml b/app-accessibility/at-spi2-atk/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/at-spi2-core-2.22.1 b/app-accessibility/at-spi2-core-2.22.1
deleted file mode 100644
index da294a4317dd..000000000000
--- a/app-accessibility/at-spi2-core-2.22.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=D-Bus accessibility specifications and registration daemon
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=X +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=2
-SRC_URI=mirror://gnome/sources/at-spi2-core/2.22/at-spi2-core-2.22.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d2a51beb4e0c9293f93ada33a88c859
diff --git a/app-accessibility/at-spi2-core-2.24.1 b/app-accessibility/at-spi2-core-2.24.1
deleted file mode 100644
index 12d1cd1b9aba..000000000000
--- a/app-accessibility/at-spi2-core-2.24.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=D-Bus accessibility specifications and registration daemon
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=X +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=2
-SRC_URI=mirror://gnome/sources/at-spi2-core/2.24/at-spi2-core-2.24.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=34934ec65892d01856669359abff6a0f
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
new file mode 100644
index 000000000000..269045c3764b
--- /dev/null
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -0,0 +1,6 @@
+AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
+DIST at-spi2-core-2.22.1.tar.xz 454048 BLAKE2B 5ee4cdb83815258d9be8b81870b590b2f85311acf75e3c830c00092cbe5dd66a07f933318ce7d4bc308308f6f87e46579b30948b67b8b7f753adc5e10589246b SHA512 2376b57ce744351ed09a13cd02f0c02264c0998860710cfcdac59f0efb78061512986f5d7305a2f6c594d70213722f81795620e8cd2c6587c6d3f1335477171f
+DIST at-spi2-core-2.24.1.tar.xz 452440 BLAKE2B 2e3e262d507dadbdb8fc5bb1bd60d3dbe8a9c2946228b6dc551d0a9564684d96b1b6cbe29849c1d846b3106b5444a2c6880a10825ba20cca87893f6a52815023 SHA512 e7f354a90204f12d4e464a6b4e4cb27141af3715d7c5ec253bdd2ebe65bc7d191ae7b775c45470a1bd1fe2c0accdd4e84feeb5e1eb1a6c05f3e5e734371027be
+EBUILD at-spi2-core-2.22.1.ebuild 1771 BLAKE2B e401dfb647adf50ce166d5871393ef12af00af92d26e0c1d735cbe3ed927ef9b2bd9a63438e7ffa7736a9d61940c8783d6b31307bd2c0ef7aacb12cb7c05ee95 SHA512 824732f4a7c7fc484fb591a7862d8a18a5326ad58150e3c23befb8f23d089d5a5fe7cd71ac7914877aff6015b99b10c086bc4a3cf6fb9b1ad71ab8085e9ba722
+EBUILD at-spi2-core-2.24.1.ebuild 1772 BLAKE2B c9aa30ad627867bff1a38dcde0c697d6df199e445cfd31148139fffcec0d571ea8638d5a8b33e35bc504ff3187e40f330fe337a85f784a22fadfa9bbe445e53b SHA512 2e2351b0ddc610560b87f7ffba31fb05f57128458af550ad35a900d69edb64f7d9b4cfb74d202883cf9a3bca7ccf66d2297beb8b91510e5c846424acf12a0b52
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.22.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.22.1.ebuild
new file mode 100644
index 000000000000..59c26497b8d0
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.22.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 multilib-minimal
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="X +introspection"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+
+# x11-libs/libSM is needed until upstream #719808 is solved either
+# making the dep unneeded or fixing their configure
+# Only libX11 is optional right now
+RDEPEND="
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	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() {
+	# xevie is deprecated/broken since xorg-1.6/1.7
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-xevie \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable X x11)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
+	fi
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
new file mode 100644
index 000000000000..20ebd6465e40
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 multilib-minimal
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="X +introspection"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+
+# x11-libs/libSM is needed until upstream #719808 is solved either
+# making the dep unneeded or fixing their configure
+# Only libX11 is optional right now
+RDEPEND="
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	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() {
+	# xevie is deprecated/broken since xorg-1.6/1.7
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-xevie \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable X x11)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
+	fi
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch
new file mode 100644
index 000000000000..269236d177e7
--- /dev/null
+++ b/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch
@@ -0,0 +1,13 @@
+diff --git a/dbind/dbtest.c b/dbind/dbtest.c
+index e8bbb63..9843c3d 100644
+--- a/dbind/dbtest.c
++++ b/dbind/dbtest.c
+@@ -417,7 +417,7 @@ int main (int argc, char **argv)
+ 
+     test_helpers ();
+     test_marshalling ();
+-    test_teamspaces (bus);
++    /* test_teamspaces (bus); */
+ 
+     return 0;
+ }
diff --git a/app-accessibility/at-spi2-core/metadata.xml b/app-accessibility/at-spi2-core/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-accessibility/at-spi2-core/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/brltty-5.2-r1 b/app-accessibility/brltty-5.2-r1
deleted file mode 100644
index 40d3a2c54c4b..000000000000
--- a/app-accessibility/brltty-5.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) python? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) ocaml? ( >=dev-ml/findlib-1.0.4-r1 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
-EAPI=6
-HOMEPAGE=http://brltty.com/
-IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java +midi ncurses nls ocaml +pcm python usb +speech tcl X elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tcl? ( api )
-SLOT=0
-SRC_URI=http://brltty.com/archive/brltty-5.2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	findlib	45d6030075064a68da8d7143726a1150	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f6b794eb1f8cafc347672c7025f51fe6
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
new file mode 100644
index 000000000000..57f601c7eedc
--- /dev/null
+++ b/app-accessibility/brltty/Manifest
@@ -0,0 +1,9 @@
+AUX brltty-5.2-fix-ldflags.patch 2168 BLAKE2B c75da04cfb57b550634a18f67c81fb0fef857122795ff1a28c5d8fd654849cd4fe25a436b72aa851cb746f6eea52e7c2a52f5ba40f3d64797341678b4035070f SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8
+AUX brltty-5.2-respect-AR.patch 260 BLAKE2B 4bdf1c41a881e59477e9472a8e9f691bccce5c837b1d1358f405df9e485aab9041b8612dfffa78d30cf90814668e8234b947b43f933d80e8e00e5c618ae8e768 SHA512 2b8de99e98e257041d7a2131775a936166f183197dc02a242cb9efaebebc19afed45292defa9567f86f8ce71e32458743b8c2d3361b1b290f6c93df88e83b1ff
+AUX brltty-5.2-sysmacros.patch 458 BLAKE2B ed2f09ed3a137758603d0067ec18708bbfc24fb3cad90954905ebeac4900dd70b679ccfc1d64c6f23fc9d4c7de0275a760222f8dcd935086541ef16cfd9ac963 SHA512 8e1ea5351c963df01603ff2469ff01079896fac40fbc1b91bb88f976749b639b4c925382e041f402f1cfef8a16716fb46109650b173539d69131f1e275ee1392
+AUX brltty-5.2-udev.patch 1025 BLAKE2B 8c83d2cf3dd09f4ee73d1dad104518449ca1136768945c879dfffa1774f7d11fac14dad53f3da840bebd77d72f10c2ed9ed6ebb69ab1ffb17bc69cc226296501 SHA512 3ef8e8ea2f7e03c88079b7cf91930ca0a86c0b383202d5e70c63419ead9e2e607812ad966e0eccce90615b3eed8600d71c63a0eabc1a01587ca959a29a484d8c
+AUX brltty.rc 242 BLAKE2B 68fc8de846cdaff11b2b6377d49985c8cbad1342dad03e60f3a3ef2e8aeb728994c05f6b9bb9378e5434c1e4cd03ead0716abf7344dea3f993ac10d9c12edc23 SHA512 067dc15ca297774ad773512f57e0b828ce97a07ac7156e4c72fc25b8b045eeca313ae566564c954193be83c72928dc3a26e1fadc4b2cc1755c607f515590cb9a
+AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7
+DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+EBUILD brltty-5.2-r1.ebuild 5229 BLAKE2B 9cda4dc74de430bd9f117e8dfd27c68a3aa726d251eec55a92dff78f763e7bbccc4bf53e00d561d85964fdd21858b1790c4ae58ec773703db9c3827dc6489593 SHA512 b3fd19b4318e1202b96ab46ecd5ac80601da4f9c8895e5f4b83db10c2294a4314683a7d4b023ef162d46f9c0914ae08599b3adf0a66e41a67bfc859b6bd94dec
+MISC metadata.xml 1502 BLAKE2B 75f1750b615a2d6d022ed682f65ce6d0d45908e0d5724a162220a915371ae357cd904b0c09083153fb0f07facbc89024604fe86e3386e58a7d409a82f3865835 SHA512 337bf98d4e2ffac2ea0721a042bd31958809de5089090b0a79d73457f700d57fb8ffe637f4ad9e896992e98a13fdbe1ac9a3f7758d8ad2703334db8edfb7c32c
diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild
new file mode 100644
index 000000000000..3622819ef62d
--- /dev/null
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+	autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
+HOMEPAGE="http://brltty.com/"
+SRC_URI="http://brltty.com/archive/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa 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"
+REQUIRED_USE="doc? ( api )
+	java? ( api )
+	ocaml? ( api )
+	python? ( api ${PYTHON_REQUIRED_USE} )
+	tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+	gpm? ( >=sys-libs/gpm-1.20 )
+	iconv? ( virtual/libiconv )
+	icu? ( dev-libs/icu:= )
+	python? ( ${PYTHON_DEPS} )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-libs/libXaw )"
+DEPEND="virtual/pkgconfig
+	java? ( >=virtual/jdk-1.4 )
+	python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+	${COMMON_DEP}"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+	${COMMON_DEP}"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
+	"${FILESDIR}"/${PN}-5.2-udev.patch
+	"${FILESDIR}"/${PN}-5.2-respect-AR.patch
+	"${FILESDIR}"/${PN}-5.2-sysmacros.patch
+)
+
+src_prepare() {
+	default
+
+	java-pkg-opt-2_src_prepare
+
+	# The code runs `pkg-config` directly instead of locating a suitable
+	# pkg-config wrapper (or respecting $PKG_CONFIG).
+	sed -i \
+		-e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \
+		aclocal.m4 configure.ac || die
+
+	# We run eautoconf instead of using eautoreconf because brltty uses
+	# a custom build system that uses autoconf without the rest of the
+	# autotools.
+	eautoconf
+	python_copy_sources
+}
+
+src_configure() {
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+
+	tc-export AR LD PKG_CONFIG
+	# override prefix in order to install into /
+	# braille terminal needs to be available as soon in the boot process as
+	# possible
+	# Also override localstatedir so that the lib/brltty directory is installed
+	# correctly.
+	# Disable stripping since we do that ourselves.
+	local myconf=(
+		--prefix=/
+		--localedir=/usr/share/locale
+		--includedir=/usr/include
+		--localstatedir=/var
+		--disable-stripping
+		--with-install-root="${D}"
+		--with-writable-directory="/run/brltty"
+		$(use_enable api)
+		$(use_with beeper beep-package)
+		$(use_enable contracted-braille)
+		$(use_with fm fm-package)
+		$(use_enable gpm)
+		$(use_enable iconv)
+		$(use_enable icu)
+		$(use_enable java java-bindings)
+		$(use_with midi midi-package)
+		$(use_enable nls i18n)
+		$(use_enable ocaml ocaml-bindings)
+		$(use_with pcm pcm-package)
+		$(use_enable speech speech-support)
+		$(use_enable tcl tcl-bindings)
+		$(use_enable X x)
+		$(use_with bluetooth bluetooth-package)
+		$(use_with ncurses curses)
+		$(use_with usb usb-package) )
+
+	econf "${myconf[@]}"
+
+	if use python; then
+		myconf+=( $(use_enable python python-bindings ) )
+
+		python_configure() {
+			econf "${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+src_compile() {
+	local JAVAC_CONF=""
+	local OUR_JNI_FLAGS=""
+	if use java; then
+		OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+		JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
+	fi
+
+	emake JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}"
+
+	if use python; then
+		python_build() {
+			cd "Bindings/Python" || die
+			emake
+		}
+		python_foreach_impl run_in_build_dir python_build
+	fi
+}
+
+src_install() {
+	if use ocaml; then
+		findlib_src_preinst
+	fi
+
+	emake OCAML_LDCONF= install
+
+	if use python; then
+		python_install() {
+			cd "Bindings/Python" || die
+			emake install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	if use java; then
+		# make install puts the _java.so there, and no it's not $(get_libdir)
+		rm -rf "${D}/usr/lib/java"
+		java-pkg_doso Bindings/Java/libbrlapi_java.so
+		java-pkg_dojar Bindings/Java/brlapi.jar
+	fi
+
+	insinto /etc
+	doins Documents/brltty.conf
+	udev_newrules Autostart/Udev/udev.rules 70-brltty.rules
+	newinitd "${FILESDIR}"/brltty.rc brltty
+	systemd_dounit Autostart/Systemd/brltty.service
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	libdir="$(get_libdir)"
+	mkdir -p "${D}"/usr/${libdir}/
+	mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
+	gen_usr_ldscript libbrlapi.so
+
+	cd Documents || die
+	mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+	mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+	mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
+	dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
+	if use doc; then
+		dodoc BrlAPI-*.txt
+		HTML_DOCS="Manual-BRLTTY" einstalldocs
+	fi
+
+	keepdir /var/lib/BrlAPI
+	rmdir "${D}/run/brltty" || die
+	rmdir "${D}/run" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "please be sure ${ROOT}etc/brltty.conf is correct for your system."
+	elog
+	elog "To make brltty start on boot, type this command as root:"
+	elog
+	elog "rc-update add brltty boot"
+}
diff --git a/app-accessibility/brltty/files/brltty-5.2-fix-ldflags.patch b/app-accessibility/brltty/files/brltty-5.2-fix-ldflags.patch
new file mode 100644
index 000000000000..e60ea9a4e509
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-fix-ldflags.patch
@@ -0,0 +1,56 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -377,7 +377,7 @@
+ case "${host_os}"
+ in
+    linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*)
+-      brltty_mkmod_ld_make="-shared"
++      brltty_mkmod_ld_make="-shared ${LDFLAGS}"
+       ;;
+    solaris*)
+       brltty_mkmod_ld_make="-G"
+@@ -404,7 +404,7 @@
+ esac
+ if test "${GCC}" = "yes"
+ then
+-   brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
++   brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
+ else
+    brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o"
+ fi])
+@@ -414,7 +414,7 @@
+ case "${host_os}"
+ in
+    linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|elf*)
+-      brltty_mklib_ld_make="-shared"
++      brltty_mklib_ld_make="-shared ${LDFLAGS}"
+       brltty_mklib_ld_options="-soname"
+       ;;
+    solaris*)
+@@ -449,7 +449,7 @@
+ esac
+ if test "${GCC}" = "yes"
+ then
+-   brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
++   brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
+ else
+    brltty_cv_prog_mklib="\$(LD) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o"
+ fi])
+--- a/Bindings/OCaml/Makefile.in
++++ b/Bindings/OCaml/Makefile.in
+@@ -55,13 +55,13 @@
+ all : $(OCAML_FILES)
+ 
+ $(OCAML_CLIBS) : brlapi_stubs.$O brlapi
+-	$(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
++	$(OCAMLMKLIB) -ldopt "$(LDFLAGS)"  $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
+ 
+ $(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo
+ 	$(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo
+ 
+ $(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx
+-	$(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
++	$(OCAMLMKLIB) -ldopt "$(LDFLAGS)"  $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
+ 
+ brlapi.cmi: brlapi.mli
+ 	$(OCAMLC) -o $@ -c brlapi.mli
diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
new file mode 100644
index 000000000000..c5698a2b9399
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
@@ -0,0 +1,11 @@
+--- a/Programs/Makefile.in
++++ b/Programs/Makefile.in
+@@ -434,7 +434,7 @@
+ 	[ ! -f lib.def ] || mv lib.def $(API_DEF)
+ 
+ $(API_ARC): $(API_CLIENT_OBJECTS)
+-	ar rc $@ $(API_CLIENT_OBJECTS)
++	$(AR) rc $@ $(API_CLIENT_OBJECTS)
+ 	$(RANLIB) $@
+ 
+ brlapi_client.$O:
diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
new file mode 100644
index 000000000000..f33e46a1890c
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -0,0 +1,20 @@
+--- a/Programs/system_linux.c
++++ b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ 
+ #include "log.h"
+ #include "file.h"
+--- a/Programs/brlapi_client.c
++++ b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
+ #include <linux/tty.h>
+ #include <linux/vt.h>
+ #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
++#include <sys/sysmacros.h>
+ #endif /* linux */
+ 
+ #ifdef __OpenBSD__
diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch b/app-accessibility/brltty/files/brltty-5.2-udev.patch
new file mode 100644
index 000000000000..e6d56603b013
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch
@@ -0,0 +1,27 @@
+--- a/Autostart/Udev/udev.rules
++++ b/Autostart/Udev/udev.rules
+@@ -182,20 +182,22 @@
+ # FreedomScientific [Focus Blue]
+ ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run"
+ 
++# Seika rules are commented out, because they conflict with USB-to-serial
++# converters.
+ # Device: 10C4:EA60
+ # Generic Identifier
+ # Vendor: Cygnal Integrated Products, Inc.
+ # Product: CP210x UART Bridge / myAVR mySmartUSB light
+ # BrailleMemo [Pocket]
+ # Seika [Braille Display]
+-ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
++#ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
+ 
+ # Device: 10C4:EA80
+ # Generic Identifier
+ # Vendor: Cygnal Integrated Products, Inc.
+ # Product: CP210x UART Bridge
+ # Seika [Note Taker]
+-ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
++#ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
+ 
+ # Device: 1148:0301
+ # BrailleMemo [Smart]
diff --git a/app-accessibility/brltty/files/brltty.rc b/app-accessibility/brltty/files/brltty.rc
new file mode 100644
index 000000000000..0bc6c6c5375b
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty.rc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/bin/brltty
+pidfile=/var/run/brltty.pid
+command_args="-P $pidfile -q"
+
+depend() {
+	before *
+	after clock
+}
diff --git a/app-accessibility/brltty/files/brltty.tmpfiles.conf b/app-accessibility/brltty/files/brltty.tmpfiles.conf
new file mode 100644
index 000000000000..18cc4021e33b
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty.tmpfiles.conf
@@ -0,0 +1 @@
+d /run/brltty 0755 root root -
diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
new file mode 100644
index 000000000000..53e30d6595d9
--- /dev/null
+++ b/app-accessibility/brltty/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <use>
+  <flag name="api">build brltty's application program interface</flag>
+  <flag name="beeper">support the console tone generator</flag>
+  <flag name="contracted-braille">support in-line contracted braille</flag>
+  <flag name="fm">support for the sound card synthesizer</flag>
+  <flag name="midi">support the musical instrument digital interface</flag>
+  <flag name="pcm">support for sound card digital audio</flag>
+  <flag name="speech">speech support</flag>
+</use>
+<longdescription lang="en">
+BRLTTY is a background process (daemon) which provides access to the Linux/Unix
+console (when in text mode) for a blind person using a refreshable braille
+display. It drives the braille display, and provides complete screen review
+functionality. Some speech capability has also been incorporated. 
+</longdescription>
+<longdescription lang="ja">
+BRLTTYは、盲人用ブライユ点字ディスプレイのためのLinux/Unixコンソールを制御するバ
+ックグラウンド・プロセス(デーモン)です。ブライユ点字ディスプレイを動かし、その多
+機能な完全なスクリーン・レビューを提供します。幾つかの台詞読み上げ機能も統合され
+ています。
+</longdescription>
+</pkgmetadata>
diff --git a/app-accessibility/caribou-0.4.21 b/app-accessibility/caribou-0.4.21
deleted file mode 100644
index bf111ebcfb4b..000000000000
--- a/app-accessibility/caribou-0.4.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-accessibility/at-spi2-core >=dev-python/pygobject-2.90.3:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3:3[introspection] x11-libs/gtk+:2 >=dev-libs/gobject-introspection-0.10.7:= dev-libs/libgee:0.8 dev-libs/libxml2 >=media-libs/clutter-1.5.11:1.0[introspection] x11-libs/libX11 x11-libs/libxklavier x11-libs/libXtst python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxslt >=dev-util/intltool-0.35.5 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Input assistive technology intended for switch and pointer users
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Caribou
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=app-accessibility/at-spi2-core >=dev-python/pygobject-2.90.3:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3:3[introspection] x11-libs/gtk+:2 >=dev-libs/gobject-introspection-0.10.7:= dev-libs/libgee:0.8 dev-libs/libxml2 >=media-libs/clutter-1.5.11:1.0[introspection] x11-libs/libX11 x11-libs/libxklavier x11-libs/libXtst python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/glib[dbus] >=dev-python/pyatspi-2.1.90[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=gnome-base/gsettings-desktop-schemas-3 gnome-base/librsvg:2 sys-apps/dbus
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/caribou/0.4/caribou-0.4.21.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=850a22228cdfd63ee3ed5bd64e40f8d3
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
new file mode 100644
index 000000000000..272fa00c39b2
--- /dev/null
+++ b/app-accessibility/caribou/Manifest
@@ -0,0 +1,3 @@
+DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
+EBUILD caribou-0.4.21.ebuild 2407 BLAKE2B 1e311e8f3e5e3204f05eb67f73081a97dc1b26a6caeede59b964b312b58d6be27a85ea15d94c1e167393f226d488a357fe13e61b2f5cde91ebb5afc5f83da0c1 SHA512 45416b8cf24b6060227f2d9861e22b9f934e5d1baabf82a22c5223be6a6363fe267f7e8afc462d1da607ee1acbba1b855c91a6ca78d77644139972cee100869c
+MISC metadata.xml 682 BLAKE2B 4ff796697db62d8c6a21ff62794c5fef391691685cece76ee7b8c38178f775a145b9a457df9bf959ab6af03559ceb4d9ad97a2ab835d63b70e58b4894f71fa5d SHA512 bec00e1cbb64bfec610e3f4e724e8afb8539a4b676b1e443a17b7eaf2263bef1fbf5787d77de253d84ebb0a54b3ca4bd386ba421826c0bb903164bb7ecf5223d
diff --git a/app-accessibility/caribou/caribou-0.4.21.ebuild b/app-accessibility/caribou/caribou-0.4.21.ebuild
new file mode 100644
index 000000000000..e97c8589f1e6
--- /dev/null
+++ b/app-accessibility/caribou/caribou-0.4.21.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Input assistive technology intended for switch and pointer users"
+HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core
+	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3:3[introspection]
+	x11-libs/gtk+:2
+	>=dev-libs/gobject-introspection-0.10.7:=
+	dev-libs/libgee:0.8
+	dev-libs/libxml2
+	>=media-libs/clutter-1.5.11:1.0[introspection]
+	x11-libs/libX11
+	x11-libs/libxklavier
+	x11-libs/libXtst
+	${PYTHON_DEPS}
+"
+# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
+# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
+# librsvg needed to load svg images in css styles
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/glib[dbus]
+	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
+	>=gnome-base/gsettings-desktop-schemas-3
+	gnome-base/librsvg:2
+	sys-apps/dbus
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# FIXME: Now this supports python3 too...
+	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
+	# + caribou is python2 only so fix the shell scripts
+#	sed -e '/export PYTHONPATH=.*python/ d' \
+#		-e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
+#		-i bin/{antler-keyboard,caribou-preferences}.in ||
+#		die "sed failed"
+
+	gnome2_src_prepare
+
+	prepare_caribou() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_caribou
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
+		gnome2_src_configure \
+			--disable-docs \
+			--disable-static \
+			--enable-gtk3-module \
+			--enable-gtk2-module \
+			VALAC=$(type -P true)
+	# vala is not needed for tarball builds, but configure checks for it...
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=769323
+	dodoc AUTHORS NEWS README # ChangeLog simply points to git log
+}
diff --git a/app-accessibility/caribou/metadata.xml b/app-accessibility/caribou/metadata.xml
new file mode 100644
index 000000000000..3a82b0ba211a
--- /dev/null
+++ b/app-accessibility/caribou/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<longdescription lang="en">
+Caribou is a text entry and UI navigation application being developed as an
+alternative to the Gnome On-screen Keyboard. The overarching goal for Caribou
+is to create a usable solution for people whose primary way of accessing a
+computer is a switch device. The initial goal is to make an in-place on-screen
+keyboard suitable for people who can use a mouse but not a hardware keyboard.
+</longdescription>
+</pkgmetadata>
diff --git a/app-accessibility/edbrowse-3.5.1 b/app-accessibility/edbrowse-3.5.1
deleted file mode 100644
index 06a6046458d7..000000000000
--- a/app-accessibility/edbrowse-3.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/spidermonkey-24.0:24 >=sys-libs/readline-6.0 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) odbc? ( dev-db/unixODBC ) virtual/pkgconfig app-arch/unzip
-DESCRIPTION=editor, browser, and mail client using the /bin/ed interface
-EAPI=5
-HOMEPAGE=http://the-brannons.com/edbrowse/
-IUSE=libressl odbc l10n_fr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/spidermonkey-24.0:24 >=sys-libs/readline-6.0 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) odbc? ( dev-db/unixODBC )
-SLOT=0
-SRC_URI=http://the-brannons.com/edbrowse/edbrowse-3.5.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2efe66bc77ff7d2dc14132e17bd6c61
diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
new file mode 100644
index 000000000000..c4a9bee0500a
--- /dev/null
+++ b/app-accessibility/edbrowse/Manifest
@@ -0,0 +1,4 @@
+AUX edbrowse-3.5.1-implicit-decl.patch 777 BLAKE2B 1e619d2ee4ff1e0f1a7690d33d34b2669c59120aca50d8b9cc835a4dbc81ba20e19983d0fc4aa2dfa12a1281e85d489084b31b3dcf15bd684a8be78f819397d2 SHA512 f8fc77759b14480ddef08b8f893eaf6791cfcced347b2cc8d5356c8ae4e3ee381d5eb3685a8bef529cc4dae3bc615f6a5b47a35bf829c6a204553c6545acdcd8
+DIST edbrowse-3.5.1.zip 745277 BLAKE2B 2256faf58de68ab2d19d3137ddaaa92dbfdfff581d83c9f2b58e0e161c10aaa5c867dbf8b81da77f21abdd5c1a07d882abafff4bcfc0706fc33a73b7ba6bc087 SHA512 83bdb1d49afa04a41a84b71e86969880b518d8d6c1e448380d70710ad2373ed57cb3699d3ad50226ea4d5776f511ff50b9510655b27d26948213113699512fc2
+EBUILD edbrowse-3.5.1.ebuild 1420 BLAKE2B 9b41708d77b29db8bece8ec0bd74ca3166bf02551899289ab720de6bd5b57d85cd8538553777014862b66c52c18bde660b6fd606810624a9c76b661e3c906dcf SHA512 d1197dca946b138c64de82fb6e4e2ac6e2268d7d2d335ece41cb5ddafe7006ded0ee70bea1997234bd6bc67d15b5bbb6f7b90207c58034e9264d889cd4ffb28f
+MISC metadata.xml 394 BLAKE2B 6e65f68555af92f50c566ca53dffbb5c4a68bf96e7a6a895adf96be6518b83ce4cfe4a1b0fa6dcd7deabdb26afe67376743518154d18fa0c944d4538840e0b53 SHA512 76561a6366dca32455b5bff45b655fd155199b36a7a3243cb900e80382f64be642c64d6ee9095a0857484eaaca98fde8bd370b164d346d13d8744763d4b5e916
diff --git a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
new file mode 100644
index 000000000000..c8e5ad5fdf8b
--- /dev/null
+++ b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils
+
+DESCRIPTION="editor, browser, and mail client using the /bin/ed interface"
+HOMEPAGE="http://the-brannons.com/edbrowse/"
+SRC_URI="http://the-brannons.com/${PN}/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl odbc l10n_fr"
+
+COMMON_DEPEND=">=dev-lang/spidermonkey-24.0:24
+	>=sys-libs/readline-6.0
+	>=net-misc/curl-7.36.0
+	>=dev-libs/libpcre-7.8
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	app-arch/unzip"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-implicit-decl.patch"
+}
+
+src_compile() {
+		jscppflags=$(pkg-config --cflags mozjs-24)
+		jslib=$(pkg-config --libs mozjs-24)
+	emake prefix=/usr JSLIB="${jslib}" JS_CXXFLAGS="${jscppflags}" STRIP=''
+	if use odbc; then
+		# Top-level makefile doesn't have this target.
+		cd src
+	emake prefix=/usr JSLIB="${jslib}" JS_CXXFLAGS="${jscppflags}" STRIP=''
+		cd ..
+	fi
+}
+
+src_install() {
+	cd src
+	emake prefix=/usr DESTDIR="${D}" install
+	if use odbc; then
+		dobin edbrowseodbc
+	fi
+	cd ..
+	dodoc CHANGES README todo
+	cd doc
+	dobin setup.ebrc
+	dohtml usersguide.html philosophy.html
+	dodoc sample.ebrc
+	if use l10n_fr; then
+		dohtml usersguide_fr.html philosophy_fr.html
+		dodoc sample_fr.ebrc
+	fi
+}
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.5.1-implicit-decl.patch b/app-accessibility/edbrowse/files/edbrowse-3.5.1-implicit-decl.patch
new file mode 100644
index 000000000000..1880d2b3bfe0
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.5.1-implicit-decl.patch
@@ -0,0 +1,22 @@
+diff -Naur edbrowse-3.5.1/src/fetchmail.c edbrowse-3.5.1.new/src/fetchmail.c
+--- edbrowse-3.5.1/src/fetchmail.c	2014-09-23 21:50:37.000000000 -0700
++++ edbrowse-3.5.1.new/src/fetchmail.c	2014-09-29 02:29:46.193856866 -0700
+@@ -6,6 +6,7 @@
+  * This file is part of the edbrowse project, released under GPL.
+  */
+ 
++#define _GNU_SOURCE
+ #include "eb.h"
+ 
+ #define MHLINE 200		/* length of a mail header line */
+diff -Naur edbrowse-3.5.1/src/sendmail.c edbrowse-3.5.1.new/src/sendmail.c
+--- edbrowse-3.5.1/src/sendmail.c	2014-09-23 21:50:37.000000000 -0700
++++ edbrowse-3.5.1.new/src/sendmail.c	2014-09-29 02:29:37.105874233 -0700
+@@ -5,6 +5,7 @@
+  * This file is part of the edbrowse project, released under GPL.
+  */
+ 
++#define _GNU_SOURCE
+ #include "eb.h"
+ 
+ #include <time.h>
diff --git a/app-accessibility/edbrowse/metadata.xml b/app-accessibility/edbrowse/metadata.xml
new file mode 100644
index 000000000000..53850bf1c4d0
--- /dev/null
+++ b/app-accessibility/edbrowse/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<longdescription>
+	edbrowse is a line editor, web browser and email client using the /bin/ed
+	user interface.
+</longdescription>
+</pkgmetadata>
diff --git a/app-accessibility/eflite-0.4.1-r3 b/app-accessibility/eflite-0.4.1-r3
deleted file mode 100644
index a7ea60fc3890..000000000000
--- a/app-accessibility/eflite-0.4.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=app-accessibility/flite-1.4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A speech server that allows screen readers to interact with festival lite
-EAPI=5
-HOMEPAGE=http://eflite.sourceforge.net
-IUSE=+16k_voice
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-accessibility/flite-1.4
-SLOT=0
-SRC_URI=mirror://sourceforge/eflite/eflite-0.4.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3fa3316554882367d1471aa9b103eafd
diff --git a/app-accessibility/eflite/Manifest b/app-accessibility/eflite/Manifest
new file mode 100644
index 000000000000..c1ed9a56f337
--- /dev/null
+++ b/app-accessibility/eflite/Manifest
@@ -0,0 +1,6 @@
+AUX eflite-0.4.1-flite14.patch 1070 BLAKE2B 18faef8ed5fe227a060c33f82a8dae1cca5282da77b152297040fb601722d4e9f7017758fa0fcf0c2d94bc9e79cc3f0e8e5869756ea9e30be694b86c5561419b SHA512 fabf260a517c1d7fd3af66fd6972f200d9c7d129ed36090ae77f493142728cd6207db77b1b02710fd22fd0e81e59857fb21b113ef5fb30ff6035778e143a3304
+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 925 BLAKE2B 8ae762568b882ee2002017aa3ac902bd0eb445952497132226ddf9ee37bfbe21472222b858de2cf5705e0bd059e12dde2787a4d845b348cf818cad7303404de8 SHA512 40ddda73dc2d7f34dbadcd4894e408cf73c4a29054061d50cf82bad32a3c5aa26e58af2820f25022358450735a395b2a40c2f4ee8a76b630027cab43b36319df
+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
new file mode 100644
index 000000000000..fd08c28eb243
--- /dev/null
+++ b/app-accessibility/eflite/eflite-0.4.1-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools eutils user
+
+DESCRIPTION="A speech server that allows screen readers to interact with festival lite"
+HOMEPAGE="http://eflite.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="+16k_voice"
+
+DEPEND=">=app-accessibility/flite-1.4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i 's:/etc/es.conf:/etc/eflite/es.conf:g' *
+	epatch "${FILESDIR}"/${PN}-0.4.1-flite14.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use 16k_voice; then
+		myconf='--with-vox=cmu_us_kal16'
+	fi
+	econf ${myconf}
+}
+
+src_install() {
+	einstall
+	dodoc ChangeLog README INSTALL eflite_test.txt
+
+	insinto /etc/eflite
+	doins "${FILESDIR}"/es.conf
+
+	newinitd "${FILESDIR}"/eflite.rc eflite
+}
+
+pkg_postinst() {
+	enewgroup speech
+}
diff --git a/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch b/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch
new file mode 100644
index 000000000000..cb3096d88a43
--- /dev/null
+++ b/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch
@@ -0,0 +1,24 @@
+diff -Naur eflite-0.4.1/Makefile.in eflite-0.4.1-new/Makefile.in
+--- eflite-0.4.1/Makefile.in	2007-01-18 18:01:09.000000000 -0600
++++ eflite-0.4.1-new/Makefile.in	2010-07-23 20:06:45.000000000 -0500
+@@ -34,7 +34,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS)
+ 
+ fs.o: fs.c
+-	$(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $<
++	$(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(FL_VOX) -DSTANDALONE -DEFLITE -c -o $@ $<
+ 
+ tone.o: tone.c
+ 	$(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $<
+diff -Naur eflite-0.4.1/fs.c eflite-0.4.1.new/fs.c
+--- eflite-0.4.1/fs.c	2007-01-18 16:01:09.000000000 -0800
++++ eflite-0.4.1.new/fs.c	2013-09-08 09:31:57.417262688 -0700
+@@ -523,7 +523,7 @@
+   int playlen, skip;
+   if (type == SPEECH)
+   {
+-	skip = (187 * wptr->sample_rate) / speed;
++	skip = 0;
+ 	playlen = wptr->num_samples - (skip * 2);
+ 	if (playlen > 0 && playlen < 500) playlen += (skip * 2) / 3;
+   }
diff --git a/app-accessibility/eflite/files/eflite.rc b/app-accessibility/eflite/files/eflite.rc
new file mode 100644
index 000000000000..2a65b04d0a8a
--- /dev/null
+++ b/app-accessibility/eflite/files/eflite.rc
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use alsasound
+	use modules
+	use hotplug
+}
+
+start() {
+	ebegin "Starting eflite"
+	start-stop-daemon --start --exec /usr/bin/eflite --background \
+		--quiet --pidfile /var/run/eflite.pid --make-pidfile -- -D || eend 1
+
+	SOCKET=`egrep '^sockname=' /etc/eflite/es.conf | sed 's/^sockname=//'`
+	[ ! -S ${SOCKET} ] && SOCKET=/tmp/es.socket
+
+	chown root:speech ${SOCKET}
+	chmod 660 ${SOCKET}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping eflite"
+	start-stop-daemon --stop --quiet --pidfile /var/run/eflite.pid
+	eend $?
+}
diff --git a/app-accessibility/eflite/files/es.conf b/app-accessibility/eflite/files/es.conf
new file mode 100644
index 000000000000..17443d3e42ba
--- /dev/null
+++ b/app-accessibility/eflite/files/es.conf
@@ -0,0 +1,11 @@
+# What socket do we listen on
+sockname=/tmp/es.socket
+
+# What volume do we set?
+tone_volume=8192
+
+# Do we use the PC Speaker? (0/1)
+speaker_tones=0
+
+# Do we use the sound card (via flite)? (0/1)
+soundcard_tones=1
diff --git a/app-accessibility/eflite/metadata.xml b/app-accessibility/eflite/metadata.xml
new file mode 100644
index 000000000000..9c8a9fdaf58f
--- /dev/null
+++ b/app-accessibility/eflite/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="16k_voice">Use a higher-quality voice.</flag>
+	</use>
+	<longdescription lang="en">
+	EFlite is a speech server for Emacspeak and other screen readers
+	that allows	them to interface with Festival Lite, a free 
+	text-to-speech engine developed at the CMU Speech Center as an 
+	off-shoot of Festival.
+</longdescription>
+	<longdescription lang="ja">
+	EFliteはEmacspeakと他のスクリーン読取り装置のスピーチサーバ。この
+	サーバーで前のプログラムはFestival Lite(CMU Speech Centerで開発した
+	Festivalのようにスピーチにテキストを変わるエンジン。)と
+	インタフェスすることが出来る。
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">eflite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/emacspeak-39.0-r2 b/app-accessibility/emacspeak-39.0-r2
deleted file mode 100644
index c9e3ab166976..000000000000
--- a/app-accessibility/emacspeak-39.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=espeak? ( app-accessibility/espeak ) >=virtual/emacs-24
-DESCRIPTION=the emacspeak audio desktop
-EAPI=6
-HOMEPAGE=http://emacspeak.sourceforge.net/
-IUSE=+espeak
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD GPL-2
-RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://emacspeak.googlecode.com/files/emacspeak-39.0.tar.bz2
-_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
-_md5_=02876f569083daff9874034ee9576174
diff --git a/app-accessibility/emacspeak-9999 b/app-accessibility/emacspeak-9999
deleted file mode 100644
index 5c25e1762c14..000000000000
--- a/app-accessibility/emacspeak-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=espeak? ( app-accessibility/espeak ) >=virtual/emacs-24 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=the emacspeak audio desktop
-EAPI=6
-HOMEPAGE=http://emacspeak.sourceforge.net/
-IUSE=+espeak
-LICENSE=BSD GPL-2
-RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=virtual/emacs-24
-SLOT=0
-_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	8f6de46b0aa318aea0e8cac62ece098b	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
-_md5_=bb5e081141fefe72f22d1d7405b36da5
diff --git a/app-accessibility/emacspeak-ss-1.9.1 b/app-accessibility/emacspeak-ss-1.9.1
deleted file mode 100644
index 7d4274eb905b..000000000000
--- a/app-accessibility/emacspeak-ss-1.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=adds support for several speech synthesizers to emacspeak
-EAPI=6
-HOMEPAGE=http://leb.net/blinux/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-accessibility/emacspeak-18
-SLOT=0
-SRC_URI=http://leb.net/pub/blinux/emacspeak/blinux/emacspeak-ss-1.9.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=eac5db3e6889139ae2628c2d36dbcd0f
diff --git a/app-accessibility/emacspeak-ss/Manifest b/app-accessibility/emacspeak-ss/Manifest
new file mode 100644
index 000000000000..6b47a74e3838
--- /dev/null
+++ b/app-accessibility/emacspeak-ss/Manifest
@@ -0,0 +1,4 @@
+AUX gentoo-apollo-fix.patch 633 BLAKE2B 79b528111af975c2b1c226d4df21f4982705546e025c0a85b7f720c0d15bf2592d9b12ddbee8238ec0ab891cc8096b57570f19826b03139f5c5f35bbf0238c45 SHA512 08c0ec7e0755efefbbecfc7efd376102b9333e4b2589bf9b97649481e0bf16d6b32caf917b229de15938d73beeae4d882fbe9d8bef7038f039b8924eba1af592
+DIST emacspeak-ss-1.9.1.tar.gz 49077 BLAKE2B 601e46d1d9160dfed6c90523dbf6bdd8ba8254de4246ba33c34d8afef842624c0c57886655e2ebf70dbc9a768e5eebdaccfd75fe11316742a0f3b506dce3aef0 SHA512 a95505a1eaa0b45732d6d8e7322fb75bebc59b876233ae07c5912f1582f0be29d3258dfd5659993ce4b03f72eb316469de95688dcefb7ec61b4ef328f2f50335
+EBUILD emacspeak-ss-1.9.1.ebuild 689 BLAKE2B 06da9cd61a4331f4259dd9ba18b0fec33119b44cfe9bc5de58ca60093b2cf5927e5cdb3aacd02456b9abd3c2eea73dca0b6270299860ea56e159582669f4c43a SHA512 2c0577d4a69c38f0c7cfeb1107b64c2d3eaa6dd72565c91cd392b48fa29bf3270562701ff10e77932e55d6f241dfa6e5df64b11cec0442549e8cede8c77f3086
+MISC metadata.xml 935 BLAKE2B 4fac2308400b57c654762c7f25b5c0d20d0ca001811bf555ee565e22e13376c1c1b72c01d0952a412b407d2289e78ada6780c99e585d6fcfa85b9daaeb0a40c4 SHA512 5e83a64303469728d2e027852ff1feef97d30094405552922aea1ef59eefe6dfa9ad1faa4b049f9a3e72948b06ee9dc3a0d9b9b8ce7deea0da790d63ad22810d
diff --git a/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild b/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild
new file mode 100644
index 000000000000..7eb873e8bb76
--- /dev/null
+++ b/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="adds support for several speech synthesizers to emacspeak"
+HOMEPAGE="http://leb.net/blinux/"
+SRC_URI="http://leb.net/pub/blinux/emacspeak/blinux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-accessibility/emacspeak-18"
+
+PATCHES=(
+	"${FILESDIR}"/gentoo-apollo-fix.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		man1dir="${D}"/usr/share/man/man1 \
+		install
+	dodoc CREDITS ChangeLog OtherSynthesizers TODO TROUBLESHOOTING README*
+}
diff --git a/app-accessibility/emacspeak-ss/files/gentoo-apollo-fix.patch b/app-accessibility/emacspeak-ss/files/gentoo-apollo-fix.patch
new file mode 100644
index 000000000000..55abe1238949
--- /dev/null
+++ b/app-accessibility/emacspeak-ss/files/gentoo-apollo-fix.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,7 +3,7 @@
+ man1dir=@mandir@/man1
+ exec_prefix = @exec_prefix@
+ bindir=$(prefix)/share/emacs/site-lisp/emacspeak/
+-libdir=$(prefix)/lib/emacs/common/emacspeak/
++libdir=$(prefix)/lib/emacspeak-ss
+ 
+ INSTALL=@INSTALL@
+ VERSION=@VERSION@
+--- a/apollo.in
++++ b/apollo.in
+@@ -101,7 +101,7 @@
+ # write the argument to the synthesizer, and return its response if any
+ proc tts_ping {query} {
+     global tts
+-    set status [exec /usr/lib/emacs/common/emacspeak/ping-apollo "$query" $tts(port) ]
++    set status [exec /usr/lib/emacspeak-ss/ping-apollo "$query" $tts(port) ]
+     return $status
+ }
+ 
diff --git a/app-accessibility/emacspeak-ss/metadata.xml b/app-accessibility/emacspeak-ss/metadata.xml
new file mode 100644
index 000000000000..02a513c4c55c
--- /dev/null
+++ b/app-accessibility/emacspeak-ss/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Emacspeak speech servers for DoubleTalk PC and AT,
+		Braille 'n Speak, Type 'n Speak, Braille Lite from Blazie,
+		Accent SA, Apollo 2, JUNO, and JUNO-sp from Dolphin,
+		Spanish ciber 232 (+plus), Spanish PC Hablado notebook.
+	</longdescription>
+	<longdescription lang="ja">
+		DoubleTalkPC and ATとBraille 'n SpeakとType 'n SpeakとBlazieから
+		Braille LiteとAccent SAとApollo SAとApollo 2とDolphinからJUNO
+		and JUNO-spとSpanish ciber 232 (+plus)とSpanish PC Hablado
+		notebookのEmacspeakスピーチサーバーです。
+	</longdescription>
+</pkgmetadata>
diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest
new file mode 100644
index 000000000000..9fcb190f682e
--- /dev/null
+++ b/app-accessibility/emacspeak/Manifest
@@ -0,0 +1,4 @@
+DIST emacspeak-39.0.tar.bz2 4989631 BLAKE2B ea58436fd3d7450938de04b74dcefdd9b9c5bee5c8c3bf48dbd2ca5bd5ce5c795a0d4c60ec05ca83c0020ca650b717e378717dc2d68eb56e80653b5045d5b132 SHA512 c0a0c503d6ccc2abb53a8be580997b44e0449c2225e8a64cee73c24d69a28c3f47c0e660a95a6e77dd4d660272ad562ff747ce3c0a989f8fe7c8171f60349173
+EBUILD emacspeak-39.0-r2.ebuild 2075 BLAKE2B 1adb4a4cade944dd77d4635f9db22face5b234e2c0d0b577902cd21e503c323c0fcbf93e254942cc7ccec3cad49adaf7b55b6f030d8b691b2887337ea9613381 SHA512 b1507eb711316486f4d026a40116d465e909c9709bae2fe4549369fc525d2dc55bd16621661296049174cb327e0e35fdc3d77511ba1edbb54b5f25a7d16da182
+EBUILD emacspeak-9999.ebuild 2078 BLAKE2B c5a3b3230f5e2ff9f321ba405aadf463f03d0a57657e4b96b00f1f0168f8a504f5689ae685ff81199a9b65ff178270b85d37470a26e1726fa68821542cbd57e9 SHA512 755477e57ed910b0142203839a2ab228eb6fd099b877024731b87fb62294d737dd79f4799a06104192209dd749342d189876ec58d18afb81281c38a7b3e619c9
+MISC metadata.xml 935 BLAKE2B b6d4290a33c03d8f5867bbd03fda6dc10db6372049fd783d44f6cfc18caa3f667cfd59441cf1e032fb9da990f3b210592db9d909c25d0ff8bdd6c384c76018e7 SHA512 27ae503ae1f338a52ecb4ce06cc4d227f6fd922f4b391abf1dfe75a7433d2d350f63979e71d16adf27de6f2f6bca34fa4213578868e2883e8c50f409e453706e
diff --git a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
new file mode 100644
index 000000000000..daa09b1d5317
--- /dev/null
+++ b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NEED_EMACS=24
+FORCE_PRINT_ELOG=1
+DISABLE_AUTOFORMATTING=1
+inherit elisp readme.gentoo-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git"
+	inherit git-r3
+else
+	SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
+	KEYWORDS="amd64 ppc x86"
+fi
+
+DESCRIPTION="the emacspeak audio desktop"
+HOMEPAGE="http://emacspeak.sourceforge.net/"
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="+espeak"
+
+DEPEND="espeak? ( app-accessibility/espeak )"
+
+RDEPEND="${DEPEND}
+	>=dev-tcltk/tclx-8.4"
+
+DOC_CONTENTS='
+As of version 39.0 and later, the /usr/bin/emacspeak
+shell script has been removed downstream in Gentoo.
+You should launch emacspeak by another method, for instance
+by adding the following to your ~/.emacs file:
+(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
+'
+
+HTML_DOCS=( install-guide user-guide )
+
+src_configure() {
+	emake config
+}
+
+src_compile() {
+	emake emacspeak
+	if use espeak; then
+		local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)"
+		if [[ -z $tcl_version ]]; then
+			die 'Unable to detect the installed version of dev-lang/tcl.'
+		fi
+		cd servers/linux-espeak || die
+		emake TCL_VERSION="${tcl_version}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm "${D}/usr/bin/emacspeak"
+	if use espeak; then
+		pushd servers/linux-espeak > /dev/null || die
+		emake DESTDIR="${D}" install
+		local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/linux-espeak"
+		local serverfile="${D}${orig_serverdir}/tclespeak.so"
+		install -Dm755  "$serverfile" \
+			"${D}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die
+		rm -f "$serverfile" || die
+		dosym "/usr/$(get_libdir)/emacspeak/tclespeak.so" \
+			"$orig_serverdir/tclespeak.so"
+		popd > /dev/null || die
+	fi
+	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
+	einstalldocs
+	cd "${D}/usr/share/emacs/site-lisp/${PN}" || die
+	rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \
+		user-guide || die
+	readme.gentoo_create_doc
+}
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
new file mode 100644
index 000000000000..67a6062698b4
--- /dev/null
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NEED_EMACS=24
+FORCE_PRINT_ELOG=1
+DISABLE_AUTOFORMATTING=1
+inherit elisp readme.gentoo-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git"
+	inherit git-r3
+else
+	SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="the emacspeak audio desktop"
+HOMEPAGE="http://emacspeak.sourceforge.net/"
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="+espeak"
+
+DEPEND="espeak? ( app-accessibility/espeak )"
+
+RDEPEND="${DEPEND}
+	>=dev-tcltk/tclx-8.4"
+
+DOC_CONTENTS='
+As of version 39.0 and later, the /usr/bin/emacspeak
+shell script has been removed downstream in Gentoo.
+You should launch emacspeak by another method, for instance
+by adding the following to your ~/.emacs file:
+(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
+'
+
+HTML_DOCS=( install-guide user-guide )
+
+src_configure() {
+	emake config
+}
+
+src_compile() {
+	emake emacspeak
+	if use espeak; then
+		local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)"
+		if [[ -z $tcl_version ]]; then
+			die 'Unable to detect the installed version of dev-lang/tcl.'
+		fi
+		cd servers/linux-espeak || die
+		emake TCL_VERSION="${tcl_version}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm "${D}/usr/bin/emacspeak"
+	if use espeak; then
+		pushd servers/linux-espeak > /dev/null || die
+		emake DESTDIR="${D}" install
+		local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/linux-espeak"
+		local serverfile="${D}${orig_serverdir}/tclespeak.so"
+		install -Dm755  "$serverfile" \
+			"${D}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die
+		rm -f "$serverfile" || die
+		dosym "/usr/$(get_libdir)/emacspeak/tclespeak.so" \
+			"$orig_serverdir/tclespeak.so"
+		popd > /dev/null || die
+	fi
+	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
+	einstalldocs
+	cd "${D}/usr/share/emacs/site-lisp/${PN}" || die
+	rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \
+		user-guide || die
+	readme.gentoo_create_doc
+}
diff --git a/app-accessibility/emacspeak/metadata.xml b/app-accessibility/emacspeak/metadata.xml
new file mode 100644
index 000000000000..2d3e20711d7a
--- /dev/null
+++ b/app-accessibility/emacspeak/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>gnu-emacs@gentoo.org</email>
+		<name>Gentoo GNU Emacs project</name>
+	</maintainer>
+	<longdescription lang="en">Emacspeak is a speech interface that allows visually impaired 
+	users to interact independently and efficiently with the computer.</longdescription>
+	<longdescription lang="ja">Emacspeakで視覚障害者が単独と手際良くでコンピュータを
+	使うことが出来る。</longdescription>
+	<use>
+		<flag name="espeak">Adds support for the espeak tts engine</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">emacspeak</remote-id>
+		<remote-id type="sourceforge">emacspeak</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/epos-2.5.37-r2 b/app-accessibility/epos-2.5.37-r2
deleted file mode 100644
index 06138ab45c19..000000000000
--- a/app-accessibility/epos-2.5.37-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-text/sgmltools-lite-3.0.3-r9 dev-util/byacc >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=language independent text-to-speech system
-EAPI=6
-HOMEPAGE=http://epos.ufe.cz/
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/epos/epos-2.5.37.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ed3c71fc774d7bb21c5d31ad2ae3e3db
diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest
new file mode 100644
index 000000000000..a26d2c0ff60f
--- /dev/null
+++ b/app-accessibility/epos/Manifest
@@ -0,0 +1,10 @@
+AUX README.gentoo 108 BLAKE2B 1cd107977e2ed79c26266edf888bb1e33945ac17170f8c7487dd9f2997c0cdbdcaba71f72b250b822aba5f5e152b5728570354be238cc5c68e82c33d38e56a23 SHA512 84afee5caf9c1703f10846e77c1bdc9e298a1d560ffe34b0d8f3b570001f45ca059b86860f62ebdf84ee811aaee7f2d2753db069bb7cb977abfb7ac2b3009829
+AUX epos-2.5.37-disable-tests.patch 401 BLAKE2B 1b5d6de2a7ac1f27910e58e311c550ea4101b4ac1e3756ce4950c66b07ee216a3e76afad903ea580b5bcdbebb2b2ee8a10214a22edf01eab5c51efff0144a7e9 SHA512 63e5026789e35b2dbf00479539ca2b7fd0567a9ff018337d14334f54f4840c0aa723e7fe44c29a6fa3709ba4130750da8fb886c65513d4d71cbf0bd026681e2e
+AUX epos-2.5.37-gcc43.patch 454 BLAKE2B 6a3db8a49d3368c50bc78b2f3eadd83e46e3408b84b5a2784849f72d073db59b322356e39962fed9c822b8c3baf62f958e0943cd58dbb77b50316467f6b05794 SHA512 34c0b51a722c75e088315202c62dbf42086bd4fa4da19b1c788c759f4c21fee26a6d7c1a414af34c4ec10d30ac8bf7ea7b65c9f3b96779dce5b40201e3611e4d
+AUX epos-2.5.37-gcc45.patch 507 BLAKE2B 03760db124cfc94c69512f710b3e84704c2bf910e54b632a4cc5a3c563fa15fbd2fcb244cdd770b34873ec7d42bf77ac3784f22a561250926aa85da98aa4636c SHA512 7dfd25ebab3bbe2cd91ccb61945d444215b7ae0f087637d47b5ce422a9b8ab6bf392a614983a49037ac937fdfcb0e6c3091fa39e443e6084348baa0c4f1fb360
+AUX epos-2.5.37-gcc47.patch 333 BLAKE2B 0ad7975a408e97aab6761b362063b61b2d914e071b3ce9d2b188c05dda89845f07d545f4b22fab9c74900ccb1c79310bc34dbf6363f6654bf1e184cb786571c4 SHA512 84a5d979fa59eaeef6f560494d67918580eb4574dada052cbf926440a0a960027c50b36284e0870f746b2a5f13f909946661174ce8d6f155d1ea0f6d202c334f
+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 937 BLAKE2B 38e6e60a5b6e25e8259aee75a531de07be3a72864d84eabf8a30050f1386f12330d3aebf63c1b1c41e2f13495db7d94f11dc7f19e7befd981e13969c07d5cfbe SHA512 363f4fde319b70dbf4d2bddf64c0556b1db225ca5b5dc171600a0c46f219ab1c50a255ef56e6ff3bdffa2dd5f16ca14867c348d58fe9316f61f546fb73b4080c
+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
new file mode 100644
index 000000000000..216717c781b9
--- /dev/null
+++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="language independent text-to-speech system"
+HOMEPAGE="http://epos.ufe.cz/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND=">=app-text/sgmltools-lite-3.0.3-r9
+	dev-util/byacc"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.37-gcc43.patch
+	"${FILESDIR}"/${PN}-2.5.37-gcc45.patch
+	"${FILESDIR}"/${PN}-2.5.37-gcc47.patch
+	"${FILESDIR}"/${PN}-2.5.37-disable-tests.patch
+	"${FILESDIR}"/${PN}-2.5.37-gcc7.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e "s/CCC/#CCC/" configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-charsets \
+		--disable-portaudio \
+		YACC=byacc
+}
+
+src_install() {
+	default
+
+	doinitd "${FILESDIR}/eposd"
+	dodoc WELCOME THANKS Changes "${FILESDIR}/README.gentoo"
+}
diff --git a/app-accessibility/epos/files/README.gentoo b/app-accessibility/epos/files/README.gentoo
new file mode 100644
index 000000000000..a058564ea278
--- /dev/null
+++ b/app-accessibility/epos/files/README.gentoo
@@ -0,0 +1,2 @@
+Due to /usr/bin/say conflicting with the speech-dispatcher ebuild, it has
+beenn moved to /usr/bin/epos_say.
diff --git a/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch b/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch
new file mode 100644
index 000000000000..7556e7995a15
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch
@@ -0,0 +1,15 @@
+--- a/src/tests/Makefile.am
++++ b/src/tests/Makefile.am
+@@ -1,11 +1,9 @@
+ ##	Process this file with automake run in the top directory to yield Makefile.in
+ 
+ TESTS=hard_zero_data_test				\
+-	intr_test					\
+-	legal_data_test long_data_test long_strm_test	\
++	legal_data_test long_data_test 	\
+ 	random_data_test				\
+ 	soft_zero_data_test				\
+-	syn2_test 					\
+ 	vogon_test 					\
+ 	shutdown_test
+ 
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc43.patch b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch
new file mode 100644
index 000000000000..c8b1dee857ad
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch
@@ -0,0 +1,23 @@
+--- a/src/nnet/neural.cc
++++ b/src/nnet/neural.cc
+@@ -38,7 +38,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <time.h>
+ 
+ /*
+--- a/arch/win/service/install.cpp
++++ b/arch/win/service/install.cpp
+@@ -23,7 +23,7 @@
+ #include <winsvc.h>
+ #include "service.h"
+ #include <stdio.h>		//sprintf & fopen
+-#include <iostream.h>
++#include <iostream>
+ #include "Shlwapi.h"
+ 
+ SC_HANDLE	scm;
+
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc45.patch b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch
new file mode 100644
index 000000000000..cbc056dded9f
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch
@@ -0,0 +1,15 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318585
+
+--- a/src/nnet/neural_parse.yy
++++ b/src/nnet/neural_parse.yy
+@@ -255,7 +255,7 @@
+ 
+ int yyerror (char *s)
+ {
+-	shriek (812, fmt ("BISON:yyerror:bison_nnet parser: bison_row %i (not counting empty rows) '%s' is erroneous. %s\n", row_num, bison_row_buf, s));
++	shriek (812, fmt ("BISON:yyerror:bison_nnet parser: bison_row %i (not counting empty rows) '%s' is erroneous. %s\n", row_num, bison_row_buf.c_str(), s));
+ 	return -1;
+ }
+  
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc47.patch b/app-accessibility/epos/files/epos-2.5.37-gcc47.patch
new file mode 100644
index 000000000000..6e795e3548a9
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc47.patch
@@ -0,0 +1,16 @@
+ https://bugs.gentoo.org/440354
+ 
+ src/nnet/map.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/nnet/map.h
++++ b/src/nnet/map.h
+@@ -25,7 +25,7 @@ T2 & TMap<T1,T2>::operator [] (const T1 &key) {
+ 	else {
+ 		TData x;
+ 		x.first() = key;
+-		return insert (x)->second();
++		return this->insert (x)->second();
+ 	}
+ }
+ 
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc7.patch b/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
new file mode 100644
index 000000000000..6c889a662c2a
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/638596
+
+--- a/src/nnet/matrix.cc
++++ b/src/nnet/matrix.cc
+@@ -63,7 +63,7 @@
+ template<class T> void CMatrix<T>::multiplyByTransponed (const CMatrix &y, CMatrix &retval)
+ {
+ 	int i,j,k;
+-	assert (cols == y.cols);
++	this->assert (cols == y.cols);
+ 	if (cols != y.cols) { retval.Realloc (0,0); return; }
+ 
+ 	T sum;
+@@ -80,7 +80,7 @@
+ template<class T> void CMatrix<T>::transponedMultiply (const CMatrix &y, CMatrix &retval)
+ {
+ 	int i,j,k;
+-	assert (rows == y.rows);
++	this->assert (rows == y.rows);
+ 	if (rows != y.rows) { retval.Realloc (0,0); return; }
+ 
+ 	T sum;
diff --git a/app-accessibility/epos/files/eposd b/app-accessibility/epos/files/eposd
new file mode 100644
index 000000000000..75aca32ca8ba
--- /dev/null
+++ b/app-accessibility/epos/files/eposd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use alsasound esound
+}
+
+start() {
+	ebegin "Starting eposd"
+	start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/eposd.pid \
+		--exec /usr/bin/eposd -- -f
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping eposd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/eposd.pid
+	eend $?
+}
diff --git a/app-accessibility/epos/metadata.xml b/app-accessibility/epos/metadata.xml
new file mode 100644
index 000000000000..ff924802b4d4
--- /dev/null
+++ b/app-accessibility/epos/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">epos</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/espeak-1.47.11-r1 b/app-accessibility/espeak-1.47.11-r1
deleted file mode 100644
index b2d8b1155d2c..000000000000
--- a/app-accessibility/espeak-1.47.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) app-arch/unzip
-DESCRIPTION=Speech synthesizer for English and other languages
-EAPI=5
-HOMEPAGE=http://espeak.sourceforge.net/
-IUSE=portaudio pulseaudio
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) media-sound/sox
-SLOT=0
-SRC_URI=mirror://sourceforge/espeak/espeak-1.47.11-source.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e3b29d8e358e6f46ea45a05363f6a02
diff --git a/app-accessibility/espeak-1.48.04 b/app-accessibility/espeak-1.48.04
deleted file mode 100644
index b7e9262bfbb7..000000000000
--- a/app-accessibility/espeak-1.48.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) app-arch/unzip
-DESCRIPTION=Speech synthesizer for English and other languages
-EAPI=5
-HOMEPAGE=http://espeak.sourceforge.net/
-IUSE=portaudio pulseaudio
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) media-sound/sox
-SLOT=0
-SRC_URI=mirror://sourceforge/espeak/espeak-1.48.04-source.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b471c5b2df9047ab8f5c7427ede6cdaa
diff --git a/app-accessibility/espeak-1.48.04-r1 b/app-accessibility/espeak-1.48.04-r1
deleted file mode 100644
index 337ec354bc7f..000000000000
--- a/app-accessibility/espeak-1.48.04-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) app-arch/unzip
-DESCRIPTION=Speech synthesizer for English and other languages
-EAPI=6
-HOMEPAGE=http://espeak.sourceforge.net/
-IUSE=portaudio pulseaudio
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) media-sound/sox
-SLOT=0
-SRC_URI=mirror://sourceforge/espeak/espeak-1.48.04-source.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=87b549bf88ecd7e52ef9d49d24016358
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
new file mode 100644
index 000000000000..ea9b0aac0618
--- /dev/null
+++ b/app-accessibility/espeak/Manifest
@@ -0,0 +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 2168 BLAKE2B 48e122f34102812549c4956e8c00974c9f2ff23574c304e20124dbe3b346b5d1c73e92cbe33c3accb39a80c857721fd241638694cc3f15b8e594084b96a44058 SHA512 2a568eecb2de15d85a53718ea909a11f1f496717c1a05c6bdccafb26258e21c3d45e8f170d802b6be5a77e9add59991c17f34fcf28505fe14a8a23c4d1fd5df7
+EBUILD espeak-1.48.04-r1.ebuild 2233 BLAKE2B c418cef82e2f14662f0d5165e38ddf26de0eddaf47191a44a7b9cf920e0ebda154333ef01a437bb222aa1d565be663b36e063cf1061b67e7b19e73cfffceb932 SHA512 0cf7bdd42f345134fa2b86f7a8bbdf2c834d2625d4f41d11f6b31355aefa3879e9c09901537c1a8495f08c4fb2a00a4926896cc59c7626e2099f64609711a156
+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
new file mode 100644
index 000000000000..a697715f8fe7
--- /dev/null
+++ b/app-accessibility/espeak/espeak-1.47.11-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="${P}-source"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+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"
+IUSE="portaudio pulseaudio"
+
+COMMON_DEPEND=" portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+
+RDEPEND="${COMMON_DEPEND}
+	media-sound/sox"
+
+S=${WORKDIR}/${MY_P}/src
+
+get_audio() {
+	if use portaudio && use pulseaudio; then
+		echo runtime
+	elif use portaudio; then
+		echo portaudio
+	elif use pulseaudio; then
+		echo pulseaudio
+	else
+		echo none
+	fi
+}
+
+src_prepare() {
+	# gentoo uses portaudio 19.
+	mv -f portaudio19.h portaudio.h
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		AR="$(tc-getAR)" \
+		AUDIO="$(get_audio)" \
+		all
+
+	einfo "Fixing byte order of phoneme data files"
+	pushd ../platforms/big_endian > /dev/null
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}"
+	./espeak-phoneme-data \
+		../../espeak-data \
+		. \
+		../../espeak-data/phondata-manifest
+	cp -f phondata phonindex phontab "../../espeak-data"
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		DESTDIR="${D}" \
+		AUDIO="$(get_audio)" \
+		install
+
+	cd ..
+	insinto /usr/share/espeak-data
+	doins -r dictsource
+	dodoc ChangeLog.txt ReadMe
+	dohtml -r docs/*
+}
+
+pkg_preinst() {
+	local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
+	if [ -d "${voicedir}" ]; then
+		rm -rf "${voicedir}"
+	fi
+}
+
+pkg_postinst() {
+	if ! use portaudio && ! use pulseaudio; then
+		ewarn "Since portaudio and pulseaudio are not in your use flags,"
+		ewarn "espeak will only be able to create wav files."
+		ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
+		ewarn "with either portaudio or pulseaudio USE flag enabled."
+	fi
+}
diff --git a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
new file mode 100644
index 000000000000..bc42c8624d34
--- /dev/null
+++ b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="${P}-source"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+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"
+IUSE="portaudio pulseaudio"
+
+COMMON_DEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+
+RDEPEND="${COMMON_DEPEND}
+	media-sound/sox"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-6-fix.patch )
+
+S="${WORKDIR}/${MY_P}/src"
+
+get_audio() {
+	if use portaudio && use pulseaudio; then
+		echo runtime
+	elif use portaudio; then
+		echo portaudio
+	elif use pulseaudio; then
+		echo pulseaudio
+	else
+		echo none
+	fi
+}
+
+src_prepare() {
+	default
+	# gentoo uses portaudio 19.
+	mv -f portaudio19.h portaudio.h
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		AR="$(tc-getAR)" \
+		AUDIO="$(get_audio)" \
+		all
+
+	einfo "Fixing byte order of phoneme data files"
+	pushd ../platforms/big_endian > /dev/null
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}"
+	./espeak-phoneme-data \
+		../../espeak-data \
+		. \
+		../../espeak-data/phondata-manifest
+	cp -f phondata phonindex phontab "../../espeak-data"
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		DESTDIR="${D}" \
+		AUDIO="$(get_audio)" \
+		install
+
+	cd ..
+	insinto /usr/share/espeak-data
+	doins -r dictsource
+	dodoc ChangeLog.txt ReadMe
+	HTML_DOCS="docs/*" einstalldocs
+}
+
+pkg_preinst() {
+	local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
+	if [ -d "${voicedir}" ]; then
+		rm -rf "${voicedir}"
+	fi
+}
+
+pkg_postinst() {
+	if ! use portaudio && ! use pulseaudio; then
+		ewarn "Since portaudio and pulseaudio are not in your use flags,"
+		ewarn "espeak will only be able to create wav files."
+		ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
+		ewarn "with either portaudio or pulseaudio USE flag enabled."
+	fi
+}
diff --git a/app-accessibility/espeak/espeak-1.48.04.ebuild b/app-accessibility/espeak/espeak-1.48.04.ebuild
new file mode 100644
index 000000000000..0ab3acc0376a
--- /dev/null
+++ b/app-accessibility/espeak/espeak-1.48.04.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="${P}-source"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+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"
+IUSE="portaudio pulseaudio"
+
+COMMON_DEPEND=" portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+
+RDEPEND="${COMMON_DEPEND}
+	media-sound/sox"
+
+S=${WORKDIR}/${MY_P}/src
+
+get_audio() {
+	if use portaudio && use pulseaudio; then
+		echo runtime
+	elif use portaudio; then
+		echo portaudio
+	elif use pulseaudio; then
+		echo pulseaudio
+	else
+		echo none
+	fi
+}
+
+src_prepare() {
+	# gentoo uses portaudio 19.
+	mv -f portaudio19.h portaudio.h
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		AR="$(tc-getAR)" \
+		AUDIO="$(get_audio)" \
+		all
+
+	einfo "Fixing byte order of phoneme data files"
+	pushd ../platforms/big_endian > /dev/null
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}"
+	./espeak-phoneme-data \
+		../../espeak-data \
+		. \
+		../../espeak-data/phondata-manifest
+	cp -f phondata phonindex phontab "../../espeak-data"
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		DESTDIR="${D}" \
+		AUDIO="$(get_audio)" \
+		install
+
+	cd ..
+	insinto /usr/share/espeak-data
+	doins -r dictsource
+	dodoc ChangeLog.txt ReadMe
+	dohtml -r docs/*
+}
+
+pkg_preinst() {
+	local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
+	if [ -d "${voicedir}" ]; then
+		rm -rf "${voicedir}"
+	fi
+}
+
+pkg_postinst() {
+	if ! use portaudio && ! use pulseaudio; then
+		ewarn "Since portaudio and pulseaudio are not in your use flags,"
+		ewarn "espeak will only be able to create wav files."
+		ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
+		ewarn "with either portaudio or pulseaudio USE flag enabled."
+	fi
+}
diff --git a/app-accessibility/espeak/files/espeak-1.48.04-gcc-6-fix.patch b/app-accessibility/espeak/files/espeak-1.48.04-gcc-6-fix.patch
new file mode 100644
index 000000000000..f28de7338b37
--- /dev/null
+++ b/app-accessibility/espeak/files/espeak-1.48.04-gcc-6-fix.patch
@@ -0,0 +1,13 @@
+https://src.fedoraproject.org/cgit/rpms/espeak.git/tree/espeak-1.48-gcc-6-fix.patch
+diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp
+--- a/tr_languages.cpp
++++ b/tr_languages.cpp
+@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = {
+ 	0x200d,  1, // zero width joiner
+ 	0, 0 };
+ 
+-const char string_ordinal[] = {0xc2,0xba,0};  // masculine ordinal character, UTF-8
++const char string_ordinal[] = {'\xc2','\xba',0};  // masculine ordinal character, UTF-8
+ 
+ 
+ static Translator* NewTranslator(void)
diff --git a/app-accessibility/espeak/metadata.xml b/app-accessibility/espeak/metadata.xml
new file mode 100644
index 000000000000..368b975990cf
--- /dev/null
+++ b/app-accessibility/espeak/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">espeak</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/espeakup-0.71-r1 b/app-accessibility/espeakup-0.71-r1
deleted file mode 100644
index 0de9e8d5d108..000000000000
--- a/app-accessibility/espeakup-0.71-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
-DESCRIPTION=espeakup is a small lightweight connector for espeak and speakup
-EAPI=5
-HOMEPAGE=http://www.linux-speakup.org
-IUSE=kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
-SLOT=0
-SRC_URI=mirror://gentoo/espeakup-0.71.tar.bz2
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f50e8d1afb0a70d15beb4f3e798df4d1
diff --git a/app-accessibility/espeakup-0.80 b/app-accessibility/espeakup-0.80
deleted file mode 100644
index bb12c006dab3..000000000000
--- a/app-accessibility/espeakup-0.80
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
-DESCRIPTION=espeakup is a small lightweight connector for espeak and speakup
-EAPI=6
-HOMEPAGE=https://github.com/williamh/espeakup
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
-SLOT=0
-SRC_URI=https://github.com/williamh/espeakup/archive/v0.80.tar.gz -> espeakup-0.80.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=60b78cdd982f72a42c1d740bdcbc6ff4
diff --git a/app-accessibility/espeakup-9999 b/app-accessibility/espeakup-9999
deleted file mode 100644
index 60bd4f859dc2..000000000000
--- a/app-accessibility/espeakup-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=espeakup is a small lightweight connector for espeak and speakup
-EAPI=6
-HOMEPAGE=https://github.com/williamh/espeakup
-IUSE=kernel_linux
-LICENSE=GPL-3
-RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
-SLOT=0
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=60b78cdd982f72a42c1d740bdcbc6ff4
diff --git a/app-accessibility/espeakup/Manifest b/app-accessibility/espeakup/Manifest
new file mode 100644
index 000000000000..4fd53fd762f4
--- /dev/null
+++ b/app-accessibility/espeakup/Manifest
@@ -0,0 +1,8 @@
+AUX espeakup.confd 256 BLAKE2B 1fc5aed1a603d19a7dcddaae05eb00dfe8651993c1f31dfb5a7db0737c24cc75f284dd313b7e1abd2c2841d408f7a719124aac91eb974a5b1e9ae00be4abf6a3 SHA512 aebd97c63dbeae5025bf54f39bb3e7d97822a2b1b369e40b013c5c7da2eba968adf48800f62ef14541ca22ed3f3dfcbdb63b2a3d7f45975ae8bddfea0a42d931
+AUX espeakup.rc 284 BLAKE2B 9cbc247d542afa3ed7cc8be816a96cca7673b5af0f30f91c91ecde838b31311371b69ad02d195fbc41973d58844eefd997b83aa5f329bd3f1ec9d74ada55e05a SHA512 411e984074260d1a5e7cbf80ff4db7e16d7b5cca48a5e82491bc775c962636da1cefc79527921d8546056b969b8368a6c157833e27bb0e4e6aae48596225b747
+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 1650 BLAKE2B e5032e2a1b412ddf5f0f3a83fc1493c0bb01bf0ea9da62a6301c49f6cf44deae5e5d8f870f106c26908544394500d201f63ab8bc5992fb404984605d4e037bc5 SHA512 5c464c9eddac8d44fb2cf3488c9b64cea14b1aaca37216c23085d76f41015ea39aa5bad334c81802aef182009aa6e755936a76788540c5a298573a9b627ab48d
+EBUILD espeakup-0.80.ebuild 1793 BLAKE2B 942b6e71215b319d1f222c11e395e2154d1a860ae0efca1623c9203a1f44fee49553950532d453804d996b5d466cefd0894823fad2eb4e31b4c3c1022ed3cd88 SHA512 f17b4b9779d724ce1711f29eb1164a225ce212ad11f11d6e2f5fe98ddccb805c68d8c2bd98b509f9911e5a30f365091c4a3cb83b23055257a5bae1ca6062a7ba
+EBUILD espeakup-9999.ebuild 1793 BLAKE2B 942b6e71215b319d1f222c11e395e2154d1a860ae0efca1623c9203a1f44fee49553950532d453804d996b5d466cefd0894823fad2eb4e31b4c3c1022ed3cd88 SHA512 f17b4b9779d724ce1711f29eb1164a225ce212ad11f11d6e2f5fe98ddccb805c68d8c2bd98b509f9911e5a30f365091c4a3cb83b23055257a5bae1ca6062a7ba
+MISC metadata.xml 598 BLAKE2B 14ae31982e49a4a506ebbe1db0a645fd1de6e7ef8441aa46a3f2a758108c9bdee3e5a58239c9148ac252f068185654f31c7e0267d38ca75d902746de73af7239 SHA512 41a8a023e62a5c3c286fcda70d55c4e3f999703ad021681cbe5f2441057e74e486d92ef023f969e0146d19131b9a73453b2f0dad06c308bb2f3a9123bfa54a48
diff --git a/app-accessibility/espeakup/espeakup-0.71-r1.ebuild b/app-accessibility/espeakup/espeakup-0.71-r1.ebuild
new file mode 100644
index 000000000000..6d8dbfdadf20
--- /dev/null
+++ b/app-accessibility/espeakup/espeakup-0.71-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info
+
+DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
+HOMEPAGE="http://www.linux-speakup.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND="|| (
+	app-accessibility/espeak[portaudio]
+	app-accessibility/espeak[pulseaudio] )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
+ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"
+ERROR_SPEAKUP_SYNTH_SOFT="CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!"
+
+pkg_setup() {
+	if kernel_is -ge 2 6 37; then
+		check_extra_config
+	elif ! has_version app-accessibility/speakup; then
+		ewarn "Cannot find speakup on your system."
+		ewarn "Please upgrade your kernel to 2.6.37 or later and enable the"
+		ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options"
+		ewarn "or install app-accessibility/speakup."
+	fi
+}
+
+src_compile() {
+	emake || die "Compile failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed."
+	dodoc ChangeLog README ToDo
+	newconfd "${FILESDIR}"/espeakup.confd espeakup
+	newinitd "${FILESDIR}"/espeakup.rc espeakup
+}
+
+pkg_postinst() {
+	elog "To get espeakup to start automatically, it is currently recommended"
+	elog "that you add it to the default run level, by giving the following"
+	elog "command as root."
+	elog
+	elog "rc-update add espeakup default"
+	elog
+	elog "You can also set a default voice now for espeakup."
+	elog "See /etc/conf.d/espeakup for how to do this."
+}
diff --git a/app-accessibility/espeakup/espeakup-0.80.ebuild b/app-accessibility/espeakup/espeakup-0.80.ebuild
new file mode 100644
index 000000000000..95a1e0ea06b2
--- /dev/null
+++ b/app-accessibility/espeakup/espeakup-0.80.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/williamh/espeakup.git"
+	inherit git-r3
+else
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://github.com/williamh/espeakup/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	inherit vcs-snapshot
+fi
+
+inherit linux-info
+
+DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
+HOMEPAGE="https://github.com/williamh/espeakup"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+COMMON_DEPEND="|| (
+	app-accessibility/espeak[portaudio]
+	app-accessibility/espeak[pulseaudio] )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
+ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"
+ERROR_SPEAKUP_SYNTH_SOFT="CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!"
+
+pkg_setup() {
+	if kernel_is -ge 2 6 37; then
+		check_extra_config
+	elif ! has_version app-accessibility/speakup; then
+		ewarn "Cannot find speakup on your system."
+		ewarn "Please upgrade your kernel to 2.6.37 or later and enable the"
+		ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options"
+		ewarn "or install app-accessibility/speakup."
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	einstalldocs
+	newconfd "${FILESDIR}"/espeakup.confd espeakup
+	newinitd "${FILESDIR}"/espeakup.rc espeakup
+}
+
+pkg_postinst() {
+	elog "To get espeakup to start automatically, it is currently recommended"
+	elog "that you add it to the default run level, by giving the following"
+	elog "command as root."
+	elog
+	elog "rc-update add espeakup default"
+	elog
+	elog "You can also set a default voice now for espeakup."
+	elog "See /etc/conf.d/espeakup for how to do this."
+}
diff --git a/app-accessibility/espeakup/espeakup-9999.ebuild b/app-accessibility/espeakup/espeakup-9999.ebuild
new file mode 100644
index 000000000000..95a1e0ea06b2
--- /dev/null
+++ b/app-accessibility/espeakup/espeakup-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/williamh/espeakup.git"
+	inherit git-r3
+else
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://github.com/williamh/espeakup/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	inherit vcs-snapshot
+fi
+
+inherit linux-info
+
+DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
+HOMEPAGE="https://github.com/williamh/espeakup"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+COMMON_DEPEND="|| (
+	app-accessibility/espeak[portaudio]
+	app-accessibility/espeak[pulseaudio] )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
+ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"
+ERROR_SPEAKUP_SYNTH_SOFT="CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!"
+
+pkg_setup() {
+	if kernel_is -ge 2 6 37; then
+		check_extra_config
+	elif ! has_version app-accessibility/speakup; then
+		ewarn "Cannot find speakup on your system."
+		ewarn "Please upgrade your kernel to 2.6.37 or later and enable the"
+		ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options"
+		ewarn "or install app-accessibility/speakup."
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	einstalldocs
+	newconfd "${FILESDIR}"/espeakup.confd espeakup
+	newinitd "${FILESDIR}"/espeakup.rc espeakup
+}
+
+pkg_postinst() {
+	elog "To get espeakup to start automatically, it is currently recommended"
+	elog "that you add it to the default run level, by giving the following"
+	elog "command as root."
+	elog
+	elog "rc-update add espeakup default"
+	elog
+	elog "You can also set a default voice now for espeakup."
+	elog "See /etc/conf.d/espeakup for how to do this."
+}
diff --git a/app-accessibility/espeakup/files/espeakup.confd b/app-accessibility/espeakup/files/espeakup.confd
new file mode 100644
index 000000000000..035012cc08e5
--- /dev/null
+++ b/app-accessibility/espeakup/files/espeakup.confd
@@ -0,0 +1,9 @@
+# conf.d file for espeakup
+#
+# Please check man 8 espeakup for more information about the options
+# espeakup accepts.
+#
+# Currently, the only meaningful option is:
+#   --default-voice=voicename -- set the espeak voice espeakup will use.
+#
+ESPEAKUP_OPTS=""
diff --git a/app-accessibility/espeakup/files/espeakup.rc b/app-accessibility/espeakup/files/espeakup.rc
new file mode 100644
index 000000000000..2989a970874b
--- /dev/null
+++ b/app-accessibility/espeakup/files/espeakup.rc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/espeakup
+command_args="${espeakup_opts:-${ESPEAKUP_OPTS}}"
+pidfile=/run/espeakup.pid
+
+depend() {
+	after modules
+	use alsasound pulseaudio
+}
diff --git a/app-accessibility/espeakup/metadata.xml b/app-accessibility/espeakup/metadata.xml
new file mode 100644
index 000000000000..af3734414e2f
--- /dev/null
+++ b/app-accessibility/espeakup/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>williamh@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>accessibility@gentoo.org</email>
+    <name>Gentoo Accessibility Project</name>
+  </maintainer>
+  <longdescription>
+Espeakup is a small lightweight connector which makes it possible for
+speakup to use espeak as its synthesizer.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">williamh/espeakup</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-accessibility/festival-2.1-r1 b/app-accessibility/festival-2.1-r1
deleted file mode 100644
index 64df72197ccb..000000000000
--- a/app-accessibility/festival-2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=~app-accessibility/speech-tools-2.1 >=sys-libs/ncurses-5.6-r2
-DESCRIPTION=Festival Text to Speech engine
-EAPI=2
-HOMEPAGE=http://www.cstr.ed.ac.uk/projects/festival/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=FESTIVAL HPND BSD rc regexp-UofT free-noncomm
-RDEPEND=~app-accessibility/speech-tools-2.1 >=sys-libs/ncurses-5.6-r2 media-sound/alsa-utils
-SLOT=0
-SRC_URI=http://www.festvox.org/packed/festival/2.1/festival-2.1-release.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_CMU.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_OALD.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_POSLEX.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_awb_cg.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_rms_cg.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_slt_arctic_hts.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_rablpc16k.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_kallpc16k.tar.gz http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=21d0b3a89e0def8a62b1b9246c363f5b
diff --git a/app-accessibility/festival-fi-20041119 b/app-accessibility/festival-fi-20041119
deleted file mode 100644
index 5d078a8fb453..000000000000
--- a/app-accessibility/festival-fi-20041119
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Finnish diphones and text to speech script for festival
-EAPI=6
-HOMEPAGE=http://www.ling.helsinki.fi/suopuhe
-IUSE=perl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=app-accessibility/festival-1.96_beta dev-lang/perl
-SLOT=0
-SRC_URI=http://www.ling.helsinki.fi/suopuhe/download/hy_fi_mv_diphone-20041119.tgz http://phon.joensuu.fi/suopuhe/tulosaineisto/suo_fi_lj-1.0g-20051204.tgz http://www.ling.helsinki.fi/suopuhe/download/lavennin-20041119.tgz
-_md5_=fd95a5a0edd734635bbabb19a2620b55
diff --git a/app-accessibility/festival-fi/Manifest b/app-accessibility/festival-fi/Manifest
new file mode 100644
index 000000000000..1bfb2349d5aa
--- /dev/null
+++ b/app-accessibility/festival-fi/Manifest
@@ -0,0 +1,6 @@
+AUX festival-fi-20041119_lavennin_path.patch 394 BLAKE2B 4a2b4b257c01af81574958aba72ac53c43ab1765be3223a307a165d5607ea6b722835bfec70f1ae79c454b4ccade0a4931e1c7481cb9582e74d059ea2b7e7451 SHA512 8946ad86e485e695c5941ff8e7247d441ef3b17ed1cf5138434f5a9e6af97ad830dc3e2ab24ea36aee0533949259a52cd7c50b09602e019fc0a2e56faf68a87f
+DIST hy_fi_mv_diphone-20041119.tgz 3670516 BLAKE2B 6f95f2697fadd1dea3127820193a0d7d16fa9b3549b6571d434dd1b8dd6ea28733df58fa63f016a432c3d9def44989062f668b2fb22306ad124c6cc7df03f24e SHA512 8e762a988e028c4b44430252150525a23421d1d58a1d58a9826866623729e4fadbb668fd891d1e0e36eee963319ae6cb2bb03dac6ce1f64629d5227d57157d60
+DIST lavennin-20041119.tgz 172438 BLAKE2B 31431a8fe2bbc62f4aaa1d3529e7ce4fd9c795c9aa177bab458864b2567c34b52eb7499f23d65dbd80bf1a9a31bf5af3a4e33ae84f56b05f78638c6b11c47ea5 SHA512 0f20ad71ce1862f05e5ee78860804255f0d40e93b80e5869276e7c8032d594b8ad259a60018fde95ea655e30d8f0574138c5bb53d5fbe61e20658d299493897d
+DIST suo_fi_lj-1.0g-20051204.tgz 5928158 BLAKE2B b38d424f69f18d232cff3ff8fabcbf495f687e396da6fa110919a89f471ce72e0305cc0ace525afeaf8ef5b0824795faaafece6b03dbab4e27f5e899d750ddfc SHA512 f239f34836a6e70be77a5f20a6cae1eba394f07e9ecb6db081b7c6d272d1c26b29ed89dc22deb7f9189562c75c00049ecb4e3426eecaa835145dfbd4aa86c360
+EBUILD festival-fi-20041119.ebuild 1134 BLAKE2B f036eb94114b0df75924a01e160675ebadae4dc4715a1381e1fd1e65517fde29b5df3ac04507a7f75ceb76c95c146dff40c45107462a136237616ac1fe212113 SHA512 1828c178078e5cf2f4b1dbbaaf2e641986864eb4c8a544caf98918b7a0d247c6addc8a56cd85afc79ddc596273a117ee8d6dce59abc90ce87c67e821ef152e89
+MISC metadata.xml 381 BLAKE2B 61e5d9f834eaad39c7af66779648cb111fb13436861e5351c336623cc4c63e10b918ad8ea78eebfaf3bfb709a15c72238eca059ac639962df736e8dfde3d1328 SHA512 bbe4c9075ebef7cbc13b22b79331aeac86d656d483c65460838eae7d1d00fffcdafa173c9702ff2ae020c64efaeb13f81d2543dbef57804f13a4fd1dd9b4ee07
diff --git a/app-accessibility/festival-fi/festival-fi-20041119.ebuild b/app-accessibility/festival-fi/festival-fi-20041119.ebuild
new file mode 100644
index 000000000000..baff3ed11700
--- /dev/null
+++ b/app-accessibility/festival-fi/festival-fi-20041119.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Finnish diphones and text to speech script for festival"
+HOMEPAGE="http://www.ling.helsinki.fi/suopuhe"
+SRC_URI="http://www.ling.helsinki.fi/suopuhe/download/hy_fi_mv_diphone-${PV}.tgz
+	http://phon.joensuu.fi/suopuhe/tulosaineisto/suo_fi_lj-1.0g-20051204.tgz
+	http://www.ling.helsinki.fi/suopuhe/download/lavennin-${PV}.tgz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="perl"
+
+RDEPEND="
+	>=app-accessibility/festival-1.96_beta
+	dev-lang/perl"
+DEPEND=""
+
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}"/${P}_lavennin_path.patch )
+
+src_install() {
+	dodoc festival/lib/voices/finnish/hy_fi_mv_diphone/README.mv
+	rm festival/lib/voices/finnish/hy_fi_mv_diphone/{README.mv,LICENSE} || die
+
+	insinto /usr/share/festival
+	doins -r festival/lib/voices
+	cd "${WORKDIR}"/lavennin/ || die
+	newdoc README.txt README.lavennin
+	dodoc man/*.shtml
+
+	if use perl; then
+		newbin bin/lavennin suopuhe-lavennin
+
+		insinto /usr/share/suopuhe
+		doins -r data
+
+		elog "TTS perl script installed as suopuhe-lavennin"
+	fi
+}
diff --git a/app-accessibility/festival-fi/files/festival-fi-20041119_lavennin_path.patch b/app-accessibility/festival-fi/files/festival-fi-20041119_lavennin_path.patch
new file mode 100644
index 000000000000..833b633e3245
--- /dev/null
+++ b/app-accessibility/festival-fi/files/festival-fi-20041119_lavennin_path.patch
@@ -0,0 +1,18 @@
+# 08/May/2009
+# Patch to fix the path to data files for Gentoo
+# Not sending this to upstrem.
+# neurogeek@gentoo.org
+
+--- a/lavennin/bin/lavennin
++++ b/lavennin/bin/lavennin
+@@ -164,8 +164,8 @@
+     $HOME = get_home_directory();
+ }
+ 
+-my $DATA_DIR = $HOME . "/data";
+-
++#Gentoo Data Dir
++my $DATA_DIR = "/usr/share/suopuhe/data";
+ 
+ # making the TMP dir...
+ unless ( -e "$HOME/tmp" || $www ) {
diff --git a/app-accessibility/festival-fi/metadata.xml b/app-accessibility/festival-fi/metadata.xml
new file mode 100644
index 000000000000..55e1c4cf77c7
--- /dev/null
+++ b/app-accessibility/festival-fi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/festival-freebsoft-utils-0.10 b/app-accessibility/festival-freebsoft-utils-0.10
deleted file mode 100644
index 0f6b7f394572..000000000000
--- a/app-accessibility/festival-freebsoft-utils-0.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=a collection of Festival functions for speech-dispatcher
-EAPI=4
-HOMEPAGE=http://www.freebsoft.org/festival-freebsoft-utils
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=app-accessibility/festival-1.4.3 media-sound/sox virtual/libiconv
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/festival-freebsoft-utils/festival-freebsoft-utils-0.10.tar.gz
-_md5_=bdc1960b17ae5a3519889b4ff883f8ab
diff --git a/app-accessibility/festival-freebsoft-utils-0.2 b/app-accessibility/festival-freebsoft-utils-0.2
deleted file mode 100644
index 7bebce3c387e..000000000000
--- a/app-accessibility/festival-freebsoft-utils-0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=app-accessibility/festival-1.4.3
-DESCRIPTION=a collection of Festival functions for speech-dispatcher
-EAPI=0
-HOMEPAGE=http://www.freebsoft.org/festival-freebsoft-utils
-KEYWORDS=x86 ppc
-LICENSE=GPL-2
-RDEPEND=>=app-accessibility/festival-1.4.3
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/festival-freebsoft-utils/festival-freebsoft-utils-0.2.tar.gz
-_md5_=1052c39322fea7bfc4013d754ce76c49
diff --git a/app-accessibility/festival-freebsoft-utils/Manifest b/app-accessibility/festival-freebsoft-utils/Manifest
new file mode 100644
index 000000000000..f91bb41f3b71
--- /dev/null
+++ b/app-accessibility/festival-freebsoft-utils/Manifest
@@ -0,0 +1,5 @@
+DIST festival-freebsoft-utils-0.10.tar.gz 73022 BLAKE2B dfcb13a1060c4cf4f7bcc3b9e43785113659fdcd82e35d7e4089a7e9d8853c4790c8b0b8ad24a2b1bfaba4933c05f9e00341e74db111d01d158074e553544561 SHA512 26305b9d0fc7f1333786d38cc0efbbe2cb2734e9f981e846ce7b9369cf012adf04e357af9c39fea650620cf7ff619ad15c48dbbd5d6a2781907301817718136c
+DIST festival-freebsoft-utils-0.2.tar.gz 65591 BLAKE2B 06f482521c91823809668c8afbce8c64d718900affa37d13a2b93fe855259a6a7529229b906e82d614c2c2bf7fb32edb62c59c8cb3d357d961943d73c1165506 SHA512 a0744c415461b2a58205e0c8c6e8f77695a2c0f91c6ecf245d0a5c6108ba806c8557591e36c73c02db51f1a5a97254a9eb1bc7422aa7b3043f798b3376b04e2e
+EBUILD festival-freebsoft-utils-0.10.ebuild 787 BLAKE2B 12b2f1acac6daab2ba30b379e6c4be1cd81e3d54e138c5fb5e963f6a55741d651f68ad31ac7a9c8b4cdae7ce365ba423303054bcb387f0573cc4acbd4b27b264 SHA512 dee341e56dcb133d42e56e62114e7f461c13597511b8de3ad26960d0f515ccf32c340efdcb305eab09eb6f186753300f86b68fbffde5250b8cd0c8f6ede78bfb
+EBUILD festival-freebsoft-utils-0.2.ebuild 545 BLAKE2B 5a437ed03f05cecc672590526aec77a706009a6dc5f9acd26bbdf8bb7580ad758ed1614dc682af107ff94b847ad2426422a2b58396bf44fc9006bbc7dd285d96 SHA512 b6f519cd25107f60760c4c85ccb5d884c56c952302c8a6319c5e01d4413a2f3308fe84d6f4e3c399add6ffb273da2aaa2d2b05fa9e2d90d8a9997962a7b91e47
+MISC metadata.xml 345 BLAKE2B 73e4cf90f6b94e74e7fcf0e89ecca76f346b0ea8f2651a42617b136b47aec01457a21406ce360f4924e1d8bdf9027763e6198e1a363be471e2a81401f6f6f1d2 SHA512 d034cf8435010ee64e6186cb7e14f559d3e43eec3b3b31e0cec4da133c65cd8c34a00cc4c66958fb13fc1470ef0fa5307331032cde328a443b877be6f3d4c44c
diff --git a/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.10.ebuild b/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.10.ebuild
new file mode 100644
index 000000000000..138974593859
--- /dev/null
+++ b/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="a collection of Festival functions for speech-dispatcher"
+HOMEPAGE="http://www.freebsoft.org/festival-freebsoft-utils"
+SRC_URI="http://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-accessibility/festival-1.4.3
+	media-sound/sox
+	virtual/libiconv"
+# We depend on virtual/libiconv for the iconv command-line tool.  This
+# command should be available in both packages providing the virtual.
+
+src_compile(){
+	einfo "Nothing to compile."
+}
+
+src_install() {
+	dodoc ANNOUNCE NEWS README
+	doinfo doc/*.info
+	insinto /usr/share/festival
+	doins "${S}"/*.scm
+}
diff --git a/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.2.ebuild b/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.2.ebuild
new file mode 100644
index 000000000000..5fce3fecef57
--- /dev/null
+++ b/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="a collection of Festival functions for speech-dispatcher"
+HOMEPAGE="http://www.freebsoft.org/festival-freebsoft-utils"
+SRC_URI="http://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE=""
+
+DEPEND=">=app-accessibility/festival-1.4.3"
+RDEPEND="${DEPEND}"
+
+src_compile(){
+	einfo "Nothing to compile."
+}
+
+src_install() {
+	insinto /usr/lib/festival
+	doins "${S}"/*.scm
+}
diff --git a/app-accessibility/festival-freebsoft-utils/metadata.xml b/app-accessibility/festival-freebsoft-utils/metadata.xml
new file mode 100644
index 000000000000..8fb4aba1043e
--- /dev/null
+++ b/app-accessibility/festival-freebsoft-utils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>williamh@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/festival-hts-2.1 b/app-accessibility/festival-hts-2.1
deleted file mode 100644
index cc0cf339e0e2..000000000000
--- a/app-accessibility/festival-hts-2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTS voices for Festival
-EAPI=6
-HOMEPAGE=http://hts.sp.nitech.ac.jp/
-KEYWORDS=~x86 ~amd64
-LICENSE=BSD
-RDEPEND=>=app-accessibility/festival-1.96
-SLOT=0
-SRC_URI=http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_awb_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_bdl_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_clb_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_jmk_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_rms_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_slt_arctic_hts-2.1.tar.bz2
-_md5_=98b39c5fc63ebf4762e35d3b8bdd275f
diff --git a/app-accessibility/festival-hts/Manifest b/app-accessibility/festival-hts/Manifest
new file mode 100644
index 000000000000..225392035ffc
--- /dev/null
+++ b/app-accessibility/festival-hts/Manifest
@@ -0,0 +1,8 @@
+DIST festvox_nitech_us_awb_arctic_hts-2.1.tar.bz2 1636752 BLAKE2B 3074f7598e2fb785f1cb70d717f7ca888aa6c0e02efc8424d021b4bad9bf54abba3ab1e877c0ebe28ed04e52e8b70b84a208348ad4653a44415a2e9ed7e136dd SHA512 8121ca6cecf3c036ede782892a1a61737b4f967757567c285dca30e510ba0824cc94235464b0ba2594848c132e684e29e5dc3a1c6029096315b95fd3fd938240
+DIST festvox_nitech_us_bdl_arctic_hts-2.1.tar.bz2 1855093 BLAKE2B 16a4ca58a36154eea02f7580be1225fe279b142750d3e89fc5cea406c3ac20c04d44f78fe11887a904d64c34d808c60ef3e467ce7fb9836849e25a5b533767f2 SHA512 c09a14e928fd03b2fa3d2bcbf5aa197ab25d1cb336135161d119734c10702ee9a6d103d00a9a9ba22e9df9e8245aa610b717babfbf4a6d8e00f89a396ec797ec
+DIST festvox_nitech_us_clb_arctic_hts-2.1.tar.bz2 2201989 BLAKE2B cdfa4ffd3ea032c4d346e6eee71fd32a7abd9c57b13cfbb89ccda687b95b31b894865a85f109791fdd3ea8e9286b6d914c82b5bd471d9ea079949fd77597549a SHA512 133e146eff001934a6a40a82570344b0ea03fbe08a3e2538f5e4d16145eb8d5147020b2f0be02f6831003a8c39caabc289700507734a2a16064b2b4e089578b7
+DIST festvox_nitech_us_jmk_arctic_hts-2.1.tar.bz2 1607055 BLAKE2B a70a7972494f85e4a939e6bce97cb831563aa610e802d6b64f529c93fa7a5e473cbe46d135f83c8ac1a1857aebc5c4da85d1087ffca45de9f63d9f595fa5164d SHA512 4b6b7280351bdf7c6268be4a0e13487e242117374a17bf543494159b83adfc34225c26abb94d9ea08c480c11b24dcea8c7b9dd35d5794685a1684e276953ec7c
+DIST festvox_nitech_us_rms_arctic_hts-2.1.tar.bz2 1829779 BLAKE2B 5f6ec02df19fe5f6be78a9b6071b1aed4ea4c8c15886cc6c575801d6148ee8ebe58867b9b38efa36747e379a0b2ca914981cad6ec0ba2e2d97751aaa06045db3 SHA512 8072d5a1ea859aa65ea6a68ab7bbf40c080a8aede174310c81eba737c9d4b7e07bed26a2ec06c61860cd8f7f2b468e6c54325c18992209f7914046abf2509179
+DIST festvox_nitech_us_slt_arctic_hts-2.1.tar.bz2 1865263 BLAKE2B 2f87224adb462c7e09629d97f4b2dff2c88784ecf15243056df399dd6ebe301c1fabce399a770adbb3f59f602e5816f4ebac3d3f864da476e0257d2ac837b4a7 SHA512 47b3801c009775b53e9d5b2e5d20abe6a222c77cd4ac13abd9525bf38897c550a38e1819287db2ac10a863bf47837e6936b22c685d2ccfc1ed4e7a8128cb4112
+EBUILD festival-hts-2.1.ebuild 789 BLAKE2B b9c939f7376b65d12d46cc29b8800b235780bc8ad8ac53c5d42b59d0321faf89e63fed552e0e86530dc6896c31ec264fefcdc06340e3546969bbad900af708b5 SHA512 d8027a48725e92f08560268369e24c624e54ca184a3bfed1f86508286e7503291d83e75414a78709b688b2d332038284cb4c96da2062229761278de901a6ab1f
+MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/festival-hts/festival-hts-2.1.ebuild b/app-accessibility/festival-hts/festival-hts-2.1.ebuild
new file mode 100644
index 000000000000..eb34d976453c
--- /dev/null
+++ b/app-accessibility/festival-hts/festival-hts-2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="HTS voices for Festival"
+HOMEPAGE="http://hts.sp.nitech.ac.jp/"
+SITE="http://hts.sp.nitech.ac.jp/archives/${PV}"
+SRC_URI="${SITE}/festvox_nitech_us_awb_arctic_hts-${PV}.tar.bz2
+	${SITE}/festvox_nitech_us_bdl_arctic_hts-${PV}.tar.bz2
+	${SITE}/festvox_nitech_us_clb_arctic_hts-${PV}.tar.bz2
+	${SITE}/festvox_nitech_us_jmk_arctic_hts-${PV}.tar.bz2
+	${SITE}/festvox_nitech_us_rms_arctic_hts-${PV}.tar.bz2
+	${SITE}/festvox_nitech_us_slt_arctic_hts-${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-accessibility/festival-1.96"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/festival/voices
+	doins -r lib/voices/.
+}
diff --git a/app-accessibility/festival-hts/metadata.xml b/app-accessibility/festival-hts/metadata.xml
new file mode 100644
index 000000000000..1dacdab965c1
--- /dev/null
+++ b/app-accessibility/festival-hts/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/festival-it-1.0-r2 b/app-accessibility/festival-it-1.0-r2
deleted file mode 100644
index 19391b057109..000000000000
--- a/app-accessibility/festival-it-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=A collection of italian voices for Festival TTS
-EAPI=4
-HOMEPAGE=http://www2.pd.istc.cnr.it/FESTIVAL/home
-IUSE=mbrola
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-accessibility/festival-2.1 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r4[l10n_it] )
-SLOT=0
-SRC_URI=mirror://sourceforge/it-festival/Italian-FESTIVAL.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=69fee88894df5ecc12343f13dcbfe474
diff --git a/app-accessibility/festival-it/Manifest b/app-accessibility/festival-it/Manifest
new file mode 100644
index 000000000000..5fa059ab7906
--- /dev/null
+++ b/app-accessibility/festival-it/Manifest
@@ -0,0 +1,3 @@
+DIST Italian-FESTIVAL.zip 20715806 BLAKE2B a507e5eacbb35dc6c31c30613fbace5122b943f220d8dae01a95e2f7fa8a41d0e0abcb521c7ba03624fb33efaab8b03d3313714bd956ce147c80ba1ae700d200 SHA512 6044683bda58253d9bb447f24316d258e233c3a1389666667b758c89249422a3cf169eecc6a2b03c7a6548316bb45ff9d63b4d5321cedfef011954fc1ea65c34
+EBUILD festival-it-1.0-r2.ebuild 1837 BLAKE2B 7876538e14dbeaf3d872dee4940962a3550ec61afa7d9e93c3955120ac27bd0c14d0a8383c97f4922ecdf13e6d885ca21d1505209237f5a754481c6d655180f1 SHA512 e9a5ebd63834b2f3e94bd0b1185c6b92d336906138bc99707a14ea61ce97eb9e9fe272ac2754804edd1d4bf787a9a879cbba6401802e86399ac793e5af85b284
+MISC metadata.xml 539 BLAKE2B 71d031984da4e0c97d786db78032c755c9a6b3468d0ddc7ac02110f987a931131bf97019db2976d97c7028d296abec11ac85b567171093095d8ca527ed60507a SHA512 0cd664e3fb547d75b02a1a3dab1ef78e523aac62c49a9d7b2f0b67f0c96a591fcdc0e47d08edbb0e70c6f1b3274be0650bfcdd59ccc6a793e87cc23a49c3e868
diff --git a/app-accessibility/festival-it/festival-it-1.0-r2.ebuild b/app-accessibility/festival-it/festival-it-1.0-r2.ebuild
new file mode 100644
index 000000000000..3b288028c1f7
--- /dev/null
+++ b/app-accessibility/festival-it/festival-it-1.0-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A collection of italian voices for Festival TTS"
+HOMEPAGE="http://www2.pd.istc.cnr.it/FESTIVAL/home"
+SRC_URI="mirror://sourceforge/it-festival/Italian-FESTIVAL.zip"
+
+RDEPEND=">=app-accessibility/festival-2.1
+		mbrola? ( >=app-accessibility/mbrola-3.0.1h-r4[l10n_it] )"
+DEPEND="app-arch/unzip"
+IUSE="mbrola"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}
+
+src_prepare() {
+
+	unzip -qo italian_scm.zip
+	unzip -qo lex_ifd.zip
+	unzip -qo lp_diphone.zip
+	unzip -qo pc_diphone.zip
+
+	if use mbrola; then
+	  unzip -qo lp_mbrola_unix.zip
+	  unzip -qo pc_mbrola_unix.zip
+	fi
+
+	# Deletes some useless files
+	rm -f *.zip
+
+	rm -f `find festival/ -name install_unix.txt`
+	rm -f `find festival/ -name italian_mbrola_win.scm`
+
+	if ! use mbrola; then
+	  rm -f `find festival/ -name italian_mbrola_unix.scm`
+	fi
+
+	# Aggregates some README files
+	mkdir docs
+	mv `find festival/ -name \*README` docs/
+
+	# All remaining files are moved "here"
+	mv festival/lib/* .
+	rm -rf festival/
+}
+
+src_install () {
+	# Install the docs
+	dodoc "${WORKDIR}"/docs/*
+
+	# Install the voice scheme
+	insinto /usr/share/festival/
+	doins -r "${WORKDIR}"/italian_scm/
+
+	# Install the dicts
+	insinto /usr/share/festival/dicts
+	doins -r "${WORKDIR}"/dicts/*
+
+	# Installs the voices
+	insinto /usr/share/festival/voices
+	doins -r "${WORKDIR}"/voices/*
+
+	# Enables the mbrola-based voices
+	if use mbrola; then
+	  dosym /opt/mbrola/it3 /usr/share/festival/voices/italian/pc_mbrola/it3
+	  dosym /opt/mbrola/it4 /usr/share/festival/voices/italian/lp_mbrola/it4
+	fi
+}
+
+pkg_postinst () {
+	einfo "Italian voices installed:"
+	for VOICE in `ls "${ROOT}/usr/share/festival/voices/italian/"`; do
+	  einfo "   (voice_${VOICE})"
+	done
+}
diff --git a/app-accessibility/festival-it/metadata.xml b/app-accessibility/festival-it/metadata.xml
new file mode 100644
index 000000000000..102d683c2750
--- /dev/null
+++ b/app-accessibility/festival-it/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="mbrola">Adds support for mbrola voices</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">it-festival</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/festival-ru-0.5 b/app-accessibility/festival-ru-0.5
deleted file mode 100644
index 8337581b0a87..000000000000
--- a/app-accessibility/festival-ru-0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Russian voices for Festival
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/festlang.berlios/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/festival-1.96_beta
-SLOT=0
-SRC_URI=mirror://sourceforge/project/festlang.berlios/msu_ru_nsh_clunits-0.5.tar.bz2
-_md5_=fcd3930f7ccb503093d7d84ea0a37c0c
diff --git a/app-accessibility/festival-ru/Manifest b/app-accessibility/festival-ru/Manifest
new file mode 100644
index 000000000000..4ab6bc0543c4
--- /dev/null
+++ b/app-accessibility/festival-ru/Manifest
@@ -0,0 +1,3 @@
+DIST msu_ru_nsh_clunits-0.5.tar.bz2 176320511 BLAKE2B 7ccda2c1de0513042cb458d752813517ac4b0a597135206a9217821bdad6584bc9cd4d5de586c186f0bb53014411d5d5e1f558cc2c8da115e59aa5d988b4f579 SHA512 17428fb230cbf8154c88819c2ffe58a9e8044e80f87d2e90cb22043431558e7d3faca45d2817414754be4062dbc5a2b72957d2fbd1961e535b738b11567856e7
+EBUILD festival-ru-0.5.ebuild 812 BLAKE2B 415ad254f4de0307598384636b87044825a3de1c977c9850af605432918396ec731be52a1fa36a9a80cddc452903fe63e60da3228cacdc81a14ef53f31c8f5e4 SHA512 8b3086149c547655cef21be6957211e82483709c790181c09b1dd82cd547561a058899b497abf4d6f682a4b8e10561197b3dfddba10725cf60beafbdd60d979d
+MISC metadata.xml 469 BLAKE2B 82918233a1c4dc49ec807ddbfb5d4c2731d566db5040850f560b744a58ee94338276a9dfed040449eb3c83db6cf6499a5f647471c9851c9b9e99b1f1b305904b SHA512 dcb8fa1d20e4465274fadf51333383ca0b6301ffc97b80c3d4ecd65f71effb7f2864d4eec41550b50f2626666b87b44586cff31131edf00b9fedb11233118ad7
diff --git a/app-accessibility/festival-ru/festival-ru-0.5.ebuild b/app-accessibility/festival-ru/festival-ru-0.5.ebuild
new file mode 100644
index 000000000000..e7cf31a1fe14
--- /dev/null
+++ b/app-accessibility/festival-ru/festival-ru-0.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=msu_ru_nsh_clunits
+
+DESCRIPTION="Russian voices for Festival"
+HOMEPAGE="https://sourceforge.net/projects/festlang.berlios/"
+SRC_URI="mirror://sourceforge/project/festlang.berlios/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-accessibility/festival-1.96_beta"
+DEPEND=""
+
+S=${WORKDIR}
+
+src_install() {
+	dodoc ${MY_PN}/README
+
+	insinto /usr/share/festival/voices/russian
+	rm ${MY_PN}/{README,COPYING} || die
+	doins -r ${MY_PN}
+}
+
+pkg_postinst() {
+	elog
+	elog "    To enable russian voices run festval and use command:"
+	elog "        (voice_msu_ru_nsh_clunits)"
+	elog
+	elog "    Please note that text input should have UTF-8 encoding."
+	elog
+}
diff --git a/app-accessibility/festival-ru/metadata.xml b/app-accessibility/festival-ru/metadata.xml
new file mode 100644
index 000000000000..27c18ba7ea1c
--- /dev/null
+++ b/app-accessibility/festival-ru/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">festlang.berlios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
new file mode 100644
index 000000000000..aba207e4952d
--- /dev/null
+++ b/app-accessibility/festival/Manifest
@@ -0,0 +1,16 @@
+AUX festival-2.1-gcc4.7.patch 924 BLAKE2B e1c4147f4d6d8ea0499aed3084a0f78330d786071ebaa6f0034e874811d693dc598d116ea1787fc031377f549f0bacc2b493da3207b8a3b9888e5be30715e703 SHA512 d5d41c1dd60339fd219c51da7f1d6f9348832b2ffe4181787dacdca024d218dc7dbca168b9fbcb75795d681d534d77089aa8bf6fcbfbb47e2946f17c16a12071
+AUX festival-2.1-gentoo-system.patch 7736 BLAKE2B 9fcb970b7e0529c36aeb491e11d0d8ea46101f77567567661eaf956f7e63046092ab95dc3b46b0404b4f0376efb8e09115cd3b70160c7a81b02f28ce2f453a08 SHA512 bd15a7668e8702b1171b8a5b0ad615f6dd22ca2f2940f91abd1617fcf29aab70d97f6bf940ff5b8887bd0799af1545f781d17e23000c1f339bd9808afac4860a
+AUX festival-2.1-init-scm.patch 856 BLAKE2B 36536c1ffa0b7a2ca539cd0e269e55739d5c50868b5ffb96cff00ee936c992d276ae78774501d44c6c2106cc9e52f959351e22b246c4dab1a0f7f84fe0296e04 SHA512 bf86a21659affa4e7ec2eefedb0bfb3650473a90c72fe30e5ad8aabb9a20a344a792c6f612af466fc50359b4dec7e6f9afb358f1e509428513781b93e7c3c874
+AUX festival-2.1-ldflags.patch 438 BLAKE2B af42f0498d419cb5182538118bc0ce4d6749753b79b8c0c02a6d5d71503cfa141fc3513b567e998aa3136eae163f9c9112cf2d53f559e0e5ac6dcffe9bbfbd13 SHA512 5c7eb23673aef0ddcc0d13bec73caa90c807fdd884f73cda33c28bc80d701ef80fbf417987f078f692d418cb3a67a6243652017bb34537a75fd32b29819b9726
+DIST festival-2.1-release.tar.gz 787313 BLAKE2B 91d650ed13389107aa220d2625b09c03e98bbcbb7a6b6d2e7d76d7b12239410fbbba1b1c69c4cd364372940539037adcd2d6b0739a1c87c304df0418d1009e5e SHA512 1f9f28af7106c98e313d3c4d4bb26a7f927c1214fa5a0e2b4972fc85e1011e328331b73852abb57f26fa5062263d1dbccaf65e3be59c6ec762ccf340fc93797a
+DIST festlex_CMU.tar.gz 1925748 BLAKE2B b6ecd5d79de7c3de6ea479c89e441a0416f2afd1b5de291a65b7ff5c3c8c0642aaceddec7f97948dea7350f5ee58d009ccd389d00587587562da924254fbaf5c SHA512 c293344020fd3337193303cd5dfb7e2b0a1012770a484d8bccaae921b0c61b75699204bec45fee0db754506d6f1558fd616866cc94e76afcbb85a4dcbcf9542b
+DIST festlex_OALD.tar.gz 1472516 BLAKE2B b7037413e5c90a7ebf2ebcb14240210fdad225e3327b032897c559dcfc6f7b87d0899c0e91171d37799c5e4afc2f47fd467c14ab0b126ffcde38d540cd7899cd SHA512 0221c3d78140c6cb4e74f98edbdf0dbe5987a8efa3e7205844a5c01c31a98aaced3b20e4a42b09aaa4a3c93c9225d9f24d96df3fb5d963092e955d4cb4674aac
+DIST festlex_POSLEX.tar.gz 242914 BLAKE2B d8e38aa7f119d7e4cf5e29940bd86dbee3d0d98b0cbe4b35c873fa05eeeadb3605a2c2c692e7591da812db712d19a764a8c89160d0081415d6491ecd9bb71e54 SHA512 5c3857a195f5f5ebc4c366f37685437af41eb7e86a1a13b41b08cab91e536114ae4ddfa8b124acb40ec32c13b53d0dbf2c857d4c756b0720c9a363866ecb8c47
+DIST festvox_cmu_us_awb_cg.tar.gz 4452760 BLAKE2B ee0495700797b0d10afd83713df854543ed420ce165dab7cf11ce217d13b819813aee25ef99ac7b50b7e551ef09304d5074e75b40d54cb3830fe5dba84ecb065 SHA512 b77174d2e9ab914ee3c4d6e0d83e29b64034bb45d3fe021acf3a6da13304acc819c4ac5b1046a6f022312e90aa23c73b585aaf11f927e80aee4533584b60356b
+DIST festvox_cmu_us_rms_cg.tar.gz 5222226 BLAKE2B 4f8c41306b7dda17ed0f63bb9634bb0f16f1909b85651e1fb1e28924dc892c3197642059585f7baee429cf67754c9260cd84c8d441db068fb18f83d46e3372c6 SHA512 a251fa27f6cabecb29cf4199cb040cb2ce512a6a447840d31b0d2055d26e6a86f4730bbe3e0f1612e413858f41fdbdd184f04575f9f64658d3f34171612ee172
+DIST festvox_cmu_us_slt_arctic_hts.tar.gz 955706 BLAKE2B f696d59a4d3578ef5806cabed639de20ec3bf86dba2b84a65652193eff2aa1fb48a1e5dfa408b3088f44fe46f83a95f2f73608d01512996a1898fe4c7bdf56fd SHA512 58908094c7e538118471ebd80d86d91f681d0958587f0c5ee6c3a00e1ad5f41519e7bb2a96353f9a68946aba343e11c2949fe2b1efafc53f0d8a6b20d7e3e1f8
+DIST festvox_kallpc16k.tar.gz 4104056 BLAKE2B 4cb54b57aa90d294764faab9547bd8eeab8eea9a85f19736c45d0307d633b409be8be79373e9685a1534a9583bc9575d384e4e343f56879881ff12fe9c7ece19 SHA512 ad8d45e04cb704f31a01de8f4d1b3adb4530563728e8b331b0a730c762bd0c0590e5d49f893404a0199f51fb6afce4b786107ae1fdbc4d1b61c3139ce805267c
+DIST festvox_rablpc16k.tar.gz 5369001 BLAKE2B 5433a90e48a467afd4bbfb6a05071cf81871e14509925b9d2e1b2baf3e279ff150cc311643e98a1599b6616dd37af5698e3b5775fe82c3532e7b0c582f6195fc SHA512 11539bfb822eec9c4803c8526364d3cf6ad735a0edfd018471e95df1447e0cd3e19fdee44faaf0f0fbceed281a06b21a971f0c2a3a3ff6c46ea8272202f53f11
+DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
+EBUILD festival-2.1-r1.ebuild 3667 BLAKE2B 17d5846890f0f0ea4118fe488bee16334b9c25bbf965cc85063af060ef6633004f7b54b068eff7400f604ebae2d0883be3d65d9ff4613958399afa8989d28fa1 SHA512 7b3bd3fcaba747e7358f4eb5257d6fb951c5d3a4cf9051820d8c118585735ecc59a3e768c750974698d225b52d370db72a91e6c7698f36d396a9fec05e41dc41
+MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/festival/festival-2.1-r1.ebuild b/app-accessibility/festival/festival-2.1-r1.ebuild
new file mode 100644
index 000000000000..ea2559bf691b
--- /dev/null
+++ b/app-accessibility/festival/festival-2.1-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs user
+
+MY_PV="${PV}-release"
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Festival Text to Speech engine"
+HOMEPAGE="http://www.cstr.ed.ac.uk/projects/festival/"
+SITE="http://www.festvox.org/packed/${PN}/${PV}"
+SRC_URI="${SITE}/${MY_P}.tar.gz
+	${SITE}/festlex_CMU.tar.gz
+	${SITE}/festlex_OALD.tar.gz
+	${SITE}/festlex_POSLEX.tar.gz
+	${SITE}/festvox_cmu_us_awb_cg.tar.gz
+	${SITE}/festvox_cmu_us_rms_cg.tar.gz
+	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
+	${SITE}/festvox_rablpc16k.tar.gz
+	${SITE}/festvox_kallpc16k.tar.gz
+	${SITE}/speech_tools-${MY_PV}.tar.gz"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="~app-accessibility/speech-tools-2.1
+		>=sys-libs/ncurses-5.6-r2"
+RDEPEND="${DEPEND}
+	media-sound/alsa-utils
+"
+
+S=${WORKDIR}/festival
+
+pkg_setup() {
+	enewuser festival -1 -1 -1 audio
+}
+
+src_prepare() {
+	# tell festival to use the speech-tools we have installed.
+	sed -i -e "s:\(EST=\).*:\1${EPREFIX}/usr/share/speech-tools:" "${S}"/config/config.in
+	sed -i -e "s:\$(EST)/lib:/usr/$(get_libdir):" "${S}"/config/project.mak
+
+	# fix the reference  to /usr/lib/festival
+	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1${EPREFIX}/usr/share/festival:" "${S}"/config/project.mak
+
+	# Fix path for examples in festival.scm
+	sed -i -e "s:\.\./examples/:${EPREFIX}/usr/share/doc/${PF}/examples/:" "${S}"/lib/festival.scm
+
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+	epatch "${FILESDIR}/${P}-init-scm.patch"
+	epatch "${FILESDIR}/${P}-gentoo-system.patch"
+
+	# copy what we need for MultiSyn from speech_tools.
+	cp -pr "${WORKDIR}"/speech_tools/base_class "${S}"/src/modules/MultiSyn
+
+	epatch "${FILESDIR}/${P}-gcc4.7.patch"
+
+	echo "(Parameter.set 'Audio_Command \"aplay -q -c 1 -t raw -f s16 -r \$SR \$FILE\")" >> "${S}"/lib/siteinit.scm
+	echo "(Parameter.set 'Audio_Method 'Audio_Command)" >> "${S}"/lib/siteinit.scm
+}
+
+src_configure() {
+	econf || die "econf failed"
+}
+
+src_compile() {
+	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" \
+		OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
+}
+
+src_install() {
+	# Install the binaries
+	dobin src/main/festival
+	dobin lib/etc/*Linux*/audsp
+	dolib.a src/lib/libFestival.a
+
+	# Install the main libraries
+	insinto /usr/share/festival
+	doins -r lib/*
+
+	# Install the examples
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+
+	# Need to fix saytime, etc. to look for festival in the correct spot
+	for ex in "${D}"/usr/share/doc/${PF}/examples/*.sh; do
+		exnoext=${ex%%.sh}
+		chmod a+x "${exnoext}"
+		dosed "s:${S}/bin/festival:/usr/bin/festival:" "${exnoext##$D}"
+	done
+
+	# Install the header files
+	insinto /usr/include/festival
+	doins src/include/*.h
+
+	insinto /etc/festival
+	doins lib/site*
+
+	# Install the docs
+	dodoc "${S}"/{ACKNOWLEDGMENTS,NEWS,README}
+	doman "${S}"/doc/{festival.1,festival_client.1}
+
+	# create the directory where our log file will go.
+	diropts -m 0755 -o festival -g audio
+	keepdir /var/log/festival
+
+}
+
+pkg_postinst() {
+	elog
+	elog "    Useful examples include saytime, text2wave. For example, try:"
+	elog "        \"/usr/share/doc/${PF}/examples/saytime\""
+	elog
+	elog "    Or for something more fun:"
+	elog '        "echo "Gentoo can speak" | festival --tts"'
+	elog
+	elog "This version also allows configuration of site specific"
+	elog "initialization in /etc/festival/siteinit.scm and"
+	elog "variables in /etc/festival/sitevars.scm."
+	elog
+}
diff --git a/app-accessibility/festival/files/festival-2.1-gcc4.7.patch b/app-accessibility/festival/files/festival-2.1-gcc4.7.patch
new file mode 100644
index 000000000000..8ebc8cc472c0
--- /dev/null
+++ b/app-accessibility/festival/files/festival-2.1-gcc4.7.patch
@@ -0,0 +1,29 @@
+diff -uNr festival.orig/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc festival/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc
+--- festival.orig/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc	2012-12-02 23:03:27.000000000 +0000
++++ festival/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc	2012-12-02 23:21:17.000000000 +0000
+@@ -42,6 +42,7 @@
+ 
+ #include "EST_TSimpleVector.h"
+ #include "EST_matrix_support.h"
++#include <cstring>
+ #include <fstream>
+ #include "EST_cutils.h"
+ 
+@@ -49,7 +50,7 @@
+ {
+   if (this->p_column_step==1 && a.p_column_step==1)
+     {
+-    resize(a.n(), FALSE);
++    this->resize(a.n(), FALSE);
+     memcpy((void *)(this->p_memory), (const void *)(a.p_memory), this->n() * sizeof(T));
+     }
+ else
+@@ -70,7 +71,7 @@
+   int old_offset = this->p_offset;
+   unsigned int q;
+ 
+-  just_resize(newn, &old_vals);
++  this->just_resize(newn, &old_vals);
+ 
+   if (set && old_vals)
+     {
diff --git a/app-accessibility/festival/files/festival-2.1-gentoo-system.patch b/app-accessibility/festival/files/festival-2.1-gentoo-system.patch
new file mode 100644
index 000000000000..a09e1379eebf
--- /dev/null
+++ b/app-accessibility/festival/files/festival-2.1-gentoo-system.patch
@@ -0,0 +1,124 @@
+diff -uNr festival.orig/config/systems/GentooLinux.mak festival/config/systems/GentooLinux.mak
+--- festival.orig/config/systems/GentooLinux.mak	1969-12-31 19:00:00.000000000 -0500
++++ festival/config/systems/GentooLinux.mak	2011-02-09 10:43:28.000000000 -0500
+@@ -0,0 +1,42 @@
++ ###########################################################################
++ ##                                                                       ##
++ ##                Centre for Speech Technology Research                  ##
++ ##                     University of Edinburgh, UK                       ##
++ ##                         Copyright (c) 1996                            ##
++ ##                        All Rights Reserved.                           ##
++ ##                                                                       ##
++ ##  Permission is hereby granted, free of charge, to use and distribute  ##
++ ##  this software and its documentation without restriction, including   ##
++ ##  without limitation the rights to use, copy, modify, merge, publish,  ##
++ ##  distribute, sublicense, and/or sell copies of this work, and to      ##
++ ##  permit persons to whom this work is furnished to do so, subject to   ##
++ ##  the following conditions:                                            ##
++ ##   1. The code must retain the above copyright notice, this list of    ##
++ ##      conditions and the following disclaimer.                         ##
++ ##   2. Any modifications must be clearly marked as such.                ##
++ ##   3. Original authors' names are not deleted.                         ##
++ ##   4. The authors' names are not used to endorse or promote products   ##
++ ##      derived from this software without specific prior written        ##
++ ##      permission.                                                      ##
++ ##                                                                       ##
++ ##  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        ##
++ ##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
++ ##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
++ ##  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     ##
++ ##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
++ ##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
++ ##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
++ ##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
++ ##  THIS SOFTWARE.                                                       ##
++ ##                                                                       ##
++ ###########################################################################
++ ##                                                                       ##
++ ##                 Author: William Hubbs <williamh@gentoo.org>           ##
++ ## --------------------------------------------------------------------  ##
++ ## Settings for Gentoo Linux distributions.                              ##
++ ##                                                                       ##
++ ###########################################################################
++
++MANDIR=$(INSTALL_PREFIX)/share/man
++# Gentoo does not use termcap
++OS_LIBS = $(LDFLAGS) -ldl -lncurses
+diff -uNr festival.orig/config/systems/Makefile festival/config/systems/Makefile
+--- festival.orig/config/systems/Makefile	2011-02-09 10:41:01.000000000 -0500
++++ festival/config/systems/Makefile	2011-02-09 10:44:22.000000000 -0500
+@@ -41,6 +41,7 @@
+ 	Linux.mak				\
+ 	RedHatLinux.mak				\
+ 	DebianGNULinux.mak			\
++	GentooLinux.mak			\
+ 	alpha_Linux.mak				\
+ 	alpha_OSF1V4.0.mak			\
+ 	alpha_RedHatLinux.mak			\
+@@ -94,6 +95,7 @@
+ 	sparc_SunOS5.8.mak			\
+ 	sparc_SunOS5.mak			\
+ 	unknown_DebianGNULinux.mak		\
++	unknown_GentooLinux.mak		\
+ 	unknown_Linux.mak			\
+ 	unknown_RedHatLinux.mak			\
+ 	power_macintosh_Darwin.mak		\
+diff -uNr festival.orig/config/systems/unknown_GentooLinux.mak festival/config/systems/unknown_GentooLinux.mak
+--- festival.orig/config/systems/unknown_GentooLinux.mak	1969-12-31 19:00:00.000000000 -0500
++++ festival/config/systems/unknown_GentooLinux.mak	2011-02-09 10:45:34.000000000 -0500
+@@ -0,0 +1,41 @@
++###########################################################################
++##                                                                       ##
++##                Centre for Speech Technology Research                  ##
++##                     University of Edinburgh, UK                       ##
++##                         Copyright (c) 1996                            ##
++##                        All Rights Reserved.                           ##
++##                                                                       ##
++##  Permission is hereby granted, free of charge, to use and distribute  ##
++##  this software and its documentation without restriction, including   ##
++##  without limitation the rights to use, copy, modify, merge, publish,  ##
++##  distribute, sublicense, and/or sell copies of this work, and to      ##
++##  permit persons to whom this work is furnished to do so, subject to   ##
++##  the following conditions:                                            ##
++##   1. The code must retain the above copyright notice, this list of    ##
++##      conditions and the following disclaimer.                         ##
++##   2. Any modifications must be clearly marked as such.                ##
++##   3. Original authors' names are not deleted.                         ##
++##   4. The authors' names are not used to endorse or promote products   ##
++##      derived from this software without specific prior written        ##
++##      permission.                                                      ##
++##                                                                       ##
++##  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        ##
++##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
++##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
++##  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     ##
++##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
++##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
++##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
++##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
++##  THIS SOFTWARE.                                                       ##
++##                                                                       ##
++###########################################################################
++##                                                                       ##
++##                 Author: William Hubbs <williamh@gentoo.org>           ##
++## --------------------------------------------------------------------  ##
++## Settings for Gentoo Linux distributions.                              ##
++##                                                                       ##
++###########################################################################
++
++include $(EST)/config/systems/Linux.mak
++include $(EST)/config/systems/GentooLinux.mak
+diff -uNr festival.orig/config/system.sh festival/config/system.sh
+--- festival.orig/config/system.sh	2011-02-09 10:41:01.000000000 -0500
++++ festival/config/system.sh	2011-02-09 10:42:10.000000000 -0500
+@@ -70,6 +70,10 @@
+ 	then
+ 	OSTYPE=DebianGNULinux
+ 	OSREV=`cat /etc/debian_version`
++    elif [ -f "/etc/gentoo-release" ]
++    then
++    OSTYPE=GentooLinux
++    OSREV=""
+     else
+ 	# Generic unknown GNU/Linux system.
+ 	OSTYPE=Linux
diff --git a/app-accessibility/festival/files/festival-2.1-init-scm.patch b/app-accessibility/festival/files/festival-2.1-init-scm.patch
new file mode 100644
index 000000000000..efe575b0c2b7
--- /dev/null
+++ b/app-accessibility/festival/files/festival-2.1-init-scm.patch
@@ -0,0 +1,24 @@
+--- festival/lib/init.scm	2006-09-15 01:34:32.000000000 -0500
++++ festival/lib/init.scm	2006-09-15 01:50:30.000000000 -0500
+@@ -52,8 +52,8 @@
+ 
+ ;;;  A chance to set various variables to a local setting e.g.
+ ;;;  lexdir, voices_dir audio etc etc.
+-(if (probe_file (path-append libdir "sitevars.scm"))
+-    (load (path-append libdir "sitevars.scm")))
++(if (probe_file "/etc/festival/sitevars.scm")
++    (load "/etc/festival/sitevars.scm"))
+ 
+ ;;; CSTR siod extensions
+ (require 'cstr)
+@@ -133,8 +133,8 @@
+ ;;;
+ ;;;  Local site initialization, if the file exists load it
+ ;;;
+-(if (probe_file (path-append libdir "siteinit.scm"))
+-    (load (path-append libdir "siteinit.scm")))
++(if (probe_file "/etc/festival/siteinit.scm")
++    (load "/etc/festival/siteinit.scm"))
+ 
+ ;;;  User initialization, if a user has a personal customization
+ ;;;  file loaded it
diff --git a/app-accessibility/festival/files/festival-2.1-ldflags.patch b/app-accessibility/festival/files/festival-2.1-ldflags.patch
new file mode 100644
index 000000000000..e6559c8a8168
--- /dev/null
+++ b/app-accessibility/festival/files/festival-2.1-ldflags.patch
@@ -0,0 +1,12 @@
+diff -uNr festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak
+--- festival.orig/config/systems/Linux.mak	2011-02-09 10:08:20.000000000 -0500
++++ festival/config/systems/Linux.mak	2011-02-09 10:09:04.000000000 -0500
+@@ -46,7 +46,7 @@
+ JAVAH=/usr/bin/javah
+ 
+ TCL_LIBRARY = -ltcl
+-OS_LIBS = -ldl 
++OS_LIBS = $(OPTIMISE_LDFLAGS) -ldl 
+ 
+ ## the native audio module for this type of system
+ NATIVE_AUDIO_MODULE = LINUX16
diff --git a/app-accessibility/festival/metadata.xml b/app-accessibility/festival/metadata.xml
new file mode 100644
index 000000000000..1dacdab965c1
--- /dev/null
+++ b/app-accessibility/festival/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/flite-1.4-r4 b/app-accessibility/flite-1.4-r4
deleted file mode 100644
index 0dfc686a19d9..000000000000
--- a/app-accessibility/flite-1.4-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Flite text to speech engine
-EAPI=6
-HOMEPAGE=http://www.speech.cs.cmu.edu/flite/index.html
-IUSE=alsa oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ppc ppc64 sparc x86
-LICENSE=BSD freetts public-domain regexp-UofT BSD-2
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=http://www.speech.cs.cmu.edu/flite/packed/flite-1.4/flite-1.4-release.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=72975ce79084bc6712a4bc6dd9fedcac
diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
new file mode 100644
index 000000000000..55b4187e0d26
--- /dev/null
+++ b/app-accessibility/flite/Manifest
@@ -0,0 +1,8 @@
+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-1.4-tempfile.patch 1413 BLAKE2B 4e87ce5acc26a69148107b0c1d31c62871917a200d6235bb34516456d8a1f30ed17847298e8e002d83c076c08196c2dfe9da49058e68647d3ae52027feddcafb SHA512 ebf09b9067eb2e97486950bbc93f8d428fee3b762483cb6332fb93d17c1b444a1d2e2c07ee3d874415ef50449b7800dccb19d16924e124cd158b93a5340531df
+DIST flite-1.4-release.tar.bz2 15163897 BLAKE2B 34b721ecd98a5699c352346528374df1c1e8395b815ea9026dbc6e4de7584bd93efb83d64fe1ec32bef03311c19920b18b198e2543dd2f010b0a3ca229337ad0 SHA512 eec1022077fb7a47db3848ae6944509e18a6c86a25aa24f921b8b6c2af708fc9811b287e76d96cf64fc68f8e1d0a43b7e878659f15bfcf76957eddd75e599112
+EBUILD flite-1.4-r4.ebuild 1713 BLAKE2B 2bf9fe611d3f02058525665658afe45e31a83a1e1fd3189a557b55d986a8c9ff8d928cf1f21cee9bbb9160a4d09161200b280ab797d721afea68285877cd02bc SHA512 169dc7d49d84ca0378b2392f0b21ff8d4d15d06bda1507eda3b742d00dbe55a63dfdfec44a1f488608ceca83c1a613cc09506fb41f9f0638feb9abb47f1e81c7
+MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/flite/files/flite-1.4-audio-interface.patch b/app-accessibility/flite/files/flite-1.4-audio-interface.patch
new file mode 100644
index 000000000000..d50428edd5af
--- /dev/null
+++ b/app-accessibility/flite/files/flite-1.4-audio-interface.patch
@@ -0,0 +1,22 @@
+--- a/configure.in
++++ b/configure.in
+@@ -304,7 +304,6 @@
+ 	[  --with-audio          with specific audio support (none linux freebsd etc) ],
+         AUDIODRIVER=$with_audio )
+ 
+-if test "x$AUDIODEFS" = x; then
+     case "$AUDIODRIVER" in
+ 	linux|oss)
+ 	    AUDIODRIVER=oss
+@@ -325,9 +324,10 @@
+ 	    ;;
+ 	none)
+ 	    AUDIODEFS=-DCST_AUDIO_NONE
++	    AUDIOLIBS=
+ 	    ;;
+     esac
+-fi
++
+ AC_SUBST(AUDIODRIVER)
+ AC_SUBST(AUDIODEFS)
+ AC_SUBST(AUDIOLIBS)
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
new file mode 100644
index 000000000000..270395877c53
--- /dev/null
+++ b/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000000..fd8f49059e76
--- /dev/null
+++ b/app-accessibility/flite/files/flite-1.4-ldflags.patch
@@ -0,0 +1,34 @@
+--- 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
new file mode 100644
index 000000000000..d54771423e1f
--- /dev/null
+++ b/app-accessibility/flite/files/flite-1.4-respect-destdir.patch
@@ -0,0 +1,59 @@
+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-1.4-tempfile.patch b/app-accessibility/flite/files/flite-1.4-tempfile.patch
new file mode 100644
index 000000000000..09b54f64ea2e
--- /dev/null
+++ b/app-accessibility/flite/files/flite-1.4-tempfile.patch
@@ -0,0 +1,50 @@
+From a85193f122b7ec0d377e0a39ac58c64f12c51085 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Mon, 6 Jan 2014 13:45:00 +0000
+Subject: [PATCH] auserver.c: Only write audio data to a file in debug builds
+
+This isn't useful in regular builds and is actually a security
+concern.
+---
+ src/audio/auserver.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/audio/auserver.c b/src/audio/auserver.c
+index 29716d3..3e838d0 100644
+--- a/src/audio/auserver.c
++++ b/src/audio/auserver.c
+@@ -58,9 +58,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) ?
+@@ -107,7 +109,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);
+@@ -116,7 +120,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;
+ 
+-- 
+1.8.3.1
+
diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild b/app-accessibility/flite/flite-1.4-r4.ebuild
new file mode 100644
index 000000000000..54ce1000b6a8
--- /dev/null
+++ b/app-accessibility/flite/flite-1.4-r4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal
+
+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 static-libs"
+
+DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-release
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-tempfile.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=()
+	if ! use static-libs; then
+		myconf+=( --enable-shared )
+	fi
+	myconf+=( --with-audio=$(get_audio) )
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+multilib_src_install_all() {
+	dodoc ACKNOWLEDGEMENTS README
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' ! -name '*.dll.a' -delete || die
+	fi
+}
+
+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/metadata.xml b/app-accessibility/flite/metadata.xml
new file mode 100644
index 000000000000..1dacdab965c1
--- /dev/null
+++ b/app-accessibility/flite/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/freetts-1.2.1-r2 b/app-accessibility/freetts-1.2.1-r2
deleted file mode 100644
index 99f346b2961d..000000000000
--- a/app-accessibility/freetts-1.2.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) jsapi? ( app-arch/sharutils ) app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A speech synthesis system written entirely in Java
-EAPI=0
-HOMEPAGE=http://freetts.sourceforge.net/
-IUSE=doc jsapi mbrola elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
-RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-SLOT=0
-SRC_URI=mirror://sourceforge/freetts/freetts-1.2.1-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9a61719a93397abbdca541c442f78d90
diff --git a/app-accessibility/freetts-1.2.2 b/app-accessibility/freetts-1.2.2
deleted file mode 100644
index ef2e53fd2b86..000000000000
--- a/app-accessibility/freetts-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) jsapi? ( app-arch/sharutils ) app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A speech synthesis system written entirely in Java
-EAPI=5
-HOMEPAGE=http://freetts.sourceforge.net/
-IUSE=jsapi mbrola elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
-RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2a12e601f44e6f39f12bc019d01943e7
diff --git a/app-accessibility/freetts/Manifest b/app-accessibility/freetts/Manifest
new file mode 100644
index 000000000000..09b04055a3b0
--- /dev/null
+++ b/app-accessibility/freetts/Manifest
@@ -0,0 +1,6 @@
+AUX jsapi-gentoo.diff 10444 BLAKE2B 0f829738e11f9cf3e852aac0483c891f4c140639e0c7037abf9117a9301f85632bfe11409191d8c137a9b2c4f9dc4251618f16c376fb6c35c9b0848f06072465 SHA512 43e53a55afb973821a7997f7989e7330e263a55eb4c1fdd4bbc6b7269ae428582f21f59b05e258f618c9f2ce88d047797e24dfdaab7465c6feca995fcbcb8ca1
+DIST freetts-1.2.1-src.zip 14100414 BLAKE2B 8feb4d6405e605f75a4e5223fcd3ddea9b4a5b719fb91e8224a63b3ad5ddb451ff8513b991737fc3ca1b87559448d777225fb3f09e4ee83f8de9bf3dc2c4132a SHA512 927d881263f561df8e8ee919ea6019ed44d6ecad7d434c618e333063e992f938d50161a281094b27a4dd8312ac3eedc34040ede947df91e94bbca06c25ba45d3
+DIST freetts-1.2.2-src.zip 14111416 BLAKE2B fd3ac79ffe3ca031d40a6523a4ae900200c1b1eea0369fd1eec3233f852af8edffd81ca6c0bba628132221346d283d2138794e1f9697074fc1044944ad852e5b SHA512 a2cce0b1fd2267cc8dbd3e2ad3ec1f99526de3988443c0937405cc7b2eab9ef517001ef0b4b387e8721d3c33610cd642c6b7cf83217996a83481830de9713de7
+EBUILD freetts-1.2.1-r2.ebuild 1554 BLAKE2B 4f22bc7d4107a3e694d035a38c0567a3ddba491a47b8ca753efaebefd85cf59baf36a344d2736645e6ab1b10b221e95a331d9aaf3f55227e7b00fbc3e7904dc1 SHA512 a3504c3114f77914e747c88bb3a24bf8ab3cf3595907a3cae8e580ce872d66ca8d0d7bc4ea12512d37459805327a93b8fa79204c01186a43d58c9e5fc94c83a2
+EBUILD freetts-1.2.2.ebuild 1894 BLAKE2B a85572c75c5facf42b2226e9736fec070286549bee2560f6290ccb462dfc709272f3ee94f02566d87b9e5a547245c4e01399ab486f70cc1d4efdabbae718b4dc SHA512 abca6c28b6311e592cbd3bf986e9e097649b6446629b287ea695327ff946d7240b0178d3f0c5368ebceb185c889ddf02eef75306e460c31be503d2731f2d99d2
+MISC metadata.xml 576 BLAKE2B dda15cfed056b8e34ebd707ac45b632b2ba322b85109a77fd8cdb3c9f2e485ec6495cee5773ec7a092e553dc51f2e1534b9778b1e35ec1f6719ce8ac56fb3406 SHA512 f4541826693d1e4b6c943c269d2702f27d60c70727f19ac6511696c723d9e56e5d4673ebb8a219a974bd1b1cfdeba9164b8084017c09fba28429b795308b25a8
diff --git a/app-accessibility/freetts/files/jsapi-gentoo.diff b/app-accessibility/freetts/files/jsapi-gentoo.diff
new file mode 100644
index 000000000000..016263e24d0d
--- /dev/null
+++ b/app-accessibility/freetts/files/jsapi-gentoo.diff
@@ -0,0 +1,194 @@
+--- jsapi.sh	2001-12-20 09:51:28.000000000 -0500
++++ jsapi-gentoo.sh	2004-03-20 01:36:10.021810888 -0500
+@@ -10,191 +10,6 @@
+ # ------ ---------- ------------------------------------------
+ #  51811 -rw-rw-r-- jsapi.jar
+ #
+-more <<- xxxFOOxxx
+-
+-                          Sun Microsystems, Inc. 
+-                      Binary Code License Agreement
+-
+-READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE
+-TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE
+-MEDIA PACKAGE.  BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE
+-TERMS OF THIS AGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE
+-ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING
+-THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT.  IF YOU DO NOT AGREE
+-TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE
+-OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED
+-ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS
+-AGREEMENT.
+-
+-1.  LICENSE TO USE.  Sun grants you a non-exclusive and
+-non-transferable license for the internal use only of the accompanying
+-software and documentation and any error corrections provided by Sun
+-(collectively "Software"), by the number of users and the class of
+-computer hardware for which the corresponding fee has been paid.
+-
+-2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to
+-Software and all associated intellectual property rights is retained by
+-Sun and/or its licensors.  Except as specifically authorized in any
+-Supplemental License Terms, you may not make copies of Software, other
+-than a single copy of Software for archival purposes.  Unless
+-enforcement is prohibited by applicable law, you may not modify,
+-decompile, or reverse engineer Software.  You acknowledge that Software
+-is not designed, licensed or intended for use in the design,
+-construction, operation or maintenance of any nuclear facility.  Sun
+-disclaims any express or implied warranty of fitness for such uses.  No
+-right, title or interest in or to any trademark, service mark, logo or
+-trade name of Sun or its licensors is granted under this Agreement.
+-
+-3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety
+-(90) days from the date of purchase, as evidenced by a copy of the
+-receipt, the media on which Software is furnished (if any) will be free
+-of defects in materials and workmanship under normal use.  Except for
+-the foregoing, Software is provided "AS IS".  Your exclusive remedy and
+-Sun's entire liability under this limited warranty will be at Sun's
+-option to replace Software media or refund the fee paid for Software.
+-
+-4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL
+-EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+-INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE
+-EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+-
+-5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN
+-NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
+-PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
+-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY,
+-ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE,
+-EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  In no
+-event will Sun's liability to you, whether in contract, tort (including
+-negligence), or otherwise, exceed the amount paid by you for Software
+-under this Agreement.  The foregoing limitations will apply even if the
+-above stated warranty fails of its essential purpose.
+-
+-6.  Termination.  This Agreement is effective until terminated.  You
+-may terminate this Agreement at any time by destroying all copies of
+-Software.  This Agreement will terminate immediately without notice
+-from Sun if you fail to comply with any provision of this Agreement.
+-Upon Termination, you must destroy all copies of Software.
+-
+-7. Export Regulations. All Software and technical data delivered under
+-this Agreement are subject to US export control laws and may be subject
+-to export or import regulations in other countries.  You agree to
+-comply strictly with all such laws and regulations and acknowledge that
+-you have the responsibility to obtain such licenses to export,
+-re-export, or import as may be required after delivery to you.
+-
+-8.   U.S. Government Restricted Rights.  If Software is being acquired
+-by or on behalf of the U.S. Government or by a U.S. Government prime
+-contractor or subcontractor (at any tier), then the Government's rights
+-in Software and accompanying documentation will be only as set forth in
+-this Agreement; this is in accordance with 48 CFR 227.7201 through
+-227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48
+-CFR 2.101 and 12.212 (for non-DOD acquisitions).
+-
+-9.  Governing Law.  Any action related to this Agreement will be
+-governed by California law and controlling U.S. federal law.  No choice
+-of law rules of any jurisdiction will apply.
+-
+-10.  Severability. If any provision of this Agreement is held to be
+-unenforceable, this Agreement will remain in effect with the provision
+-omitted, unless omission would frustrate the intent of the parties, in
+-which case this Agreement will immediately terminate.
+-
+-11.  Integration.  This Agreement is the entire agreement between you
+-and Sun relating to its subject matter.  It supersedes all prior or
+-contemporaneous oral or written communications, proposals,
+-representations and warranties and prevails over any conflicting or
+-additional terms of any quote, order, acknowledgment, or other
+-communication between the parties relating to its subject matter during
+-the term of this Agreement.  No modification of this Agreement will be
+-binding, unless in writing and signed by an authorized representative
+-of each party.
+-
+- JAVA(TM) SPEECH API (JSAPI) SPECIFICATION IMPLEMETATION, VERSION
+-			    1.0
+-		SUPPLEMENTAL LICENSE TERMS
+-
+-These supplemental license terms ("Supplemental Terms") add to or
+-modify the terms of the Binary Code License Agreement (collectively,
+-the "Agreement"). Capitalized terms not defined in these Supplemental
+-Terms shall have the same meanings ascribed to them in the Agreement.
+-These Supplemental Terms shall supersede any inconsistent or
+-conflicting terms in the Agreement, or in any license contained within
+-the Software.
+-
+-1. Software Internal Use and Development License Grant. Subject to the
+-terms and conditions of this Agreement, including, but not limited to
+-Section 3 (Java(TM) Technology Restrictions) of these Supplemental
+-Terms, Sun grants you a non-exclusive, non-transferable, limited
+-license to reproduce internally and use internally the binary form of
+-the Software, complete and unmodified, for the sole purpose of
+-designing, developing and testing your Java applets and applications
+-("Programs").
+-
+-2. License to Distribute Software.  In addition to the license granted
+-in Section 1 (Software Internal Use and Development License Grant) of
+-these Supplemental Terms, subject to the terms and conditions of this
+-Agreement, including but not limited to Section 3 (Java Technology
+-Restrictions), Sun grants you a non-exclusive, non-transferable,
+-limited license to reproduce and distribute the Software in binary form
+-only, provided that you (i) distribute the Software complete and
+-unmodified and only bundled as part of your Programs, (ii) do not
+-distribute additional software intended to replace any component(s) of
+-the Software, (iii) do not remove or alter any proprietary legends or
+-notices contained in the Software, (iv) only distribute the Software
+-subject to a license agreement that protects Sun's interests consistent
+-with the terms contained in this Agreement, and (v) agree to defend and
+-indemnify Sun and its licensors from and against any damages, costs,
+-liabilities, settlement amounts and/or expenses (including attorneys'
+-fees) incurred in connection with any claim, lawsuit or action by any
+-third party that arises or results from the use or distribution of any
+-and all Programs and/or Software.
+-
+-3. Java Technology Restrictions. You may not modify the Java Platform
+-Interface ("JPI", identified as classes contained within the "java"
+-package or any subpackages of the "java" package), by creating
+-additional classes within the JPI or otherwise causing the addition to
+-or modification of the classes in the JPI.  In the event that you
+-create an additional class and associated API(s) which (i) extends the
+-functionality of the Java Platform, and (ii) is exposed to third party
+-software developers for the purpose of developing additional software
+-which invokes such additional API, you must promptly publish broadly an
+-accurate specification for such API for free use by all developers. You
+-may not create, or authorize your licensees to create additional
+-classes, interfaces, or subpackages that are in any way identified as
+-"java", "javax", "sun" or similar convention as specified by Sun in any
+-naming convention designation.
+-
+-4. Trademarks and Logos. You acknowledge and agree as between you and
+-Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET
+-trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related
+-trademarks, service marks, logos and other brand designations ("Sun
+-Marks"), and you agree to comply with the Sun Trademark and Logo Usage
+-Requirements currently located at
+-http://www.sun.com/policies/trademarks. Any use you make of the Sun
+-Marks inures to Sun's benefit.
+-
+-5. Source Code. Software may contain source code that is provided
+-solely for reference purposes pursuant to the terms of this Agreement.
+-Source code may not be redistributed unless expressly provided for in
+-this Agreement.
+-
+-6.  Termination for Infringement.  Either party may terminate this
+-Agreement immediately should any Software become, or in either party's
+-opinion be likely to become, the subject of a claim of infringement of
+-any intellectual property right.
+-
+-For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio
+-Road, Palo Alto, California 94303 (LFI#108931/Form ID#011801)
+-xxxFOOxxx
+-
+-echo "Accept (y/n)?: "
+-read ans
+-if [ "$ans" != "y" ]
+-then
+-  echo 'failed to accept license'
+-  exit 1
+-fi
+ save_IFS="${IFS}"
+ IFS="${IFS}:"
+ gettext_dir=FAILED
diff --git a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild b/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..379cc12449fb
--- /dev/null
+++ b/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A speech synthesis system written entirely in Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+HOMEPAGE="http://freetts.sourceforge.net/"
+
+RDEPEND=">=virtual/jre-1.4
+	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) "
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	jsapi? ( app-arch/sharutils )
+	app-arch/unzip"
+
+LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="doc jsapi mbrola"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/lib"
+
+	chmod 0755 jsapi.sh
+	epatch "${FILESDIR}/jsapi-gentoo.diff"
+
+	use mbrola && echo "mbrola.base=/usr/share/mbrola/" >> "${S}/speech.properties"
+}
+
+src_compile() {
+	cd "${S}/lib"
+	if use jsapi; then
+		./jsapi.sh || die "jsapi.sh failed"
+	fi
+	cd "${S}"
+	eant jars
+}
+
+# Tests dont' seem included
+# http://freetts.sourceforge.net/docs/index.php#how_test
+#src_test() {
+#	ANT_TASKS="ant-junit" eant junit
+#}
+
+src_install() {
+	java-pkg_dojar lib/*.jar mbrola/*.jar
+
+	use mbrola && local jflags="--java_args -Dmbrola.base=/usr/share/mbrola"
+	java-pkg_dolauncher ${PN} --main com.sun.speech.freetts.FreeTTS ${jflags}
+
+	insinto /usr/share/${PN}
+	doins speech.properties
+
+	cp -R "${S}/demo" "${D}/usr/share/${PN}"
+	cp -R "${S}/tools" "${D}/usr/share/${PN}"
+
+	dodoc README.txt RELEASE_NOTES acknowledgments.txt || die
+	if use doc; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r "${S}"/docs/*
+		java-pkg_dojavadoc "${S}/javadoc"
+	fi
+}
diff --git a/app-accessibility/freetts/freetts-1.2.2.ebuild b/app-accessibility/freetts/freetts-1.2.2.ebuild
new file mode 100644
index 000000000000..fba0a2a231d2
--- /dev/null
+++ b/app-accessibility/freetts/freetts-1.2.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A speech synthesis system written entirely in Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+HOMEPAGE="http://freetts.sourceforge.net/"
+
+RDEPEND=">=virtual/jre-1.4
+	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) "
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	jsapi? ( app-arch/sharutils )
+	app-arch/unzip"
+
+LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE="jsapi mbrola"
+
+# Tests aren't present.
+RESTRICT="test"
+
+java_prepare() {
+	# Prepare source directory.
+	mkdir src || die "Failed to create source directory."
+	mv com de src/ || die "Failed to move files to source directory."
+
+	# Prepare library directory.
+	cd lib || die "Lib directory not present."
+	chmod 0755 jsapi.sh || die "jsapi.sh not present or can't change permissions."
+	epatch "${FILESDIR}"/jsapi-gentoo.diff
+
+	use mbrola && echo "mbrola.base=/usr/share/mbrola/" >> "${S}"/speech.properties
+}
+
+src_compile() {
+	if use jsapi; then
+		pushd lib
+		./jsapi.sh || die "jsapi.sh failed"
+		popd
+	fi
+
+	eant jars
+}
+
+# Tests aren't present.
+# http://freetts.sourceforge.net/docs/index.php#how_test
+#src_test() {
+#	ANT_TASKS="ant-junit" eant junit
+#}
+
+src_install() {
+	java-pkg_dojar lib/*.jar mbrola/*.jar
+
+	use mbrola && local jflags="--java_args -Dmbrola.base=/usr/share/mbrola"
+
+	java-pkg_dolauncher ${PN} --main com.sun.speech.freetts.FreeTTS ${jflags}
+
+	insinto /usr/share/${PN}
+	doins speech.properties
+	doins -r tools
+
+	dodoc ANNOUNCE.txt README.txt RELEASE_NOTES
+
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r docs/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	if use examples ; then
+		java-pkg_doexamples demo
+	fi
+
+	if use source ; then
+		java-pkg-dosrc src/*
+	fi
+}
diff --git a/app-accessibility/freetts/metadata.xml b/app-accessibility/freetts/metadata.xml
new file mode 100644
index 000000000000..c7177e539175
--- /dev/null
+++ b/app-accessibility/freetts/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<use>
+		<flag name="jsapi">build Java Speech API (JSAPI)</flag>
+		<flag name="mbrola">Adds support for mbrola voices</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">freetts</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/julius-4.2.2 b/app-accessibility/julius-4.2.2
deleted file mode 100644
index beef3884ca24..000000000000
--- a/app-accessibility/julius-4.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=dev-lang/perl dev-perl/Jcode sys-libs/readline:0 sys-libs/zlib alsa? ( media-libs/alsa-lib ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) sys-devel/flex
-DESCRIPTION=Large Vocabulary Continuous Speech Recognition Engine
-EAPI=6
-HOMEPAGE=http://julius.sourceforge.jp/
-IUSE=+alsa l10n_ja oss portaudio pulseaudio sndfile
-KEYWORDS=amd64 x86
-LICENSE=julius
-RDEPEND=dev-lang/perl dev-perl/Jcode sys-libs/readline:0 sys-libs/zlib alsa? ( media-libs/alsa-lib ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile )
-REQUIRED_USE=^^ ( alsa oss portaudio pulseaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/julius/56549/julius-4.2.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=79b1a15e5dfb0e800c975924ca9683c6
diff --git a/app-accessibility/julius/Manifest b/app-accessibility/julius/Manifest
new file mode 100644
index 000000000000..c5cf9e4b611f
--- /dev/null
+++ b/app-accessibility/julius/Manifest
@@ -0,0 +1,5 @@
+AUX julius-4.2.2-install.patch 9287 BLAKE2B 8cb38d56d664996354e8489f9bdc37b696e03f86bac18dd9f521e2512a228afd1a95bbb738d1d5318de10fb847a0135db0573a3e6b315225bf288cdc0f428e00 SHA512 d757ac3ec1643ec441c54938c201eb88eebb27e084e753bd5555f91e94421398fc8085810e600314dd7942867298b4170e8abcd0f67960a8971bb397e147a01c
+AUX julius-4.2.2-ldflags.patch 239 BLAKE2B e7b89f42b368df7142e412296e3c652f186f66d21244f9fa1fe6bad6411d1e79fa0df4887afc388078bd810783eedf897a60f93fb14a89afd60de297bac079c7 SHA512 23a4855af3abad321c96642b8e63004a30f262044b3f8debe936c39b855d3be7b600910f29553c0e077960546d9db336ab737987e4e226a2fc2c2253ca6bb67e
+DIST julius-4.2.2.tar.gz 1720888 BLAKE2B c43fe54a6eb8ad48d1ddf8634115f85369062289516b7ae79ce2dbf7b8bc8610b0fea1cff5716c3ce532f9d5b522cb8e94996c9236a337a3e2d73fd0932d9797 SHA512 c1d6c4016cf326becc2e8945c08cbab9b5acefd0e648b6e35b3078850b1746b5bbdb994fccc66c0adab175fb45fc86c25b8a655047a97c130a2f8e922d3d1c0f
+EBUILD julius-4.2.2.ebuild 1364 BLAKE2B ea3df00050b3a902a19bdceaecde21b65f03e59e7c2f6657d336316217869b7cb3bbf6d304c4826c09df4dde58b8507b5f05197676c75557bf79df6bd5538130 SHA512 0af4108ebdc711022ea44b7bbdabf2894f56af8f7927e9d874d6fb72f905b37ad1cdd4fce175a1d5114a0167febdfb868c322a7f9a8a7426aaf2c9772043c003
+MISC metadata.xml 348 BLAKE2B ea499c45e21fd6e63288ae466663a68608aee34c183e9a5094060798422047141b5cbb4210ad791d74daf4b2937b27f32bc43af41e5699cf87dc729393242446 SHA512 a537f387dfb607d6f90321336e8002f6bb49169bb6fbbbdfc0135a9c110180529b84c69efbe68f9ed682321d03f65737ad2041fc5a98a97cd72fe1a68b771c1c
diff --git a/app-accessibility/julius/files/julius-4.2.2-install.patch b/app-accessibility/julius/files/julius-4.2.2-install.patch
new file mode 100644
index 000000000000..e8260d9ef0c6
--- /dev/null
+++ b/app-accessibility/julius/files/julius-4.2.2-install.patch
@@ -0,0 +1,344 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Mar 31 20:38:49 UTC 2013
+Subject: respect DESTDIR
+
+--- a/libsent/Makefile.in
++++ b/libsent/Makefile.in
+@@ -144,16 +144,16 @@
+ install: install.lib install.include install.bin
+ 
+ install.lib: $(TARGET)
+-	${INSTALL} -d ${libdir}
+-	${INSTALL_DATA} $(TARGET) ${libdir}
++	${INSTALL} -d $(DESTDIR)/${libdir}
++	${INSTALL_DATA} $(TARGET) $(DESTDIR)/${libdir}
+ 
+ install.include:
+-	${INSTALL} -d ${includedir}/sent
+-	${INSTALL_DATA} include/sent/*.h ${includedir}/sent
++	${INSTALL} -d $(DESTDIR)/${includedir}/sent
++	${INSTALL_DATA} include/sent/*.h $(DESTDIR)/${includedir}/sent
+ 
+ install.bin: libsent-config-dist
+-	${INSTALL} -d ${bindir}
+-	${INSTALL_PROGRAM} libsent-config-dist ${bindir}/libsent-config
++	${INSTALL} -d $(DESTDIR)/${bindir}
++	${INSTALL_PROGRAM} libsent-config-dist $(DESTDIR)/${bindir}/libsent-config
+ 
+ clean:
+ 	$(RM) *~ src/*/*~ src/*/*.o src/*/*/*.o src/*/*/*/*.o src/*/*/*/*/*.o include/sent/*~ 
+--- a/libjulius/Makefile.in
++++ b/libjulius/Makefile.in
+@@ -90,16 +90,16 @@
+ install: install.lib install.include install.bin
+ 
+ install.lib: $(TARGET)
+-	${INSTALL} -d ${libdir}
+-	${INSTALL_DATA} $(TARGET) ${libdir}
++	${INSTALL} -d $(DESTDIR)/${libdir}
++	${INSTALL_DATA} $(TARGET) $(DESTDIR)/${libdir}
+ 
+ install.include:
+-	${INSTALL} -d ${includedir}/julius
+-	${INSTALL_DATA} include/julius/*.h ${includedir}/julius 
++	${INSTALL} -d $(DESTDIR)/${includedir}/julius
++	${INSTALL_DATA} include/julius/*.h $(DESTDIR)/${includedir}/julius 
+ 
+ install.bin: libjulius-config-dist
+-	${INSTALL} -d ${bindir}
+-	${INSTALL_PROGRAM} libjulius-config-dist ${bindir}/libjulius-config
++	${INSTALL} -d $(DESTDIR)/${bindir}
++	${INSTALL_PROGRAM} libjulius-config-dist $(DESTDIR)/${bindir}/libjulius-config
+ 
+ depend:
+ 	makedepend -- $(CFLAGS) -- $(OBJSENT)
+--- a/julius/Makefile.in
++++ b/julius/Makefile.in
+@@ -61,8 +61,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	${INSTALL_PROGRAM} $(TARGET) ${bindir}/${INSTALLTARGET}
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	${INSTALL_PROGRAM} $(TARGET) $(DESTDIR)/${bindir}/${INSTALLTARGET}
+ 
+ depend:
+ 	makedepend -- $(CFLAGS) -- $(OBJSENT)
+--- a/mkbingram/Makefile.in
++++ b/mkbingram/Makefile.in
+@@ -32,8 +32,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ clean:
+ 	$(RM) $(OBJ)
+--- a/mkbinhmm/Makefile.in
++++ b/mkbinhmm/Makefile.in
+@@ -32,8 +32,8 @@
+ install: install.bin
+ 
+ install.bin: mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@ @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@ $(DESTDIR)/@bindir@
+ 
+ clean:
+ 	$(RM) mkbinhmm.o mkbinhmmlist.o
+--- a/adinrec/Makefile.in
++++ b/adinrec/Makefile.in
+@@ -36,8 +36,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ ############################################################
+ 
+--- a/adintool/Makefile.in
++++ b/adintool/Makefile.in
+@@ -36,8 +36,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ ############################################################
+ 
+--- a/mkgshmm/Makefile.in
++++ b/mkgshmm/Makefile.in
+@@ -23,8 +23,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ ############################################################
+ 
+--- a/mkss/Makefile.in
++++ b/mkss/Makefile.in
+@@ -36,8 +36,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ ############################################################
+ 
+--- a/jcontrol/Makefile.in
++++ b/jcontrol/Makefile.in
+@@ -31,19 +31,19 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@/jucontrol
+ 
+ clean:
+ 	$(RM) $(OBJ)
+ 	$(RM) config.log config.cache
+ 	$(RM) *~ core
+-	$(RM) $(TARGET) $(TARGET).exe
++	$(RM) $(TARGET) $(TARGET).exe jucontrol
+ 
+ distclean:
+ 	$(RM) $(OBJ)
+ 	$(RM) config.log config.cache
+ 	$(RM) *~ core
+-	$(RM) $(TARGET) $(TARGET).exe
++	$(RM) $(TARGET) $(TARGET).exe jucontrol
+ 	$(RM) config.status
+ 	$(RM) Makefile
+--- a/gramtools/accept_check/Makefile.in
++++ b/gramtools/accept_check/Makefile.in
+@@ -36,8 +36,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ ############################################################
+ 
+--- a/gramtools/dfa_determinize/Makefile.in
++++ b/gramtools/dfa_determinize/Makefile.in
+@@ -35,8 +35,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ ############################################################
+ 
+--- a/gramtools/dfa_minimize/Makefile.in
++++ b/gramtools/dfa_minimize/Makefile.in
+@@ -34,8 +34,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ ############################################################
+ 
+--- a/gramtools/generate/Makefile.in
++++ b/gramtools/generate/Makefile.in
+@@ -35,8 +35,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ ############################################################
+ 
+--- a/gramtools/gram2sapixml/Makefile.in
++++ b/gramtools/gram2sapixml/Makefile.in
+@@ -17,8 +17,8 @@
+ install: install.bin
+ 
+ install.bin:
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ clean:
+ 	echo nothing to do
+--- a/gramtools/mkdfa/Makefile.in
++++ b/gramtools/mkdfa/Makefile.in
+@@ -18,13 +18,13 @@
+ 
+ install:
+ 	(cd $(SUBDIR); $(MAKE) install)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ install.bin:
+ 	(cd $(SUBDIR); $(MAKE) install.bin)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ clean:
+ 	(cd $(SUBDIR); $(MAKE) clean)
+--- a/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in
++++ b/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in
+@@ -43,8 +43,8 @@
+ install: install.bin
+ 
+ install.bin:
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ clean:
+ 	$(RM) *.o *~ core
+--- a/gramtools/nextword/Makefile.in
++++ b/gramtools/nextword/Makefile.in
+@@ -36,8 +36,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ ############################################################
+ 
+--- a/gramtools/yomi2voca/Makefile.in
++++ b/gramtools/yomi2voca/Makefile.in
+@@ -17,8 +17,8 @@
+ install: install.bin
+ 
+ install.bin:
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ clean:
+ 	echo nothing to do
+--- a/generate-ngram/Makefile.in
++++ b/generate-ngram/Makefile.in
+@@ -33,8 +33,8 @@
+ install: install.bin
+ 
+ install.bin: $(TARGET)
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ clean:
+ 	$(RM) $(OBJ) *~ core
+--- a/jclient-perl/Makefile.in
++++ b/jclient-perl/Makefile.in
+@@ -17,8 +17,8 @@
+ install: install.bin
+ 
+ install.bin:
+-	${INSTALL} -d @bindir@
+-	@INSTALL_PROGRAM@ $(TARGET) @bindir@
++	${INSTALL} -d $(DESTDIR)/@bindir@
++	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
+ 
+ clean:
+ 	echo nothing to do
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -19,16 +19,16 @@
+ install: install.man install.man.ja
+ 
+ install.man:
+-	${INSTALL} -d @mandir@/man1
++	${INSTALL} -d $(DESTDIR)/@mandir@/man1
+ 	for f in *.1; do \
+-	  @INSTALL_DATA@ $$f @mandir@/man1/$$f; \
++	  @INSTALL_DATA@ $$f $(DESTDIR)/@mandir@/man1/$$f; \
+ 	done
+ 
+ install.man.ja:
+-	${INSTALL} -d @mandir@/ja/man1
++	${INSTALL} -d $(DESTDIR)/@mandir@/ja/man1
+ 	cd ja;
+ 	for f in *.1; do \
+-	  @INSTALL_DATA@ $$f @mandir@/ja/man1/$$f; \
++	  @INSTALL_DATA@ $$f $(DESTDIR)/@mandir@/ja/man1/$$f; \
+ 	done
+ 	cd ..
+ 
diff --git a/app-accessibility/julius/files/julius-4.2.2-ldflags.patch b/app-accessibility/julius/files/julius-4.2.2-ldflags.patch
new file mode 100644
index 000000000000..716b7bbfb021
--- /dev/null
+++ b/app-accessibility/julius/files/julius-4.2.2-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/jcontrol/Makefile.in
++++ b/jcontrol/Makefile.in
+@@ -14,7 +14,7 @@
+ CC=@CC@
+ CFLAGS=@CFLAGS@
+ CPPFLAGS=@CPPFLAGS@ @DEFS@
+-LDFLAGS=@LIBS@ @EXTRALIB@
++LDFLAGS += @LIBS@ @EXTRALIB@
+ RM=@RM@ -f
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
diff --git a/app-accessibility/julius/julius-4.2.2.ebuild b/app-accessibility/julius/julius-4.2.2.ebuild
new file mode 100644
index 000000000000..6c41e4be6171
--- /dev/null
+++ b/app-accessibility/julius/julius-4.2.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Large Vocabulary Continuous Speech Recognition Engine"
+HOMEPAGE="http://julius.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/julius/56549/${P}.tar.gz"
+
+LICENSE="julius"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+alsa l10n_ja oss portaudio pulseaudio sndfile"
+REQUIRED_USE="^^ ( alsa oss portaudio pulseaudio )"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Jcode
+	sys-libs/readline:0
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.2-install.patch
+	"${FILESDIR}"/${PN}-4.2.2-ldflags.patch
+)
+
+pkg_setup() {
+	tc-export CC CXX
+}
+
+src_configure() {
+	local mymic i
+	for i in alsa oss portaudio pulseaudio ; do
+		use ${i} && mymic=${i}
+	done
+
+	econf \
+		--with-mictype=${mymic} \
+		$(use_with sndfile)
+}
+
+src_install() {
+	default
+	if ! use l10n_ja ; then
+		rm -r "${ED}"/usr/share/man/ja || die
+	fi
+}
+
+pkg_postinst() {
+	eerror "IMPORTANT NOTICE"
+	elog "/usr/bin/jcontrol has been renamed to /usr/bin/jucontrol"
+	elog "to avoid file collision with dev-java/java-config."
+	elog "If this creates a problem with applications, file a gentoo bug."
+}
diff --git a/app-accessibility/julius/metadata.xml b/app-accessibility/julius/metadata.xml
new file mode 100644
index 000000000000..1631e86a2744
--- /dev/null
+++ b/app-accessibility/julius/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge-jp">julius</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/mbrola-3.0.1h-r6 b/app-accessibility/mbrola-3.0.1h-r6
deleted file mode 100644
index f0cbdb1d6f14..000000000000
--- a/app-accessibility/mbrola-3.0.1h-r6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Speech synthesizer based on the concatenation of diphones. Includes samples
-EAPI=0
-HOMEPAGE=http://tcts.fpms.ac.be/synthesis/mbrola.html
-IUSE=l10n_de l10n_es l10n_fr l10n_it l10n_la l10n_pl l10n_ro l10n_sv
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=MBROLA
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://tcts.fpms.ac.be/synthesis/mbrola/bin/pclinux/mbr301h.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/us1/us1-980512.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/us1/us2-980812.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/us3/us3-990208.zip l10n_de? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/de1/de1-980227.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/de2/de2-990106.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/de3/de3-000307.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/de4/de4.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/de5/de5.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/de8/de8.zip ) l10n_es? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/es1/es1-980610.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/es2/es2-989825.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/es4/es4.zip ) l10n_fr? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/fr1/fr1-990204.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/fr2/fr2-980806.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/fr3/fr3-990324.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/fr6/fr6-010330.zip ) l10n_it? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/it3/it3-010304.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/it4/it4-010926.zip ) l10n_la? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/la1/la1.zip ) l10n_pl? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/pl1/pl1.zip ) l10n_ro? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/ro1/ro1-980317.zip ) l10n_sv? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/sw1/sw1-980623.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/sw2/sw2-140102.zip )
-_md5_=908d067bfa3b3d1a5e8265841b778609
diff --git a/app-accessibility/mbrola/Manifest b/app-accessibility/mbrola/Manifest
new file mode 100644
index 000000000000..f4381d9b9b9e
--- /dev/null
+++ b/app-accessibility/mbrola/Manifest
@@ -0,0 +1,26 @@
+DIST de1-980227.zip 9946342 BLAKE2B f14c2baef6cfdd66004a2d64e0623c347b8a1116cfb6441729cf9089eef2c67bc9c1cbf3db2679d43c4b407d4a8b73d2905fb8c547777ba1dc461bf8a603a9c3 SHA512 df9027ee1a1bd32542d02bb851bff54379a9526f3d52429786e51c4a96b9de9cb1b8e1e7d66d4c6c77a13e285311c62fa0a13e0e749c8590c7292121e231fb47
+DIST de2-990106.zip 9463658 BLAKE2B db52832db05ed81b1abe43972fc6497b8ea2a93c157fb4c5a641fb9fef0fe70d3ac8139c76b1dba00a58e722e3afdb2629979581731a48d706bdda85414061d4 SHA512 9d2dfb685c71d4348bad142035152c6c4bfb60f98121ea1be4e51adfb078137aa93c0b8b4c1e43c9aaee51e0d3bad4a6c7a2f6ffc019e0cb34ac853cddd8b7be
+DIST de3-000307.zip 10486554 BLAKE2B 019fd652fb173e6ff492467eef35d4d45ed89ae04a39785c1ddaa59d32d16cf6779d80b9812368540398e19416e280041671c2d74577e7727d0a12f6c5c3e3d0 SHA512 32bbf8d19d2f1032429b1f777c43d49746c45d5c150258f08a1533f7681df973483ac96f3db8c6bfff0481f7558853b749ee7c024410237982e712880935ccb9
+DIST de4.zip 19520969 BLAKE2B c8598846b30583f7d187be0a0ef11b45bbbd537d4df3a8a571929ed7498abd58274769eb1d7d39dfd6e30397981119e94657cc5bef41852ce38cee56764135a4 SHA512 ea8ab4192c68b9ad6c4f4c02500015449fc332c22f811cdeee8956a85c347bb48fa263082495f5cd20c0b3641b67673acb7b3da081cb15863271d988b238b4d7
+DIST de5.zip 13134662 BLAKE2B 7c755a75ce66c6c964e23ba3e5db4981137f7d8c12bf3087f14737c285f9c76e664fcdd60a8c25abc9fc006872d40d14d0a82035700841e2bf6f9f8040855303 SHA512 652110430f13cb81420ffa08d368d7992a5ce814c9682d5ab90ec1cd43aa631b6cae9df918171864184efdda0ad804ca4560ede6d048ef3067332f712f72cc19
+DIST de8.zip 9693603 BLAKE2B 714d9cf965f334cd78fad9678b211b9774e82bddfab15a8f9a277a6a1a47ed5e27c4bb49393c500e78c21577a248888c05ec3a4bb36e48cc4c5d60c30ec9c150 SHA512 6e8d1be85eb8c24d5c38c1c102cecca4af9538a55b75b78ef62bccf0761a431beb0ed3d31e4aea271c29037631ed4b00763aea90c06dffddb3b52cbe8d65b3d7
+DIST es1-980610.zip 2110022 BLAKE2B ca03827f5db08e7489f7d7526e0a5607a1d8e06d1936984dbf6cce044731ad80acdf8674b07b4efb48be27f036b5e4b4abf189e4bf85885d0cf3ed59a873443d SHA512 1459a346c66133e70eeb1cec057b762e6f22d11472c33c732cd45b92afecb8628de861992abb07c3272ee640bb023154b838d1648b6541228256e57206216ed5
+DIST es2-989825.zip 5111601 BLAKE2B f97a09006ee4e676d1b2e271330c46f989fc9df429a8b38240cee2240b4a0d667e37afdae9d14db86e0eecb99beba9b61a26350205589cde4231c5bd77ad7018 SHA512 69d9bb62b42607714ea692a3570c70ddbe32590f2dd6c0466f6cad685a292c74ade693af7fead0d4bbdf12a70a36e06e3205bd07854855b628f59d7bc1d1be3a
+DIST es4.zip 2804262 BLAKE2B 52f7d37ffafefecc82235bc9fc75e18d2beb123b1aeedcb9e2b1dae57fa97ef2bcd5d9b594f320a26b6fa8e30ad4e6d036ace9e34297166ac17f5142ce63d571 SHA512 b5ce924fc894a3e186cf06feb3afc0f8ce2805310e1da34c4a74b52100d2ecfbb073d63c87c5809e05e89b47b57fa32bc0edd44ad7477aa92facc9ac041cd349
+DIST fr1-990204.zip 4694334 BLAKE2B a47befd6d661a497072dea2d693bf20be00eda72f64d7670588692acfb3304f9cf10973e99cb6455b919c2adc89bb597ea1c78c04573b60eb5f1c0a916833054 SHA512 1a24326f6f9989d88f8a8447ebb1d9f8fbfd49f909a28d456c170bc8615b9385be678202e0d6d5c867d3a50ca68ca16f85ea5410d16fd2c70e4f9b6f7b115afb
+DIST fr2-980806.zip 5744598 BLAKE2B 21006b4b236ec05df964832eb3487b55ac447c199fa544143fadb18bb57214e7278c119f4a7566e089666e2b2562c5f1899f85b37bb746d75a8c68adc4d990ea SHA512 cca19bc7db0118e6a09f203346f355e87b2a75902e06ee7d82c2379a4ebaa8144f64ae79b5ff6cd9c49e0d46a26d2a05109f325bda78e1b0462089b6d03a104c
+DIST fr3-990324.zip 4702681 BLAKE2B 8a9078bee17f488f43225bad2aff93e94e8d6c29f2b1b291f7e651376da7ca1595d16b66360b02e429b16428aa9bbe485c44e151d9ff8a8920b11aafa6a16215 SHA512 24a715b5913ca931624f5c079d7027d3c84543c6044ab49283550dd7d0158d19c610d2ee9ebb055d8de14f9b817aac1d4b32599729b17838d5f914ec3bf50439
+DIST fr6-010330.zip 4610252 BLAKE2B 37242228b5722a5f1a9962492e9d927d8e25c54abc499f2d11f5fe6e1007c7609aca0733f40edb81fd73f8a42c443b5124398a3292a21d718dec10c4e3687588 SHA512 41bfba97e6b06a987a691a7dbb6e6a5bc00c7a6e4576215297e1db974a8efd06fc7e960fc0c83f024852c195c7f4c0da5e8d3ac6f5ad3f641193ee1d65679879
+DIST it3-010304.zip 5349273 BLAKE2B 7f1c98945c213b738eaacbf4164bb18cc44cef0b12a64f1ee2ced92e0cf468bfcebefa83307d31e5695f3580d57b06d0bf43397bd524a28825163f38aa75507a SHA512 cb179430b93cef676d4e3f792d453f2dc3a34ad0f5bd0a36e97ded98b17c0dc5cad1622f7bb7e7f4f6b26d944573b906b33eb519bc19d0bcec01ea4810d8f71c
+DIST it4-010926.zip 5044168 BLAKE2B e2e63f85f13f0d8667a46e5c78e9e449ffe32cf798d8e46b942af390b60bf636cf1d23520c5e13d180b2dcfe80040ae87616726bf1db818f2aad31d8b9a48e4f SHA512 a7fcdff5b30e213bf9f043c2323e73a769357a46ce6df9114579cc62392fe2394ce472120c73018a1a71870c7565d18bb912ba7650a267f8779e18c12f260113
+DIST la1.zip 7627631 BLAKE2B 7361fdf7fe072d6e9e71e8f41e3874023c6368d47e1fb8853578774b8df61b90e9ba6b38921f5286fd7c5ba9bfdf9056b6cdab9546e162f78f0d6082a7148a88 SHA512 5a367ede393feb28b587a380975baa84ca1840dfc5479f938de1588954f3ae23b06e0214b854e1f0137f178d197e4999e8e8750b136d964797116d53e49ec6cb
+DIST mbr301h.zip 309820 BLAKE2B 4c311e700e8ab0af7da9a33da6f57ac5fa2328f4049f703669fb03e4e468e578b5df5fa9b4cd468a74ad62a70330378f8127637e850e3f1ce3a8e1a979a6dc1d SHA512 24b522092ff8f18ab606ed9cae609a69ce8ae9ea56228468dfc3c4c6c114bc65ce9d69f420cddbdff75f1200dbed1edb667e8d84937a73218542dea25a88b848
+DIST pl1.zip 4050906 BLAKE2B ed60926ed95949e3e92313863d7e3c84c853347123ac93d54e042fc995e311d0db7afb19603f89b410ec544f0ea56d3eea1f094b45ea82c789325c09776642e8 SHA512 e42d4208719798512c5296e89defa59b46719c787bd352503f6377b185e817b709a27228a8fd2e70536632f68dff81aac9e145902e2a17fe95a366b0d4d03478
+DIST ro1-980317.zip 3222054 BLAKE2B b19e3ec147e7650fc0475dafb63af8c2d09da7f21f6536617fbaa73d4dc95431895bbe134f39daa3078e01a6620d91bc22e162401b3be42e731592c627a540e6 SHA512 06075426f3befde1a4a2c589f92340c964b22fc1cf54d34d1808d6ab8ba0d50a57f4a96e1c68ba06badee466d11bb46db6c929ce974ea25212ffb1987468b9a1
+DIST sw1-980623.zip 9386828 BLAKE2B 89a03aa3491efaf188b70d4cdeafa071dee86faefc45ecdbd6b26e10a60619a02e79874b86f67c6e2217c7592c5afaaadf4757eab6b94c1924546f1b7800ec8e SHA512 c3b2493f5ba6f91983bd6e2d821cce741d427886cdfa17f1f3ea58197445229fcaca05bd09f531c3166360f77232d04ef61290a5f2a2bbba22587d689d821484
+DIST sw2-140102.zip 5629399 BLAKE2B ea0b340dc4b0cf3fa7cbb170d2eb51d7a3f1c383de1ea2c2a397426f460eacf2f032e0e68170f98d43e5f869a5ab89cac71e867ae0b142f44b2794e8330fd145 SHA512 eedfe81cd37e3cbd022b3e2be5878d165cf29fb0cee36ddc700ba567c92181eaec0e48699fedffdd780f2205ab3e1ddd9a9426a88b0e6f02992de1639e4ce0b3
+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 2712 BLAKE2B 6875ccedc5c5f0527e477a8dfbb994afe1f807bfaa9d4da88beda807058d23bcebde8804d2c19e0cdfdc8fb827cc105df095b3aa4954f659a9e4577fddb2185b SHA512 ea55e6af66eb17fba4e4f01a1fc68fb32562c663f2315cee1e734df94b0c5813274a0ef1fb696b603b3d9f591adc95b6cf1f92e8676271de681c8cda720d073e
+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
new file mode 100644
index 000000000000..f6e60099d3e0
--- /dev/null
+++ b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+IUSE="l10n_de l10n_es l10n_fr l10n_it l10n_la l10n_pl l10n_ro l10n_sv"
+
+S=${WORKDIR}
+
+DESCRIPTION="Speech synthesizer based on the concatenation of diphones. Includes samples"
+HOMEPAGE="http://tcts.fpms.ac.be/synthesis/mbrola.html"
+MY_PV=${PV//./}
+TCTS="http://tcts.fpms.ac.be/synthesis"
+SRC_URI="http://tcts.fpms.ac.be/synthesis/${PN}/bin/pclinux/mbr${MY_PV}.zip
+	${TCTS}/mbrola/dba/us1/us1-980512.zip
+	${TCTS}/mbrola/dba/us1/us2-980812.zip
+	${TCTS}/mbrola/dba/us3/us3-990208.zip
+	l10n_de? ( ${TCTS}/mbrola/dba/de1/de1-980227.zip
+		${TCTS}/mbrola/dba/de2/de2-990106.zip
+		${TCTS}/mbrola/dba/de3/de3-000307.zip
+		${TCTS}/mbrola/dba/de4/de4.zip
+		${TCTS}/mbrola/dba/de5/de5.zip
+		${TCTS}/mbrola/dba/de8/de8.zip )
+	l10n_es? ( ${TCTS}/mbrola/dba/es1/es1-980610.zip
+		${TCTS}/mbrola/dba/es2/es2-989825.zip
+		${TCTS}/mbrola/dba/es4/es4.zip )
+	l10n_fr? ( ${TCTS}/mbrola/dba/fr1/fr1-990204.zip
+		${TCTS}/mbrola/dba/fr2/fr2-980806.zip
+		${TCTS}/mbrola/dba/fr3/fr3-990324.zip
+		${TCTS}/mbrola/dba/fr6/fr6-010330.zip )
+	l10n_it? ( ${TCTS}/mbrola/dba/it3/it3-010304.zip
+		${TCTS}/mbrola/dba/it4/it4-010926.zip )
+	l10n_la? ( ${TCTS}/mbrola/dba/la1/la1.zip )
+	l10n_pl? ( ${TCTS}/mbrola/dba/pl1/pl1.zip )
+	l10n_ro? ( ${TCTS}/mbrola/dba/ro1/ro1-980317.zip )
+	l10n_sv? ( ${TCTS}/mbrola/dba/sw1/sw1-980623.zip
+		${TCTS}/mbrola/dba/sw2/sw2-140102.zip )"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND=""
+
+RESTRICT="strip"
+QA_PREBUILT="/usr/bin/mbrola"
+
+SLOT="0"
+LICENSE="MBROLA"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+
+src_unpack () {
+	unpack ${A}
+
+	if [[ -f pl1 ]]; then
+		mkdir pl1DIR
+		mv pl1 pl1.txt pl1DIR
+		mv test pl1DIR/TEST
+		mv pl1DIR pl1
+	fi
+
+	case ${ARCH} in
+		x86|amd64)
+			cp mbrola-linux-i386 mbrola || die
+			;;
+		ppc)
+			cp mbrola302b-linux-ppc mbrola || die
+			;;
+		sparc)
+			cp mbrola-SuSElinux-ultra1.dat mbrola || die
+			;;
+		alpha)
+			cp mbrola-linux-alpha mbrola || die
+			;;
+		*)
+			elog "mbrola binary not available on this architecture.  Still installing voices."
+	esac
+}
+
+src_install () {
+
+	# Take care of main binary
+	if [[ -f "mbrola" ]]; then
+		dobin mbrola
+		dosym ../../bin/mbrola "/usr/share/${PN}/mbrola"
+	fi
+
+	dodoc readme.txt
+
+	for voice in ??[0-9]; do
+		insinto /usr/share/${PN}/${voice}
+		[[ -f "${voice}/license.txt" ]] && doins ${voice}/license.txt
+		[[ -f "${voice}/${voice}" ]] && doins ${voice}/${voice}
+		[[ -f "${voice}/${voice}mrpa" ]] && doins ${voice}/${voice}mrpa
+
+		if [[ -d "${voice}/TEST" ]]; then
+			insinto /usr/share/${PN}/${voice}/TEST
+			doins ${voice}/TEST/*
+		fi
+
+		[[ -f "${voice}/${voice}.txt" ]] && dodoc ${voice}/${voice}.txt
+	done
+}
diff --git a/app-accessibility/mbrola/metadata.xml b/app-accessibility/mbrola/metadata.xml
new file mode 100644
index 000000000000..1dacdab965c1
--- /dev/null
+++ b/app-accessibility/mbrola/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/metadata.xml b/app-accessibility/metadata.xml
new file mode 100644
index 000000000000..e76c80d9abf1
--- /dev/null
+++ b/app-accessibility/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-accessibility category contains packages which help with
+		accessibility (for example, screen readers).
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-accessibility contiene paquetes para ayudar con 
+		accesibilidad (por ejemplo, lectores de pantallas).
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-accessibility enthält Programme für barrierefreies
+		Arbeiten (Accessibility), wie beispielsweise Screenreader.
+	</longdescription>
+	<longdescription lang="nl">
+		De app-accessibility categorie bevat applicaties die de
+		toegankelijkheid bevorderen, bijvoorbeeld een schermlezer.
+	</longdescription>
+	<longdescription lang="ja">
+		app-accessibilityカテゴリィにはアクセシビリティと
+		手伝うパッケージが含まれます。
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-accessibility chứa các gói trợ giúp về truy nhập (ví dụ, trình đọc màn hình)
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-accessibility contiene strumenti per l'accessibilità del software (ad esempio lettori di schermo per ipovedenti).
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-accessibility contém pacotes que ajudam com
+		acessibilidade (por exemplo, leitores de tela).
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-accessibility zawiera pakiety ułatwiające dostęp do
+		komputera osobom niepełnosprawnym.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-accessibility/nfbtrans-7.74-r2 b/app-accessibility/nfbtrans-7.74-r2
deleted file mode 100644
index 98237a2a371c..000000000000
--- a/app-accessibility/nfbtrans-7.74-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=app-arch/unzip-5.50-r2
-DESCRIPTION=braille translator from the National Federation of the Blind
-EAPI=6
-HOMEPAGE=http://www.nfb.org/nfbtrans
-KEYWORDS=amd64 ppc x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=42c5ac6353b9a823b55105931d21b319
diff --git a/app-accessibility/nfbtrans/Manifest b/app-accessibility/nfbtrans/Manifest
new file mode 100644
index 000000000000..c96643f9facc
--- /dev/null
+++ b/app-accessibility/nfbtrans/Manifest
@@ -0,0 +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
+DIST nfbtr774.zip 470847 BLAKE2B 54dd9b612c6dda0734d5b21c1ed8b0d428663d2b442406cb36276afd1a6c0b742ddcb4848954a0bbdd29cb300dab6a55dd9b3bafeb603b08ef6a7e678c0d9a86 SHA512 58fa72c53d88d11fa005572f4e2ebd81d21afaec2fac0e986bfad66b42c194ec3573199e2f2b863725001c1cb777b60881605a1533f7eb73e31e24a244673c2c
+EBUILD nfbtrans-7.74-r2.ebuild 916 BLAKE2B b321b58663e89c3092f1561840dcf60685839c539f041ee728d76edbb7b7becb1d7cebf7df094800ff23301fd44ceed28f1fa12d49dbb56148647fe8aa85a49c SHA512 f89dd1f3499667fe5d4f40d3dc147bce0d8abefffe730a87d285c5a28ff13fd4ce615bb1e7abf9c83356d018efd6bd5421907f86c1004878633d35ef8c4dda19
+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
new file mode 100644
index 000000000000..7040de343db0
--- /dev/null
+++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch
@@ -0,0 +1,11 @@
+--- a/nfbtrans.c	2004-09-21 19:52:34.341784094 -0500
++++ b/nfbtrans.c	2004-09-21 19:54:07.005727168 -0500
+@@ -6,7 +6,7 @@
+ #define LINT_ARGS
+ #define DOS
+ #else
+-#define UNIX_PATH "/usr/local/lib/"
++#define UNIX_PATH "/etc/nfbtrans/"
+ #endif             /* unix */
+ #include	<stdio.h>
+ #include <sys/types.h>
diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch
new file mode 100644
index 000000000000..14c13c063246
--- /dev/null
+++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch
@@ -0,0 +1,40 @@
+diff --git a/nfbtrans.c.orig b/nfbtrans.c
+index e697393..9a2944e 100644
+--- a/nfbtrans.c.orig
++++ b/nfbtrans.c
+@@ -534,7 +534,7 @@ void compact_line(char *);
+ void length_error(char *);
+ void do_lop_op(foptype *);
+ void do_lop(void);
+-void getline(void);
++void nfbtrans_getline(void);
+ void get_input(char *, int);
+ int get_paragraph_type(int);
+ void check_purge(void);
+@@ -2585,7 +2585,7 @@ void do_lop()
+   }
+ }                  /* do_lop */
+ 
+-void getline()
++void nfbtrans_getline()
+ {
+   int i = -1;
+   for (;;)
+@@ -2722,7 +2722,7 @@ int get_paragraph_type(int mode)
+   total_lines = 0;
+   do
+   {
+-    getline();
++    nfbtrans_getline();
+     if (linein[0])
+     {              /* line not empty */
+       if (prev_char == '\0')
+@@ -2874,7 +2874,7 @@ void get_word()
+     }              /* head */
+     else
+       header_flag = 0;
+-    getline();
++    nfbtrans_getline();
+     if (remove_page_nums)
+       remove_page_number();
+     if (auto_center)
diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch
new file mode 100644
index 000000000000..61c991c8a368
--- /dev/null
+++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch
@@ -0,0 +1,24 @@
+--- a/Makefile	2017-06-13 11:08:23.428114301 -0500
++++ b/Makefile	2017-06-13 11:09:01.084376256 -0500
+@@ -28,10 +28,10 @@
+ djgppall: nfbtrans.exe

+ 

+ nfbtrans: $(OBJFILES)

+-	$(CC) $(CFLAGS) $(OBJFILES) $(LIBS) -o nfbtrans

++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJFILES) $(LIBS) -o nfbtrans

+ 

+ nfbtrans.exe:$(OBJFILES)

+-	$(CC)  $(CFLAGS) $(OBJFILES) -o nfbtrans.exe

++	$(CC)  $(CFLAGS) $(LDFLAGS) $(OBJFILES) -o nfbtrans.exe

+ 

+ ultrix:

+ 	$(MAKE) CFLAGS=-O

+@@ -44,7 +44,7 @@
+ 

+ insight:

+ 	insight -fno-builtin -fwritable-strings \

+-	$(CFLAGS) $(OBJFILES) $(LIBS) -o nfbtrans

++	$(CFLAGS) $(LDFLAGS) $(OBJFILES) $(LIBS) -o nfbtrans

+ 

+ aix:

+ 	$(MAKE) all CC=cc CFLAGS="-o -Dunix -Daix"

diff --git a/app-accessibility/nfbtrans/metadata.xml b/app-accessibility/nfbtrans/metadata.xml
new file mode 100644
index 000000000000..8fb4aba1043e
--- /dev/null
+++ b/app-accessibility/nfbtrans/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>williamh@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
new file mode 100644
index 000000000000..5a275017973a
--- /dev/null
+++ b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+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"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=" >=app-arch/unzip-5.50-r2"
+RDEPEND=""
+
+S=${WORKDIR}
+
+PATCHES=(
+"${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
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) \
+		LIBS= \
+		CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" all
+}
+
+src_install() {
+	dobin nfbtrans
+	dodoc *fmt readme.txt makedoc
+	insinto /etc/nfbtrans
+	doins *cnf *tab *dic spell.dat *zip
+}
diff --git a/app-accessibility/orca-3.24.0 b/app-accessibility/orca-3.24.0
deleted file mode 100644
index 86d778e13fa9..000000000000
--- a/app-accessibility/orca-3.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) python_targets_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-accessibility/at-spi2-atk-2.12:2 >=app-accessibility/at-spi2-core-2.12:2[introspection] >=dev-libs/atk-2.10 >=dev-libs/glib-2.28:2 dev-python/gst-python:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3.10:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] braille? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-util/intltool-0.50 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Extensible screen reader that provides access to the desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Orca
-IUSE=+braille python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) python_targets_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-accessibility/at-spi2-atk-2.12:2 >=app-accessibility/at-spi2-core-2.12:2[introspection] >=dev-libs/atk-2.10 >=dev-libs/glib-2.28:2 dev-python/gst-python:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3.10:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] braille? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/atk[introspection] dev-python/pyatspi[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/orca/3.24/orca-3.24.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24ba3439a538a6f001f290d0e64424ad
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
new file mode 100644
index 000000000000..5353f3f146a9
--- /dev/null
+++ b/app-accessibility/orca/Manifest
@@ -0,0 +1,3 @@
+DIST orca-3.24.0.tar.xz 2391740 BLAKE2B 1f294bc8e1c593690c511f0d7d660230c420b33de59c8b1e78ee8d7b16f973b9fff9ce4d656de7202ffd5789ae3604d030c442e8c35eecfd5c5dca058031e996 SHA512 9aa65b534f69bb4a1b800e715776416843ac3756ec1267feca3c66476e34e54f6744f70c0f8ac8868a009d38b6cc165267268491a9ad29ebbd3601dba09d424c
+EBUILD orca-3.24.0.ebuild 1878 BLAKE2B f3831feb7b8d95a3c4291b0a97048f58baea95ffb94793de3c25b8ff5ae4944c5a42297efb3b6802cda6e8ccdd29f15855a8520b8b3a847cf95f34d835a9470c SHA512 6437a256bf980f50cc766029959400c829b6a48f8c10b89a377b42e98cac3cade2022d7dba836512dc7af00a702d0b69b92eae21adbec53a03c05f0744adb01f
+MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
diff --git a/app-accessibility/orca/metadata.xml b/app-accessibility/orca/metadata.xml
new file mode 100644
index 000000000000..81828abc6360
--- /dev/null
+++ b/app-accessibility/orca/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="braille">Enable braille support</flag>
+</use>
+<longdescription>
+	Orca is a flexible, extensible, and powerful assistive technology
+	for people with visual impairments. Using various combinations of
+	speech synthesis, braille, and magnification, Orca helps provide
+	access to applications and toolkits that support the AT-SPI (e.g.,
+	the GNOME desktop).
+</longdescription>
+</pkgmetadata>
diff --git a/app-accessibility/orca/orca-3.24.0.ebuild b/app-accessibility/orca/orca-3.24.0.ebuild
new file mode 100644
index 000000000000..216575e26152
--- /dev/null
+++ b/app-accessibility/orca/orca-3.24.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="threads"
+
+inherit gnome2 python-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 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-atk-2.12:2
+	>=app-accessibility/at-spi2-core-2.12:2[introspection]
+	>=dev-libs/atk-2.10
+	>=dev-libs/glib-2.28:2
+	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	>=x11-libs/gtk+-3.6.2:3[introspection]
+	braille? (
+		>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
+		dev-libs/liblouis[python,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
+	dev-libs/atk[introspection]
+	dev-python/pyatspi[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure \
+		$(use_with braille liblouis)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
+			-i src/orca/orca || die
+		python_doscript src/orca/orca
+	}
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/app-accessibility/perlbox-voice-0.09-r2 b/app-accessibility/perlbox-voice-0.09-r2
deleted file mode 100644
index c15e3e55a3ee..000000000000
--- a/app-accessibility/perlbox-voice-0.09-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A voice enabled application to bring your desktop under your command
-EAPI=6
-HOMEPAGE=http://perlbox.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Tk app-accessibility/sphinx2 app-accessibility/festival app-accessibility/mbrola
-SLOT=0
-SRC_URI=mirror://sourceforge/perlbox/perlbox-voice-0.09.noarch.tgz
-_md5_=73633848e089f3582f3e5ad480947bfd
diff --git a/app-accessibility/perlbox-voice/Manifest b/app-accessibility/perlbox-voice/Manifest
new file mode 100644
index 000000000000..b72201bf5ba1
--- /dev/null
+++ b/app-accessibility/perlbox-voice/Manifest
@@ -0,0 +1,3 @@
+DIST perlbox-voice-0.09.noarch.tgz 1316675 BLAKE2B 2684c891c7cf688976a4024133b32460fdfda455c7e682ca972eacfb84959ec123e04f03d39313bea8afaf928b11cd6d9d219a338ade764818d4c653bc1224b7 SHA512 db461c4b60003383cc14d25dbc6fdbc82069f588dae14434d6d29efa809c566b36c38f4311271492a9c35e965fed8fcdccf0debf06dc121c10fec460211387c6
+EBUILD perlbox-voice-0.09-r2.ebuild 562 BLAKE2B c60a32b6c819eb83c9bcb3435856ac0f3c486504238acb7dc48d296b93bbb127fd6fc937a4771a40e937ef79534ba2c238b8d64e804283da0ddb0d402003f21c SHA512 f392fdcab967a93be814061c6750ff23a5eabdaa295df34b92628f70e7f6571ade93cb9c286ab7354c8ab346befb363d937462ca104783b228f5012ea795cb21
+MISC metadata.xml 244 BLAKE2B e9ba31e8b01f3ee6ff7a098b1cdf886d08c41c10536bbad83aeca89e0a34e9b4f5e5816d6dbaa5399f4bd2b89f87d714ec12736d286114023f0e2dc42acfb521 SHA512 fe707dfe4f31afb9a8d5fb323fbe09cffc54e895a8863cac7541a01ff26f90a99092cfa4c6b9cca75d5f3d464c283a5be3f87ecd8b01feee9491d7392af902e3
diff --git a/app-accessibility/perlbox-voice/metadata.xml b/app-accessibility/perlbox-voice/metadata.xml
new file mode 100644
index 000000000000..32f77b0a6625
--- /dev/null
+++ b/app-accessibility/perlbox-voice/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">perlbox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/perlbox-voice/perlbox-voice-0.09-r2.ebuild b/app-accessibility/perlbox-voice/perlbox-voice-0.09-r2.ebuild
new file mode 100644
index 000000000000..692e2dbd2edc
--- /dev/null
+++ b/app-accessibility/perlbox-voice/perlbox-voice-0.09-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A voice enabled application to bring your desktop under your command"
+HOMEPAGE="http://perlbox.sourceforge.net/"
+SRC_URI="mirror://sourceforge/perlbox/${P}.noarch.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-lang/perl
+	 dev-perl/Tk
+	 app-accessibility/sphinx2
+	 app-accessibility/festival
+	 app-accessibility/mbrola"
+
+src_install() {
+	tar xvf perlbox-voice.ss -C "${D}" || die "tar failed"
+	dodoc ${PN}.readme
+}
diff --git a/app-accessibility/pidgin-festival-2.4 b/app-accessibility/pidgin-festival-2.4
deleted file mode 100644
index 71fa7da84436..000000000000
--- a/app-accessibility/pidgin-festival-2.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-accessibility/festival net-im/pidgin[gtk] x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=A plugin which enables text-to-speech output of conversations using festival
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/pidgin-festival/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-accessibility/festival net-im/pidgin[gtk] x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/pidgin-festival/pidgin-festival-2.4.tar.gz
-_md5_=df1ff6e8830bbe0b82a733cb5746fd95
diff --git a/app-accessibility/pidgin-festival/Manifest b/app-accessibility/pidgin-festival/Manifest
new file mode 100644
index 000000000000..94adee2a7e8a
--- /dev/null
+++ b/app-accessibility/pidgin-festival/Manifest
@@ -0,0 +1,3 @@
+DIST pidgin-festival-2.4.tar.gz 359230 BLAKE2B 50b949f3977ac77d2a8f5bed85d3a2ca4c6d2b910c528c0304465deb68823129131d01303404cd71d2af1c5322117da5bbf37f664e4752dbe92ce76b0021fa5d SHA512 6f929e53eb3dd6b53cf18e217676f62230c016f955aa18985f186ac3c697318321a3138279bfe6d01a292b371af47d6f0759585ec57490e0fd04e7020e7abd3d
+EBUILD pidgin-festival-2.4.ebuild 502 BLAKE2B 9ddc0a23e696fdcc0aee91750e9db74de25280e2b77ac3c4bee24e1519c0948389cda87c34c28b014c39bf25a64841bc7a6006f7254f2d749516d898207f1fe8 SHA512 fe412fe0ec480dd473219a2f7bfe58b226a90dde84dd725eccfafafa1a297ec05d77ff69b9952f7327ebaa5ea1660ad64fde4ad2f04db5a5a4152838cfbb69b7
+MISC metadata.xml 354 BLAKE2B 858dba775f3638d94856cce5d8bd30aea752add73d02f1fea92e73d462d0c3a0d59054a0b3c5d751c6aeb26651e4109f61960f4084cbff0edb4a2588abc674cd SHA512 ae277f8f2d930f13a7d7c470a5a3cf2c154f505fb638b642e4dc5129c4c38ee1c9f30f0f426018cbd14c1005c28a2fd7b23096384d0221ccbdf259d015885c28
diff --git a/app-accessibility/pidgin-festival/metadata.xml b/app-accessibility/pidgin-festival/metadata.xml
new file mode 100644
index 000000000000..9b2b7c90b036
--- /dev/null
+++ b/app-accessibility/pidgin-festival/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pidgin-festival</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/pidgin-festival/pidgin-festival-2.4.ebuild b/app-accessibility/pidgin-festival/pidgin-festival-2.4.ebuild
new file mode 100644
index 000000000000..854b9e25929d
--- /dev/null
+++ b/app-accessibility/pidgin-festival/pidgin-festival-2.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A plugin which enables text-to-speech output of conversations using festival"
+HOMEPAGE="https://sourceforge.net/projects/pidgin-festival/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-accessibility/festival
+	net-im/pidgin[gtk]
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-accessibility/pocketsphinx-0.8 b/app-accessibility/pocketsphinx-0.8
deleted file mode 100644
index db947deb6e82..000000000000
--- a/app-accessibility/pocketsphinx-0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-accessibility/sphinxbase media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig
-DESCRIPTION=Speaker-independent large vocabulary with continuous speech recognizer
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/cmusphinx/
-IUSE=python static-libs python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=app-accessibility/sphinxbase media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/cmusphinx/pocketsphinx-0.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c1ccc27ea60ac294eeda9d0b4e83eeae
diff --git a/app-accessibility/pocketsphinx/Manifest b/app-accessibility/pocketsphinx/Manifest
new file mode 100644
index 000000000000..48aa7c1a0193
--- /dev/null
+++ b/app-accessibility/pocketsphinx/Manifest
@@ -0,0 +1,3 @@
+DIST pocketsphinx-0.8.tar.gz 23781837 BLAKE2B 069f283f1cd80f62b625fe6fc621609b73ae90c2abfe37f36b67a9282fe50a1f877742a824439f9d2bc1d66da047d6460ae77f788e58e7fb93cdf9be610437db SHA512 b53ab8883ddbc2c66c6a6af1bac318f3cdfd5a495cb636f33eb649d42f28780b36c43dfd9a61f213d6a1b83f0fba6b114d44b38d9fa091acf62a8e529118e583
+EBUILD pocketsphinx-0.8.ebuild 1023 BLAKE2B 2eb97c8657796911711d01eb4f24f212494739259f1503c7b708161e34f168dd545a66de6cfa461f48b60f14263c21013b1696708b1eeb5fed553556f38d877f SHA512 979d56f0ec0886ded897007e5bbd87a105a852912b3c5e826252e0ba968a065d5fb9080713ac20b3b2d10e0c90337d63dbb4d751dc50b7ab7710ebb6c7751a97
+MISC metadata.xml 348 BLAKE2B afc4022dc46500e70aba84d0f85d8a1f843e5faef82c6bfbfe494784ed322c4b3e41a1415f4c4d5ff1655791ce805722d638785b985908182f5805ef44e68068 SHA512 34f2af68ffe473a5fc01eafc493532b72e40339ec299960ed5b9b0b45f0a2681497d1adad8c87dfefbdd446825c1eaa8d08a29b900e8e6998a131c20f24ef5c7
diff --git a/app-accessibility/pocketsphinx/metadata.xml b/app-accessibility/pocketsphinx/metadata.xml
new file mode 100644
index 000000000000..b41f634a646d
--- /dev/null
+++ b/app-accessibility/pocketsphinx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cmusphinx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/pocketsphinx/pocketsphinx-0.8.ebuild b/app-accessibility/pocketsphinx/pocketsphinx-0.8.ebuild
new file mode 100644
index 000000000000..6b2f52862a61
--- /dev/null
+++ b/app-accessibility/pocketsphinx/pocketsphinx-0.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+inherit eutils distutils-r1
+
+DESCRIPTION="Speaker-independent large vocabulary with continuous speech recognizer"
+HOMEPAGE="https://sourceforge.net/projects/cmusphinx/"
+SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="app-accessibility/sphinxbase
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+run_distutils() {
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_"${@}"
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--without-python \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	run_distutils ${FUNCNAME}
+}
+
+src_install() {
+	default
+	run_distutils ${FUNCNAME}
+	prune_libtool_files
+}
diff --git a/app-accessibility/powiedz-1.0-r2 b/app-accessibility/powiedz-1.0-r2
deleted file mode 100644
index bbd0880832a6..000000000000
--- a/app-accessibility/powiedz-1.0-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Polish speech synthesizer based on rsynth
-EAPI=6
-HOMEPAGE=http://kadu.net/index.php?page=download&lang=en
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-1
-SLOT=0
-SRC_URI=http://kadu.net/download/additions/powiedz-1.0.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a5cb69eb98303d32177b47c7098368c1
diff --git a/app-accessibility/powiedz/Manifest b/app-accessibility/powiedz/Manifest
new file mode 100644
index 000000000000..f7eda04641a0
--- /dev/null
+++ b/app-accessibility/powiedz/Manifest
@@ -0,0 +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 631 BLAKE2B 8d316a9f7b5ff89575bb90808e34eb60a2f6107efb94b29860811373063171aca736cf6968f36551d1cb3da840b86592a0c92dd5dad3864501d3508018f2a3b2 SHA512 afa242398e76db041ec11938ebf4114f3021c669ccbc84e0dfd5d733a94bbcd438b07b7d467ad345113eb3301049d0189de8623b172569f1bb6ad9476c04ca52
+MISC metadata.xml 393 BLAKE2B 934a4030dd96c98a6614bed171bab10582d885d3aeeefb793bb9c5aff190f3a8c59713c085e962dd9b2c56453be49fcdf5ba37c4e2f25dc619740403f93041f5 SHA512 e667c596590296dc51b7125efdc97da72a5e4c4d7e83469b1fa0975f066fb3c78ce4dc91032f3401e01fa107e1f3fec165c9adbe9572aa3163f2dcb7380fc116
diff --git a/app-accessibility/powiedz/files/powiedz-1.0-dsp-handle-fix.patch b/app-accessibility/powiedz/files/powiedz-1.0-dsp-handle-fix.patch
new file mode 100644
index 000000000000..fb2852b61c0e
--- /dev/null
+++ b/app-accessibility/powiedz/files/powiedz-1.0-dsp-handle-fix.patch
@@ -0,0 +1,12 @@
+--- a/aufile.c
++++ b/aufile.c
+@@ -217,8 +217,7 @@
+ audio_open(int samp_rate,int disp)
+ {
+  int i;
+-// esd_fd = open(dev_file, O_WRONLY | O_NDELAY);
+- esd_fd = open(audio_dsp, O_WRONLY);
++ esd_fd = open(audio_dsp, O_WRONLY | O_NDELAY);
+  if (esd_fd < 0)
+   {
+    if (disp) perror(audio_dsp);
diff --git a/app-accessibility/powiedz/files/powiedz.desktop b/app-accessibility/powiedz/files/powiedz.desktop
new file mode 100644
index 000000000000..2ea1c4820f69
--- /dev/null
+++ b/app-accessibility/powiedz/files/powiedz.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Powiedz
+Comment=Polish speak synthesizer
+Comment[pl]=Polski syntezator mowy
+Exec=powiedz
+Type=Application
+Terminal=false
+Categories=AudioVideo;Audio;
diff --git a/app-accessibility/powiedz/metadata.xml b/app-accessibility/powiedz/metadata.xml
new file mode 100644
index 000000000000..2cb7080a0514
--- /dev/null
+++ b/app-accessibility/powiedz/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>accessibility@gentoo.org</email>
+    <name>Gentoo Accessibility Project</name>
+  </maintainer>
+<maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/powiedz/powiedz-1.0-r2.ebuild b/app-accessibility/powiedz/powiedz-1.0-r2.ebuild
new file mode 100644
index 000000000000..fc5fe347bd92
--- /dev/null
+++ b/app-accessibility/powiedz/powiedz-1.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Polish speech synthesizer based on rsynth"
+HOMEPAGE="http://kadu.net/index.php?page=download&lang=en"
+SRC_URI="http://kadu.net/download/additions/powiedz-1.0.tgz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-dsp-handle-fix.patch
+)
+
+src_compile() {
+	emake -f Makefile_plain LDLIBS="-lm" CFLAGS="${CFLAGS}" DEFS="" CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin powiedz
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/app-accessibility/simon-9999 b/app-accessibility/simon-9999
deleted file mode 100644
index be66c4e2f1f1..000000000000
--- a/app-accessibility/simon-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/okular-17.12.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 media-libs/alsa-lib media-libs/libqaccessibilityclient:5 x11-libs/libX11 x11-libs/libXtst x11-libs/qwt:6=[qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils
-DESCRIPTION=Open-source speech recognition program for replacing mouse and keyboard
-EAPI=6
-HOMEPAGE=http://simon-listens.org/
-IUSE=libsamplerate opencv pim sphinx debug +handbook test
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/okular-17.12.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 media-libs/alsa-lib media-libs/libqaccessibilityclient:5 x11-libs/libX11 x11-libs/libXtst x11-libs/qwt:6=[qt5] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=61b42c57cadead483bba8a6a8d8e05cb
diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
new file mode 100644
index 000000000000..f06657f665c6
--- /dev/null
+++ b/app-accessibility/simon/Manifest
@@ -0,0 +1,2 @@
+EBUILD simon-9999.ebuild 2058 BLAKE2B 5cdd32e8b39ce6b43ace50f615160bfce2e60ddc9534845771d5696de494c1d4822fe7b4a47dce519b42a61206b0166214feb1c7b040cc4ab52d07de3d133511 SHA512 630dda06440102440ee0f833aeab94140dc65b6ee00df95442bca853993d49a3f1ec50cc090dea339ddb3fded4a0f3ffa3e4cb9bcd4eb0b84e95851fe3ddac52
+MISC metadata.xml 526 BLAKE2B 90a5578ad2dd40b107c0a810ac487cf2c952f056bc8c6bb109cfceda2b66cdfc2ccc027e741d2eb0a4ee77e9ac349f43f7724b126d077c988ba4dd3c0c940375 SHA512 ab2dbc917334c5877b7654179b0f28e7d2824d98ba68c62e13ab912f5c1010198b8891ea5764c9e304727ac18be28b758f23f414e145047f99caef335006659d
diff --git a/app-accessibility/simon/metadata.xml b/app-accessibility/simon/metadata.xml
new file mode 100644
index 000000000000..923816d1f30f
--- /dev/null
+++ b/app-accessibility/simon/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<use>
+		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
+		<flag name="pim">Enable support for KDE PIM resources integration</flag>
+		<flag name="sphinx">Build sphinx backend (pulls <pkg>app-accessibility/julius</pkg> if disabled</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-accessibility/simon/simon-9999.ebuild b/app-accessibility/simon/simon-9999.ebuild
new file mode 100644
index 000000000000..f5fc867b2122
--- /dev/null
+++ b/app-accessibility/simon/simon-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="kf5"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
+HOMEPAGE="http://simon-listens.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="libsamplerate opencv pim sphinx"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep okular)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtx11extras)
+	media-libs/alsa-lib
+	media-libs/libqaccessibilityclient:5
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/qwt:6=[qt5]
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pim KF5CalendarCore)
+		$(cmake-utils_use_find_package pim KF5Akonadi)
+		-DWITH_LibSampleRate=$(usex libsamplerate)
+		-DWITH_OpenCV=$(usex opencv)
+		-DBackendType=$(usex sphinx "both" "jhtk")
+		$(cmake-utils_use_find_package sphinx Sphinxbase)
+		$(cmake-utils_use_find_package sphinx Pocketsphinx)
+		-DQWT_INCLUDE_DIR=/usr/include/qwt6
+		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog "Optional dependency:"
+	use sphinx && elog "  app-accessibility/julius (alternative backend)"
+}
diff --git a/app-accessibility/sound-icons-0.1 b/app-accessibility/sound-icons-0.1
deleted file mode 100644
index cfb6e37a628a..000000000000
--- a/app-accessibility/sound-icons-0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=a collection of Sound Icons for speech-dispatcher
-EAPI=0
-HOMEPAGE=http://www.freebsoft.org
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-accessibility/speech-dispatcher
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz
-_md5_=2dcaabc6ab513048d18801487902ec20
diff --git a/app-accessibility/sound-icons/Manifest b/app-accessibility/sound-icons/Manifest
new file mode 100644
index 000000000000..148ed50f1803
--- /dev/null
+++ b/app-accessibility/sound-icons/Manifest
@@ -0,0 +1,3 @@
+DIST sound-icons-0.1.tar.gz 591196 BLAKE2B 3632d544dd186eb4358ca9cacaf6babc9ccae287cc4918462dff3b7b7a5b57fe33aea65e5c0a9399aa28a294c04ec686ddee47327cda9900173c064ef4631a5c SHA512 f0ba9e1e84ace325671c7f323f01d647aa0e1a318e9adc2a6d8af4e0d795e478b2ea66007670f9c7ced9ef7310fdbccb5168b0f404579f5dff8712fe12ad93a0
+EBUILD sound-icons-0.1.ebuild 682 BLAKE2B 36acf82e4a1e9ba9943ed3ad5aa2a06c91465826e1bf0771c561356676a1363cbba87f6551838f8675e54bd0c4673c2d82d00f84d6861ca57640301fb765f3cf SHA512 5e2e7f8057cfa7ca47ee9fab1717de65746106ea71d861117597c98d492e74c65c99c85cad7daf0d550fe4884cf1cfc45b48858881f1e193c16fdc602ee1f069
+MISC metadata.xml 468 BLAKE2B 8eff8fd0170fd571a0cdb2ac23fa62751223d7629e4b740408e3aa6ccbc1957bb2cb4f6e506916de9913293f9959d46ad2118d02a200ed0617848a2a8cf992ed SHA512 9ab288130466bb7e5574fb54cf239a7ff0b5415e24b02f022df013fd3eb1ef8f733b7e1e310a2305f816de797ab592db7a3c7e33af46fea05e39139536b0f611
diff --git a/app-accessibility/sound-icons/metadata.xml b/app-accessibility/sound-icons/metadata.xml
new file mode 100644
index 000000000000..4e89c04468b7
--- /dev/null
+++ b/app-accessibility/sound-icons/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>williamh@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
+<longdescription lang="en">
+This is a collection of sound icons which can be used by speech dispatcher.
+</longdescription>
+</pkgmetadata>
diff --git a/app-accessibility/sound-icons/sound-icons-0.1.ebuild b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
new file mode 100644
index 000000000000..ad29d961800f
--- /dev/null
+++ b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="a collection of Sound Icons for speech-dispatcher"
+HOMEPAGE="http://www.freebsoft.org"
+SRC_URI="http://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND="app-accessibility/speech-dispatcher"
+
+src_compile(){
+	einfo "Nothing to compile."
+}
+
+src_install() {
+	dodoc README
+	insinto /usr/share/sounds/sound-icons
+	doins "${S}"/*.wav
+	links="`find ${S} -type l -print`"
+	for link in $links; do
+		target=`readlink -n $link`
+		dosym $target /usr/share/sounds/sound-icons/`basename $link`
+	done
+}
diff --git a/app-accessibility/speech-dispatcher-0.8.1 b/app-accessibility/speech-dispatcher-0.8.1
deleted file mode 100644
index 1ae622e3187a..000000000000
--- a/app-accessibility/speech-dispatcher-0.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=python? ( python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) >=dev-util/intltool-0.40.0 virtual/pkgconfig
-DESCRIPTION=Speech synthesis interface
-EAPI=5
-HOMEPAGE=http://www.freebsoft.org/speechd
-IUSE=alsa ao +espeak flite nas pulseaudio python static-libs python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python? ( python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) dev-python/pyxdg
-REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c1893a06de60ad846eaa6124902b214
diff --git a/app-accessibility/speech-dispatcher-0.8.3 b/app-accessibility/speech-dispatcher-0.8.3
deleted file mode 100644
index 97e01e233c25..000000000000
--- a/app-accessibility/speech-dispatcher-0.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) >=dev-util/intltool-0.40.0 virtual/pkgconfig
-DESCRIPTION=Speech synthesis interface
-EAPI=5
-HOMEPAGE=http://www.freebsoft.org/speechd
-IUSE=alsa ao +espeak flite nas pulseaudio python static-libs python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) dev-python/pyxdg
-REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5854e1d3c08c039767d5843c074207e1
diff --git a/app-accessibility/speech-dispatcher-0.8.7 b/app-accessibility/speech-dispatcher-0.8.7
deleted file mode 100644
index 9cc26a41236b..000000000000
--- a/app-accessibility/speech-dispatcher-0.8.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.28:2 dev-libs/libltdl:0 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) >=dev-util/intltool-0.40.0 virtual/pkgconfig
-DESCRIPTION=Speech synthesis interface
-EAPI=6
-HOMEPAGE=http://www.freebsoft.org/speechd
-IUSE=alsa ao +espeak flite nas pulseaudio python static-libs python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.28:2 dev-libs/libltdl:0 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) dev-python/pyxdg
-REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9456648b7b6124cea0d0497725dff471
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
new file mode 100644
index 000000000000..c79c59fed64e
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -0,0 +1,7 @@
+DIST speech-dispatcher-0.8.1.tar.gz 1309969 BLAKE2B 225a7b6a134cf0c82b1e08f961bad87a509ae7b4a9948c1e548c84a325b86b70ee66cd52dabd560f6640682385ea826fa4e67ec762a3da223a14303ddfdae5c2 SHA512 35f1ae547001a45d7945406ae5672829ff9ab6ac3f0cccb9eb3670dd92888a63c7cc4270ee90b5a166e6788afe3b117b5c3ef62c41a9df9f9af94dc4e0948fe8
+DIST speech-dispatcher-0.8.3.tar.gz 1292321 BLAKE2B a9a69734b9aa3c38041ea2872fa872e91d0e464714b71852266d5010677accee84a656e1b3661370b5e0047f0f0051e61dc5e8152185146b3779f59117bf7670 SHA512 48eaa1fb27a14ad6c6a1f214044fbddde85ff07e636355e75f4f3ac1e46cea0cbbbd2cb9ce01ce4b9cb27d5395d840bd38afd2c65ec0fabcc8787483ae7a7b67
+DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375
+EBUILD speech-dispatcher-0.8.1.ebuild 2645 BLAKE2B a6d970c44f8c1a1217de41fb6d78644ec3bccf0043116c6bd57a13fefa66927b93a84d45cf886946ea4b708cab1e49ff3ed59d886e790357980925741297f507 SHA512 7b9ada7edd6d2ccf949805c743f68848dbb35b8a3c4714e33b7a1c4248770165c77405214d24d38549d89309a85cc2233311b74594e9c0b21dcbc3390ab388a4
+EBUILD speech-dispatcher-0.8.3.ebuild 2686 BLAKE2B 64c7a07709e1ad1c1b11177b6a6bfbfb237d547113e508973a4f8cefa2802a4abc0813e88ec747fc1586c77dc0277c5c326a3dcbb53e4346a5a1885c37dd841d SHA512 186583ec15e3900ac82ffcac768002b3615ebe3d9e0906ca62d30642be72b7365b2d9043e327fb492f32057d735ec1a7b4e24fc543be000a3c951699ee341438
+EBUILD speech-dispatcher-0.8.7.ebuild 2683 BLAKE2B b039d22a45e5eab91b214d7f7869ef387c9d82a43dc290efa821ddfada13b1064e96a54b41e46c0e62d50082a56a1114ed9eb808b46b214460618d7346e7898d SHA512 015670fda481b919e734172deb8c1d4a602ae7c5f45ac71dc473f3c9ccbe7709f3ee835195af5067e82dd367aa4a16791e390b5ad5e900baa5d0c5e074e92ceb
+MISC metadata.xml 632 BLAKE2B 2a60d2e822db36bf3f0547d97ccaad05d6bcce11afa71534b108358f1d71f857f200907f01c31c3083a5196e43eb681c06e2991a086c91731daced3f56282c2d SHA512 db94cba99bd2c9bbfe98b1647ac53a3861cbd697df791bea025e2a713a5991ca6929f2bc82a985ba38eef4a2571515d96aac6558fe143b68e24713490c12dd0a
diff --git a/app-accessibility/speech-dispatcher/metadata.xml b/app-accessibility/speech-dispatcher/metadata.xml
new file mode 100644
index 000000000000..3b8394dd85b4
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>williamh@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>accessibility@gentoo.org</email>
+    <name>Gentoo Accessibility Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="espeak">Adds support for espeak speech engine</flag>
+    <flag name="flite">Adds support for flite speech engine</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild
new file mode 100644
index 000000000000..04aa370dd7ea
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils python-r1
+
+DESCRIPTION="Speech synthesis interface"
+HOMEPAGE="http://www.freebsoft.org/speechd"
+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"
+IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="python? ( ${PYTHON_DEPS} )
+	>=dev-libs/dotconf-1.3
+	>=dev-libs/glib-2.28:2
+	>=media-libs/libsndfile-1.0.2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	espeak? ( app-accessibility/espeak )
+	flite? ( app-accessibility/flite )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig"
+	RDEPEND="${COMMON_DEPEND}
+	dev-python/pyxdg"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-python
+		$(use_enable static-libs static)
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with espeak)
+		$(use_with flite)
+		$(use_with pulseaudio pulse)
+		$(use_with nas)
+	)
+	econf ${myeconfargs[@]}
+}
+
+src_compile() {
+	use python && python_copy_sources
+
+	emake
+
+	if use python; then
+		building() {
+			cd src/api/python || die
+			emake \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_foreach_impl run_in_build_dir building
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ANNOUNCE AUTHORS BUGS ChangeLog FAQ NEWS README*
+
+	prune_libtool_files --all
+
+	if use python; then
+		installation() {
+			cd src/api/python || die
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl run_in_build_dir installation
+		python_replicate_script "${ED}"/usr/bin/spd-conf
+	fi
+}
+
+pkg_postinst() {
+	local editconfig="n"
+	if ! use espeak; then
+		ewarn "You have disabled espeak, which is speech-dispatcher's"
+		ewarn "default speech synthesizer."
+		ewarn
+		editconfig="y"
+	fi
+	if ! use pulseaudio; then
+		ewarn "You have disabled pulseaudio support."
+		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
+		ewarn
+		editconfig="y"
+	fi
+	if [[ "${editconfig}" == "y" ]]; then
+		ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf"
+		ewarn "and make sure the settings there match your system."
+		ewarn
+	fi
+	elog "For festival support, you need to"
+	elog "install app-accessibility/festival-freebsoft-utils."
+}
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.3.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.3.ebuild
new file mode 100644
index 000000000000..2c177405d33e
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit eutils python-r1
+
+DESCRIPTION="Speech synthesis interface"
+HOMEPAGE="http://www.freebsoft.org/speechd"
+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"
+IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="python? ( ${PYTHON_DEPS} )
+	>=dev-libs/dotconf-1.3
+	>=dev-libs/glib-2.28:2
+	>=media-libs/libsndfile-1.0.2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	espeak? ( app-accessibility/espeak )
+	flite? ( app-accessibility/flite )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig"
+	RDEPEND="${COMMON_DEPEND}
+	dev-python/pyxdg"
+
+src_configure() {
+	# bug 573732
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+
+	local myeconfargs=(
+		--disable-python
+		$(use_enable static-libs static)
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with espeak)
+		$(use_with flite)
+		$(use_with pulseaudio pulse)
+		$(use_with nas)
+	)
+	econf ${myeconfargs[@]}
+}
+
+src_compile() {
+	use python && python_copy_sources
+
+	emake
+
+	if use python; then
+		building() {
+			cd src/api/python || die
+			emake \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_foreach_impl run_in_build_dir building
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ANNOUNCE AUTHORS BUGS ChangeLog FAQ NEWS README*
+
+	prune_libtool_files --all
+
+	if use python; then
+		installation() {
+			cd src/api/python || die
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl run_in_build_dir installation
+		python_replicate_script "${ED}"/usr/bin/spd-conf
+	fi
+}
+
+pkg_postinst() {
+	local editconfig="n"
+	if ! use espeak; then
+		ewarn "You have disabled espeak, which is speech-dispatcher's"
+		ewarn "default speech synthesizer."
+		ewarn
+		editconfig="y"
+	fi
+	if ! use pulseaudio; then
+		ewarn "You have disabled pulseaudio support."
+		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
+		ewarn
+		editconfig="y"
+	fi
+	if [[ "${editconfig}" == "y" ]]; then
+		ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf"
+		ewarn "and make sure the settings there match your system."
+		ewarn
+	fi
+	elog "For festival support, you need to"
+	elog "install app-accessibility/festival-freebsoft-utils."
+}
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
new file mode 100644
index 000000000000..7c27ba87a9dc
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-r1
+
+DESCRIPTION="Speech synthesis interface"
+HOMEPAGE="http://www.freebsoft.org/speechd"
+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"
+IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="python? ( ${PYTHON_DEPS} )
+	>=dev-libs/dotconf-1.3
+	>=dev-libs/glib-2.28:2
+	dev-libs/libltdl:0
+	>=media-libs/libsndfile-1.0.2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	espeak? ( app-accessibility/espeak )
+	flite? ( app-accessibility/flite )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pyxdg"
+
+src_configure() {
+	# bug 573732
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+
+	local myeconfargs=(
+		--disable-python
+		$(use_enable static-libs static)
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with espeak)
+		$(use_with flite)
+		$(use_with pulseaudio pulse)
+		$(use_with nas)
+	)
+	econf ${myeconfargs[@]}
+}
+
+src_compile() {
+	use python && python_copy_sources
+
+	emake
+
+	if use python; then
+		building() {
+			cd src/api/python || die
+			emake \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_foreach_impl run_in_build_dir building
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ANNOUNCE AUTHORS BUGS FAQ NEWS README*
+
+	prune_libtool_files --all
+
+	if use python; then
+		installation() {
+			cd src/api/python || die
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl run_in_build_dir installation
+		python_replicate_script "${ED}"/usr/bin/spd-conf
+	fi
+}
+
+pkg_postinst() {
+	local editconfig="n"
+	if ! use espeak; then
+		ewarn "You have disabled espeak, which is speech-dispatcher's"
+		ewarn "default speech synthesizer."
+		ewarn
+		editconfig="y"
+	fi
+	if ! use pulseaudio; then
+		ewarn "You have disabled pulseaudio support."
+		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
+		ewarn
+		editconfig="y"
+	fi
+	if [[ "${editconfig}" == "y" ]]; then
+		ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf"
+		ewarn "and make sure the settings there match your system."
+		ewarn
+	fi
+	elog "For festival support, you need to"
+	elog "install app-accessibility/festival-freebsoft-utils."
+}
diff --git a/app-accessibility/speech-tools-2.1-r4 b/app-accessibility/speech-tools-2.1-r4
deleted file mode 100644
index fe713a2f41ff..000000000000
--- a/app-accessibility/speech-tools-2.1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) >=media-libs/alsa-lib-1.0.20-r1 !<app-accessibility/festival-1.96_beta !sys-power/powerman >=sys-libs/ncurses-5.6-r2:0= virtual/pkgconfig
-DESCRIPTION=Speech tools for Festival Text to Speech engine
-EAPI=5
-HOMEPAGE=http://www.cstr.ed.ac.uk/projects/speech_tools/
-IUSE=nas X
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=FESTIVAL HPND BSD rc regexp-UofT
-RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) >=media-libs/alsa-lib-1.0.20-r1 !<app-accessibility/festival-1.96_beta !sys-power/powerman >=sys-libs/ncurses-5.6-r2:0=
-SLOT=0
-SRC_URI=http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz https://dev.gentoo.org/~neurogeek/speech-tools/speech_tools-2.1-r3-patches.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=60a9a13eef714fed10171ab32b87721e
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
new file mode 100644
index 000000000000..8114b3b5f756
--- /dev/null
+++ b/app-accessibility/speech-tools/Manifest
@@ -0,0 +1,6 @@
+AUX speech-tools-2.1-gcc7.patch 612 BLAKE2B ded8216c1e7c49821fd1bd738f1c0d508afbd07115d98d3149d31eb402611c1dbe70c07d4885e82beef94bfdfe8a9261722eaf7ea43f3704cee27eb5055f7488 SHA512 6d4c9c43821f571b5fa8f476f740ee276b9a05dcb8a39cfc32f5b3a87548acf051a1abf75f3be5a8563b03c5302b9208ce894a5065899b0f43ba9d2ffe7a65db
+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 3061 BLAKE2B 51de1ff71493a519be0fdd86e866f4dadf5d719731fc18ecc91e0fa5d33350a5d94c0c308da3959234b618bef86d135813cb89e0f1b94f33d71ed2553294fdf7 SHA512 8ee2149acf54a88c4eb3e5b07295742b7adcbc0f45d77e938f6a078b11a08c390730aba0d153e8bd3d57bd48d450087f98128645536cff00d1d0ccda26fc9477
+MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch b/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch
new file mode 100644
index 000000000000..9e1067fa1dc1
--- /dev/null
+++ b/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch
@@ -0,0 +1,20 @@
+--- a/siod/siod.cc
++++ b/siod/siod.cc
+@@ -459,7 +459,7 @@ char **siod_variable_generator(char *text,int length)
+     matches = walloc(char *,siod_llength(lmatches)+1);
+     for (l=lmatches,i=0; l; l=cdr(l),i++)
+ 	matches[i] = wstrdup(PNAME(car(l)));
+-    matches[i] = '\0';
++    *matches[i] = '\0';
+ 
+     return matches;
+ }
+@@ -498,7 +498,7 @@ char **siod_command_generator (char *text,int length)
+     matches = walloc(char *,siod_llength(lmatches)+1);
+     for (l=lmatches,i=0; l; l=cdr(l),i++)
+ 	matches[i] = wstrdup(PNAME(car(l)));
+-    matches[i] = '\0';
++    *matches[i] = '\0';
+ 
+     return matches;
+ }
diff --git a/app-accessibility/speech-tools/files/speech-tools-2.1-underlinking.patch b/app-accessibility/speech-tools/files/speech-tools-2.1-underlinking.patch
new file mode 100644
index 000000000000..35011735cc8c
--- /dev/null
+++ b/app-accessibility/speech-tools/files/speech-tools-2.1-underlinking.patch
@@ -0,0 +1,11 @@
+--- speech_tools.orig/config/systems/GentooLinux.mak.old	2013-11-24 01:49:44.000000000 +0200
++++ speech_tools/config/systems/GentooLinux.mak	2013-11-24 13:04:14.327758435 +0200
+@@ -38,6 +38,7 @@
+  ###########################################################################
+ 
+ MANDIR=$(INSTALL_PREFIX)/share/man
++GENTOO_ALSA_LIBS=$(shell pkg-config --libs alsa)
+ GENTOO_CURSES_LIBS=$(shell pkg-config --libs ncurses)
+ # Gentoo does not use termcap
+-OS_LIBS = $(GENTOO_CURSES_LIBS) $(LDFLAGS) -ldl
++OS_LIBS = $(GENTOO_ALSA_LIBS) $(GENTOO_CURSES_LIBS) $(LDFLAGS) -ldl
diff --git a/app-accessibility/speech-tools/metadata.xml b/app-accessibility/speech-tools/metadata.xml
new file mode 100644
index 000000000000..1dacdab965c1
--- /dev/null
+++ b/app-accessibility/speech-tools/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
new file mode 100644
index 000000000000..9611369cead0
--- /dev/null
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_P=${P/speech-/speech_}
+PATCHSET="r3"
+
+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/${PV}/${MY_P}-release.tar.gz
+		 https://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="nas X"
+
+RDEPEND="
+	nas? ( media-libs/nas )
+	X? ( x11-libs/libX11
+		x11-libs/libXt )
+	>=media-libs/alsa-lib-1.0.20-r1
+	!<app-accessibility/festival-1.96_beta
+	!sys-power/powerman
+	>=sys-libs/ncurses-5.6-r2:0=
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/speech_tools"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch"
+	epatch
+
+	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
+		main/siod_main.cc || die
+
+	#WRT bug #309983
+	sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
+		"${S}"/config/systems/sparc_SunOS5.mak || die
+
+	# Fix underlinking, bug #493204
+	epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch
+
+	# Fix gcc7 build failure, bug #634224
+	epatch "${FILESDIR}"/${PN}-2.1-gcc7.patch
+}
+
+src_configure() {
+	local CONFIG=config/config.in
+	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
+	if use nas; then
+		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
+			${CONFIG} || die
+	fi
+	if ! use X; then
+		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
+	fi
+	econf
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dolib.so lib/libest*.so*
+
+	dodoc "${S}"/README
+	dodoc "${S}"/lib/cstrutt.dtd
+
+	insinto /usr/share/doc/${PF}
+	doins -r lib/example_data
+
+	insinto /usr/share/speech-tools
+	doins -r config base_class
+
+	insinto /usr/share/speech-tools/lib
+	doins -r lib/siod
+
+	cd include || die
+	insinto /usr/include/speech-tools
+	doins -r *
+	dosym ../../include/speech-tools /usr/share/speech-tools/include
+
+	cd ../bin || die
+	for file in *; do
+		[ "${file}" = "Makefile" ] && continue
+		dobin ${file}
+		dstfile="${D}/usr/bin/${file}"
+		sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \
+			${dstfile} || die
+		sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \
+			${dstfile} || die
+		sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \
+			${dstfile} || die
+
+		# This just changes LD_LIBRARY_PATH
+		sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die
+	done
+
+	cd "${S}" || die
+	exeinto /usr/$(get_libdir)/speech-tools
+	for file in `find main -perm /111 -type f`; do
+		doexe ${file}
+	done
+
+	#Remove /usr/bin/resynth as it is broken. See bug #253556
+	rm "${D}/usr/bin/resynth" || die
+
+	# 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
+}
diff --git a/app-accessibility/speechd-el-2.5 b/app-accessibility/speechd-el-2.5
deleted file mode 100644
index 8c159c8e8156..000000000000
--- a/app-accessibility/speechd-el-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs speech support
-EAPI=4
-HOMEPAGE=http://www.freebsoft.org/speechd-el
-IUSE=brltty
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.7 brltty? ( app-accessibility/brltty ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.5.tar.gz
-_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=20323b1a4156951fb1c7625027308a41
diff --git a/app-accessibility/speechd-el/Manifest b/app-accessibility/speechd-el/Manifest
new file mode 100644
index 000000000000..a59b4ff08890
--- /dev/null
+++ b/app-accessibility/speechd-el/Manifest
@@ -0,0 +1,3 @@
+DIST speechd-el-2.5.tar.gz 183278 BLAKE2B 7ed220a742642d1d22a25ad247e7184183099e93cee37dc0309346d7ad41bd7d2a54e15bae49366af8b31925bfdac43173042ddb4a0851970ac0eaee07461977 SHA512 b4e5d00d3a86be9c42172ab48c5b0c0f5f25817cb542302f04e29f594422247e4b008428dfaaa1bb2e208a71f126b9c86d25186974606bf5764212a0d6a1a09f
+EBUILD speechd-el-2.5.ebuild 952 BLAKE2B a76fabbf502fecd527e3e6039dbd93b4e588201f36098c699a9595f8e133ab2de3a76d6e6e4798f767c0f9a7bd902d84a8bff98ade642815a63785023529f733 SHA512 8e093afa0ceb7bbd429cf10ef149ce3725f05e03e6c3552f8f10d0bd5f303bbb2470920c9b4be5d7934a29b5849a812d03596f08fa2b1d28d56a9372cdd98e63
+MISC metadata.xml 520 BLAKE2B e22bed4d2f247ed68b685beb59b81ac8fedf50f4d45399400f8d41822120c2537ea53eb55004d16932039fa17b6dce7beb9fd74afb6af6a6cc38187cf25d46a8 SHA512 a3eac680b1c15b152cb6de69f0b4e421b83019eafb49ce781caf9388446f131dea00c0903fd17066d7deb85fa3c789ed4d593d3fb5a09362a673cb0a93c7e6a3
diff --git a/app-accessibility/speechd-el/metadata.xml b/app-accessibility/speechd-el/metadata.xml
new file mode 100644
index 000000000000..298ece6d7d62
--- /dev/null
+++ b/app-accessibility/speechd-el/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>williamh@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<use>
+  <flag name="brltty">brltty support</flag>
+</use>
+</pkgmetadata>
diff --git a/app-accessibility/speechd-el/speechd-el-2.5.ebuild b/app-accessibility/speechd-el/speechd-el-2.5.ebuild
new file mode 100644
index 000000000000..f01f6acc0a06
--- /dev/null
+++ b/app-accessibility/speechd-el/speechd-el-2.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit elisp
+
+DESCRIPTION="Emacs speech support"
+HOMEPAGE="http://www.freebsoft.org/speechd-el"
+SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="brltty"
+
+DEPEND=""
+RDEPEND=">=app-accessibility/speech-dispatcher-0.7
+	brltty? ( app-accessibility/brltty )"
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	elisp-install ${PN} *.el *.elc
+	dobin speechd-log-extractor
+	dodoc ANNOUNCE NEWS README speechd-speak.pdf
+	doinfo speechd-el.info
+}
+
+pkg_postinst() {
+	elog "Execute the following commands from within emacs to get it to speak:"
+	elog "  M-x load-library RET speechd-speak RET"
+	elog "  M-x speechd-speak RET"
+	elog
+	elog "or add the following to your ~/.emacs file:"
+	elog
+	elog "(autoload 'speechd-speak \"speechd-speak\" nil t)"
+	elog '(speechd-speak)'
+}
diff --git a/app-accessibility/sphinx2-0.6 b/app-accessibility/sphinx2-0.6
deleted file mode 100644
index af3d8306c210..000000000000
--- a/app-accessibility/sphinx2-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=CMU Speech Recognition-engine
-EAPI=6
-HOMEPAGE=http://fife.speech.cs.cmu.edu/sphinx/
-IUSE=static-libs
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=mirror://sourceforge/cmusphinx/sphinx2-0.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2ff859b3ea526cf3662b1d8fb2ac4663
diff --git a/app-accessibility/sphinx2/Manifest b/app-accessibility/sphinx2/Manifest
new file mode 100644
index 000000000000..6c77f2309440
--- /dev/null
+++ b/app-accessibility/sphinx2/Manifest
@@ -0,0 +1,4 @@
+AUX sphinx2-0.6-as-needed.patch 776 BLAKE2B 831ae9cc8e1ed018eecb03f29c6dbe349b09d2ecaa6cdcd879613d372f437629d8e352b140c934a9f42c0192f34d29ebb81a2d74eb9b61948f926d510c9410f0 SHA512 2e4e48041e7eb79acd84a384943ebfbb0be17faab404b7d05b09d95ee5313730e6bd3026443ebe01bb79edb0c3bbcee3ec0b207978a1f0a30df4e0af54c11187
+DIST sphinx2-0.6.tar.gz 6883359 BLAKE2B 7e5da2f05d2ff92fd2c21a64c76954ff00104adcb81548ccfc19da4fc4995c59a494461f4343ae3b6799526d3f3f3a3c0051a6030af4cc9873d5cd5258fe30a6 SHA512 98e66cedf8a147aee7871df85ee45f58ab76637d26163cbb30ee9554638b503f52c9b14f4f3b64bbb49bb84282e399451a0f9a8622b6e7e545889773d72ba5d4
+EBUILD sphinx2-0.6.ebuild 785 BLAKE2B f5213991ef42065c6b763e1564d5f385a7adcff2588e80c98eb1f231af322fa87cccaab7e30ddf2283b0564094055b34f6a62f1de68b6c814a533ef4d10f1070 SHA512 9ebb298a554ea320369044ae3ea8c74e7cdb3838a9e3efd5eb9ced157c8976f9d5ef326296f9a9334ca2caa0c32a598280c8052813068696fe523b28ab20d62c
+MISC metadata.xml 462 BLAKE2B 2eae170bbccdd12a464c1bfef24e390e894f5449f09d70d69df8c221a55242b99863db56d7db2226d1af531be975f218b69c788c4aae348a00544b8f32836d3c SHA512 3159e075a7d959d2a6a75305692f706690f3ae54f6f114a131a4750c0ae020d4721d4a33434d3d98088f9fb3e1315ea8a25e54542752605bfb7a5600203bbe25
diff --git a/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch b/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch
new file mode 100644
index 000000000000..f647ab35142c
--- /dev/null
+++ b/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch
@@ -0,0 +1,32 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1,7 +1,7 @@
+ dnl Welcome to the Sphinx-2 automated build system.
+ dnl try not to hurt yourself ;)
+ 
+-AC_INIT(configure.in)
++AC_INIT(configure.ac)
+ AM_INIT_AUTOMAKE(sphinx2,0.6)
+ 
+ CFLAGS=${CFLAGS:--g -O2 -Wall}
+--- a/src/libsphinx2/Makefile.am
++++ b/src/libsphinx2/Makefile.am
+@@ -88,7 +88,7 @@
+ 	word_fsg.c
+ 
+ 
+-# libsphinx2_la_LIBADD = -lc -lm $(top_srcdir)/src/libsphinx2fe/libsphinx2fe.la
++libsphinx2_la_LIBADD = -lc -lm $(top_srcdir)/src/libsphinx2fe/libsphinx2fe.la
+ 
+ # hjf@cs.brown.edu - Added for Solaris build
+ # LDADD = -L/usr/demo/SOUND/lib/ -laudio
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,5 @@
+-SUBDIRS = libsphinx2 \
+-	libsphinx2fe \
++SUBDIRS = libsphinx2fe \
+ 	libsphinx2ad \
++	libsphinx2 \
+ 	examples
+ 
diff --git a/app-accessibility/sphinx2/metadata.xml b/app-accessibility/sphinx2/metadata.xml
new file mode 100644
index 000000000000..5272aff94276
--- /dev/null
+++ b/app-accessibility/sphinx2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cmusphinx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/sphinx2/sphinx2-0.6.ebuild b/app-accessibility/sphinx2/sphinx2-0.6.ebuild
new file mode 100644
index 000000000000..0ca32c0a2170
--- /dev/null
+++ b/app-accessibility/sphinx2/sphinx2-0.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P=${P/_/}
+
+DESCRIPTION="CMU Speech Recognition-engine"
+HOMEPAGE="http://fife.speech.cs.cmu.edu/sphinx/"
+SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="static-libs"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	HTML_DOCS=( doc/{phoneset_s2,sphinx2}.html )
+	default
+	dodoc doc/{README.{bin,lib},SCHMM_format,filler.dict,phoneset{,-old}}
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/app-accessibility/sphinx3-0.8-r1 b/app-accessibility/sphinx3-0.8-r1
deleted file mode 100644
index 060050159af6..000000000000
--- a/app-accessibility/sphinx3-0.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-accessibility/sphinxbase-0.7[static-libs?,python?,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-portage/elt-patches-20170422
-DESCRIPTION=CMU Speech Recognition engine
-EAPI=5
-HOMEPAGE=http://cmusphinx.sourceforge.net/
-IUSE=doc python static-libs python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=>=app-accessibility/sphinxbase-0.7[static-libs?,python?,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/cmusphinx/sphinx3-0.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d82e172cbf8da7613c07e95d2fc8026
diff --git a/app-accessibility/sphinx3/Manifest b/app-accessibility/sphinx3/Manifest
new file mode 100644
index 000000000000..f3b72d10af98
--- /dev/null
+++ b/app-accessibility/sphinx3/Manifest
@@ -0,0 +1,5 @@
+AUX sphinx3-0.8-libutil.patch 390 BLAKE2B 42bf803c7368396150e784ebd5965bebba72338cfcc0591f477f39b596fd5baf21caef374c87ff3c90323e69980c392aa1d84d648976b035efba20893a5d150f SHA512 cddb0e0378129f75f0d453c421a6e94e99cd9f495fb431d5bd1113471e77299c4ee5c42f3400f3998ab398db6cc8d9ae9d10e0c7a6c77610e29c8c1883ebd4b6
+AUX sphinx3-0.8_heap_fix.patch 1475 BLAKE2B 5786ca8b194c24fc1b305b36f4fd4506af2dd5e568aecdea3c86bf635126ebf307029d8ad815ee6bee90f3427caa066b4c8802162c55916ea76e300a0a51b0e0 SHA512 7b709e1f3741fb3403bbb9ffda77feeba7ff8e5373d1b3e8e03247dd5eff5e1b0f90595d579e6216602da376d2f297e9a46aa2d0016dbaeef400781ef9272751
+DIST sphinx3-0.8.tar.gz 25226326 BLAKE2B 0eb2c6474ec32ef1aed277816b0b596ba561c1705b389b19de7dfd969212bc24e5eec0a920aaeb15ed3a90f464552b4e24e964b94380dc292a9299b4651793bc SHA512 85b8e574e2f92a758c8c56ef11b873c49ef8a376e964f30a12d75850d4a0db56e3108eaea25fa5587675ef2ffa4531a13f0f182a85cc8e434c6bcee42058e050
+EBUILD sphinx3-0.8-r1.ebuild 1236 BLAKE2B c7abf6b80dfe393b0b5cd9913cb5368a843ac78fdab0e146ee932ee71f17bf37feddf381df1fa79b27063a208ad4f30fc79b9a60fe9963d264a4a5e3718ace5a SHA512 02200fa47d7d50f6010a7899c1a9564e632e59125efc21edfa6960af684540ea0e46320fefcd192303ec9377445b4be6bd403cfbbfcdcf2ce034c4ca1fa53f11
+MISC metadata.xml 348 BLAKE2B afc4022dc46500e70aba84d0f85d8a1f843e5faef82c6bfbfe494784ed322c4b3e41a1415f4c4d5ff1655791ce805722d638785b985908182f5805ef44e68068 SHA512 34f2af68ffe473a5fc01eafc493532b72e40339ec299960ed5b9b0b45f0a2681497d1adad8c87dfefbdd446825c1eaa8d08a29b900e8e6998a131c20f24ef5c7
diff --git a/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch b/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch
new file mode 100644
index 000000000000..0f7733154a53
--- /dev/null
+++ b/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch
@@ -0,0 +1,18 @@
+--- src/libs3decoder/libsearch/fsg_history.c
++++ src/libs3decoder/libsearch/fsg_history.c
+@@ -55,7 +55,6 @@
+ #include <kb.h>
+ /*#include <phone.h>*/
+ #include <search.h>
+-#include "libutil.h"
+ 
+ 
+ #define __FSG_DBG__	0
+--- src/libs3decoder/libcfg/s3_cfg_convert.c
++++ src/libs3decoder/libcfg/s3_cfg_convert.c
+@@ -1,5 +1,4 @@
+ 
+-#include <libutil.h>
+ #include "s3_cfg.h"
+ #include "fsg.h"
+ 
diff --git a/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch b/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch
new file mode 100644
index 000000000000..b7b71d974413
--- /dev/null
+++ b/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch
@@ -0,0 +1,34 @@
+diff -uNr sphinx3-0.8.orig/python/setup.py sphinx3-0.8/python/setup.py
+--- sphinx3-0.8.orig/python/setup.py	2008-12-31 23:20:08.000000000 -0500
++++ sphinx3-0.8/python/setup.py	2011-11-17 09:46:57.000000000 -0500
+@@ -8,15 +8,10 @@
+     define_macros = []
+ 
+ module = Extension('_sphinx3',
+-                   include_dirs = ['../../sphinxbase/include',
+-                                   '../include',
+-                                   '/usr/local/include/sphinxbase/',
+-                                   '/usr/local/include/sphinx3',
+-                                   ],
++                   include_dirs = ['../include',
++                                   '@GENTOO_PORTAGE_EPREFIX@/usr/include/sphinxbase'],
+ 		   define_macros = define_macros,
+-		   library_dirs = ['../../sphinxbase/src/libsphinxbase/.libs',
+-				'../src/libs3decoder/.libs',
+-				'../../sphinxbase/lib/debug',
++		   library_dirs = ['../src/libs3decoder/.libs',
+ 				'../lib/debug',
+ 				],
+                    libraries = ['sphinxbase', 's3decoder'],
+diff -uNr sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c sphinx3-0.8/src/libs3decoder/libsearch/vithist.c
+--- sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c	2008-12-31 13:27:56.000000000 -0500
++++ sphinx3-0.8/src/libs3decoder/libsearch/vithist.c	2011-11-17 09:46:24.000000000 -0500
+@@ -647,7 +647,7 @@
+ {
+     int32 se, fe, filler_done, th;
+     vithist_entry_t *ve;
+-    heap_t h;
++    heap_t *h;
+     s3wid_t *wid;
+     int32 i;
+ 
diff --git a/app-accessibility/sphinx3/metadata.xml b/app-accessibility/sphinx3/metadata.xml
new file mode 100644
index 000000000000..b41f634a646d
--- /dev/null
+++ b/app-accessibility/sphinx3/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cmusphinx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild b/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
new file mode 100644
index 000000000000..42f44dfce588
--- /dev/null
+++ b/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# disable automatic phase exports and deps
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils distutils-r1 prefix eutils
+
+DESCRIPTION="CMU Speech Recognition engine"
+HOMEPAGE="http://cmusphinx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc python static-libs"
+
+RDEPEND=">=app-accessibility/sphinxbase-0.7[static-libs?,python?,${PYTHON_USEDEP}]
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Due to generated Python setup.py.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}_heap_fix.patch" \
+		"${FILESDIR}/${P}-libutil.patch"
+	eprefixify 'python/setup.py'
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog NEWS README )
+	autotools-utils_src_install
+
+	if use doc; then
+		cd doc || die
+		dohtml -r -x CVS s3* s3 *.html
+	fi
+
+	if use python; then
+		unset DOCS
+
+		cd "${S}"/python || die
+		distutils-r1_src_install
+	fi
+}
diff --git a/app-accessibility/sphinxbase-0.8 b/app-accessibility/sphinxbase-0.8
deleted file mode 100644
index d6d19ae7209e..000000000000
--- a/app-accessibility/sphinxbase-0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-sound/pulseaudio lapack? ( virtual/lapack ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( >=app-doc/doxygen-1.4.7 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Support library required by the Sphinx Speech Recognition Engine
-EAPI=5
-HOMEPAGE=http://cmusphinx.sourceforge.net/
-IUSE=doc lapack python static-libs python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD-2 HPND MIT
-RDEPEND=media-sound/pulseaudio lapack? ( virtual/lapack ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/cmusphinx/sphinxbase-0.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5dec7b385c8010a79a35215f1d25295c
diff --git a/app-accessibility/sphinxbase/Manifest b/app-accessibility/sphinxbase/Manifest
new file mode 100644
index 000000000000..0d01bd8029ed
--- /dev/null
+++ b/app-accessibility/sphinxbase/Manifest
@@ -0,0 +1,5 @@
+AUX sphinxbase-0.8-automake113.patch 844 BLAKE2B eec1859c0284ac982cb27b296d79c4d42600f43c0cfe1105ceabf2c3468f5ead4330cf055d17959dabf5c0ca3a143bbbda4076ef311c57992b4156da5f3f5c17 SHA512 3275705839ce5d720e2f0914998ad8709e2199ae00852555c89691897499b4ea2dfcd9943213bd3d62472e7d73c6cc8a9ba2cf9315f4e0c2b3023b9adca01787
+AUX sphinxbase-0.8-unbundle-lapack.patch 2838 BLAKE2B 3191a63a888c4147105d206dc78921fd462697d8405fddffc5f2ddbc6f1c8328e65189dadd6ff7a8d282fd6047f9118205904bd010d2745bfcb1c1d0b6a2635c SHA512 65fe50fb11851848d0ae9ad17b4839953c1bebb027b91c42dc347c7e714ddea5f2a3131e2e243ba0ff771501c074a5d9850cef44b848d0feae90c764daa59447
+DIST sphinxbase-0.8.tar.gz 3313197 BLAKE2B ec2dcd232194d32d851924099ffb64fa9da6bdccb973fe1311d2b4b0506073cfd35b548ba8d8f64c2ee757f3b5ba87ae23c95d0f67c95be1110b7e2a995c9be2 SHA512 fdb13c07e591e868c395d5f8209ec389fb9d5a93d99104a00cb82382e84d320091ae7e74d53225706331d4959ab5e248fa622582a148bfdb6ab5c38470d1963c
+EBUILD sphinxbase-0.8.ebuild 1614 BLAKE2B 9ce3250b173fada5e927918af7aea7e1d036fc848ca487d1932875941322ad6960375039b14b7866cbe8609fc8aa8c181fd53b2e5580ebf72bc8892c4a3376d6 SHA512 73652225a2391c08e925714b6bbdc320268e96ab71a137844855e0158f83b1c6458fa3c4fb14a715d4f34213485e220d3f6778dcd38d1c4201e3d582ac799b9e
+MISC metadata.xml 358 BLAKE2B 3be69151b1f892ba756462711924daa29e845b15c1033680e1d9a1ad43db0bb4457397a544c0f87728e94c3b1a2e7516451e84d185fbcf2ce8754cdeed9c1eb0 SHA512 f9dee1e233aa868e4b33adb73c09b58f97a17e6844723222f1bcd1363eef669e769f12f188da17789abccc88cabb306eea6f40e31ba36e4569e4f24bfbde2421
diff --git a/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch b/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch
new file mode 100644
index 000000000000..11031918ee68
--- /dev/null
+++ b/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch
@@ -0,0 +1,25 @@
+diff -Naur sphinxbase-0.8/test/regression/Makefile.am sphinxbase-0.8.new/test/regression/Makefile.am
+--- sphinxbase-0.8/test/regression/Makefile.am	2012-12-05 06:05:39.000000000 -0800
++++ sphinxbase-0.8.new/test/regression/Makefile.am	2013-10-08 13:05:15.498853962 -0700
+@@ -33,9 +33,19 @@
+ 
+ # Disable sphinx_fe tests for now if fixed-point due to imprecision
+ if FIXED_POINT
+-TESTS = $(srcdir)/test-cepview.sh $(srcdir)/test-sphinx_pitch.sh
++TESTS = test-cepview.sh test-sphinx_pitch.sh
+ else
+-TESTS = $(srcdir)/test-*.sh
++TESTS = \
++	test-cepview.sh \
++	test-sphinx_fe-ctl.sh \
++	test-sphinx_fe-dct.sh \
++	test-sphinx_fe-dither-seed.sh \
++	test-sphinx_fe-logspec2cep.sh \
++	test-sphinx_fe-logspec.sh \
++	test-sphinx_fe.sh \
++	test-sphinx_fe-smoothspec.sh \
++	test-sphinx_jsgf2fsg.sh \
++	test-sphinx_pitch.sh
+ endif
+ 
+ EXTRA_DIST += $(TESTS)
diff --git a/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch b/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch
new file mode 100644
index 000000000000..70beae05de7e
--- /dev/null
+++ b/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch
@@ -0,0 +1,85 @@
+ configure.in                  | 40 +++++++++++++++++++++-------------------
+ src/libsphinxbase/Makefile.am |  1 +
+ 2 files changed, 22 insertions(+), 19 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e10629c..b5d6ea9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -62,13 +62,15 @@ if test x$withval = xno; then
+    use_lapack=false
+ fi
+ ])
+-if test x$use_lapack = xtrue; then
+-   AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true)
+-   if test x$use_internal_lapack != xtrue; then
+-      AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true)
+-   fi
++AS_IF([test "x$with_lapack" = "xyes"], [
++   PKG_CHECK_MODULES([LAPACK], [lapack],,
++                     AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true))
++   AS_IF([test "x$use_internal_lapack" != "xtrue"], [
++      PKG_CHECK_MODULES([BLAS], [blas],,
++                        AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true))
++   ])
+    AC_DEFINE(WITH_LAPACK, [], [Enable matrix algebra with LAPACK])
+-fi
++])
+ AM_CONDITIONAL(LAPACK_LITE, test x$use_internal_lapack = xtrue)
+ AM_CONDITIONAL(USE_LAPACK, test x$use_lapack = xtrue)
+ 
+@@ -208,9 +210,15 @@ AM_PROG_LIBTOOL
+ dnl
+ dnl Check for Doxygen, and build dox if present
+ dnl
+-AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no)
++AC_ARG_ENABLE([doc],
++   AS_HELP_STRING([--enable-doc], [Build docs using doxygen]))
++AS_IF([test "x$enable_doc" = "xyes"], [
++   AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no)
++	AS_IF([test "x$HAVE_DOXYGEN" != "xyes"], [
++      AC_MSG_ERROR([--enable-doc given, but doxygen not found.]); exit 1
++   ])
++])
+ AM_CONDITIONAL(BUILD_DOXYGEN, test "x$HAVE_DOXYGEN" = "xyes")
+-
+ dnl
+ dnl Check for Python, and build python module if present
+ dnl
+@@ -260,19 +268,13 @@ fi
+ AM_CONDITIONAL(BUILD_CYTHON, test "x$HAVE_CYTHON" = "xyes")
+ 
+ dnl
+-dnl Check for pkgconfig
+-dnl
+-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
+-
+-dnl
+ dnl Check for libsndfile
+ dnl
+-if test "x$HAVE_PKGCONFIG" = "xyes"; then
+-   PKG_CHECK_MODULES(SNDFILE,sndfile,,true)
+-   AC_CHECK_HEADERS([sndfile.h])
+-   PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true)
+-   AC_CHECK_HEADERS([samplerate.h])
+-fi
++PKG_CHECK_MODULES(SNDFILE,sndfile,,true)
++AC_CHECK_HEADERS([sndfile.h])
++PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true)
++AC_CHECK_HEADERS([samplerate.h])
++
+ AC_SUBST(SNDFILE_LIBS)
+ AC_SUBST(SNDFILE_CFLAGS)
+ AC_SUBST(SAMPLERATE_LIBS)
+diff --git a/src/libsphinxbase/Makefile.am b/src/libsphinxbase/Makefile.am
+index 52ee3e1..f4efd8a 100644
+--- a/src/libsphinxbase/Makefile.am
++++ b/src/libsphinxbase/Makefile.am
+@@ -8,6 +8,7 @@ libsphinxbase_la_SOURCES =
+ # This is API version 2, software release 1, which also supports API version 1
+ libsphinxbase_la_LDFLAGS = -version-info 2:1:1
+ libsphinxbase_la_LIBADD = $(LTLIBICONV) \
++	@LAPACK_LIBS@ \
+ 	util/libsphinxutil.la \
+ 	fe/libsphinxfe.la \
+ 	feat/libsphinxfeat.la \
diff --git a/app-accessibility/sphinxbase/metadata.xml b/app-accessibility/sphinxbase/metadata.xml
new file mode 100644
index 000000000000..c381beacd5fe
--- /dev/null
+++ b/app-accessibility/sphinxbase/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>accessibility@gentoo.org</email>
+    <name>Gentoo Accessibility Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">cmusphinx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild b/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild
new file mode 100644
index 000000000000..b52de17feda6
--- /dev/null
+++ b/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils distutils-r1
+
+DESCRIPTION="Support library required by the Sphinx Speech Recognition Engine"
+HOMEPAGE="http://cmusphinx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
+
+LICENSE="BSD-2 HPND MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc lapack python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# automagic dep on pulseaudio
+RDEPEND="
+	media-sound/pulseaudio
+	lapack? ( virtual/lapack )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.4.7 )"
+
+# Due to generated Python setup.py.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-unbundle-lapack.patch
+	"${FILESDIR}"/${P}-automake113.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with lapack)
+		$(use_enable doc)
+		# python modules are built through distutils
+		# so disable the ugly wrapper
+		--without-python
+	)
+	autotools-utils_src_configure
+}
+
+run_distutils() {
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_"${@}"
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	run_distutils ${FUNCNAME}
+}
+
+python_test() {
+	LD_LIBRARY_PATH="${S}"/src/lib${PN}/.libs \
+		"${PYTHON}" sb_test.py || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	autotools-utils_src_test
+
+	run_distutils ${FUNCNAME}
+}
+
+src_install() {
+	run_distutils ${FUNCNAME}
+
+	use doc && local HTML_DOCS=( doc/html/. )
+	autotools-utils_src_install
+}
diff --git a/app-accessibility/yasr-0.6.9-r1 b/app-accessibility/yasr-0.6.9-r1
deleted file mode 100644
index f82b8c892527..000000000000
--- a/app-accessibility/yasr-0.6.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst prepare
-DEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=General-purpose console screen reader
-EAPI=6
-HOMEPAGE=http://yasr.sourceforge.net/
-IUSE=nls
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/yasr/yasr-0.6.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2815edeec3cc0f478d042f7e3c83da3e
diff --git a/app-accessibility/yasr/Manifest b/app-accessibility/yasr/Manifest
new file mode 100644
index 000000000000..0e88931a8fe2
--- /dev/null
+++ b/app-accessibility/yasr/Manifest
@@ -0,0 +1,7 @@
+AUX yasr-0.6.9-automake113.patch 350 BLAKE2B e0b5dfea954b7454b53c2895782394402ff5d7b57fe7dae8a8b14e74884c89a26d971169910235d0c689bc639a2d9a6f50b62eb112d391ddfbd53a58981b2061 SHA512 4af1f1cd14f78f7ead05398b981d5028f3d2c8164dcc43102b6d42fbf86e0f829df70c2316f14a62db01527c2bf0f5abc88ebff88d4fcfabbd3aa99f720a3738
+AUX yasr-0.6.9-gcc43.patch 830 BLAKE2B 12f6cfb9cd4761eddbe7b1fa5063fa122916858a68de1df553fa213cd5df9c6c6332df716eb361d9a0df61bafcc6761bd36945eef575e57b8e1afa5292516530 SHA512 bc41914287b834dfc2469658a0462c1a32e83fb176005e0b093d1f0eedafad1ff1495e257a8b24ad0bde7d6b59076332e484a99f1b2e44d5c4402a58c5c659ff
+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
+MISC metadata.xml 343 BLAKE2B 996f4f22178b37cf20289679145ed57ce54dd1c4cfe90eb0bb77ed527b8e605241bdc7183418157b6795fcea0a4a340e2683dcfc44bc72a7fbafc047af16c490 SHA512 ec1a6eb820455bbb6d1dca0aba4e60e1e47e91725ea2091480f96a52cc98b1779b0c6bd2927142bc9bed45a45d51de22c84626531ee287303fce14ff9bd1a8f0
diff --git a/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch b/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch
new file mode 100644
index 000000000000..0697a17fdc3f
--- /dev/null
+++ b/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch
@@ -0,0 +1,15 @@
+--- a/configure.in
++++ b/configure.in
+@@ -2,11 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_INIT(yasr, 0.6.9, mgorse@alum.wpi.edu)
+ AM_INIT_AUTOMAKE()
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AC_PROG_INSTALL
+ dnl Checks for libraries.
diff --git a/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch b/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch
new file mode 100644
index 000000000000..ccff0009e9eb
--- /dev/null
+++ b/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch
@@ -0,0 +1,25 @@
+--- a/yasr/yasr.h
++++ b/yasr/yasr.h
+@@ -306,22 +306,10 @@
+ extern void opt_say(int num, int flag);
+ extern void opt_set(int num, void *val);
+ extern void opt_queue_empty(int ll);
+ extern void opt_write(FILE * fp);
+ 
+-/* openpty.c prototypes */
+-extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
+-
+-/* cfmakeraw.c prototypes */
+-extern void cfmakeraw(struct termios *);
+-
+-/* login_tty.c prototypes */
+-extern int login_tty(int);
+-
+-/* forkpty.c prototypes */
+-extern int forkpty(int *, char *, struct termios *, struct winsize *);
+-
+ /* tbc - Would it be more efficient to ensure that "blank" grids always held
+    ascii 0x20 rather than ascii 0x00? */
+ #define y_isblank(ch) ((ch & 0xdf) == 0)
+ #define cblank(r, c)  ((win->row[r][c] & 0xdf) == 0)
+ #define ttssend(x)    if (x) tts_send(x, strlen(x))
diff --git a/app-accessibility/yasr/files/yasr-0.6.9-gettext019.patch b/app-accessibility/yasr/files/yasr-0.6.9-gettext019.patch
new file mode 100644
index 000000000000..89b2adfcd45f
--- /dev/null
+++ b/app-accessibility/yasr/files/yasr-0.6.9-gettext019.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -57,7 +57,7 @@ fi
+ changequote([,])dnl
+ 
+ AM_GNU_GETTEXT(external)
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.19])
+ 
+ AC_OUTPUT([ m4/Makefile 
+ Makefile
diff --git a/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch b/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch
new file mode 100644
index 000000000000..4c2a345df58b
--- /dev/null
+++ b/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch
@@ -0,0 +1,27 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,6 @@
+ 
+ SUBDIRS = \
+ 	$(yasr_DDIRS) \
+-m4 \
+ 	po
+ 
+ pkgdata_DATA = \
+@@ -25,4 +24,3 @@
+ 	README-fr \
+ 	README-ru
+ 
+-ACLOCAL_AMFLAGS = -I m4
+--- a/configure.in
++++ b/configure.in
+@@ -59,8 +59,7 @@
+ AM_GNU_GETTEXT(external)
+ AM_GNU_GETTEXT_VERSION([0.17])
+ 
+-AC_OUTPUT([ m4/Makefile 
+-Makefile
++AC_OUTPUT([ Makefile 
+ yasr/Makefile
+ acclogin/Makefile
+ po/Makefile.in
diff --git a/app-accessibility/yasr/metadata.xml b/app-accessibility/yasr/metadata.xml
new file mode 100644
index 000000000000..57bad5623af8
--- /dev/null
+++ b/app-accessibility/yasr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">yasr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
new file mode 100644
index 000000000000..b9e8c1573d6e
--- /dev/null
+++ b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="General-purpose console screen reader"
+HOMEPAGE="http://yasr.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND=""
+DEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.9-automake113.patch
+	"${FILESDIR}"/${PN}-0.6.9-gettext019.patch
+	"${FILESDIR}"/${PN}-0.6.9-gcc43.patch
+	"${FILESDIR}"/${PN}-0.6.9-remove-m4.patch
+)
+
+src_prepare() {
+	default
+	local x=/usr/share/gettext/po/Makefile.in.in
+	[[ -e $x ]] && cp -f $x po/ || die #330879
+
+	rm -r "${S}"/m4 || die
+
+	sed -i \
+	's:^\(synthesizer=emacspeak server\):#\1:
+	s:^\(synthesizer port=|/usr/local/bin/eflite\):#\1:
+	s:^#\(synthesizer=speech dispatcher\):\1:
+	s:^#\(synthesizer port=127.0.0.1.6560\):\1:' yasr.conf || die
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--datadir="${EPREFIX}"/etc \
+		$(use_enable nls)
+}
+
+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."
+}