Version bump and removed old versions.

(Portage version: 2.2_rc23/cvs/Linux i686)

5 files changed, 27 insertions, 37 deletions

diff --git a/app-accessibility/espeakup/ChangeLog b/app-accessibility/espeakup/ChangeLog
index b130e72e3191..c6ca5bdff036 100644
--- a/app-accessibility/espeakup/ChangeLog
+++ b/app-accessibility/espeakup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/espeakup
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/ChangeLog,v 1.5 2009/02/11 15:10:15 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/ChangeLog,v 1.6 2009/03/09 06:25:47 williamh Exp $
+
+*espeakup-0.60 (09 Mar 2009)
+
+  09 Mar 2009; William Hubbs <williamh@gentoo.org> +files/espeakup.confd,
+  files/espeakup.rc, -espeakup-0.4.ebuild, -espeakup-0.51.ebuild,
+  +espeakup-0.60.ebuild:
+  Version bump and removed old versions.
 
 *espeakup-0.51 (11 Feb 2009)
 
diff --git a/app-accessibility/espeakup/espeakup-0.4.ebuild b/app-accessibility/espeakup/espeakup-0.4.ebuild
deleted file mode 100644
index e3810e53f9ab..000000000000
--- a/app-accessibility/espeakup/espeakup-0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-0.4.ebuild,v 1.1 2008/10/23 13:27:28 williamh Exp $
-
-DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
-HOMEPAGE="http://www.linux-speakup.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-accessibility/espeak"
-RDEPEND="${DEPEND}
-	app-accessibility/speakup"
-
-src_compile() {
-	emake || die "Compile failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed."
-	dodoc README ToDo
-	newinitd "${FILESDIR}"/espeakup.rc espeakup
-}
-
-pkg_postinst() {
-	elog "To get espeakup to start automatically, it is currently recommended"
-	echo "that you add it to the default run level, by giving the following"
-	elog "command as root."
-	elog
-	elog "rc-update add espeakup default"
-}
diff --git a/app-accessibility/espeakup/espeakup-0.51.ebuild b/app-accessibility/espeakup/espeakup-0.60.ebuild
index af811dc6b650..f8d64c4e5373 100644
--- a/app-accessibility/espeakup/espeakup-0.51.ebuild
+++ b/app-accessibility/espeakup/espeakup-0.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-0.51.ebuild,v 1.1 2009/02/11 15:10:15 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-0.60.ebuild,v 1.1 2009/03/09 06:25:47 williamh Exp $
 
 DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
 HOMEPAGE="http://www.linux-speakup.org"
@@ -22,6 +22,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed."
 	dodoc README ToDo
+	newconfd "${FILESDIR}"/espeakup.confd espeakup
 	newinitd "${FILESDIR}"/espeakup.rc espeakup
 }
 
@@ -31,4 +32,7 @@ pkg_postinst() {
 	elog "command as root."
 	elog
 	elog "rc-update add espeakup default"
+	elog
+	elog "You can also set a default voice now for espeakup."
+	elog "See /etc/conf.d/espeakup for how to do this."
 }
diff --git a/app-accessibility/espeakup/files/espeakup.confd b/app-accessibility/espeakup/files/espeakup.confd
new file mode 100644
index 000000000000..035012cc08e5
--- /dev/null
+++ b/app-accessibility/espeakup/files/espeakup.confd
@@ -0,0 +1,9 @@
+# conf.d file for espeakup
+#
+# Please check man 8 espeakup for more information about the options
+# espeakup accepts.
+#
+# Currently, the only meaningful option is:
+#   --default-voice=voicename -- set the espeak voice espeakup will use.
+#
+ESPEAKUP_OPTS=""
diff --git a/app-accessibility/espeakup/files/espeakup.rc b/app-accessibility/espeakup/files/espeakup.rc
index 890c1eb289e6..3a443399e4ae 100644
--- a/app-accessibility/espeakup/files/espeakup.rc
+++ b/app-accessibility/espeakup/files/espeakup.rc
@@ -1,4 +1,7 @@
 #!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/files/espeakup.rc,v 1.2 2009/03/09 06:25:47 williamh Exp $
 
 depend() {
 	after modules
@@ -7,7 +10,8 @@ depend() {
 
 start() {
 	ebegin "Starting espeakup"
-	start-stop-daemon --start --exec /usr/bin/espeakup
+	start-stop-daemon --start --exec /usr/bin/espeakup \
+		-- ${ESPEAKUP_OPTS}
 	eend $?
 }