Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/python-psutil/PKGBUILD
	extra/timidity++/PKGBUILD

2 files changed, 3 insertions, 43 deletions

diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD
index ba3a7744e..151d036f4 100644
--- a/extra/timidity++/PKGBUILD
+++ b/extra/timidity++/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173850 2012-12-25 00:34:49Z foutrelis $
+# $Id: PKGBUILD 182711 2013-04-13 07:33:18Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=timidity++
 pkgver=2.14.0
-pkgrel=4.1
+pkgrel=5
 pkgdesc="A MIDI to WAVE converter and player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://timidity.sourceforge.net"
@@ -14,10 +14,9 @@ optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface
             'xaw3d: for using the Xaw interface')
 backup=('etc/timidity++/timidity.cfg')
 source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \
-        timidity.cfg timidity++.sh timidity.service)
+        timidity.cfg timidity.service)
 sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b'
           '660b3afbb720d26e8f008034cee66dd8da082d6e'
-          '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
           'f0351b9eb8928d3d82c380107654a7dbe7cd2d54')
 
 build() {
@@ -35,6 +34,5 @@ package() {
   cd "${srcdir}/TiMidity++-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg"
-  install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++"
   install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service"
 }
diff --git a/extra/timidity++/timidity++.sh b/extra/timidity++/timidity++.sh
deleted file mode 100644
index 3fa13cea9..000000000
--- a/extra/timidity++/timidity++.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/timidity`
-case "$1" in
-   start)
-     stat_busy "Starting Timidity++ ALSA Daemon"
-     [ -z "$PID" ] && /usr/bin/timidity -iAD > /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       echo $PID > /var/run/timidity.pid
-       add_daemon timidity++
-       stat_done
-     fi
-     ;;
-   stop)
-     stat_busy "Stopping Timidity++ ALSA Daemon"
-     [ ! -z "$PID" ]  && kill $PID &> /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       rm /var/run/timidity.pid
-       rm_daemon timidity++
-       stat_done
-     fi
-     ;;
-   restart)
-     $0 stop
-     sleep 1
-     $0 start
-     ;;
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
-exit 0