Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/r8168-lts/PKGBUILD
	community-testing/evas_generic_loaders-svn/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/libextractor/PKGBUILD
	community-testing/pdf2djvu/PKGBUILD
	community-testing/r8168-lts/PKGBUILD
	community-testing/sage-mathematics/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	core/dhcpcd/PKGBUILD
	core/glibc/PKGBUILD
	core/net-tools/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/cups/PKGBUILD
	extra/maxima/PKGBUILD
	extra/scim-hangul/PKGBUILD
	extra/speech-dispatcher/PKGBUILD
	extra/subversion/PKGBUILD
	extra/telepathy-idle/PKGBUILD
	extra/x11vnc/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/binutils-multilib/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-krb5/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-libxml2/PKGBUILD
	multilib/lib32-libxrandr/PKGBUILD
	multilib/lib32-p11-kit/PKGBUILD
	testing/binutils/PKGBUILD
	testing/calligra/PKGBUILD
	testing/dhcp/PKGBUILD
	testing/gcc/PKGBUILD
	testing/glibc/PKGBUILD
	testing/inkscape/PKGBUILD
	testing/iproute2/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/libreoffice/PKGBUILD.36
	testing/poppler/PKGBUILD

3 files changed, 32 insertions, 5 deletions

diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index c06cff90c..379268477 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=synergy
-pkgver=1.4.6
+pkgver=1.4.10
 pkgrel=1
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
@@ -12,7 +12,8 @@ depends=('gcc-libs' 'libxtst' 'libxinerama' )
 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" )
+source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "${pkgname}s.rc" "synergys.socket" "synergys.service")
+
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
@@ -24,7 +25,7 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source/bin"
 
-#  make DESTDIR="$pkgdir" install # doesn't work atm
+  #make DESTDIR="$pkgdir" install # doesn't work atm
 
   # install binary
   install -d "$pkgdir/usr/bin/"
@@ -35,6 +36,13 @@ package() {
   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 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/"
 }
-md5sums=('3e1ecc4fcbfe6b130ac0c86c674f6db3'
-         '8f8c01add9bf6e3ae9f37a36ca6345b6')
+md5sums=('18aee04a7e232e4d821f46ff24da3364'
+         '8f8c01add9bf6e3ae9f37a36ca6345b6'
+         '58f48336836d6faf3d5eecbe4155b77e'
+         'b95e4b83d8a19c0bd81a15280078fcd5')
diff --git a/community/synergy/synergys.service b/community/synergy/synergys.service
new file mode 100644
index 000000000..56c1ac061
--- /dev/null
+++ b/community/synergy/synergys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Synergy Server Daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/synergys --config /etc/synergy.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/synergy/synergys.socket b/community/synergy/synergys.socket
new file mode 100644
index 000000000..dda1537ca
--- /dev/null
+++ b/community/synergy/synergys.socket
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=synergys.service
+
+[Socket]
+ListenStream=24800
+Accept=false
+
+[Install]
+WantedBy=sockets.target