gnuhealth-1.8.0-1: updating version and dependencies

7 files changed, 23 insertions, 167 deletions

diff --git a/social/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD
index 10d059d4a..10d059d4a 100644
--- a/social/gnuhealth/PKGBUILD
+++ b/pcr/gnuhealth/PKGBUILD
diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD
index bae5d2f4e..4b5c3c86d 100644
--- a/pcr/trytond/PKGBUILD
+++ b/pcr/trytond/PKGBUILD
@@ -1,31 +1,31 @@
+# Contributor: Florian Walch <florian.walch@gmx.at>
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
 pkgname=trytond
-pkgver=2.4.0
-_pkgdir=2.4
-pkgrel=2
+pkgver=2.6.3
+_pkgdir=2.6
+pkgrel=1
 pkgdesc="A three-tiers high-level general purpose application platform (server application)"
 arch=('any')
 url="http://www.tryton.org/"
 license=('GPL3')
-depends=('python2>=2.4' 'python2-lxml' 'python2-egenix-mx-base' 'python2-relatorio>=0.2.0' 'python2-genshi>=0.5' 
-'python2-polib')
-optdepends=('python2-psycopg2: support for PostgreSQL database'
-  'python2-pywebdav: support for WebDAV feature'
+depends=('python2>=2.4' 'python-lxml' 'python2-egenix-mx-base' 'python-relatorio>=0.2.0' 'python2-genshi>=0.5' 'python2-polib')
+optdepends=('python-psycopg2: support for PostgreSQL database'
+  'python-pywebdav: support for WebDAV feature'
   'pydot: support for displaying workflow graphs'
-  'python2-pytz: timezone support'
-  'python2-pyopenssl: support for SSL connection')
+  'python-pytz: timezone support'
+  'pyopenssl: support for SSL connection')
 makedepends=('python2-distribute')
 install="trytond.install"
 source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz"
         'trytond.install'
-        'trytond.rc')
-md5sums=('ce0bbb8fcd0ef6a02c575823712e29e4'
+        'trytond.service')
+md5sums=('c1bc8517e11f030bcd338414eaefa3b0'
          '768e68c01cb5913e36ea89c67fc98038'
-         '3ca6aff9b30a52bcf159be7ca630fb6e')
+         'b1535a8528dfd8f655624bf6faea6985')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   python2 setup.py install --root=$pkgdir
   install -D -m644 etc/trytond.conf $pkgdir/etc/trytond.conf
-  install -D -m755 $srcdir/trytond.rc $pkgdir/etc/rc.d/trytond
+  install -D -m755 $startdir/trytond.service $pkgdir/usr/lib/systemd/system/trytond.service
 }
diff --git a/pcr/trytond/trytond.rc b/pcr/trytond/trytond.rc
deleted file mode 100644
index a93172a58..000000000
--- a/pcr/trytond/trytond.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/python /usr/bin/trytond`
-case "$1" in
-    start)
-	stat_busy "Starting Tryton server"
-	# handling log file
-	if [ ! -e /var/log/trytond/trytond.log ]; then
-	    mkdir -p /var/log/trytond
-	    touch /var/log/trytond/trytond.log
-	    chown -R trytond:trytond /var/log/trytond
-	fi
-	# starting the daemon
-	if [ -z "$PID" ]; then
-            su - trytond -s /bin/bash -c "/usr/bin/python2 /usr/bin/trytond \
-	--logfile=/var/log/trytond/trytond.log &> /dev/null &"
-            if [ $? -gt 0 ]; then
-		stat_fail
-            else
-		add_daemon trytond
-		stat_done
-            fi
-	else
-            stat_fail
-	fi
-	;;
-    stop)
-	stat_busy "Stopping Tryton server"
-	if [ ! -z "$PID" ]; then
-	    if [ $? -gt 0 ]; then
-		stat_fail
-	    else
-		kill $PID &> /dev/null &
-		rm_daemon trytond
-		stat_done
-	    fi
-	else
-	    stat_fail
-	fi
-	;;
-    restart)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/pcr/trytond/trytond.service b/pcr/trytond/trytond.service
new file mode 100644
index 000000000..7d85691b3
--- /dev/null
+++ b/pcr/trytond/trytond.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tryton Server Daemon
+
+[Service]
+Type=simple
+User=tryton
+ExecStart=/usr/bin/trytond
+
+[Install]
+WantedBy=multi-user.target
diff --git a/social/trytond/PKGBUILD b/social/trytond/PKGBUILD
deleted file mode 100644
index 237c599f9..000000000
--- a/social/trytond/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-pkgname=trytond
-pkgver=2.4.0
-_pkgdir=2.4
-pkgrel=1
-pkgdesc="A three-tiers high-level general purpose application platform (server application)"
-arch=('any')
-url="http://www.tryton.org/"
-license=('GPL3')
-depends=('python2>=2.4' 'python-lxml' 'python-egenix-mx-base' 'python-relatorio>=0.2.0' 'python-genshi>=0.5' 'python2-polib')
-optdepends=('python-psycopg2: support for PostgreSQL database'
-  'python-pywebdav: support for WebDAV feature'
-  'pydot: support for displaying workflow graphs'
-  'python-pytz: timezone support'
-  'pyopenssl: support for SSL connection')
-makedepends=('python2-distribute')
-install="trytond.install"
-source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz"
-        'trytond.install'
-        'trytond.rc')
-md5sums=('ce0bbb8fcd0ef6a02c575823712e29e4'
-         '768e68c01cb5913e36ea89c67fc98038'
-         '3ca6aff9b30a52bcf159be7ca630fb6e')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-  install -D -m644 etc/trytond.conf $pkgdir/etc/trytond.conf
-  install -D -m755 $srcdir/trytond.rc $pkgdir/etc/rc.d/trytond
-}
diff --git a/social/trytond/trytond.install b/social/trytond/trytond.install
deleted file mode 100644
index 46d6daaba..000000000
--- a/social/trytond/trytond.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  echo
-  echo "Adding tryton group... "
-  groupadd  tryton
-  echo
-  echo "Adding tryton user... "
-  useradd -c "Tryton Server Daemon" -g tryton -s /bin/false tryton
-
-  echo "Note:"
-  echo "==> Please don't forget to configure your PostgreSQL database for the program."
-}
-
-post_remove() {
-  echo "Removing tryton system user... "
-  userdel tryton && echo "trytond [done]"
-}
-
-op=$1
-shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"
diff --git a/social/trytond/trytond.rc b/social/trytond/trytond.rc
deleted file mode 100644
index a93172a58..000000000
--- a/social/trytond/trytond.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/python /usr/bin/trytond`
-case "$1" in
-    start)
-	stat_busy "Starting Tryton server"
-	# handling log file
-	if [ ! -e /var/log/trytond/trytond.log ]; then
-	    mkdir -p /var/log/trytond
-	    touch /var/log/trytond/trytond.log
-	    chown -R trytond:trytond /var/log/trytond
-	fi
-	# starting the daemon
-	if [ -z "$PID" ]; then
-            su - trytond -s /bin/bash -c "/usr/bin/python2 /usr/bin/trytond \
-	--logfile=/var/log/trytond/trytond.log &> /dev/null &"
-            if [ $? -gt 0 ]; then
-		stat_fail
-            else
-		add_daemon trytond
-		stat_done
-            fi
-	else
-            stat_fail
-	fi
-	;;
-    stop)
-	stat_busy "Stopping Tryton server"
-	if [ ! -z "$PID" ]; then
-	    if [ $? -gt 0 ]; then
-		stat_fail
-	    else
-		kill $PID &> /dev/null &
-		rm_daemon trytond
-		stat_done
-	    fi
-	else
-	    stat_fail
-	fi
-	;;
-    restart)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0