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

Conflicts:
	community/distcc/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libtorrent/PKGBUILD
	community/picard/PKGBUILD
	community/rtorrent/PKGBUILD
	community/ushare/PKGBUILD
	extra/catdoc/PKGBUILD
	extra/curl/PKGBUILD
	extra/ethstatus/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/metacity/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/x2x/PKGBUILD
	kde-unstable/kdeaccessibility/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdelibs/PKGBUILD
	kde-unstable/kdemultimedia/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	libre/kernel26-libre/PKGBUILD
	libre/libretools/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/wine/PKGBUILD
	testing/alex/PKGBUILD
	testing/ghc/PKGBUILD
	testing/haskell-cgi/PKGBUILD
	testing/haskell-deepseq/PKGBUILD
	testing/haskell-fgl/PKGBUILD
	testing/haskell-glut/PKGBUILD
	testing/haskell-haskell-src/PKGBUILD
	testing/haskell-html/PKGBUILD
	testing/haskell-http/PKGBUILD
	testing/haskell-hunit/PKGBUILD
	testing/haskell-mtl/PKGBUILD
	testing/haskell-network/PKGBUILD
	testing/haskell-opengl/PKGBUILD
	testing/haskell-parallel/PKGBUILD
	testing/haskell-parsec/PKGBUILD
	testing/haskell-platform/PKGBUILD
	testing/haskell-quickcheck/PKGBUILD
	testing/haskell-regex-base/PKGBUILD
	testing/haskell-regex-compat/PKGBUILD
	testing/haskell-regex-posix/PKGBUILD
	testing/haskell-stm/PKGBUILD
	testing/haskell-syb/PKGBUILD
	testing/haskell-text/PKGBUILD
	testing/haskell-transformers/PKGBUILD
	testing/haskell-xhtml/PKGBUILD
	testing/haskell-zlib/PKGBUILD
	testing/perl/ChangeLog
	testing/perl/PKGBUILD
	testing/perl/perlbin.sh
	testing/pidgin/PKGBUILD
	testing/spamassassin/PKGBUILD

5 files changed, 61 insertions, 8 deletions

diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD
index b19241655..b15f66916 100644
--- a/social/diaspora-git/PKGBUILD
+++ b/social/diaspora-git/PKGBUILD
@@ -6,7 +6,7 @@
 # https://wiki.archlinux.org/index.php/Diaspora
 
 pkgname=diaspora-git
-pkgver=20110417
+pkgver=20110623
 pkgrel=1
 pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network"
 arch=('i686' 'x86_64')
diff --git a/social/ruby-headers/PKGBUILD b/social/ruby-headers/PKGBUILD
index 73b85c3c1..9deedb708 100644
--- a/social/ruby-headers/PKGBUILD
+++ b/social/ruby-headers/PKGBUILD
@@ -5,12 +5,12 @@ pkgname=ruby-headers
 _pkgname=ruby
 pkgver=1.9.2_p180
 _pkgver=1.9.2-p180
-pkgrel=1
+pkgrel=2
 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug."
 arch=('any')
 url="http://www.ruby-lang.org/en/"
 license=('custom')
-depends=('ruby')
+depends=("ruby=$pkgver")
 source=("ftp://ftp.ruby-lang.org/pub/ruby/1.9/$_pkgname-$_pkgver.tar.bz2")
 
 build() {
diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD
index 184dcf130..d18d4c20b 100644
--- a/social/tinc/PKGBUILD
+++ b/social/tinc/PKGBUILD
@@ -1,13 +1,15 @@
 pkgname=tinc
-pkgver=1.0.14
-pkgrel=1
+pkgver=1.0.15
+pkgrel=2
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=(i686 x86_64 'mips64el')
 url="http://www.tinc-vpn.org/"
 license=('GPL')
 depends=('lzo2' 'zlib' 'openssl')
-source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz)
-md5sums=('967dfafc4aa41a614c1d2739df8a8372')
+source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz
+        tincd.conf
+        tincd.rcd)
+md5sums=('44bb7d1618955a0a56e9e159f1c46362')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -21,6 +23,13 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
-  install -d $pkgdir/etc/tinc
+  install -d $pkgdir/etc/{tinc,rc.d,conf.d}
+
+  install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd
+  install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd
+
   tar xzvf doc/sample-config.tar.gz -C $pkgdir/etc/tinc/
 }
+md5sums=('44bb7d1618955a0a56e9e159f1c46362'
+         '9b40646cd898709e90ae3c32baecb075'
+         '75516d05803ee6c6b22516e10129ad99')
diff --git a/social/tinc/tincd.conf b/social/tinc/tincd.conf
new file mode 100644
index 000000000..84547936c
--- /dev/null
+++ b/social/tinc/tincd.conf
@@ -0,0 +1 @@
+NETNAME=yournetname
diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd
new file mode 100644
index 000000000..f0a456e17
--- /dev/null
+++ b/social/tinc/tincd.rcd
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+daemon_name=tincd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/$daemon_name.conf
+
+PID=`pidof -o %PPID /usr/sbin/tincd`
+
+case "$1" in
+    start)
+        stat_busy "Starting ${daemon_name}"
+        [ -z "$PID" ] && \
+            /usr/sbin/tincd -n ${NETNAME} \
+                            --pidfile=/var/run/tinc.${NETNAME} &> /dev/null
+
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon ${daemon_name}
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping ${daemon_name}"
+        [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon ${daemon_name}
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+        sleep 3
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+esac
+exit 0