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

Conflicts:
	community/apvlv/PKGBUILD
	community/audit/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/dia/PKGBUILD
	community/gedit-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/gitg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnome-screensaver/PKGBUILD
	community/gtranslator/PKGBUILD
	community/metacity/PKGBUILD
	community/zeitgeist-datahub/PKGBUILD
	core/glib2/PKGBUILD
	core/perl/PKGBUILD
	extra/anjuta-extras/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/brltty/PKGBUILD
	extra/cheese/PKGBUILD
	extra/clutter/PKGBUILD
	extra/cogl/PKGBUILD
	extra/devhelp/PKGBUILD
	extra/empathy/PKGBUILD
	extra/eog/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution/PKGBUILD
	extra/fontconfig/PKGBUILD
	extra/gcr/PKGBUILD
	extra/gdl/PKGBUILD
	extra/gedit/PKGBUILD
	extra/gjs/PKGBUILD
	extra/glade/PKGBUILD
	extra/glib-networking/PKGBUILD
	extra/gnome-calculator/PKGBUILD
	extra/gnome-contacts/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-documents/PKGBUILD
	extra/gnome-font-viewer/PKGBUILD
	extra/gnome-games/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-screenshot/PKGBUILD
	extra/gnome-session/PKGBUILD
	extra/gnome-terminal/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/grilo-plugins/PKGBUILD
	extra/gssdp/PKGBUILD
	extra/gthumb/PKGBUILD
	extra/gtkmm3/PKGBUILD
	extra/gtksourceview3/PKGBUILD
	extra/gucharmap/PKGBUILD
	extra/gupnp-av/PKGBUILD
	extra/gupnp-dlna/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/gupnp/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/js/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libgweather/PKGBUILD
	extra/liboauth/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/libsocialweb/PKGBUILD
	extra/libsoup/PKGBUILD
	extra/mash/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/mutter/PKGBUILD
	extra/mysql/PKGBUILD
	extra/nautilus-sendto/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/network-manager-applet/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/p11-kit/PKGBUILD
	extra/pango/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/rest/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/rygel/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vala/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vte3/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/yelp/PKGBUILD
	extra/zeitgeist/PKGBUILD
	libre/rp-pppoe-libre/PKGBUILD
	pcr/python-sfml2/PKGBUILD
	pcr/python2-sfml2/PKGBUILD

4 files changed, 25 insertions, 100 deletions

diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index 50c7abbb8..e1aca1de3 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,49 +1,44 @@
-# $Id: PKGBUILD 180801 2013-03-26 11:49:28Z foutrelis $
-# Maintainer:
+# $Id: PKGBUILD 183561 2013-04-23 13:10:19Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=brltty
-pkgver=4.4
-pkgrel=4
+pkgver=4.5
+pkgrel=3
 pkgdesc="Braille display driver for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mielke.cc/brltty"
-license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=51.1' 'tcl' 'atk' 'pyrex')
-makedepends=('bluez')
-optdepends=('bluez: bluetooth support')
-backup=(etc/brltty.conf etc/conf.d/brltty.conf)
-options=('!makeflags' '!emptydirs')
+license=(GPL LGPL)
+depends=(libxaw gpm icu tcl cython)
+makedepends=(bluez at-spi2-core)
+optdepends=('bluez: bluetooth support'
+	    'at-spi2-core: X11/GNOME Apps accessibility'
+	    'atk: ATK bridge for X11/GNOME accessibility')
+backup=(etc/brltty.conf)
+options=('!emptydirs')
 install=brltty.install
 source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
-        'brltty'
-        'brltty.conf'
-	     'brltty.service')
-md5sums=('8ebe96efe679f5f6ccff08928fec5b26'
-         '831ebaf0c56091702929c68805d20c4f'
-         'a8ab8b3dd059e96e1734bc9cdcf844fc'
-         '7acecd700b9f94d76fe4a6ad56cb0448')
+        brltty.service)
+
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' Tables/latex-access.ctb
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --mandir=/usr/share/man \
-    --localstatedir=/var \
-    --with-screen-driver=a2 \
+    --with-tables-directory=/usr/share/brltty \
+    --with-screen-driver=lx \
     --enable-gpm \
     --disable-java-bindings \
-    PYTHON=/usr/bin/python2
+    --disable-static
 
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make INSTALL_ROOT="$pkgdir" install
-  install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty"
-  install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf"
-  install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
-  install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service"
+  install -Dm644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
+  install -Dm644 ../brltty.service "$pkgdir/usr/lib/systemd/system/brltty.service"
 }
+md5sums=('7b52fa7746fed41ed344a1f75ce55951'
+         '0cad54bb5470122535f5e3a11d5ca123')
diff --git a/extra/brltty/brltty b/extra/brltty/brltty
deleted file mode 100755
index 5ed21a52d..000000000
--- a/extra/brltty/brltty
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=brltty
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name $brltty_args
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/brltty/brltty.conf b/extra/brltty/brltty.conf
deleted file mode 100644
index 94115e1d5..000000000
--- a/extra/brltty/brltty.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Specify any arguments to pass to brltty here.
-brltty_args=""
\ No newline at end of file
diff --git a/extra/brltty/brltty.service b/extra/brltty/brltty.service
index 1b9d55e32..4ef39c3fc 100644
--- a/extra/brltty/brltty.service
+++ b/extra/brltty/brltty.service
@@ -9,4 +9,4 @@ Type=forking
 PIDFile=/run/brltty.pid
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sysinit.target