Mon May 13 01:16:27 PDT 2013

2 files changed, 11 insertions, 60 deletions

diff --git a/community/espeakup/PKGBUILD b/community/espeakup/PKGBUILD
index 5cad1dcf7..b7ca9b086 100644
--- a/community/espeakup/PKGBUILD
+++ b/community/espeakup/PKGBUILD
@@ -4,33 +4,27 @@
 
 pkgname=espeakup
 pkgver=0.71
-pkgrel=7
+pkgrel=8
 pkgdesc='Allows the Speakup screen review system to use the ESpeak synthesizer.'
 arch=('i686' 'x86_64')
-url="http://github.com/williamh/espeakup"
+url='http://github.com/williamh/espeakup'
 license=('GPL3')
-#source=("ftp://linux-speakup.org/pub/linux/goodies/${pkgname}-${pkgver}.tar.bz2"
-# temporary location
-source=("http://the-brannons.com/espeakup-0.71.tar.bz2"
-        espeakup espeakup.conf.d espeakup.service espeakup.modules-load.d)
-depends=(speakup-utils espeak)
-backup=(etc/conf.d/espeakup)
+source=(http://the-brannons.com/espeakup-0.71.tar.bz2
+        espeakup.service espeakup.modules-load.d)
+depends=('speakup-utils' 'espeak')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install 
-  install -m755 -D "${srcdir}/espeakup" "${pkgdir}/etc/rc.d/espeakup"
-  install -m644 -D "${srcdir}/espeakup.conf.d" "${pkgdir}/etc/conf.d/espeakup"
   install -m644 -D "${srcdir}/espeakup.service" "${pkgdir}/usr/lib/systemd/system/espeakup.service"
   install -m644 -D "${srcdir}/espeakup.modules-load.d" "${pkgdir}/usr/lib/modules-load.d/espeakup.conf"
 }
-md5sums=('03daa70b3db3f4f6fbb42c2ee428eda7'
-         '7cf0abd493710ed924b7bb7c8d279fb3'
-         '0f93974845b15efa12f5e7a74cc0eecd'
-         '2c80525983a700d3763d4c90c3ab79a8'
-         '75eb512d510d6701b6f63390475dd34f')
+
+sha256sums=('8307986998256db21e615c4edc1befedde28a6995971da258e9d513dd79bd3ab'
+            '0d17413611db3fc4d70e34e84c1e55e832d9eec29482ed7d8c3d737e4ba162b8'
+            '916abe0c03b843194705940ef062046809a68b51c5696f505d5444a73b45f214')
diff --git a/community/espeakup/espeakup b/community/espeakup/espeakup
deleted file mode 100644
index 94a71701a..000000000
--- a/community/espeakup/espeakup
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/espeakup
-. /etc/rc.d/functions
-
-PID=`pidof espeakup`
-PIDFILE=/var/run/espeakup.pid
-case "$1" in
-  start)
-    stat_busy "Starting Espeakup"
-    if [ -z "$PID" ]; then
-      if [ -f $PIDFILE ]; then
-        rm $PIDFILE
-      fi
-      /usr/bin/espeakup $ESPEAKUP_ARGS
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon espeakup
-        stat_done
-      fi
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Espeakup"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon espeakup
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0