14 files changed, 5 insertions, 251 deletions
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
index 1a871d82ec03..ea2dba3fcc63 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
@@ -13,7 +13,7 @@ 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"
+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="
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
index f0af8132a3a7..ab61bf9f2144 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
@@ -14,7 +14,7 @@ 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"
+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
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 9ed26fa7a527..969fc082b6da 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,2 +1,2 @@
-DIST caribou-0.4.18.1.tar.xz 410548 SHA256 aefadf125a647fc68696f4134e99ee43dca121da5de8e1edf6eab5664a9f3150 SHA512 226ca64fafb4e7c5e38ba714059e9e6ef7bbfce04160b98884fb299dc465e4f7d278033477f2539ba64fe9c39c62448903a8273dee0315bff81dbbe107d665d5 WHIRLPOOL 1310f79944ee547535a04563dd7910dfff2db400faf6c28685deecc062432759a24f0587f875d88cc87ddcdcd4c249a83abde0222ffcab4a24afe91dc9a55cdb
 DIST caribou-0.4.19.tar.xz 412328 SHA256 2f0bd0c14c5f94cf5ac3a7627018919addf7a054ac84aaa8e62356957c175a44 SHA512 ae8fd278612778eae35810eee199dc9c64b45340de1459cc71eb5806ebc14ddd05e7e0e5464e2976d0160a50c6d76656a7ed0362bfd79eecdc09de1fc78b6de1 WHIRLPOOL db26dbc91e231558712bd33f57f857de660cc17f5c7c6c8c8fd2687807b75d5784df8654e0328c35a4e06902ec5a628609b8c9dd2d568a2afcb59c2f12c081a8
+DIST caribou-0.4.20.tar.xz 415148 SHA256 3a6664d5698c2b62a6c1c115743630d339ac237a7324bb354f2e5d55b4bb50d9 SHA512 e72a18462268278e0c07f178085eeff0e65ece6a9bf2f667c4ca66a66d173b39c68843c537ba6e8bd056c21575be592cece5f4f752f324c7f0db44fe28c45504 WHIRLPOOL e718ab799dcb8474c813e22fae1445d5a299d6c14dfa880cbe3da55793db867a8e5b5ef442a99e184a75a5b6fbf4d5719821a901d75ba69dba74db1d3473c437
diff --git a/app-accessibility/caribou/caribou-0.4.18.1.ebuild b/app-accessibility/caribou/caribou-0.4.20.ebuild
index 77a349079ddd..4804eb814073 100644
--- a/app-accessibility/caribou/caribou-0.4.18.1.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.20.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-accessibility/orca/orca-3.18.2.ebuild b/app-accessibility/orca/orca-3.18.2.ebuild
index 090e21a8f091..7d2b6adcbe24 100644
--- a/app-accessibility/orca/orca-3.18.2.ebuild
+++ b/app-accessibility/orca/orca-3.18.2.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-accessibility/speakup/Manifest b/app-accessibility/speakup/Manifest
deleted file mode 100644
index e62a838af6bd..000000000000
--- a/app-accessibility/speakup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST speakup-3.1.6_p201011120508.tar.bz2 128355 SHA256 29a75654d18a6b5d3067142acd6e33e6ba91453cff3101d86f4ba7af7f3e1e1b SHA512 b15245635d42dc1798734031401c644a55484c299fcc7368a80e2b1ef4c4cdea962e0d1c15bee3ef0f1dab1212bb60a0cd6124d656bf9ad46875ec1d95d8cf88 WHIRLPOOL 7e0c4a9674ac46cf432a0e3c65c291610268dc9b5345edc008ba0c4f15ad6a38c3acb0be04ce3f29e6038de56c8e8fccbe1c92b3615f9ccf572f5adb9d4062fd
diff --git a/app-accessibility/speakup/metadata.xml b/app-accessibility/speakup/metadata.xml
deleted file mode 100644
index 8fb4aba1043e..000000000000
--- a/app-accessibility/speakup/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/speakup/speakup-3.1.6_p201011120508.ebuild b/app-accessibility/speakup/speakup-3.1.6_p201011120508.ebuild
deleted file mode 100644
index 4f5e7693e502..000000000000
--- a/app-accessibility/speakup/speakup-3.1.6_p201011120508.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://linux-speakup.org/speakup.git"
-	vcs=git-2
-else
-	SRC_URI="ftp://linux-speakup.org/pub/speakup/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-inherit $vcs linux-mod
-
-DESCRIPTION="The speakup linux kernel based screen reader"
-HOMEPAGE="http://linux-speakup.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="modules"
-
-S="${WORKDIR}/${PN}-3.1.6"
-MODULE_NAMES="speakup(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_acntpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_acntsa(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_apollo(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_audptr(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_bns(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_decext(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_decpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dectlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dtlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dummy(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_keypc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_ltlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_soft(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_spkout(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_txprt(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)"
-BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
-BUILD_TARGETS="clean all"
-
-src_prepare() {
-	use modules && cmd=die || cmd=ewarn
-	if ! kernel_is 2 6 36; then
-		$cmd "This version of speakup requires kernel version 2.6.36"
-	fi
-}
-
-src_compile() {
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	use modules && linux-mod_src_install
-	dodoc Bugs.txt README To-Do
-	dodoc drivers/staging/speakup/DefaultKeyAssignments
-	dodoc drivers/staging/speakup/spkguide.txt
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	elog "You must set up the speech synthesizer driver to be loaded"
-	elog "automatically in order for your system to start speaking"
-	elog "when it is booted."
-	if has_version "<sys-apps/baselayout-2"; then
-		elog "this is done via /etc/modules.autoload.d/kernel-2.6"
-	else
-		elog "This is done via /etc/conf.d/modules."
-	fi
-}
diff --git a/app-accessibility/speakup/speakup-9999.ebuild b/app-accessibility/speakup/speakup-9999.ebuild
deleted file mode 100644
index 11d7a80a69ac..000000000000
--- a/app-accessibility/speakup/speakup-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://linux-speakup.org/speakup.git"
-	vcs=git-2
-else
-	SRC_URI="ftp://linux-speakup.org/pub/speakup/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit $vcs linux-mod
-
-DESCRIPTION="The speakup linux kernel based screen reader"
-HOMEPAGE="http://linux-speakup.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="modules"
-
-MODULE_NAMES="speakup(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_acntpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_acntsa(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_apollo(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_audptr(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_bns(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_decext(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_decpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dectlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dtlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dummy(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_keypc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_ltlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_soft(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_spkout(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_txprt(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)"
-BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
-BUILD_TARGETS="clean all"
-
-src_prepare() {
-	use modules && cmd=die || cmd=ewarn
-	if kernel_is lt 2 6 36; then
-		$cmd "Speakup requires at least kernel version 2.6.36"
-	fi
-}
-
-src_compile() {
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	use modules && linux-mod_src_install
-	dodoc Bugs.txt README To-Do
-	dodoc drivers/staging/speakup/DefaultKeyAssignments
-	dodoc drivers/staging/speakup/spkguide.txt
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	elog "You must set up the speech synthesizer driver to be loaded"
-	elog "automatically in order for your system to start speaking"
-	elog "when it is booted."
-	if has_version "<sys-apps/baselayout-2"; then
-		elog "this is done via /etc/modules.autoload.d/kernel-2.6"
-	else
-		elog "This is done via /etc/conf.d/modules."
-	fi
-}
diff --git a/app-accessibility/speechd-up/Manifest b/app-accessibility/speechd-up/Manifest
deleted file mode 100644
index 9c72956a6277..000000000000
--- a/app-accessibility/speechd-up/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST speechd-up-0.4.tar.gz 395659 SHA256 03ebc5c05eedebbeb86c561a4708b90deecacfeb7aecd4a8b93ea3b3419d202a SHA512 17f67049e9dbd6986b1e068b6ebb9baf250990d6b3d41e7f5c5f887051e876d48972fe7881d309696c8ed57093297a9a1479046ae97da2428615d566ce51d383 WHIRLPOOL cd42a0b6c2eb9c2746c47f7a8564ccf55e033857886528bbc67d7e40fa1dc5031cf1323b791fc2fc7defea092dd2a36e15c7bb05f0c083573b7ba85769f8c0b9
diff --git a/app-accessibility/speechd-up/files/speechd-up.confd b/app-accessibility/speechd-up/files/speechd-up.confd
deleted file mode 100644
index 2808a6c1b80a..000000000000
--- a/app-accessibility/speechd-up/files/speechd-up.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/speechd-up: config file for /etc/init.d/speechd-up
-
-# Niceness level at which to run speechd-up
-
-NICELEVEL=-5
-
diff --git a/app-accessibility/speechd-up/files/speechd-up.rc b/app-accessibility/speechd-up/files/speechd-up.rc
deleted file mode 100644
index 76a58506e1da..000000000000
--- a/app-accessibility/speechd-up/files/speechd-up.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SPEAKUPDEV=/dev/softsynth
-SPEAKUPDIR=/sys/module/speakup/parameters
-
-depend() {
-	use eflite festival
-	need speech-dispatcher
-}
-
-check_speakup() {
-	if [ ! -d ${SPEAKUPDIR} ]; then
-		eerror "Speakup is not currently running."
-		eerror "Please correct this before using speechd-up."
-		return 1
-	fi
-
-	if [ ! -c ${SPEAKUPDEV} ]; then
-		mknod ${SPEAKUPDEV} c 10 26
-	fi
-	echo soft > ${SPEAKUPDIR}/synth
-	sleep 1
-}
-
-start() {
-	check_speakup || return 1
-	ebegin "Starting speechd-up"
-	start-stop-daemon --start --quiet --nicelevel ${NICELEVEL} --exec /usr/bin/speechd-up -- -d -t
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping speechd-up"
-	start-stop-daemon --stop --quiet --pidfile /var/run/speechd-up.pid
-	eend $?
-}
diff --git a/app-accessibility/speechd-up/metadata.xml b/app-accessibility/speechd-up/metadata.xml
deleted file mode 100644
index 8a688c3b0195..000000000000
--- a/app-accessibility/speechd-up/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/speechd-up/speechd-up-0.4-r3.ebuild b/app-accessibility/speechd-up/speechd-up-0.4-r3.ebuild
deleted file mode 100644
index 26494f4456b2..000000000000
--- a/app-accessibility/speechd-up/speechd-up-0.4-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-IUSE=""
-
-inherit eutils
-
-DESCRIPTION="Interface between speakup and speech-dispatcher"
-HOMEPAGE="http://www.freebsoft.org/speechd-up"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-up/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-DEPEND=">=app-accessibility/speech-dispatcher-0.6"
-RDEPEND="${DEPEND}
-	>=app-accessibility/speakup-3.0.2"
-
-src_compile() {
-	econf || die
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}"/speechd-up.rc speechd-up
-	newconfd "${FILESDIR}"/speechd-up.confd speechd-up
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	doinfo speechd-up.info
-}