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

Conflicts:
	core/expat/PKGBUILD
	core/gcc/PKGBUILD
	core/glibc/PKGBUILD
	core/libtool/PKGBUILD
	core/wpa_actiond/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/binutils-multilib/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/gcc-multilib/gcc_pure64-multilib.patch
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
	multilib/lib32-glibc/glibc-__i686.patch
	multilib/libtool-multilib/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdepim-runtime/PKGBUILD
	testing/telepathy-gabble/PKGBUILD
	testing/telepathy-glib/PKGBUILD
	testing/telepathy-mission-control/PKGBUILD

5 files changed, 45 insertions, 9 deletions

diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index ea5fafe3f..ba9ae1152 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68691 2012-03-31 19:33:32Z arodseth $
+# $Id: PKGBUILD 68856 2012-04-03 23:02:20Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andres Perera <andres87p gmail>
@@ -8,7 +8,7 @@
 
 pkgname=go
 pkgver=1
-pkgrel=3
+pkgrel=4
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('x86_64' 'i686')
@@ -17,9 +17,10 @@ license=('custom')
 depends=('perl' 'ed' 'gawk')
 makedepends=('mercurial' 'inetutils')
 options=('!strip' '!emptydirs')
+install=go.install
 source=("$pkgname"
         "$pkgname.sh")
-md5sums=('fb4d2508c44b3823e05ed360c2976322'
+md5sums=('c14a33c0d138f9cd19264a8dd0b809a7'
          'e7087d190fd519db3be5adb3a51194cc')
 
 build() {
diff --git a/community/go/go b/community/go/go
index c284ec45c..2f68ce8ff 100644
--- a/community/go/go
+++ b/community/go/go
@@ -2,4 +2,7 @@
 if [[ -z $GOROOT ]]; then
     export GOROOT=/usr/lib/go
 fi
+if [[ -z $GOROOT_FINAL ]]; then
+    export GOROOT_FINAL=$GOROOT
+fi
 /usr/bin/go.elf "$@"
diff --git a/community/go/go.install b/community/go/go.install
new file mode 100644
index 000000000..9a87b9d11
--- /dev/null
+++ b/community/go/go.install
@@ -0,0 +1,32 @@
+post_upgrade() {
+  # Backup any previous /usr/lib/go/bin directory
+  if [ -e /usr/lib/go/bin ]; then
+    mv /usr/lib/go/bin /usr/lib/go/bin.pacnew
+  fi
+
+  # Point /usr/lib/go/bin to /usr/bin
+  #
+  # This is to make go get code.google.com/p/go-tour/gotour and
+  # then running the gotour executable work out of the box.
+  #
+  # Also, /usr/bin is the place for system-wide executables,
+  # not /usr/lib/go/bin. Users should use different paths by
+  # setting the appropriate environment variables.
+  #
+  ln -sf /usr/bin /usr/lib/go/bin
+}
+
+post_install() {
+  post_upgrade
+}
+
+pre_remove() {
+  if [ -c /usr/lib/go/bin ]; then
+    rmdir --ignore-fail-on-non-empty /usr/lib/go/bin
+  fi
+  if [ -L /usr/lib/go/bin ]; then
+    rm /usr/lib/go/bin
+  fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD
index a081a49b5..12112a773 100644
--- a/community/python-psycopg2/PKGBUILD
+++ b/community/python-psycopg2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60983 2011-12-20 09:13:23Z spupykin $
+# $Id: PKGBUILD 68833 2012-04-03 16:20:19Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=python-psycopg2
 pkgname=('python-psycopg2' 'python2-psycopg2')
-pkgver=2.4.4
+pkgver=2.4.5
 pkgrel=1
 pkgdesc="A PostgreSQL database adapter for the Python programming language."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://initd.org/psycopg/"
 license=('LGPL3')
 makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
 source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz)
-md5sums=('331255d2d44018bcef2ea192aabc1d6a')
+md5sums=('075e4df465e9a863f288d5bdf6e6887e')
 
 build() {
   cd "$srcdir/psycopg2-$pkgver"
diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD
index d21f4e205..14a00e706 100644
--- a/community/xapian-core/PKGBUILD
+++ b/community/xapian-core/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60985 2011-12-20 09:14:11Z spupykin $
+# $Id: PKGBUILD 68835 2012-04-03 16:30:36Z foutrelis $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=xapian-core
-pkgver=1.2.8
+pkgver=1.2.9
 pkgrel=1
 pkgdesc='Open source search engine library.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('sh' 'gcc-libs' 'zlib' 'util-linux')
 # xapian config requires libxapian.la
 options=('libtool')
 source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6c9f9e7ac43aa4e086283201329e98ee')
+md5sums=('909dd02931fe8f37690aa82a4daaa441')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"