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

Conflicts:
	extra/libzip/PKGBUILD
	extra/qt/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/gnome-color-manager/PKGBUILD
	gnome-unstable/gnome-disk-utility/PKGBUILD
	gnome-unstable/gnome-documents/PKGBUILD
	gnome-unstable/gnome-font-viewer/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-system-log/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/libimobiledevice/PKGBUILD
	gnome-unstable/libplist/PKGBUILD
	libre/grub2/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib-testing/lib32-glibc/glibc-__i686.patch
	multilib/lib32-qt/PKGBUILD
	testing/dhcpcd/PKGBUILD
	testing/glibc/PKGBUILD
	testing/glibc/glibc-__i686.patch

7 files changed, 40 insertions, 40 deletions

diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD
index d5f5589f0..85d8c6f48 100644
--- a/community/gendesk/PKGBUILD
+++ b/community/gendesk/PKGBUILD
@@ -1,41 +1,34 @@
-# $Id: PKGBUILD 68578 2012-03-28 14:04:58Z arodseth $
+# $Id: PKGBUILD 68610 2012-03-29 14:55:20Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Thanks to Moonprincessluna at DeviantArt for the default icon:
 # http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a
 
 pkgname=gendesk
-pkgver=0.2
+pkgver=0.3
 pkgrel=1
 pkgdesc="Utility to generate .desktop files and download icons"
 arch=('x86_64' 'i686')
 url="http://roboticoverlords.org/gendesk/"
 license=('MIT')
 depends=('glibc')
-makedepends=('go')
+makedepends=('go>=2:1-2')
 conflicts=('go-hg')
 source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.gz"
         "http://roboticoverlords.org/images/default.png")
-sha256sums=('51de3dd28ac38da82ca1db1428aad44348bc2edc491931ed0146044e781ca2e8'
+sha256sums=('a8d7ba4eacb01351f220ee93f5b72d3e58848f1de6b578d6b1d579e328a2aa37'
             '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837')
-options=(!strip)
-if [ "$CARCH" = "x86_64" ]; then
-  _go=6
-else
-  _go=8
-fi
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   msg2 "Compiling..."
-  "${_go}g" "$pkgname.go"
-  "${_go}l" -o "$pkgname" "$pkgname.$_go"
+  go build
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$pkgname"
   install -Dm644 "$srcdir/default.png" "$pkgdir/usr/share/pixmaps/default.png"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 5b6aec0dc..c835cc950 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 68595 2012-03-29 03:48:22Z vegai $
+# $Id: PKGBUILD 68608 2012-03-29 13:28:45Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Andres Perera <andres87p gmail>
 # Contributor: Matthew Bauer <mjbauer95@gmail.com>
 # Contributor: Christian Himpel <chressie at gmail dot com>
+# Contributor: Mike "str1ngs" Rosset
 
 pkgname=go
 pkgver=1
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://golang.org/"
 license=('custom')
-depends=('perl' 'ed')
+depends=('perl' 'ed' 'gawk')
 makedepends=('mercurial' 'inetutils')
-options=('!strip')
+options=('!strip' '!emptydirs')
 install=$pkgname.install
 source=($pkgname.sh)
-md5sums=('67c472bfcfdb760d1d1f0a87cfe3661f')
+md5sums=('e7087d190fd519db3be5adb3a51194cc')
 
 build() {
   _hgroot="https://go.googlecode.com/hg/"
@@ -35,13 +36,13 @@ build() {
   fi
 
   msg "Mercurial checkout done or server timeout"
-  msg "Starting make..."
 
   rm -rf "$srcdir/$_hgrepo-build"
   cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
   cd "$srcdir/$_hgrepo-build"
 
   export GOROOT="$srcdir/$_hgrepo-build"
+  export GOOS_FINAL="/usr/lib/go"
   export GOOS=linux
   export GOBIN="$GOROOT/bin"
   export PATH="$GOBIN:$PATH"
@@ -57,10 +58,14 @@ package() {
 
   install -Dm644 LICENSE $pkgdir/usr/share/licenses/go/LICENSE
   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
+  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}}
 
@@ -69,18 +74,23 @@ package() {
   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/cmd $pkgdir/usr/lib/go/src/cmd
   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
 
-  # remove object files from target src dir
+  # Remove object files from target src dir
   find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete
   find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete
 
   # Headers for C modules
-  install -Dm644 src/pkg/runtime/runtime.h $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h
-  install -Dm644 src/pkg/runtime/cgocall.h $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
+  install -Dm644 src/pkg/runtime/runtime.h \
+    $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h
+  install -Dm644 src/pkg/runtime/cgocall.h \
+    $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
 
   install $srcdir/go.sh $pkgdir/etc/profile.d/
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/go/go.sh b/community/go/go.sh
index 4aa526a11..8393dc8d2 100755
--- a/community/go/go.sh
+++ b/community/go/go.sh
@@ -1,3 +1 @@
 export GOROOT=/usr/lib/go
-export GOOS=linux
-export GOBIN=/usr/bin
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index eb2a209a4..fa2120572 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 63458 2012-02-04 10:12:39Z stativ $
+# $Id: PKGBUILD 68602 2012-03-29 08:23:57Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=11.0.2
-_pkgver=111.277
+pkgver=11.1
+_pkgver=117.105
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('156fddbdeba44bb9427c05fe567f7070')
+md5sums=('bb9943b052bcdb4832ea9b2f3f72848b')
 
 build() {
   cd "$srcdir"
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 9af3a3f56..de24295bb 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -1,24 +1,23 @@
-# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=sxiv
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc='simple x image viewer'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 install=sxiv.install
 url='https://github.com/muennich/sxiv'
-depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils')
+depends=('libx11' 'xproto' 'imlib2' 'giflib' 'libexif' 'desktop-file-utils')
 source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz"
         'sxiv.desktop'
 	    'config.h')
 md5sums=('c887e0af1e4d5a101b285a46d288c419'
          '1dda85ff6bed4de337f8fb303075ed11'
-         '67c470b605eae732aed4a8119a70832b')
-
+         'c3e6c4b86da6b17687699dbd32c7717b')
 build() {
   	cd "sxiv-${pkgver}"
 
diff --git a/community/sxiv/config.h b/community/sxiv/config.h
index f84629cb4..cc95fd46a 100644
--- a/community/sxiv/config.h
+++ b/community/sxiv/config.h
@@ -3,7 +3,7 @@
 /* auto-orientate jpeg files according to their exif tags?
  * (requires libexif [-lexif] to be installed)
  */
-#define EXIF_SUPPORT 0
+#define EXIF_SUPPORT 1
 /* load all frames from gif files and support gif animations?
  * (requires giflib [-lgif] to be installed)
  */
diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install
index c50e26c78..f09c533f4 100644
--- a/community/sxiv/sxiv.install
+++ b/community/sxiv/sxiv.install
@@ -1,8 +1,8 @@
 post_install () {
     update-desktop-database -q
 
-  	echo "* Look into config.h to customize sxiv to your needs."
-  	echo "  Use 'makepkg --skipinteg' to rebuild the package after changing config.h."
+    echo "* Edit config.h in sxiv's PKGBUILD directory (generally /var/abs/community/sxiv/)"
+    echo "  and rebuild package if you want to change settings."
 	echo "* Create the directory ~/.sxiv/ to enable thumbnail caching."
   	echo "  See sxiv(1) for more information."
 }