Tue Mar 4 03:48:46 UTC 2014

3 files changed, 16 insertions, 41 deletions

diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 56e9c03db..9eee99996 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105906 2014-02-18 23:59:49Z arodseth $
+# $Id: PKGBUILD 106448 2014-03-03 17:04:25Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Rémy Oudompheng  <remy@archlinux.org>
@@ -9,36 +9,25 @@
 # Contributor: Daniel YC Lin <dlin.tw@gmail.com>
 
 pkgname=go
-pkgver=1.2
-pkgrel=3
+pkgver=1.2.1
+pkgrel=1
 epoch=2
 pkgdesc='Compiler and tools for the Go programming language from Google'
 arch=('x86_64' 'i686')
 url='http://golang.org/'
 license=('custom')
 depends=('perl' 'gawk')
-makedepends=('inetutils')
+makedepends=('inetutils' 'mercurial')
 options=('!strip' 'staticlibs')
 optdepends=('liteide: IDE for editing and building projects written in Go'
-            'mercurial: Version control system written in Python'
-            'git: Version control system written in C')
+            'mercurial: VCS written in Python'
+            'git: VCS written in C')
 install="$pkgname.install"
-backup=('usr/lib/go/bin')
-
-if [ "$CARCH" == 'x86_64' ]; then
-  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz"
-          'go.sh')
-  sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2'
-              'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a')
-else
-  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz"
-          'go.sh')
-  sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651'
-              'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a')
-fi
+source=("$pkgname-$pkgver::hg+https://code.google.com/p/$pkgname#branch=release-branch.$pkgname${pkgver/.1}")
+md5sums=('SKIP')
 
 build() {
-  cd "$pkgname/src"
+  cd "$pkgname-$pkgver/src"
 
   export GOROOT_FINAL=/usr/lib/go
 
@@ -63,10 +52,13 @@ build() {
       bash make.bash --no-clean
     done
   done
+
+  # TODO: Find a way to install these tools as well:
+  #go get code.google.com/p/go.tools/cmd/...
 }
 
 check() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
 
   export GO386=387
 
@@ -77,15 +69,15 @@ check() {
     export GOARCH=386
   fi
 
-  export GOROOT="$srcdir/$pkgname"
-  export PATH="$srcdir/$pkgname/bin:$PATH"
+  export GOROOT="$srcdir/$pkgname-$pkgver"
+  export PATH="$srcdir/$pkgname-$pkgver/bin:$PATH"
 
   # TestSimpleMulticastListener will fail in standard chroot
   cd src && bash run.bash --no-rebuild || true
 }
 
 package() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
 
   install -Dm644 LICENSE \
     "$pkgdir/usr/share/licenses/go/LICENSE"
@@ -135,9 +127,6 @@ package() {
   install -Dm644 src/pkg/runtime/cgocall.h \
     "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h"
 
-  # In order to make godoc work, see FS#38597
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
-
   # This is to make go get code.google.com/p/go-tour/gotour and
   # then running the gotour executable work out of the box.
   ln -sf /usr/bin "$pkgdir/usr/lib/go/bin"
diff --git a/community/go/go.install b/community/go/go.install
index 2f6482620..286aaf9dd 100644
--- a/community/go/go.install
+++ b/community/go/go.install
@@ -8,19 +8,6 @@ post_install() {
   echo '    export PATH=$PATH:~/go/bin'
   echo '    go get code.google.com/p/go-tour/gotour'
   echo
-  echo 'For adding useful go tools:'
-  echo
-  echo '    go get code.google.com/p/go.tools/cmd/benchcmp'
-  echo '    go get code.google.com/p/go.tools/cmd/cover'
-  echo '    go get code.google.com/p/go.tools/cmd/godoc'
-  echo '    go get code.google.com/p/go.tools/cmd/goimports'
-  echo '    go get code.google.com/p/go.tools/cmd/gotype'
-  echo '    go get code.google.com/p/go.tools/cmd/html2article'
-  echo '    go get code.google.com/p/go.tools/cmd/ssadump'
-  echo '    go get code.google.com/p/go.tools/cmd/vet'
-  echo
-  echo '#go-nuts at irc.freenode.net may provide more answers.'
-  echo
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/go/go.sh b/community/go/go.sh
deleted file mode 100644
index 8393dc8d2..000000000
--- a/community/go/go.sh
+++ /dev/null
@@ -1 +0,0 @@
-export GOROOT=/usr/lib/go