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

Conflicts:
	community/bitcoin/PKGBUILD
	community/canorus/PKGBUILD
	community/celt-0.7/PKGBUILD
	community/djview4/PKGBUILD
	community/erlang-sdl/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/glitz/PKGBUILD
	community/gmerlin/PKGBUILD
	community/gmic/PKGBUILD
	community/goldendict/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/highlight/PKGBUILD
	community/jack2/PKGBUILD
	community/kvirc/PKGBUILD
	community/launchy/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/mupdf/PKGBUILD
	community/projectm/PKGBUILD
	community/psimedia/PKGBUILD
	community/pyqt3/PKGBUILD
	community/qps/PKGBUILD
	community/qstardict/PKGBUILD
	community/qsynergy/PKGBUILD
	community/synergy/PKGBUILD
	community/units/PKGBUILD
	community/yagf/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/avahi/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/cairo/PKGBUILD
	extra/calligra/PKGBUILD
	extra/cmake/PKGBUILD
	extra/dssi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glu/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/hylafax/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libbluedevil/PKGBUILD
	extra/liblastfm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpng/PKGBUILD
	extra/libqzeitgeist/PKGBUILD
	extra/libx11/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mpg123/PKGBUILD
	extra/mtr/PKGBUILD
	extra/mysql/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/nspr/PKGBUILD
	extra/polkit-qt/PKGBUILD
	extra/poppler/PKGBUILD
	extra/prison/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/qimageblitz/PKGBUILD
	extra/qscintilla/PKGBUILD
	extra/qsynth/PKGBUILD
	extra/qt-assistant-compat/PKGBUILD
	extra/qt-gstreamer/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/qwt/PKGBUILD
	extra/samba/PKGBUILD
	extra/sane/PKGBUILD
	extra/smplayer/PKGBUILD
	extra/soprano/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/tomcat-native/PKGBUILD
	extra/transmission/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/lame-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD

4 files changed, 40 insertions, 60 deletions

diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index 379268477..1c1817a07 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -1,48 +1,57 @@
-# Maintainer: Jelle van der Waa <jelle vdwaa nl>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=synergy
 pkgver=1.4.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('gcc-libs' 'libxtst' 'libxinerama' )
+depends=('gcc-libs' 'libxtst' 'libxinerama')
+makedepends=('libxt' 'cmake' 'qt4')
+optdepends=('qt4: gui support')
 license=('GPL2')
-makedepends=('libxt' 'cmake')       # used by configure to test for libx11...
-backup=('etc/synergy.conf')
-source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "${pkgname}s.rc" "synergys.socket" "synergys.service")
-
+source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
+        "synergys.socket"
+        "synergys.service"
+        "synergy.png"
+        "synergy.desktop")
+md5sums=('18aee04a7e232e4d821f46ff24da3364'
+         '58f48336836d6faf3d5eecbe4155b77e'
+         'b95e4b83d8a19c0bd81a15280078fcd5'
+         '11fdb13390908e02c6e2f19c4c09eded'
+         '1e8d574c19994d13e6f342ed08e531bb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
 
-  cmake  -D CMAKE_INSTALL_PREFIX=/usr . 
+  cmake -D CMAKE_INSTALL_PREFIX=/usr . 
+  make
+
+  cd src/gui
+  qmake-qt4
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source/bin"
 
-  #make DESTDIR="$pkgdir" install # doesn't work atm
-
   # install binary
-  install -d "$pkgdir/usr/bin/"
-  install -Dm755 synergyc $pkgdir/usr/bin/
-  install -Dm755 synergys $pkgdir/usr/bin/
+  install -Dm755 synergy "$pkgdir/usr/bin/synergy"
+  install -Dm755 synergyc "$pkgdir/usr/bin/synergyc"
+  install -Dm755 synergys "$pkgdir/usr/bin/synergys"
 
-  # install rc.d script  and config
-  install -d "${pkgdir}/etc/rc.d"
-  install -Dm644 $srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example "${pkgdir}/etc" 
-  install -Dm755 $srcdir/${pkgname}s.rc "${pkgdir}/etc/rc.d/${pkgname}s" 
+  # install config
+  install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" 
 
-  # Install systemd service and socket
+  # install systemd service and socket
   install -d "$pkgdir/usr/lib/systemd/system"
   install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/"
   install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/"
+
+  # install desktop/icon stuff
+  install -Dm644 "$srcdir/synergy.png" "$pkgdir/usr/share/pixmaps/synergy.png"
+  install -Dm644 "$srcdir/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
 }
-md5sums=('18aee04a7e232e4d821f46ff24da3364'
-         '8f8c01add9bf6e3ae9f37a36ca6345b6'
-         '58f48336836d6faf3d5eecbe4155b77e'
-         'b95e4b83d8a19c0bd81a15280078fcd5')
diff --git a/community/synergy/synergy.desktop b/community/synergy/synergy.desktop
new file mode 100644
index 000000000..e7bf87b9e
--- /dev/null
+++ b/community/synergy/synergy.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Synergy
+Comment=The Synergy GUI is based on QSynergy by Volker Lanz.
+Exec=synergy
+Icon=synergy
+Terminal=false
+Type=Application
+Categories=Utility;DesktopUtility;Qt
diff --git a/community/synergy/synergy.png b/community/synergy/synergy.png
new file mode 100644
index 000000000..5534f0fdf
--- /dev/null
+++ b/community/synergy/synergy.png
diff --git a/community/synergy/synergys.rc b/community/synergy/synergys.rc
deleted file mode 100644
index 8f19dc5f7..000000000
--- a/community/synergy/synergys.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-daemon_name=synergys
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/synergys`
-case "$1" in
-  start)
-    stat_busy "Starting Synergy Server"
-    [ -z "$PID" ] && /usr/bin/synergys --config /etc/synergy.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Synergy Server"
-    [ ! -z "$PID" ] && kill -9 $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0