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

Conflicts:
	community/agave/PKGBUILD
	community/raul/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/cheese/PKGBUILD
	gnome-unstable/cogl/PKGBUILD
	gnome-unstable/empathy/PKGBUILD
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/gdk-pixbuf2/PKGBUILD
	gnome-unstable/gedit/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/gnome-bluetooth/PKGBUILD
	gnome-unstable/gnome-documents/PKGBUILD
	gnome-unstable/gnome-documents/gnome-documents.install
	gnome-unstable/gnome-shell/PKGBUILD
	gnome-unstable/gnome-system-monitor/PKGBUILD
	gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtksourceview3/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/libwebkit/PKGBUILD
	gnome-unstable/metacity/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/nautilus/PKGBUILD
	gnome-unstable/sushi/PKGBUILD
	gnome-unstable/telepathy-farstream/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-libdrm/no-pthread-stubs.patch
	testing/iproute2/PKGBUILD
	testing/openssh/PKGBUILD

6 files changed, 52 insertions, 20 deletions

diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index 0ff620ff9..ef39b7277 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153500 2012-03-15 08:12:48Z allan $
+# $Id: PKGBUILD 153952 2012-03-21 02:16:32Z eric $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgname=bash
 _basever=4.2
 _patchlevel=024 #prepare for some patches
 pkgver=$_basever.$_patchlevel
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Bourne Again shell"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -77,7 +77,7 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
          '027d6bd8f5f6a06b75bb7698cb478089'
          '2902e0fee7a9168f3a4fd2ccd60ff047'
          '42f4400ed2314bd7519c020d0187edc5'
-         'fe5d3a367f7d5f754214dc05e3d958ab'
+         '3546099a1b2f667adc9794f52e78e35b'
          '472f536d7c9e8250dc4568ec4cfaf294'
          '1100bc1dda2cdc06ac44d7e5d17864a3'
          'a7184b76eb4a079f10174a0a8f574819'
diff --git a/core/bash/system.bashrc b/core/bash/system.bashrc
index 84de2898c..a2231e861 100644
--- a/core/bash/system.bashrc
+++ b/core/bash/system.bashrc
@@ -20,4 +20,4 @@ case ${TERM} in
     ;;
 esac
 
-[ -r /etc/bash_completion   ] && . /etc/bash_completion
+[ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 90199ce49..f32071eb9 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 147158 2012-01-23 15:27:38Z ibiru $
+# $Id: PKGBUILD 153932 2012-03-20 20:07:55Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-url="http://www.linux-foundation.org/en/Net:Iproute2"
-depends=('glibc' 'db')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+depends=('glibc' 'db' 'libnl')
 makedepends=('linux-atm')
 optdepends=('linux-atm: ATM support')
 provides=('iproute')
@@ -20,10 +20,12 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro
 	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
 source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
 	iproute2-fhs.patch
-        fix-ip-l.patch)
+        fix-ip-l.patch
+        remove-libnl-headers.patch)
 sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
           '2416b11252364d7a6c742eabb4a6924a75637a46'
-          '2ec5513c44f89046438d65e2cda1a014010e3b73')
+          '2ec5513c44f89046438d65e2cda1a014010e3b73'
+          '1cb89ea0945fd190e6943fa7b1c3a4f254d0c1b3')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -33,6 +35,7 @@ build() {
 
   #upstream fixes
   patch -Np1 -i "$srcdir/fix-ip-l.patch"
+  patch -Np1 -i "$srcdir/remove-libnl-headers.patch"
 
   ./configure
 
diff --git a/core/iproute2/remove-libnl-headers.patch b/core/iproute2/remove-libnl-headers.patch
new file mode 100644
index 000000000..921e1fa82
--- /dev/null
+++ b/core/iproute2/remove-libnl-headers.patch
@@ -0,0 +1,31 @@
+From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <shemminger@vyatta.com>
+Date: Tue, 10 Jan 2012 08:50:49 -0800
+Subject: [PATCH] iplt2p: remove unused libnl headers
+
+Leftover from change to original code.
+---
+ ip/ipl2tp.c |    7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
+index 042ddb4..97f98b6 100644
+--- a/ip/ipl2tp.c
++++ b/ip/ipl2tp.c
+@@ -23,13 +23,6 @@
+ #include <linux/if_arp.h>
+ #include <linux/ip.h>
+ 
+-#include <netlink/netlink.h>
+-#include <netlink/genl/genl.h>
+-#include <netlink/genl/family.h>
+-#include <netlink/genl/mngt.h>
+-#include <netlink/genl/ctrl.h>
+-#include <netlink/utils.h>
+-
+ #include <linux/genetlink.h>
+ #include <linux/l2tp.h>
+ 
+-- 
+1.7.6.5
+
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index a47d2a5fa..48435da86 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149749 2012-02-10 03:59:10Z eric $
+# $Id: PKGBUILD 153950 2012-03-21 02:16:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.90
+pkgver=2.02.95
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceware.org/lvm2/"
@@ -14,8 +14,8 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvm2_install
         lvm2_hook
         11-dm-initramfs.rules)
-sha1sums=('de37e533e5f3af6a18c1acadd7a07ae06150d7d6'
-          '61c4b46dff520f9c178062930ea9f169019f57e6'
+sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
+          '45f5e31045065e7bdf5d6f2e21c857b4978024b4'
           '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
           '7d63aa838703c9f986531a78164b556f765f5cce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41')
diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD
index e6c726737..62e258f7e 100644
--- a/core/psmisc/PKGBUILD
+++ b/core/psmisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149213 2012-02-06 11:42:36Z eric $
+# $Id: PKGBUILD 153948 2012-03-21 02:16:23Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=psmisc
-pkgver=22.15
+pkgver=22.16
 pkgrel=1
 pkgdesc="Miscellaneous procfs tools"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,13 +10,11 @@ url="http://psmisc.sourceforge.net/index.html"
 license=('GPL')
 groups=('base')
 depends=('ncurses')
-source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz COMM_LEN-to-18.patch)
-sha1sums=('06f507d889afab70ac7ff20fbd419ca2ffcf90c0'
-          '6f45338fc34e453bea5273691a0cf81ed3e20fb8')
+source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('27f1c8deab06e79101af1914ff81a9d561f2fcfe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../COMM_LEN-to-18.patch
   ./configure --prefix=/usr
   make
 }