Updated to support speakup-3.0.2

(Portage version: 2.1.5_rc6)

7 files changed, 24 insertions, 138 deletions

diff --git a/app-accessibility/speechd-up/ChangeLog b/app-accessibility/speechd-up/ChangeLog
index f6226ab1446a..b57dfacd9479 100644
--- a/app-accessibility/speechd-up/ChangeLog
+++ b/app-accessibility/speechd-up/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/speechd-up
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/ChangeLog,v 1.16 2007/05/30 04:05:27 williamh Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/ChangeLog,v 1.17 2008/04/24 13:31:49 williamh Exp $
+
+*speechd-up-0.4-r3 (24 Apr 2008)
+
+  24 Apr 2008; William Hubbs <williamh@gentoo.org> files/speechd-up.rc,
+  -speechd-up-0.3.ebuild, -speechd-up-0.3-r1.ebuild, -speechd-up-0.4.ebuild,
+  -speechd-up-0.4-r1.ebuild, -speechd-up-0.4-r2.ebuild,
+  +speechd-up-0.4-r3.ebuild:
+  Updated to support speakup-3.0.2.
 
 *speechd-up-0.4-r2 (30 May 2007)
 
diff --git a/app-accessibility/speechd-up/files/speechd-up.rc b/app-accessibility/speechd-up/files/speechd-up.rc
index 6e2fa1c6acf6..d4b9ec5a17a8 100644
--- a/app-accessibility/speechd-up/files/speechd-up.rc
+++ b/app-accessibility/speechd-up/files/speechd-up.rc
@@ -1,20 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/files/speechd-up.rc,v 1.6 2007/05/30 04:05:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/files/speechd-up.rc,v 1.7 2008/04/24 13:31:49 williamh Exp $
+
+SPEAKUPDEV=/dev/softsynth
+SPEAKUPDIR=/sys/module/speakup/parameters
 
 depend() {
 	use eflite festival
 	need speech-dispatcher
 }
 
-SPEAKUPDIR=/proc/speakup
-SPEAKUPDEV=/dev/softsynth
-
-load_speakup() {
+check_speakup() {
 	if [ ! -d ${SPEAKUPDIR} ]; then
-		eerror "Speakup is either not part of the kernel or the main"
-		eerror "part of it is built as a module."
+		eerror "Speakup is not currently running."
 		eerror "Please correct this before using speechd-up."
 		return 1
 	fi
@@ -22,12 +21,12 @@ load_speakup() {
 	if [ ! -c ${SPEAKUPDEV} ]; then
 		mknod ${SPEAKUPDEV} c 10 26
 	fi
-	echo sftsyn > ${SPEAKUPDIR}/synth_name
+	echo soft > ${SPEAKUPDIR}/synth
 	sleep 1
 }
 
 start() {
-	load_speakup || return 1
+	check_speakup || return 1
 	ebegin "Starting speechd-up"
 	start-stop-daemon --start --quiet --nicelevel ${NICELEVEL} --exec /usr/bin/speechd-up -- -d -t
 	eend $?
diff --git a/app-accessibility/speechd-up/speechd-up-0.3-r1.ebuild b/app-accessibility/speechd-up/speechd-up-0.3-r1.ebuild
deleted file mode 100644
index 47d5da2cd543..000000000000
--- a/app-accessibility/speechd-up/speechd-up-0.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/speechd-up-0.3-r1.ebuild,v 1.1 2006/08/28 03:30:49 williamh Exp $
-
-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="virtual/libc"
-RDEPEND=" app-accessibility/speech-dispatcher"
-
-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
-}
diff --git a/app-accessibility/speechd-up/speechd-up-0.3.ebuild b/app-accessibility/speechd-up/speechd-up-0.3.ebuild
deleted file mode 100644
index 0cd5cf327e1f..000000000000
--- a/app-accessibility/speechd-up/speechd-up-0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/speechd-up-0.3.ebuild,v 1.2 2007/04/28 16:22:37 swegener Exp $
-
-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="virtual/libc"
-RDEPEND="app-accessibility/eflite
-	 app-accessibility/speech-dispatcher"
-
-src_compile() {
-	econf || die
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	newinitd ${FILESDIR}/speechd-up.rc speechd-up
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	doinfo speechd-up.info
-}
diff --git a/app-accessibility/speechd-up/speechd-up-0.4-r2.ebuild b/app-accessibility/speechd-up/speechd-up-0.4-r2.ebuild
deleted file mode 100644
index d283978c3dce..000000000000
--- a/app-accessibility/speechd-up/speechd-up-0.4-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/speechd-up-0.4-r2.ebuild,v 1.1 2007/05/30 04:05:27 williamh Exp $
-
-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"
-
-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
-}
diff --git a/app-accessibility/speechd-up/speechd-up-0.4-r1.ebuild b/app-accessibility/speechd-up/speechd-up-0.4-r3.ebuild
index ecc11532efb5..a230d81bdcf3 100644
--- a/app-accessibility/speechd-up/speechd-up-0.4-r1.ebuild
+++ b/app-accessibility/speechd-up/speechd-up-0.4-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/speechd-up-0.4-r1.ebuild,v 1.2 2007/03/03 23:09:58 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/speechd-up-0.4-r3.ebuild,v 1.1 2008/04/24 13:31:49 williamh Exp $
 
 IUSE=""
 
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=app-accessibility/speech-dispatcher-0.6"
+RDEPEND="${DEPEND}
+	>=app-accessibility/speakup-3.0.2"
 
 src_compile() {
 	econf || die
@@ -23,8 +25,8 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	newinitd ${FILESDIR}/speechd-up.rc speechd-up
-	newconfd ${FILESDIR}/speechd-up.confd speechd-up
+	newinitd "${FILESDIR}"/speechd-up.rc speechd-up
+	newconfd "${FILESDIR}"/speechd-up.confd speechd-up
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	doinfo speechd-up.info
 }
diff --git a/app-accessibility/speechd-up/speechd-up-0.4.ebuild b/app-accessibility/speechd-up/speechd-up-0.4.ebuild
deleted file mode 100644
index 28a7d8e5a83c..000000000000
--- a/app-accessibility/speechd-up/speechd-up-0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/speechd-up-0.4.ebuild,v 1.1 2006/11/04 16:58:49 williamh Exp $
-
-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="virtual/libc"
-RDEPEND=">=app-accessibility/speech-dispatcher-0.6"
-
-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
-}