gentoo resync : 05.04.2019

24 files changed, 251 insertions, 508 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 5f7735519627..a9a141d04df4 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 4d2a604fe038..81f03eae0be0 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,18 +1,5 @@
-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.24.1.tar.xz 308576 BLAKE2B 92b96c54cd5a2dbd8a3dddbaa3188b3396ef8e4631cc9438e4ba57da27672d509babae3415c66d2c6afc74855ff0536d4cc6f24a8cecf66478021d350b3572a1 SHA512 5dbc186c7ea4f7f34aa0acaf90f683e549162caa274ba5b5818ae9992b52f1b475923d9818870978e87e3dacdf1018db31810d2d53b39bb4f068bcb64a423f23
 DIST at-spi2-atk-2.26.2.tar.xz 322800 BLAKE2B 108a01fd8c16816d9953ad42721080dd6dcb9f75c95c412387d7f54920998c66eb5855eb859e8e00096a47b387d05779691887a7717d31f4c70681d69a9c8266 SHA512 f938b8e2b999fcdfa13e9433bd13c39430bae2ceae0c664a24caccc6af522947bf73de02de3c359807f5370a85961193df2ba24b193b60b915c61828ea747bb2
-DIST at-spi2-atk-2.30.0.tar.xz 94824 BLAKE2B 65f8abb034a610e8aaa72c4d0e3c93fa03f6737cbf8bff28c885c654ba3fe98e8750e6398326e47069f12d33f75eae729cbafdfca31a3a0ab7b233ba3f8a4c58 SHA512 d7a02c347e31d78da81455cff77b44ab6d9e11add8d9457fba6a6b354cef731ab73e8a83060c150f3ef3d5191bfbc649618360a61c9826816b1aafb3e2bea7d5
 DIST at-spi2-atk-2.30.1.tar.xz 94812 BLAKE2B fe3ef77e749bef2300219fe32586ac0b871d06dce708ce8b7b57356a1fa17041c3f7b788e3e6d6b5f89dc97c3e8d43a9d1eb897ed8fbaac954f042421aef68b6 SHA512 862cccb65d2a8a7df4e899e4f53742535389a0efa0a75c936b52e68690c07e206b19d8308f0910cddb71bda0d803012d613f6959329ae43c411d1314062b7018
-EBUILD at-spi2-atk-2.24.1.ebuild 1295 BLAKE2B 71f951fbfea338bc0b02a47e421f0be5c3b4f6596554c90f009a8e4798c626ce54e00be1574e94fa2fd12f825978a4a3ff88e49df80e4afe548014a556f003aa SHA512 bfccd577a9cd84257478d0ac1dfa9df89094f38dc36bbe45657ba8603a398a07097e316f386bf337e6fb1d545489f58d26303af73eaacaa23b1c42ae00919d08
 EBUILD at-spi2-atk-2.26.2.ebuild 1045 BLAKE2B c31f716ec099bf46d0932c4aec785a85124882d69baa007345e1837e28521fc0c0c796d3373e42c70270e3eb401e398b71eb68acd47cfad7ac2f54d735de18bb SHA512 91e1ecd6ad2d751a0d1f73cd149767b0e03921965d59ba7722147547d0d55204dca5ecba251e761c95a42de586932e6be8167ed1b65579fa0b79d7ba91e9a676
-EBUILD at-spi2-atk-2.30.0.ebuild 1008 BLAKE2B d754cf235c1b3f83b867525961764250409bc63bca72e9ec30e5d952456bf5100c399619cbb98b2d178090b0fcf863235080bec965f0bb4b35abcc70283c6f0f SHA512 44b6a15add43d9579d56573edec73d0e0a02bdbffb0cdf6a06acfadaf33f87d894dcf4521f6388ee278d4ceb7ef03e63eade9747c86f6bbab9357e27aaec1a90
 EBUILD at-spi2-atk-2.30.1.ebuild 1008 BLAKE2B d754cf235c1b3f83b867525961764250409bc63bca72e9ec30e5d952456bf5100c399619cbb98b2d178090b0fcf863235080bec965f0bb4b35abcc70283c6f0f SHA512 44b6a15add43d9579d56573edec73d0e0a02bdbffb0cdf6a06acfadaf33f87d894dcf4521f6388ee278d4ceb7ef03e63eade9747c86f6bbab9357e27aaec1a90
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
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
deleted file mode 100644
index cf70707dd345..000000000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 ~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.30.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.0.ebuild
deleted file mode 100644
index 3af77c5c498a..000000000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson multilib-minimal virtualx xdg
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.30.0[${MULTILIB_USEDEP}]
-	>=app-accessibility/at-spi2-core-2.30.0[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-multilib_src_configure() {
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-multilib_src_install() {
-	meson_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
deleted file mode 100644
index 7086ede8554c..000000000000
--- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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
deleted file mode 100644
index 7363a622e76d..000000000000
--- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-document.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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
deleted file mode 100644
index ae8084c2cc4b..000000000000
--- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-editable-text.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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
deleted file mode 100644
index 1b6be6d4b1f3..000000000000
--- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-hypertext.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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
deleted file mode 100644
index b678ac250745..000000000000
--- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-image.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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
deleted file mode 100644
index 2fc173334492..000000000000
--- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-selection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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
deleted file mode 100644
index 9d6cb502d74c..000000000000
--- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-table.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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
deleted file mode 100644
index ab72522afd53..000000000000
--- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-text.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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
deleted file mode 100644
index 83172d5f8b8a..000000000000
--- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-value.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index c810ae365761..b5188c848cc5 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,11 +1,7 @@
 AUX 2.26.2-fix-inverted-logic.patch 858 BLAKE2B 23461bae3252ce92c767f6d1f4375d5fa40f2b64a925d3be9f8593fa59524363ace55919c2aef8dc022aee6a6079b7afef7a438ab47b24f8a200387c873593f3 SHA512 a1fa03e003691ccc5c774dec73626efc09b0bd019a23596a7d8aa0c79982249490d7e39be1d1c312b324d49f7855e8920db66475e1886c28c82cc8e9a3cbe6bb
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
-DIST at-spi2-core-2.24.1.tar.xz 452440 BLAKE2B 2e3e262d507dadbdb8fc5bb1bd60d3dbe8a9c2946228b6dc551d0a9564684d96b1b6cbe29849c1d846b3106b5444a2c6880a10825ba20cca87893f6a52815023 SHA512 e7f354a90204f12d4e464a6b4e4cb27141af3715d7c5ec253bdd2ebe65bc7d191ae7b775c45470a1bd1fe2c0accdd4e84feeb5e1eb1a6c05f3e5e734371027be
 DIST at-spi2-core-2.26.2.tar.xz 494484 BLAKE2B 0c67cea9c0107fb6503a933de134eb662f192ae2a98734bde1b0629da151476858720d2dcb1791a00a44b61ae2ead945178fba659f88303c552567d7f3f9817b SHA512 6a8e158e30c37ce475467b6634aff046a318875271966d7bfa3e56052d0cd26cd37435d0b9ae14f079542b8b3e76088da5bd50ed39eb39f3f40394c55ed3f255
-DIST at-spi2-core-2.30.0.tar.xz 188016 BLAKE2B 07e60fdcdf129f807d247bfc02d3d2f11796e21ce94f5149cb2970e13a02ec77c5ef05f8fcb8851d9bd83c1c2ab4c72868980c570c27e63704ad2263e527702e SHA512 f875738fd8a30dc8eeebb0b1a2631d7ef03e93db4dd8475cddb91c173a4ca7b473149ccb4fa2480df53555654612aa02f571461160e8931f50fda10b6a8b8c21
 DIST at-spi2-core-2.30.1.tar.xz 188056 BLAKE2B 8686a5bd0a359d575d052f5c42cec76bbd88f7d681decbcec92ef163d5f59dac4e642b544b928e141739479b9e349868c0f5ecb7d42a29e9b32615f27a852e52 SHA512 c8b6a2ae5f96ce7d8c1fd32c9fec861148ceff631069b417296425fe6e2ae15198628826e13a72e018871d38e12b1128aa299edcc45eaf3eb7bbff83774361cd
-EBUILD at-spi2-core-2.24.1.ebuild 1761 BLAKE2B ae0738ed2eaabbd4ba26d60181d1c4068ec879c1147269ea8204ac5afce022d629a10131b5a9dcd7e64cf0fdfc1d371a19dd0d9fb33f80cb82799d37b2b8c1d4 SHA512 ec0fb7f620f1ef2d4abbe4772f199f481d0b475a1f0e5f4af9222c29d1579254ae70932bef5195ce377932d4d1b70e04a090d691aae01a7054cf8b57d89c4892
 EBUILD at-spi2-core-2.26.2.ebuild 1606 BLAKE2B 19e358388142aaf80fa64e30ab819a3021a6a37b089822d63f6524ed47450b1660c81a815db0632d8d8bf311feed2db5a3b69d127ecbb283c0be81f9b81b81af SHA512 7236f8967e3c733094c89fdb028cf9dbcf903778e235f1f40c0c01f64551e788f278b08f057c56f18ac50aa4669a002b5e851d132708069c47925eacc3b1ea30
-EBUILD at-spi2-core-2.30.0.ebuild 1527 BLAKE2B 0e7651e7f85d388c2493feec5f71c29d9d7e4d471eb380431bb2d524f81f0f00aa7df5da83930b4d895814281e15271243f6ee118a64144cf68b577e174172c0 SHA512 6b772e21de42a846912e618b2c9a2e5cb95fb5d3fe8005622e2015452e03db46da055dd4c8c9e6b70ed21d3d6664c9dde7adab4d800f912ff39414cba9a353b7
 EBUILD at-spi2-core-2.30.1.ebuild 1527 BLAKE2B 0e7651e7f85d388c2493feec5f71c29d9d7e4d471eb380431bb2d524f81f0f00aa7df5da83930b4d895814281e15271243f6ee118a64144cf68b577e174172c0 SHA512 6b772e21de42a846912e618b2c9a2e5cb95fb5d3fe8005622e2015452e03db46da055dd4c8c9e6b70ed21d3d6664c9dde7adab4d800f912ff39414cba9a353b7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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
deleted file mode 100644
index 7ad84728a78f..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 ~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.30.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.30.0.ebuild
deleted file mode 100644
index 2e152be27993..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.30.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson multilib-minimal systemd virtualx xdg
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Denable_docs=$(multilib_native_usex gtk-doc true false)
-		-Denable-introspection=$(multilib_native_usex introspection)
-		-Denable-x11=$(usex X)
-		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 1828c69f1a51..71a6af3d408e 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -2,8 +2,11 @@ AUX brltty-5.2-fix-ldflags.patch 2168 BLAKE2B c75da04cfb57b550634a18f67c81fb0fef
 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-6.0-udev.patch 1033 BLAKE2B d5220b3351af4191ab78f122265296ed802209d0320ebde04c3e947ba736132f5c16db8be18f3e1964c39fe61aadb535d4f84f75d070f68caeea4ca3b3c3ee05 SHA512 0512fbfcd9e9085e37b3b935f8f5a002e82fb514aa56ad807819a39d9da16fbf3bc5f45540ae1ca754160a81957f62d5c5bc8acc6295ee1af971aa9acf5b915a
+AUX brltty.rc 241 BLAKE2B 873b1344cc6dee3aa6272d9c8857b58a751200e77d7fa0d96f9ff992f2825267503db5fc11ea07d7064a0fa4fe78af637c41ced04212d063efb92183bb936c9f SHA512 d3b91fddbfa61e212537c58444585262d2781fa97ff7f8f4e9ab3c3ad937c680b230d805f7541e2701050e2b001d7d11f7e5937476568a3459d73bb36026f847
 AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+DIST brltty-6.0.tar.xz 2879976 BLAKE2B 31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265 SHA512 07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06
 EBUILD brltty-5.2-r1.ebuild 5222 BLAKE2B c08dc651756c02ebbe30b3d55989c814ce9b049c08f5f775f2f2a2d369cbeb5681cf8eebbad09fa66825c391e94f54c56996bdbbfb2b333e4e8e9560b872e932 SHA512 3456c6d7bb6badda1f2cce1e6d6edaae677cd2d4eac62d3a5e67c9ad5a98b0383fed0d5e9fa6b65a4c17b853da26824806d828fc4861a255be32b9f89b43a006
-MISC metadata.xml 1502 BLAKE2B 75f1750b615a2d6d022ed682f65ce6d0d45908e0d5724a162220a915371ae357cd904b0c09083153fb0f07facbc89024604fe86e3386e58a7d409a82f3865835 SHA512 337bf98d4e2ffac2ea0721a042bd31958809de5089090b0a79d73457f700d57fb8ffe637f4ad9e896992e98a13fdbe1ac9a3f7758d8ad2703334db8edfb7c32c
+EBUILD brltty-6.0-r1.ebuild 5553 BLAKE2B 315450e69be151d9d1db7cef82aa58d3449496324b243221d86fbbb37cb84ae889191d49c54d1cf228c9780a5a81f49031b900748dc5ac9b7de3213a55e5f9c3 SHA512 d4d0582f8360a932fb06222b834a517ff071ef5a7f4630ca3e003d6d707cfa49c627d713bd17fef88f53237fd49a63f5d6f0bc13dcae2371c790defd55e9d228
+MISC metadata.xml 1581 BLAKE2B dad24f7b2a02b83a33a5cff8513d22bb9977d2293d1c549347c5ea9c19166f771523c8d442f4c10e30f17827e2b501802ef545b528c16841faa50962644e5c30 SHA512 bd04635109012b7b2e1a605e6538dba54781cfa033b9fac49b1be1364eac02e9bb2ec55b4025a9a74477d7183cea89e4261db4ee3b9cc29eefc335b7b2939ccc
diff --git a/app-accessibility/brltty/brltty-6.0-r1.ebuild b/app-accessibility/brltty/brltty-6.0-r1.ebuild
new file mode 100644
index 000000000000..718a81cf76d6
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.0-r1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+FINDLIB_USE="ocaml"
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+	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 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+		java louis +midi ncurses nls ocaml +pcm policykit python
+		usb systemd +speech tcl xml X"
+REQUIRED_USE="doc? ( api )
+	java? ( api )
+	ocaml? ( api )
+	python? ( api ${PYTHON_REQUIRED_USE} )
+	tcl? ( api )"
+
+COMMON_DEP="
+	app-accessibility/at-spi2-core:2
+	dev-libs/libpcre2[pcre32]
+	sys-apps/dbus
+	bluetooth? ( net-wireless/bluez )
+	gpm? ( >=sys-libs/gpm-1.20 )
+	iconv? ( virtual/libiconv )
+	icu? ( dev-libs/icu:= )
+	louis? ( dev-libs/liblouis )
+	midi? ( media-libs/alsa-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	pcm? ( media-libs/alsa-lib )
+	policykit? ( sys-auth/polkit )
+	python? ( ${PYTHON_DEPS} )
+	speech? (
+		app-accessibility/espeak
+		app-accessibility/flite
+		app-accessibility/speech-dispatcher
+	)
+	systemd? ( sys-apps/systemd )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	usb? ( virtual/libusb:0 )
+	xml? ( dev-libs/expat )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
+DEPEND="${COMMON_DEP}"
+BDEPEND="
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.4 )
+	nls? ( virtual/libintl )
+	python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+	${COMMON_DEP}"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0-udev.patch
+	"${FILESDIR}"/${PN}-5.2-respect-AR.patch
+)
+
+src_prepare() {
+	default
+
+	java-pkg-opt-2_src_prepare
+
+	# We run eautoconf instead of using eautoreconf because brltty uses
+	# a custom build system that uses autoconf without the rest of the
+	# autotools.
+	eautoconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	tc-export AR LD PKG_CONFIG
+
+	export JAVAC=""
+	export JAVA_JNI_FLAGS=""
+	if use java; then
+		export JAVA_HOME="$(java-config -g JAVA_HOME)"
+		export JAVAC_HOME="${JAVA_HOME}/bin"
+		export JAVA_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+		export JAVAC="$(java-pkg_get-javac) -encoding UTF-8 $(java-pkg_javac-args)"
+	fi
+
+	# override prefix in order to install into /
+	# braille terminal needs to be available as soon in the boot process as
+	# possible
+	# Also override localstatedir so that the lib/brltty directory is installed
+	# correctly.
+	# Disable stripping since we do that ourselves.
+	local myconf=(
+		--prefix="${EPREFIX}"/
+		--localedir="${EPREFIX}"/usr/share/locale
+		--includedir="${EPREFIX}"/usr/include
+		--localstatedir="${EPREFIX}"/var
+		--disable-stripping
+		--with-install-root="${D}"
+		--with-writable-directory="${EPREFIX}"/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_enable louis liblouis)
+		$(use_with midi midi-package)
+		$(use_enable nls i18n)
+		$(use_enable ocaml ocaml-bindings)
+		$(use_with pcm pcm-package)
+		$(use_enable policykit polkit)
+		$(use_enable python python-bindings)
+		$(use_enable speech speech-support)
+		$(use_with systemd service-package)
+		$(use_enable tcl tcl-bindings)
+		$(use_enable xml expat)
+		$(use_enable X x)
+		$(use_with bluetooth bluetooth-package)
+		$(use_with ncurses curses)
+		$(use_with usb usb-package) )
+
+	econf "${myconf[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+src_compile() {
+	emake JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}"
+
+	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
+		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/rules 70-brltty.rules
+	newinitd "${FILESDIR}"/brltty.rc brltty
+	systemd_dounit Autostart/Systemd/brltty@.service
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	if use api ; then
+		local libdir="$(get_libdir)"
+		mkdir -p "${ED}"/usr/${libdir}/ || die
+		mv "${ED}"/${libdir}/*.a "${ED}"/usr/${libdir}/ || die
+		gen_usr_ldscript libbrlapi.so
+	fi
+
+	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 "${ED}/run/brltty" || die
+	rmdir "${ED}/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-6.0-udev.patch b/app-accessibility/brltty/files/brltty-6.0-udev.patch
new file mode 100644
index 000000000000..e53b7a6aa664
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-6.0-udev.patch
@@ -0,0 +1,27 @@
+--- brltty-6.0/Autostart/Udev/rules
++++ brltty-6.0/Autostart/Udev/rules
+@@ -276,20 +276,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
index 0bc6c6c5375b..100dd29b778a 100644
--- a/app-accessibility/brltty/files/brltty.rc
+++ b/app-accessibility/brltty/files/brltty.rc
@@ -1,10 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command=/bin/brltty
 pidfile=/var/run/brltty.pid
-command_args="-P $pidfile -q"
+command_args="-P ${pidfile} -q"
 
 depend() {
 	before *
diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index 53e30d6595d9..b05083dfd091 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -10,6 +10,7 @@
   <flag name="beeper">support the console tone generator</flag>
   <flag name="contracted-braille">support in-line contracted braille</flag>
   <flag name="fm">support for the sound card synthesizer</flag>
+  <flag name="louis">Use braille tranlator <pkg>dev-libs/liblouis</pkg></flag>
   <flag name="midi">support the musical instrument digital interface</flag>
   <flag name="pcm">support for sound card digital audio</flag>
   <flag name="speech">speech support</flag>
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 9a991cce148c..6eda4c4b38db 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,9 +1,5 @@
 DIST orca-3.24.0.tar.xz 2391740 BLAKE2B 1f294bc8e1c593690c511f0d7d660230c420b33de59c8b1e78ee8d7b16f973b9fff9ce4d656de7202ffd5789ae3604d030c442e8c35eecfd5c5dca058031e996 SHA512 9aa65b534f69bb4a1b800e715776416843ac3756ec1267feca3c66476e34e54f6744f70c0f8ac8868a009d38b6cc165267268491a9ad29ebbd3601dba09d424c
-DIST orca-3.26.0.tar.xz 2407368 BLAKE2B e04a891a2f2478b5b5f556a423c073f8c64de78d1f744d41d292cd783edc2ba0e57824ba3afb1f1b58f62503a204003d97e1fb652df307f34ae6838bce44389c SHA512 ca3a60b36d9528cf424e01d7a1aad75a8e14e46a6c93330b8e439bd44832dbc44897657b8da3c583501ce8c835f589209f1b3969ab110766cb1dc099defd2445
-DIST orca-3.28.2.tar.xz 2460112 BLAKE2B 7c577f639c7a37e5bae755bab32b753d0f2a9eef49872a9b0f3805ad33d8dd8ded7bdfda8239662eec87dde1b0d935634628709fa18e0b0db223550ee478ad59 SHA512 3a93c39f9245890d134fa96e58bdfdb273600730be6fedd8590628cf8b1740a6caa7c4fb180c1da156e179b6e0cc352f6f5aacfa8eaed3e306f399bd1fe3cc43
 DIST orca-3.30.2.tar.xz 2493112 BLAKE2B 06ac902f67c66d5098be1829aa7cb7a160663a3a713d407a5245a95215c309f3b374937e4b70acbf9750f6e0e270ed8ab5516ca3cb6b0a19f347ee72a01a325b SHA512 146a132ce06f7f36d6d9397c507ea767be5df6c47a5c7485c35c325868ebc0b3ff7b3653572be82f6d5ed937033cd6d68a08700056a63e5691aed4c9171b3485
 EBUILD orca-3.24.0.ebuild 1878 BLAKE2B f3831feb7b8d95a3c4291b0a97048f58baea95ffb94793de3c25b8ff5ae4944c5a42297efb3b6802cda6e8ccdd29f15855a8520b8b3a847cf95f34d835a9470c SHA512 6437a256bf980f50cc766029959400c829b6a48f8c10b89a377b42e98cac3cade2022d7dba836512dc7af00a702d0b69b92eae21adbec53a03c05f0744adb01f
-EBUILD orca-3.26.0.ebuild 1884 BLAKE2B 75ee6dcf8f42da7a9ed5fd1cbe416e612811041fa6415a7d6f579f1ca778f048ef940559a297dcdb3326e403c53d755f00775820a2b79a853c3cd417f95e2c4a SHA512 651658f7a28f014727c41f5c35a5d123030ee129ff405bdbda80d6bca40c8b81505788135a6717b672db0b9df7369385a1d10b85c31379c7a61144026f8bca18
-EBUILD orca-3.28.2.ebuild 1453 BLAKE2B ae0cabd62fd682f3be751598ae0b45118e7c195313640798585bac2cf128ecf04e55462718a12828e8696af69a215382cbfb244664cdb60ab09fe9afd405294c SHA512 247df2a6e648ce51e4dccda33c0b9660aaf971af5a236b082a432dcd38567fbb274128e8745ac857805ba21b9437f58edd1635a153a36053613dba2d538d9db1
 EBUILD orca-3.30.2.ebuild 1453 BLAKE2B b37de0e2dfa549b4d37b0d248d3213e88eaf0c2daaa36b8a92e49831fce0e0e51ff1fdc26be112577d141e8e3402e8e5493ccc18d544a8039ee9cbb201c8dcb8 SHA512 934d8469512d91c8fa37ceff56c22e395ea127362d25fba142cf16fe08cf9035fe8d8f2cff8f10adb9494e7d9f40af89726c19812f99b94c20e91549e86f3af8
 MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
diff --git a/app-accessibility/orca/orca-3.26.0.ebuild b/app-accessibility/orca/orca-3.26.0.ebuild
deleted file mode 100644
index 88ecd17c1e56..000000000000
--- a/app-accessibility/orca/orca-3.26.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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.26:2
-	>=app-accessibility/at-spi2-core-2.26:2[introspection]
-	>=dev-libs/atk-2.26
-	>=dev-libs/glib-2.28:2
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.18: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-2.26[${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/orca/orca-3.28.2.ebuild b/app-accessibility/orca/orca-3.28.2.ebuild
deleted file mode 100644
index 350d127290f1..000000000000
--- a/app-accessibility/orca/orca-3.28.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.28:2
-	>=app-accessibility/at-spi2-core-2.28:2[introspection]
-	>=dev-libs/atk-2.28
-	>=dev-libs/glib-2.28:2
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.18: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-2.26[${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_configure() {
-	gnome2_src_configure \
-		$(use_with braille liblouis)
-}