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

Conflicts:
	community/haskell-tar/PKGBUILD
	extra/fbida/PKGBUILD
	extra/kdesdk-kate/PKGBUILD

7 files changed, 59 insertions, 36 deletions

diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index d5bacea73..28124f4b2 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 82360 2013-01-16 10:08:28Z spupykin $
+# $Id: PKGBUILD 84131 2013-02-11 11:34:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
 
 pkgname=darktable
-pkgver=1.1.2
+pkgver=1.1.3
 _pkgver=1.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
@@ -19,7 +19,7 @@ optdepends=('librsvg')
 install=darktable.install
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
-md5sums=('cdc27dc2d9d53df3ec2c6aa908a3eb3c')
+md5sums=('8dcd880aab1b0b2418ab2bbebdd0d12e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index eab40145f..baffeb2f9 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 84012 2013-02-08 04:15:43Z td123 $
+# $Id: PKGBUILD 84148 2013-02-11 22:28:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-tar
 pkgver=0.4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Reading, writing and manipulating tar archive files'
 url='http://hackage.haskell.org/package/tar'
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.1-1')
+depends=('ghc=7.6.2-1')
 source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
 install=haskell-tar.install
 sha256sums=('a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d')
diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD
index 83cc5ca65..e786ec243 100644
--- a/community/sshguard/PKGBUILD
+++ b/community/sshguard/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80462 2012-11-22 08:40:25Z mtorromeo $
+# $Id: PKGBUILD 84143 2013-02-11 15:20:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=sshguard
 pkgver=1.5
-pkgrel=9
+pkgrel=10
 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables"
 arch=('i686' 'x86_64' 'mips64el')
 #url="http://sourceforge.net/projects/sshguard/"
@@ -26,6 +26,7 @@ sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19'
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's|^DAYNO.*|DAYNO       [0-9]?[1-9]|' src/parser/attack_scanner.l
   ./configure --prefix=/usr --with-firewall=iptables
   make
 }
diff --git a/community/tuxguitar/PKGBUILD b/community/tuxguitar/PKGBUILD
index a1fae110c..580811307 100644
--- a/community/tuxguitar/PKGBUILD
+++ b/community/tuxguitar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65417 2012-02-21 03:31:38Z spupykin $
+# $Id: PKGBUILD 84141 2013-02-11 15:15:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: |AhIoRoS| < ahioros@gmail.com >
 
 pkgname=tuxguitar
 pkgver=1.2
-pkgrel=5
+pkgrel=6
 _jdk=java-7-openjdk
 pkgdesc="multitrack guitar tablature editor and player"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,13 +19,11 @@ source=(tuxguitar-src-$pkgver.tar.gz::http://sourceforge.net/projects/tuxguitar/
 	tuxguitar.desktop
 	tuxguitar.xml)
 md5sums=('f41ed20e77c6c3d8968991a29c71b912'
-         'eea5247daa70ce6fc15e95b1080af486'
+         '0afa7f3248b9317d73ad8ccdc5e5aaf0'
          '59ce4eb8dcc0d0dde81e6cf2820aa9b0')
 
 build() {
   cd $srcdir/tuxguitar-src-$pkgver
-  mkdir -p $pkgdir/usr/share/tuxguitar
-  mkdir -p $pkgdir/usr/bin
 
   export CLASSPATH=/usr/share/java/swt.jar:$CLASSPATH
 
@@ -48,20 +46,12 @@ build() {
   (cd TuxGuitar-gervill/ && ant)
   (cd TuxGuitar-jsa/ && ant)
 
-  cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/
-  find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \;
-  mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/
-  cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/
-
   # alsa
   pushd TuxGuitar-alsa/jni
   gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \
 	-c -o org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o \
 	org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c
   gcc  -shared -o libtuxguitar-alsa-jni.so org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o -L/usr/lib -lasound
-  install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so
   popd
 
   # oss
@@ -70,9 +60,6 @@ build() {
 	-c -o org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o \
 	org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c
   gcc  -shared -o libtuxguitar-oss-jni.so org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o -L/usr/lib
-  install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so
   popd
 
   # jack
@@ -81,9 +68,6 @@ build() {
 	-c -o org_herac_tuxguitar_jack_JackClient.o \
 	org_herac_tuxguitar_jack_JackClient.c
   gcc  -shared -o libtuxguitar-jack-jni.so org_herac_tuxguitar_jack_JackClient.o -L/usr/lib -ljack
-  install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so
   popd
 
   # fluidsynth
@@ -92,6 +76,43 @@ build() {
 	-c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o \
 	org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
   gcc  -shared -o libtuxguitar-fluidsynth-jni.so org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o -L/usr/lib -lfluidsynth
+  popd
+}
+
+package() {
+  cd $srcdir/tuxguitar-src-$pkgver
+
+  mkdir -p $pkgdir/usr/share/tuxguitar
+  mkdir -p $pkgdir/usr/bin
+
+  cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/
+  find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \;
+  mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/
+  cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/
+
+  # alsa
+  pushd TuxGuitar-alsa/jni
+  install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so
+  popd
+
+  # oss
+  pushd TuxGuitar-oss/jni
+  install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so
+  popd
+
+  # jack
+  pushd TuxGuitar-jack/jni
+  install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so
+  popd
+
+  # fluidsynth
+  pushd TuxGuitar-fluidsynth/jni
   install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so
   mkdir -p $pkgdir/usr/share/tuxguitar/lib
   ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so
diff --git a/community/tuxguitar/tuxguitar.desktop b/community/tuxguitar/tuxguitar.desktop
index 77b8280d7..a733cff88 100644
--- a/community/tuxguitar/tuxguitar.desktop
+++ b/community/tuxguitar/tuxguitar.desktop
@@ -8,6 +8,6 @@ Icon=/usr/share/tuxguitar/share/skins/Lavender/icon-96x96.png
 Terminal=false
 Type=Application
 Categories=Application;AudioVideo;Audio;
-Exec=tuxguitar %F
+Exec=tuxguitar %F -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
 MimeType=audio/x-tuxguitar;audio/x-gtp;audio/x-ptb;
 #eof "$Id: tuxguitar.desktop,v 1.2 2008/09/15 07:54:28 sergej Exp $"
diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD
index 70de4c9c7..d064ec18d 100644
--- a/community/udevil/PKGBUILD
+++ b/community/udevil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 81359 2012-12-18 17:43:40Z bpiotrowski $
+# $Id: PKGBUILD 84145 2013-02-11 17:05:04Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
 
 pkgname=udevil
-pkgver=0.3.6
+pkgver=0.4.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Mount and unmount without password'
@@ -11,7 +11,8 @@ url='http://ignorantguru.github.com/udevil/'
 license=('GPL3')
 makedepends=('intltool' 'gettext')
 depends=('udev' 'glib2')
-optdepends=('nfs-utils:  mount nfs shares'
+optdepends=('davfs2:     mount WebDAV shares'
+            'nfs-utils:  mount nfs shares'
             'sshfs:      mount sftp shares'
             'curlftpfs:  mount ftp shares'
             'cifs-utils: mount samba shares'
@@ -23,7 +24,7 @@ provides=('devmon')
 backup=('etc/udevil/udevil.conf')
 install=$pkgname.install
 source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz)
-md5sums=('522a06a2af81d36f2b9d6a8bd31fa88d')
+sha256sums=('baaab9b65ccbab55849ce4dec22ba412fd45655b14d163030c2245bc62fc7265')
 
 build() {
     cd $srcdir/$pkgname-$pkgver
diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD
index 5ca0e3ab0..ec0b832c1 100644
--- a/community/xfe/PKGBUILD
+++ b/community/xfe/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74893 2012-08-09 07:50:54Z spupykin $
+# $Id: PKGBUILD 84135 2013-02-11 11:34:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Ravi Desai <ravster3@hotmail.com>
 
 pkgname=xfe
-pkgver=1.33
+pkgver=1.34
 pkgrel=1
 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=("GPL")
 depends=('fox')
 makedepends=('intltool')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('fb089ba73add411b08a6560eeb51742d')
+md5sums=('36d0a590d95742eb59d8128a9a7a35b4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver