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

Conflicts:
	community/go/PKGBUILD
	core/openssl/PKGBUILD
	extra/libsigsegv/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	staging/boost/PKGBUILD
	staging/kactivities/PKGBUILD
	staging/kdeaccessibility-jovie/PKGBUILD
	staging/kdeaccessibility-kaccessible/PKGBUILD
	staging/kdeaccessibility-kmag/PKGBUILD
	staging/kdeaccessibility-kmousetool/PKGBUILD
	staging/kdeaccessibility-kmouth/PKGBUILD
	staging/kdeadmin/PKGBUILD
	staging/kdeartwork/PKGBUILD
	staging/kdebase-konsole/PKGBUILD
	staging/kdebase-runtime/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase/PKGBUILD
	staging/kdebindings-kimono/PKGBUILD
	staging/kdebindings-korundum/PKGBUILD
	staging/kdebindings-kross/PKGBUILD
	staging/kdebindings-perlkde/PKGBUILD
	staging/kdebindings-perlqt/PKGBUILD
	staging/kdebindings-python/PKGBUILD
	staging/kdebindings-qtruby/PKGBUILD
	staging/kdebindings-qyoto/PKGBUILD
	staging/kdebindings-smokegen/PKGBUILD
	staging/kdebindings-smokekde/PKGBUILD
	staging/kdebindings-smokeqt/PKGBUILD
	staging/kdeedu-analitza/PKGBUILD
	staging/kdeedu-blinken/PKGBUILD
	staging/kdeedu-cantor/PKGBUILD
	staging/kdeedu-kalgebra/PKGBUILD
	staging/kdeedu-kalzium/PKGBUILD
	staging/kdeedu-kanagram/PKGBUILD
	staging/kdeedu-kbruch/PKGBUILD
	staging/kdeedu-kgeography/PKGBUILD
	staging/kdeedu-khangman/PKGBUILD
	staging/kdeedu-kig/PKGBUILD
	staging/kdeedu-kiten/PKGBUILD
	staging/kdeedu-klettres/PKGBUILD
	staging/kdeedu-kmplot/PKGBUILD
	staging/kdeedu-kstars/PKGBUILD
	staging/kdeedu-ktouch/PKGBUILD
	staging/kdeedu-kturtle/PKGBUILD
	staging/kdeedu-kwordquiz/PKGBUILD
	staging/kdeedu-marble/PKGBUILD
	staging/kdeedu-parley/PKGBUILD
	staging/kdeedu-rocs/PKGBUILD
	staging/kdeedu-step/PKGBUILD
	staging/kdegames/PKGBUILD
	staging/kdegraphics-gwenview/PKGBUILD
	staging/kdegraphics-kamera/PKGBUILD
	staging/kdegraphics-kcolorchooser/PKGBUILD
	staging/kdegraphics-kgamma/PKGBUILD
	staging/kdegraphics-kolourpaint/PKGBUILD
	staging/kdegraphics-kruler/PKGBUILD
	staging/kdegraphics-ksaneplugin/PKGBUILD
	staging/kdegraphics-ksnapshot/PKGBUILD
	staging/kdegraphics-mobipocket/PKGBUILD
	staging/kdegraphics-okular/PKGBUILD
	staging/kdegraphics-strigi-analyzer/PKGBUILD
	staging/kdegraphics-svgpart/PKGBUILD
	staging/kdegraphics-thumbnailers/PKGBUILD
	staging/kdemultimedia/PKGBUILD
	staging/kdenetwork/PKGBUILD
	staging/kdepim-runtime/PKGBUILD
	staging/kdepim/PKGBUILD
	staging/kdepimlibs/PKGBUILD
	staging/kdeplasma-addons/PKGBUILD
	staging/kdesdk-kate/PKGBUILD
	staging/kdesdk/PKGBUILD
	staging/kdetoys/PKGBUILD
	staging/kdeutils-filelight/PKGBUILD
	staging/kdeutils-kcalc/PKGBUILD
	staging/kdeutils-kcharselect/PKGBUILD
	staging/kdeutils-kdf/PKGBUILD
	staging/kdeutils-kfloppy/PKGBUILD
	staging/kdeutils-kgpg/PKGBUILD
	staging/kdeutils-kremotecontrol/PKGBUILD
	staging/kdeutils-ksecrets/PKGBUILD
	staging/kdeutils-ktimer/PKGBUILD
	staging/kdeutils-kwallet/PKGBUILD
	staging/kdeutils-superkaramba/PKGBUILD
	staging/kdeutils-sweeper/PKGBUILD
	staging/kdewebdev/PKGBUILD
	staging/libkdcraw/PKGBUILD
	staging/libkdeedu/PKGBUILD
	staging/libkexiv2/PKGBUILD
	staging/libkipi/PKGBUILD
	staging/libksane/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iptables/PKGBUILD
	testing/ruby/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xorg-server/autoconfig-nvidia.patch
	testing/xorg-server/autoconfig-sis.patch

1 files changed, 13 insertions, 9 deletions

diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index c835cc950..ea5fafe3f 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 68608 2012-03-29 13:28:45Z arodseth $
+# $Id: PKGBUILD 68691 2012-03-31 19:33:32Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andres Perera <andres87p gmail>
 # Contributor: Matthew Bauer <mjbauer95@gmail.com>
 # Contributor: Christian Himpel <chressie at gmail dot com>
@@ -7,34 +8,34 @@
 
 pkgname=go
 pkgver=1
-pkgrel=2
+pkgrel=3
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('x86_64' 'i686')
 url="http://golang.org/"
 license=('custom')
 depends=('perl' 'ed' 'gawk')
 makedepends=('mercurial' 'inetutils')
 options=('!strip' '!emptydirs')
-install=$pkgname.install
-source=($pkgname.sh)
-md5sums=('e7087d190fd519db3be5adb3a51194cc')
+source=("$pkgname"
+        "$pkgname.sh")
+md5sums=('fb4d2508c44b3823e05ed360c2976322'
+         'e7087d190fd519db3be5adb3a51194cc')
 
 build() {
   _hgroot="https://go.googlecode.com/hg/"
   _hgrepo="release"
 
   cd "$srcdir"
-  msg "Connecting to Mercurial server...."
 
-  if [ -d $_hgrepo ] ; then
+  msg "Connecting to Mercurial server...."
+  if [[ -d $_hgrepo ]] ; then
     cd $_hgrepo
     hg pull -u
     msg "The local files are updated."
   else
     hg clone $_hgroot $_hgrepo
   fi
-
   msg "Mercurial checkout done or server timeout"
 
   rm -rf "$srcdir/$_hgrepo-build"
@@ -91,6 +92,9 @@ package() {
     $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
 
   install $srcdir/go.sh $pkgdir/etc/profile.d/
+
+  mv "$pkgdir/usr/bin/go" "$pkgdir/usr/bin/go.elf"
+  install -Dm755 "$srcdir/go" "$pkgdir/usr/bin/go"
 }
 
 # vim:set ts=2 sw=2 et: