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

Conflicts:
	community-testing/gtranslator/PKGBUILD
	community-testing/gtranslator/gtranslator.changelog
	extra/emelfm2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-diskperf-plugin/PKGBUILD
	extra/xfce4-mount-plugin/PKGBUILD
	extra/xfce4-wavelan-plugin/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	testing/anjuta-extras/PKGBUILD
	testing/anjuta/PKGBUILD
	testing/gdl/PKGBUILD
	testing/lv2/PKGBUILD

8 files changed, 55 insertions, 46 deletions

diff --git a/community/javasqlite/PKGBUILD b/community/javasqlite/PKGBUILD
index 64157d8c6..7a630833e 100644
--- a/community/javasqlite/PKGBUILD
+++ b/community/javasqlite/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 58850 2011-11-19 00:04:26Z guillaume $
+# $Id: PKGBUILD 69678 2012-04-22 12:35:52Z guillaume $
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
 pkgname=javasqlite
-pkgver=20110827
+pkgver=20120209
 pkgrel=1
 pkgdesc="Java support for SQLite database engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ch-werner.de/javasqlite/"
-license=('BSD')
-depends=('java-runtime<7')
-makedepends=('java-environment<7' 'sqlite3')
+license=('custom:BSD-style')
+depends=('java-runtime' 'sqlite')
+makedepends=('java-environment')
 options=('!libtool')
 source=(http://www.ch-werner.de/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('6fb577b1632425ddcf45f439886623b9')
-sha1sums=('b64eb3955cfba2388dd0cda7a9d5a5ff46db22e9')
+md5sums=('a5c4f7760ed002749560068b2bd4bb25')
+sha1sums=('76aebb0a11b9e1f861ebaeab9ea3e5818b753ab3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,5 +29,3 @@ package() {
   make DESTDIR="$pkgdir" install
   install -D -m 644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD
index c68aaa2eb..0bfb9ac04 100644
--- a/community/mc/PKGBUILD
+++ b/community/mc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68243 2012-03-20 16:04:03Z schuay $
+# $Id: PKGBUILD 69681 2012-04-22 13:52:54Z schuay $
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=mc
-pkgver=4.8.2
+pkgver=4.8.3
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
 arch=('i686' 'x86_64' 'mips64el')
@@ -55,4 +55,4 @@ package() {
 		-i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
 }
 
-md5sums=('54eba7680f3e24fbdb8d83e2cde9eca3')
+md5sums=('12d38ad4969df3f8bbf66c3967a191ee')
diff --git a/community/mplayer2/mplayer2.install b/community/mplayer2/mplayer2.install
new file mode 100644
index 000000000..660593cf5
--- /dev/null
+++ b/community/mplayer2/mplayer2.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index 62ec5edea..ff27c5d97 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69072 2012-04-08 22:59:52Z seblu $
+# $Id: PKGBUILD 69704 2012-04-22 21:26:38Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=radvd
 pkgver=1.8.5
-pkgrel=3
+pkgrel=4
 pkgdesc='IPv6 Router Advertisement Daemon'
 url='http://www.litech.org/radvd/'
 license=('custom')
@@ -17,7 +17,7 @@ source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz"
         "$pkgname.conf"
         "$pkgname.service")
 sha1sums=('344c145bd29938b7eefb0210cf92bf18df3e191d'
-          'efe02c38eac45bed065fd48c1e3e7753c90c7c2a'
+          '08dd01319682f4ef2e847d11aa375e0239c08c7a'
           '63ce41d790a0472e6b3b15928f6a71d1dbb7700d'
           '9cb6b2eaaf445fe8d17dfc50fde15709d4de7d1d')
 build() {
diff --git a/community/radvd/radvd.rc b/community/radvd/radvd.rc
index 26ad0dbf4..3cac104e7 100644
--- a/community/radvd/radvd.rc
+++ b/community/radvd/radvd.rc
@@ -4,37 +4,36 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${0##*/}
 
-NAME='IPv6 Router Advertisement Daemon'
 DAEMON=/usr/sbin/radvd
 PIDFILE=${PIDFILE:-/run/${0##*/}.pid}
 DAEMON_OPTS+=("--pidfile=$PIDFILE")
 
 # check pid file
 [[ -r "$PIDFILE" ]] &&
-	read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID || unset PID
+  read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID || unset PID
 
 case "$1" in
-	start)
-		stat_busy "Starting $NAME daemon"
-		[[ ! $PID ]] && $DAEMON "${DAEMON_OPTS[@]}" &&
-			add_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+  start)
+    stat_busy "Starting ${0##*/} daemon"
+    [[ ! $PID ]] && $DAEMON "${DAEMON_OPTS[@]}" &&
+      add_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   stop)
-		stat_busy "Stopping $NAME daemon"
-		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+    stat_busy "Stopping ${0##*/} daemon"
+    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
-  *) 
-		echo "usage: ${0##*/} {start|stop|restart}" >&2
-	;;
+    $0 stop
+    $0 start
+    exit 0
+  ;;
+  *)
+    echo "usage: ${0##*/} {start|stop|restart}" >&2
+  ;;
 esac
 
 exit 1
 
-# vim:set ts=2 sw=2 ft=sh noet:
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index 297188a87..5c74ce8df 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69412 2012-04-15 23:37:55Z seblu $
+# $Id: PKGBUILD 69659 2012-04-22 00:48:23Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
 # Contributor: Jason Rodriguez <jason-aur@catloaf.net>
 
 pkgname=sslh
-pkgver=1.10
-pkgrel=6
+pkgver=1.11
+pkgrel=1
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.rutschle.net/tech/sslh.shtml'
@@ -15,9 +15,9 @@ source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
         'sslh.rc'
         'sslh.conf'
         'sslh.service')
-md5sums=('bc34e9a4770d634633e70589c72708cc'
+md5sums=('4ea599f0fa31ae235646e5a200b8f8fb'
          'f64da291e97f1a99c33cb6ebf939b95b'
-         '808199410bd6ab67421bf3544f805d1a'
+         'a098fb6b03a3435b223e16aed0e65e0b'
          'ee8a4fcfc1f6839f7c93deb6f59f7fd6')
 
 build() {
diff --git a/community/sslh/sslh.conf b/community/sslh/sslh.conf
index eb79e7c51..b22a325ef 100644
--- a/community/sslh/sslh.conf
+++ b/community/sslh/sslh.conf
@@ -1,3 +1,3 @@
 # vim:set ts=2 sw=2 ft=sh noet:
 
-DAEMON_OPTS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody -P /var/lock/sslh.lock'
+DAEMON_OPTS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody'
diff --git a/community/tcpflow/PKGBUILD b/community/tcpflow/PKGBUILD
index 701eb0ff5..97808eef0 100644
--- a/community/tcpflow/PKGBUILD
+++ b/community/tcpflow/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 65859 2012-02-22 13:07:30Z cbrannon $
+# $Id: PKGBUILD 69671 2012-04-22 09:26:57Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 
 pkgname=tcpflow
-pkgver=1.1.0
+pkgver=1.2.6
 pkgrel=1
 pkgdesc="Captures data transmitted as part of TCP connections then stores the data conveniently"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://afflib.org/software/tcpflow"
 license=('GPL')
-depends=('gcc-libs' 'libpcap')
-source=("http://afflib.org/downloads/$pkgname.tar.gz")
-md5sums=('9b836b16575679e9d10f39ac7a98efbe')
+depends=('gcc-libs' 'libpcap' 'zlib')
+source=("https://github.com/downloads/simsong/$pkgname/$pkgname-$pkgver.tar.gz")
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -23,3 +22,4 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
+md5sums=('7562f8a1a65f1ce1238be84a1fe83bf6')