Sun Mar 10 00:50:57 PST 2013

3 files changed, 13 insertions, 62 deletions

diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD
index bb96b719b..d798fb0e5 100644
--- a/extra/speech-dispatcher/PKGBUILD
+++ b/extra/speech-dispatcher/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165252 2012-08-14 16:20:06Z andrea $
+# $Id: PKGBUILD 179645 2013-03-09 01:49:56Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Steve Holmes <steve.holmes88@gmail.com>
@@ -7,14 +7,14 @@
 # Contributor: Andreas Messer <andi@bupfen.de>
 
 pkgname=speech-dispatcher
-pkgver=0.7.1
-pkgrel=7
+pkgver=0.8
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="High-level device independent layer for speech synthesis interface"
 url="http://www.freebsoft.org/speechd"
 license=('GPL2' 'FDL')
-depends=('glib2' 'python2' 'dotconf' 'texinfo' 'libpulse')
-makedepends=('pkgconfig' 'espeak')
+depends=('glib2' 'libltdl' 'python-xdg' 'dotconf' 'libpulse')
+makedepends=('intltool' 'espeak')
 optdepends=('festival: Speech output using Festival'
         'espeak: Speech output using ESpeak'
         'pulseaudio: PulseAudio support')
@@ -37,10 +37,9 @@ backup=(etc/speech-dispatcher/clients/gnome-speech.conf
 	etc/speech-dispatcher/speechd.conf)
 install="${pkgname}.install"
 source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz"
-        'speechd.sh' 'speech-dispatcherd.service')
-md5sums=('ccfc30ac006673d36b4223eb760ed696'
-        '858293f464b83f03f3b6bb796291c71d'
-        'd26f52e2e95a30eaa83560f0e63faca5')
+        'speech-dispatcherd.service')
+md5sums=('d88691a64c676122f996230c107c392f'
+         'd26f52e2e95a30eaa83560f0e63faca5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -53,20 +52,8 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
-  install -Dm755 ${srcdir}/speechd.sh ${pkgdir}/etc/rc.d/speechd
-  install -d "${pkgdir}/usr/lib/systemd/system/"
-  install -m644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/"
-  install -d ${pkgdir}/var/log/speech-dispatcher
-
-  # Fix spd-conf to use python 2.7
-  sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' ${pkgdir}/usr/bin/spd-conf
-  sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/lib/python2.7/site-packages/speechd/_test.py
-  
-  rm -f ${pkgdir}/usr/share/info/dir
-  gzip -9nf ${pkgdir}/usr/share/info/*
-
-  # Remove conflicts with erlang (FS#21674)
-  rm -r ${pkgdir}/usr/bin/run_test
+  install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service"
+  install -d "${pkgdir}/var/log/speech-dispatcher"
 }
diff --git a/extra/speech-dispatcher/speech-dispatcher.install b/extra/speech-dispatcher/speech-dispatcher.install
index 93f4f9363..1565d3a31 100644
--- a/extra/speech-dispatcher/speech-dispatcher.install
+++ b/extra/speech-dispatcher/speech-dispatcher.install
@@ -1,10 +1,10 @@
 info_dir=usr/share/info
 info_files=('speech-dispatcher.info'
-    'speech-dispatcher-cs.info'
     'ssip.info'
     'spd-say.info')
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${info_files[@]}; do
     install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
@@ -15,6 +15,7 @@ post_upgrade() {
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${info_files[@]}; do
     install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
diff --git a/extra/speech-dispatcher/speechd.sh b/extra/speech-dispatcher/speechd.sh
deleted file mode 100644
index eb44198cb..000000000
--- a/extra/speech-dispatcher/speechd.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/speech-dispatcher)
-case "$1" in
-  start)
-    stat_busy "Starting speech dispatcher Daemon"
-    [ -z "$PID" ] && /usr/bin/speech-dispatcher -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon speechd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping speech dispatcher Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon speechd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
-exit 0