version bump and cleanups

6 files changed, 15 insertions, 88 deletions

diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog
index 732275adb018..4e06d94cd09e 100644
--- a/app-accessibility/speech-dispatcher/ChangeLog
+++ b/app-accessibility/speech-dispatcher/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/speech-dispatcher
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.6 2004/05/06 16:20:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.7 2004/05/28 20:57:44 squinky86 Exp $
+
+*speech-dispatcher-0.4 (28 May 2004)
+
+  28 May 2004; Jon Hood <squinky86@gentoo.org>
+  -files/speech-dispatcher-0.2-gentoo.patch, -speech-dispatcher-0.2-r1.ebuild,
+  +speech-dispatcher-0.4.ebuild:
+  version bump, removing old ebuilds
 
   06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
   speech-dispatcher-0.3.ebuild:
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 5d9150ff22b8..8d57941afc1b 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,9 +1,8 @@
-MD5 4946b1d02e2777f5f7d9021c06f1f9f9 speech-dispatcher-0.2-r1.ebuild 1353
+MD5 3ff55b06bd8033fbcd6f1ee88d8e1cfe speech-dispatcher-0.4.ebuild 883
 MD5 43c6d932c58de899f9776ded7a95b35d speech-dispatcher-0.3.ebuild 1369
-MD5 c27e8dbd5c2f3bb5b376b4edf8c73f90 ChangeLog 1217
+MD5 8cad2afa5c992bed1ce53e58530fd94e ChangeLog 1451
 MD5 84ffd00e4b6abdf6f947fd470b810d71 metadata.xml 249
 MD5 71d875960a2c5f4bb45b4bb4a18bbcb2 files/digest-speech-dispatcher-0.3 73
-MD5 6dc3b85b3d0bdff46846556206bbded1 files/speech-dispatcher-0.2-gentoo.patch 2251
-MD5 078d5c317522b72b8d9aa82719ee3440 files/digest-speech-dispatcher-0.2-r1 63
+MD5 4c0331148bbc423ee427890b9b70c80a files/digest-speech-dispatcher-0.4 73
 MD5 0b47aa388bba472bb4dc934c1d99a47f files/speech-dispatcher-0.3-gentoo.patch 2891
 MD5 d693a3d215850d96ac42347e854e40bd files/speech-dispatcher 670
diff --git a/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.2-r1 b/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.2-r1
deleted file mode 100644
index 5031a085ee0c..000000000000
--- a/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3671404d27c211e70f5411ca9ed7bf09 speechd-0.2.tar.gz 739792
diff --git a/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.4 b/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.4
new file mode 100644
index 000000000000..ff0892eee78d
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.4
@@ -0,0 +1 @@
+MD5 cd6ba5cb156dbb4d0f8440a02130f4f0 speech-dispatcher-0.4.tar.gz 686767
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.2-gentoo.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.2-gentoo.patch
deleted file mode 100644
index 8d3ca0b169a6..000000000000
--- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.2-gentoo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur speechd-0.2.vanilla/config/speechd.conf.in speechd-0.2/config/speechd.conf.in
---- speechd-0.2.vanilla/config/speechd.conf.in	2003-10-08 16:26:43.000000000 -0500
-+++ speechd-0.2/config/speechd.conf.in	2004-03-30 19:09:14.133265136 -0600
-@@ -28,7 +28,7 @@
- # Specify "stdout" for standard console output
- # or a full path to some file which the log should be written to.
- 
--LogFile  "/var/log/speechd.log"
-+LogFile  "/var/log/speech-dispatcher.log"
- #LogFile  "stdout"
- 
- # CustomLogFile allows logging all messages of the given kind, regardless their
-@@ -164,5 +164,5 @@
- # it should apply this settings (it does glob-style matching, you can use
- # * to match any number of characters and ? to match one character)
- 
--# Include "clients/emacs.conf"
-+Include "clients/emacs.conf"
- 
-diff -Naur speechd-0.2.vanilla/configure.in speechd-0.2/configure.in
---- speechd-0.2.vanilla/configure.in	2003-10-29 14:50:15.000000000 -0600
-+++ speechd-0.2/configure.in	2004-03-30 19:08:00.153511768 -0600
-@@ -46,13 +46,13 @@
- AC_SUBST(glib_include)
- glib_libs=`pkg-config --libs glib-2.0`
- AC_SUBST(glib_libs)
--spdconfdir="$sysconfdir/speechd" 
-+spdconfdir="$sysconfdir/speech-dispatcher" 
- AC_SUBST(spdconfdir)
--snddatadir="$datadir/sounds/speechd" 
-+snddatadir="$datadir/sounds/speech-dispatcher" 
- AC_SUBST(snddatadir)
--modulebindir="$bindir/speechd-modules/" 
-+modulebindir="$libdir/speech-dispatcher-modules/" 
- AC_SUBST(modulebindir)
--moduleconfdir="$sysconfdir/speechd/modules/" 
-+moduleconfdir="$sysconfdir/speech-dispatcher/modules/" 
- AC_SUBST(moduleconfdir)
- 
- AC_ARG_VAR(pidpath, Absolute path to a pid file)
-diff -Naur speechd-0.2.vanilla/src/server/speechd.c speechd-0.2/src/server/speechd.c
---- speechd-0.2.vanilla/src/server/speechd.c	2003-10-15 16:03:05.000000000 -0500
-+++ speechd-0.2/src/server/speechd.c	2004-03-30 19:08:00.155511464 -0600
-@@ -598,9 +598,9 @@
-     options_parse(argc, argv);
- 
-     if (!strcmp(PIDPATH, ""))
--        speechd_pid_file = strdup("/var/run/speechd.pid");
-+        speechd_pid_file = strdup("/var/run/speech-dispatcher.pid");
-     else
--        speechd_pid_file = strdup(PIDPATH"speechd.pid");
-+        speechd_pid_file = strdup(PIDPATH"speech-dispatcher.pid");
- 
-     if (create_pid_file() == -1) exit(1);
- 
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.2-r1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.4.ebuild
index e9214c455f86..0dea92e52e12 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.2-r1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.4.ebuild
@@ -1,48 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.2-r1.ebuild,v 1.1 2004/04/03 20:04:38 eradicator Exp $
-
-inherit eutils libtool
-
-MY_PN="speechd"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.4.ebuild,v 1.1 2004/05/28 20:57:44 squinky86 Exp $
 
 DESCRIPTION="speech-dispatcher speech synthesis interface"
 HOMEPAGE="http://www.freebsoft.org/speechd"
-SRC_URI="http://www.freebsoft.org/pub/projects/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-RDEPEND="dev-libs/dotconf
+DEPEND="dev-libs/dotconf
 	>=app-accessibility/flite-1.2
 	>=dev-libs/glib-2
 	media-libs/alsa-lib"
 
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7.8
-	>=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	export WANT_AUTOMAKE=1.7
-	export WANT_AUTOCONF=2.5
-
-	epatch ${FILESDIR}/speech-dispatcher-${PV}-gentoo.patch
-	autoreconf || die "Could not update configure script with autoconf/automake"
-	elibtoolize
-}
-
 src_install() {
 	make DESTDIR=${D} install || die
 
-	mv ${D}/usr/bin/speechd ${D}/usr/bin/speech-dispatcher
-
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/speech-dispatcher