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

Conflicts:
	community/mhwaveedit/PKGBUILD
	extra/apr/PKGBUILD
	extra/xorg-server/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/unarchiver/PKGBUILD

10 files changed, 75 insertions, 31 deletions

diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 8ea418b77..500e28dc9 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=go
 pkgver=r57.1
-pkgrel=1
+pkgrel=3
 epoch=1
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('i686' 'x86_64' 'mips64el')
@@ -60,13 +60,18 @@ package() {
   install -Dm644 misc/bash/go $pkgdir/etc/bash_completion.d/go
   install -Dm644 misc/emacs/go-mode-load.el $pkgdir/usr/share/emacs/site-lisp/go-mode-load.el
   install -Dm644 misc/emacs/go-mode.el $pkgdir/usr/share/emacs/site-lisp/go-mode.el
+  install -Dm644 misc/vim/ftdetect/gofiletype.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/gofiletype.vim
   install -Dm644 misc/vim/syntax/go.vim $pkgdir/usr/share/vim/vimfiles/syntax/go.vim
 
   mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
 
   cp -r bin $pkgdir/usr
   cp -r doc misc -t $pkgdir/usr/share/go
+  ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc
   cp -r pkg $pkgdir/usr/lib/go
+  cp -r $GOROOT/src/pkg $pkgdir/usr/lib/go/src/ 
+  cp -r $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/ 
+  cp -r $GOROOT/lib $pkgdir/usr/lib/go/ 
 
   install -Dm644 src/Make.* $pkgdir/usr/lib/go/src
 
diff --git a/community/mhwaveedit/PKGBUILD b/community/mhwaveedit/PKGBUILD
index ec834de0a..ce2e82aea 100644
--- a/community/mhwaveedit/PKGBUILD
+++ b/community/mhwaveedit/PKGBUILD
@@ -1,22 +1,18 @@
-# $Id $
 # Maintainer: Loui Chang <louipc.ist@gmail.com>
-# Contributor: Andrea Scarpino <bash.lnx@gmail.com>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=mhwaveedit
-pkgver=1.4.20
-pkgrel=2
-pkgdesc="A graphical program for editing, playing and recording sound files."
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=1.4.21
+pkgrel=1
+pkgdesc="A graphical program for editing, playing and recording sound files"
+arch=('i686' 'x86_64')
 url="http://gna.org/projects/mhwaveedit"
 license=('GPL')
-depends=('libsamplerate' 'gtk2' 'jack')
+depends=('libsamplerate' 'libpulse' 'gtk2' 'jack')
 source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('979ac5776a57268aed0afa74d50c70a2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  sed -i "s|Icon=mhwaveedit.xpm|Icon=mhwaveedit|" share/applications/mhwaveedit.desktop
   ./configure --without-check-casts --without-arts --without-esound \
   	--without-portaudio --without-sun  --without-sdl --prefix=/usr
   make
@@ -26,3 +22,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
+md5sums=('02d4dddcb19731ff1fca961ed7d507dc')
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index 15ef52001..4417ed007 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 48022 2011-05-27 15:14:57Z svenstaro $
+# $Id: PKGBUILD 48213 2011-05-30 08:16:09Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Christian Hesse <mail@eworm.de>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
+
 pkgname=nbd
-pkgver=2.9.21a
+pkgver=2.9.22
 pkgrel=1
 pkgdesc="Tools for network block devices, allowing you to use remote block devices over TCP/IP."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://nbd.sourceforge.net"
 license=('GPL')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-	nbd.conf.d nbd)
+	config nbd)
+backup=('etc/nbd-server/config')
 depends=('glib2')
-md5sums=('4028c77d52a13f16be5e9bf3d3bab27d'
-         '6d746f377a28b92dd2c80f01176cb811'
-         'ab9c431881f5e3c98a8f6c04016f0e00')
+install=nbd.install
+md5sums=('ff79803165a349a84d526bfcea820b12'
+         '075be420c3d7d7fc9408def3cb8c470d'
+         'e7b13a8b3369e11927d9917664557efa')
 
 build(){
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sysconfdir=/etc
   make
   make DESTDIR="${pkgdir}" install
 
-  install -D -m644 "${srcdir}"/nbd.conf.d "${pkgdir}"/etc/conf.d/nbd
+  install -D -m644 "${srcdir}"/config "${pkgdir}"/etc/nbd-server/config
   install -D -m755 "${srcdir}"/nbd "${pkgdir}"/etc/rc.d/nbd
+
+  install -D -m644 README "${pkgdir}"/usr/share/doc/nbd/README
 }
diff --git a/community/nbd/config b/community/nbd/config
new file mode 100644
index 000000000..f90c36b23
--- /dev/null
+++ b/community/nbd/config
@@ -0,0 +1,24 @@
+# This is a comment
+[generic]
+	# The [generic] section is required, even if nothing is specified
+	# there.
+	# When either of these options are specified, nbd-server drops
+	# privileges to the given user and group after opening ports, but
+	# _before_ opening files.
+	user = nbd
+	group = nbd
+[export1]
+	exportname = /export/nbd/export1-file
+	port = 12345
+	authfile = /export/nbd/export1-authfile
+	timeout = 30
+	filesize = 10000000
+	readonly = false
+	multifile = false
+	copyonwrite = false
+	prerun = dd if=/dev/zero of=%s bs=1k count=500
+	postrun = rm -f %s
+[otherexport]
+	exportname = /export/nbd/experiment
+	port = 12346
+	# The other options are all optional.
diff --git a/community/nbd/nbd b/community/nbd/nbd
index b2643196b..76d16c779 100644
--- a/community/nbd/nbd
+++ b/community/nbd/nbd
@@ -2,15 +2,14 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-. /etc/conf.d/nbd
 
-PIDFILE="/var/run/nbd-server.$NBD_PORT.pid"
+PIDFILE="/var/run/nbd-server.pid"
 PID=`cat $PIDFILE 2>/dev/null`
 case "$1" in
   start)
     stat_busy "Starting Network Block Device Server"
     if [ "$PID" = "" ]; then 
-       /usr/bin/nbd-server $NBD_PORT $NBD_DEV $NBD_ARGS 
+       /usr/bin/nbd-server
     fi
     if [ "$PID" != "" -o $? -gt 0 ]; then
       stat_fail
diff --git a/community/nbd/nbd.install b/community/nbd/nbd.install
new file mode 100644
index 000000000..9e7a01e98
--- /dev/null
+++ b/community/nbd/nbd.install
@@ -0,0 +1,13 @@
+post_install() {
+	getent group "nbd" &>/dev/null || groupadd -r -g 44 nbd 1>/dev/null
+	getent passwd "nbd" &>/dev/null || useradd -r -u 44 -g nbd -d "/var/empty" -s "/bin/false" nbd 1>/dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	getent passwd "nbd" &>/dev/null && userdel nbd 1>/dev/null
+	getent group "nbd" &>/dev/null && groupdel nbd 1>/dev/null
+}
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 78f067a76..a9959e68e 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=2.25
+pkgver=2.26
 pkgrel=1
 pkgdesc='A generally useful editor with facilities for building and running programs.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ install=scite.install
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver/\./}.tgz"
         'SciTE.desktop'
         'makefile.patch')
-md5sums=('58767cfbdcb4ad99cc9460f36f958995'
+md5sums=('328865585758aca73292083ab4552af4'
          '48526532ef677982a4b156ae90f25b6f'
          '87005d4c7262a1a698cde0628dc7e2a2')
 
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 04e771c57..c24491033 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=sxiv
 pkgver=0.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc='simple x image viewer'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,7 +14,7 @@ source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz"
         'sxiv.desktop'
         'config.h')
 md5sums=('23006a1900690d46c0ff126c76cdbd02'
-         '0b6d43bd356aadc12537c010950e2272'
+         '1dda85ff6bed4de337f8fb303075ed11'
          '8018e9f2f63b155098428be9dbaf8b5c')
 
 build() {
diff --git a/community/sxiv/sxiv.desktop b/community/sxiv/sxiv.desktop
index f510d49ea..a981171c5 100644
--- a/community/sxiv/sxiv.desktop
+++ b/community/sxiv/sxiv.desktop
@@ -2,6 +2,6 @@
 Type=Application
 Name=sxiv
 GenericName=Image Viewer
-Exec=sxiv %f
+Exec=sxiv %F
 MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;
 NoDisplay=true
diff --git a/community/xdotool/PKGBUILD b/community/xdotool/PKGBUILD
index 818bd7017..58913e176 100644
--- a/community/xdotool/PKGBUILD
+++ b/community/xdotool/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 29296 2010-10-12 16:34:27Z foutrelis $
+# $Id: PKGBUILD 48265 2011-05-30 19:01:31Z foutrelis $
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Rttommy <rttommy@gmail.com>
 
 pkgname=xdotool
-pkgver=2.20101012.3049
+pkgver=2.20110530.1
 pkgrel=1
 pkgdesc="Command-line X11 automation tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.semicomplete.com/projects/xdotool/"
 license=('BSD')
-depends=('libxtst')
+depends=('libxtst' 'libxinerama')
 source=(http://semicomplete.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('b57e9b63123f326f0d1c8c43ff66678753d3da0c')
+sha1sums=('bf8372b2e76e8ee3884763cee6e8b3f66bf29aa6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"