Rev bump for #179290.

Package-Manager: portage-2.1.2.7

5 files changed, 76 insertions, 21 deletions

diff --git a/app-accessibility/speechd-up/ChangeLog b/app-accessibility/speechd-up/ChangeLog
index ff646ec175dd..f6226ab1446a 100644
--- a/app-accessibility/speechd-up/ChangeLog
+++ b/app-accessibility/speechd-up/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2007/04/28 16:22:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/ChangeLog,v 1.16 2007/05/30 04:05:27 williamh Exp $
+
+*speechd-up-0.4-r2 (30 May 2007)
+
+  30 May 2007; William Hubbs <williamh@gentoo.org> files/speechd-up.rc,
+  +speechd-up-0.4-r2.ebuild:
+  Fixed the startup script -- this closes #179290.
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> speechd-up-0.3.ebuild:
   Fix *initd and *envd calls, bug #173884.
diff --git a/app-accessibility/speechd-up/Manifest b/app-accessibility/speechd-up/Manifest
index 76fa7ee6fac1..20ee98988167 100644
--- a/app-accessibility/speechd-up/Manifest
+++ b/app-accessibility/speechd-up/Manifest
@@ -1,14 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX speechd-up.confd 125 RMD160 c87966cf5234571d358bd8e1280a2d5b406540ef SHA1 968e5c2961427f79f18066ee231f44b628b4d2c2 SHA256 4f59a5b31069425b494d097b84d82570775284b16943b587815277300455fa3a
 MD5 9c46960f8cc0c81233836fbddc731f0a files/speechd-up.confd 125
 RMD160 c87966cf5234571d358bd8e1280a2d5b406540ef files/speechd-up.confd 125
 SHA256 4f59a5b31069425b494d097b84d82570775284b16943b587815277300455fa3a files/speechd-up.confd 125
-AUX speechd-up.rc 573 RMD160 a758ae84c08752a6ffe736b20d20a3db5aff40ec SHA1 f24dedb35e31190f29458fa133638184d089f379 SHA256 446c4a10bafce01f724ec60d0fde6db00f6dbee69e88e8fddb2533e31c20ea2b
-MD5 0a2d9ed21eb9a4777e2bc8c7702e58b2 files/speechd-up.rc 573
-RMD160 a758ae84c08752a6ffe736b20d20a3db5aff40ec files/speechd-up.rc 573
-SHA256 446c4a10bafce01f724ec60d0fde6db00f6dbee69e88e8fddb2533e31c20ea2b files/speechd-up.rc 573
+AUX speechd-up.rc 1003 RMD160 6290726ef7bbd8a611ac64d8d4b12a0a6c02c06e SHA1 c9a8748ff438372530daa8c7d8682336b7694c32 SHA256 554cc3bd35252b42edef0bf4236819e76d27d278221f9a80d760fae6f98d73f1
+MD5 0b8ac55eda42f9dfb32ba5cd5e3c7a9f files/speechd-up.rc 1003
+RMD160 6290726ef7bbd8a611ac64d8d4b12a0a6c02c06e files/speechd-up.rc 1003
+SHA256 554cc3bd35252b42edef0bf4236819e76d27d278221f9a80d760fae6f98d73f1 files/speechd-up.rc 1003
 DIST speechd-up-0.3.tar.gz 388949 RMD160 e87c3e127b40aa1eafad92066892f7836584538a SHA1 765309b35ac622f0273240652c9a0ba1c52d8303 SHA256 ca5a0b1afefc8509f419404bc2a4108df982ea564aa42af420e29c4694d8549e
 DIST speechd-up-0.4.tar.gz 395659 RMD160 be0961be037db72aaa67078a35933a35cd7bff96 SHA1 ad31c9a15fd8f5616aff4d35713f736ad8266a92 SHA256 03ebc5c05eedebbeb86c561a4708b90deecacfeb7aecd4a8b93ea3b3419d202a
 EBUILD speechd-up-0.3-r1.ebuild 869 RMD160 23086bbf60c7d1dd1317bb1bf01c57377c0ccf2d SHA1 356e0467e2af605715f391f130857baa9f608c0a SHA256 419e2684af31a3879418b77d9f126232358176e031085ffed222b112d0506c98
@@ -23,14 +20,18 @@ EBUILD speechd-up-0.4-r1.ebuild 851 RMD160 0d9828c3e9ac636831a0f3aa3cb3314f5d86a
 MD5 43a8b89b0ebb0dce01c64c66dd1d52b0 speechd-up-0.4-r1.ebuild 851
 RMD160 0d9828c3e9ac636831a0f3aa3cb3314f5d86aaa3 speechd-up-0.4-r1.ebuild 851
 SHA256 64793e73527fc069e033dbd44bcf71b1dae1094462cff532af068d777aea3c6e speechd-up-0.4-r1.ebuild 851
+EBUILD speechd-up-0.4-r2.ebuild 851 RMD160 d92306c79a76d56758b7e248d3f311dc196dc5ca SHA1 58384a93eac433dfddd64b0c41079cf991062e48 SHA256 cfcff503656300ec0ca13262998c634d706a310701fed118711e4eb4e2f432cf
+MD5 7e2e976b8dd0ed0ee1795309cdd2715e speechd-up-0.4-r2.ebuild 851
+RMD160 d92306c79a76d56758b7e248d3f311dc196dc5ca speechd-up-0.4-r2.ebuild 851
+SHA256 cfcff503656300ec0ca13262998c634d706a310701fed118711e4eb4e2f432cf speechd-up-0.4-r2.ebuild 851
 EBUILD speechd-up-0.4.ebuild 871 RMD160 8a969e1a3fb708ea62b55857f07cf140b72b9a35 SHA1 6bf7752caf0107ff908f5b3625f7084f6f33f764 SHA256 557980b0830025921e8dfb173c0c01623db0acaedd51894486ead217d2e6da5c
 MD5 2952e50867df01e4653c28ab8e308f2b speechd-up-0.4.ebuild 871
 RMD160 8a969e1a3fb708ea62b55857f07cf140b72b9a35 speechd-up-0.4.ebuild 871
 SHA256 557980b0830025921e8dfb173c0c01623db0acaedd51894486ead217d2e6da5c speechd-up-0.4.ebuild 871
-MISC ChangeLog 2564 RMD160 83485031181482a4b8bc68bc20b82bc3345e3373 SHA1 4aa66ae025c0180161030ac9ffff913f4b7507c5 SHA256 fa764dbc150f20637769dc65fd133ebe3a5f24ab56a570d2306a630bb4550919
-MD5 0892f7f410df55e5260fcfe1c5f83854 ChangeLog 2564
-RMD160 83485031181482a4b8bc68bc20b82bc3345e3373 ChangeLog 2564
-SHA256 fa764dbc150f20637769dc65fd133ebe3a5f24ab56a570d2306a630bb4550919 ChangeLog 2564
+MISC ChangeLog 2751 RMD160 75e206d355564bd30c579546712fdc4f0a1b194b SHA1 e543df724584be4f643cfa2a3d3f10263d3b23cf SHA256 7df77f2c795a64c0756fee4cab562bd989dc132ab117b3dab52b47da1118f4c0
+MD5 93b3071d375c1725e11a7d1b2b0ce367 ChangeLog 2751
+RMD160 75e206d355564bd30c579546712fdc4f0a1b194b ChangeLog 2751
+SHA256 7df77f2c795a64c0756fee4cab562bd989dc132ab117b3dab52b47da1118f4c0 ChangeLog 2751
 MISC metadata.xml 228 RMD160 eab1a8846c5f4d7218d7f3065702c36abd697537 SHA1 2f7e7ce65fe8e126cde99f1d59b0d1f476a70e81 SHA256 5caa0f8c17af41df6a1cc2c79b27566dfa6a67bbbd0116241dc7f5d17454f1d7
 MD5 f49c8c33105389ec215a01ef378c98e1 metadata.xml 228
 RMD160 eab1a8846c5f4d7218d7f3065702c36abd697537 metadata.xml 228
@@ -47,10 +48,6 @@ SHA256 d235f961b4196381c179bda8eb4b90155e96b752395edd0a2379253ad6b036e6 files/di
 MD5 09cc5b43868bc4f564232d108b2a443b files/digest-speechd-up-0.4-r1 244
 RMD160 4155d0e959a392dc2009a765e11bb38eb69c6ce2 files/digest-speechd-up-0.4-r1 244
 SHA256 d235f961b4196381c179bda8eb4b90155e96b752395edd0a2379253ad6b036e6 files/digest-speechd-up-0.4-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGM3ThI1lqEGTUzyQRAhqiAKCg03eQ7uoqP4b3gr10L+S99CEmrACg3ONo
-6Stzs5xp5enstzBtdtpLnRs=
-=Cw8P
------END PGP SIGNATURE-----
+MD5 09cc5b43868bc4f564232d108b2a443b files/digest-speechd-up-0.4-r2 244
+RMD160 4155d0e959a392dc2009a765e11bb38eb69c6ce2 files/digest-speechd-up-0.4-r2 244
+SHA256 d235f961b4196381c179bda8eb4b90155e96b752395edd0a2379253ad6b036e6 files/digest-speechd-up-0.4-r2 244
diff --git a/app-accessibility/speechd-up/files/digest-speechd-up-0.4-r2 b/app-accessibility/speechd-up/files/digest-speechd-up-0.4-r2
new file mode 100644
index 000000000000..c507d7a259ec
--- /dev/null
+++ b/app-accessibility/speechd-up/files/digest-speechd-up-0.4-r2
@@ -0,0 +1,3 @@
+MD5 06d0f1014d776df524b03af640ce1144 speechd-up-0.4.tar.gz 395659
+RMD160 be0961be037db72aaa67078a35933a35cd7bff96 speechd-up-0.4.tar.gz 395659
+SHA256 03ebc5c05eedebbeb86c561a4708b90deecacfeb7aecd4a8b93ea3b3419d202a speechd-up-0.4.tar.gz 395659
diff --git a/app-accessibility/speechd-up/files/speechd-up.rc b/app-accessibility/speechd-up/files/speechd-up.rc
index 784704c4be95..6e2fa1c6acf6 100644
--- a/app-accessibility/speechd-up/files/speechd-up.rc
+++ b/app-accessibility/speechd-up/files/speechd-up.rc
@@ -1,16 +1,35 @@
 #!/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.5 2006/11/19 19:01:54 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-up/files/speechd-up.rc,v 1.6 2007/05/30 04:05:27 williamh Exp $
 
 depend() {
 	use eflite festival
 	need speech-dispatcher
 }
 
+SPEAKUPDIR=/proc/speakup
+SPEAKUPDEV=/dev/softsynth
+
+load_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 "Please correct this before using speechd-up."
+		return 1
+	fi
+
+	if [ ! -c ${SPEAKUPDEV} ]; then
+		mknod ${SPEAKUPDEV} c 10 26
+	fi
+	echo sftsyn > ${SPEAKUPDIR}/synth_name
+	sleep 1
+}
+
 start() {
+	load_speakup || return 1
 	ebegin "Starting speechd-up"
-	start-stop-daemon --start --quiet --nicelevel ${NICELEVEL} --exec /usr/bin/speechd-up -- -d
+	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.4-r2.ebuild b/app-accessibility/speechd-up/speechd-up-0.4-r2.ebuild
new file mode 100644
index 000000000000..d283978c3dce
--- /dev/null
+++ b/app-accessibility/speechd-up/speechd-up-0.4-r2.ebuild
@@ -0,0 +1,30 @@
+# 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
+}