diff --git a/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild b/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
index 556f5a80588f9..bad87d3aa3fa9 100644
--- a/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
@@ -20,7 +20,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-2+ GPL-3+"
@@ -30,6 +30,7 @@ IUSE="+espeak"
 # Usually need := dep with tcl anyway but in particular, it's needed
 # here as we do a version check in src_compile and bake in the results.
 DEPEND="
+	app-emacs/hydra
 	dev-lang/tcl:=
 	espeak? ( app-accessibility/espeak-ng )
 "
@@ -52,7 +53,7 @@ src_prepare() {
 	elisp_src_prepare
 
 	# A Make rule will regenerate it.
-	rm ./lisp/emacspeak-loaddefs.el || die
+	rm -f ./lisp/emacspeak-loaddefs.el || die
 }
 
 src_configure() {
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index 13b3d58ac497b..bad87d3aa3fa9 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -20,7 +20,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-2+ GPL-3+"
@@ -30,6 +30,7 @@ IUSE="+espeak"
 # Usually need := dep with tcl anyway but in particular, it's needed
 # here as we do a version check in src_compile and bake in the results.
 DEPEND="
+	app-emacs/hydra
 	dev-lang/tcl:=
 	espeak? ( app-accessibility/espeak-ng )
 "