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

Conflicts:
	community/python-mpi4py/PKGBUILD
	community/python-psutil/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libgtop/PKGBUILD
	libre/bitlbee-libre/PKGBUILD

23 files changed, 301 insertions, 144 deletions

diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
deleted file mode 100644
index 12f32c9a3..000000000
--- a/extra/bitlbee/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 186657 2013-05-30 12:20:27Z dreisner $
-
-# Contributor: FUBAR <mrfubar@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=bitlbee
-pkgver=3.2
-pkgrel=3
-pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
-url='http://www.bitlbee.org/'
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gnutls' 'glib2')
-makedepends=('asciidoc' 'libotr3')
-optdepends=('libotr3: for OTR encryption support'
-            'xinetd: to run bitlbee through xinetd')
-source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
-        'xinetd'
-        'bitlbee.tmpfiles')
-sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
-          '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
-          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
-backup=('etc/bitlbee/bitlbee.conf'
-        'etc/bitlbee/motd.txt'
-        'etc/xinetd.d/bitlbee')
-install=bitlbee.install
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --etcdir=/etc/bitlbee \
-    --sbindir=/usr/bin \
-    --pidfile=/run/bitlbee/bitlbee.pid \
-    --ipcsocket=/run/bitlbee/bitlbee.sock \
-    --systemdsystemunitdir=/usr/lib/systemd/system \
-    --ssl=gnutls \
-    --strip=0 \
-    --otr=plugin
-
-  # hacky: build against libotr3
-  sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings
-  sed -i 's,#include.*libotr,&3,' otr.h
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
-
-  install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
-  install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
-  install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
-}
diff --git a/extra/bitlbee/bitlbee.install b/extra/bitlbee/bitlbee.install
deleted file mode 100644
index aa5a81a70..000000000
--- a/extra/bitlbee/bitlbee.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
-	getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
-	systemd-tmpfiles --create bitlbee.conf
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
-	getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
-	true
-}
diff --git a/extra/bitlbee/bitlbee.tmpfiles b/extra/bitlbee/bitlbee.tmpfiles
deleted file mode 100644
index da72a0a79..000000000
--- a/extra/bitlbee/bitlbee.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/extra/bitlbee/xinetd b/extra/bitlbee/xinetd
deleted file mode 100644
index d671a8cfc..000000000
--- a/extra/bitlbee/xinetd
+++ /dev/null
@@ -1,12 +0,0 @@
-service bitlbee
-{
-        type = UNLISTED
-        socket_type = stream
-        protocol = tcp
-        wait = no
-        user = bitlbee
-	group = bitlbee
-        server = /usr/sbin/bitlbee
-        port = 6667
-        disable = yes
-}
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 1f09c96b3..8c5c4f89e 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,6 +1,6 @@
-# $Id: PKGBUILD 192059 2013-08-05 14:17:28Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# $Id: PKGBUILD 193497 2013-08-21 11:58:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgbase=calligra
 pkgname=('calligra-braindump'
@@ -17,7 +17,7 @@ pkgname=('calligra-braindump'
          'calligra-sheets'
          'calligra-stage'
          'calligra-words')
-pkgver=2.7.1
+pkgver=2.7.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.calligra-suite.org/'
@@ -29,7 +29,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
 [ "$CARCH" != "mips64el" ] && makedepends+=('vc')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('9cf909ddf57ecb16d4370cc1062d0f7f')
+md5sums=('645886d0fff6b1dd865850f3187004a6')
 
 prepare() {
   mkdir build
diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD
index 6d17f5df6..d48773b42 100644
--- a/extra/gnome-chess/PKGBUILD
+++ b/extra/gnome-chess/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188128 2013-06-10 07:55:22Z heftig $
+# $Id: PKGBUILD 193436 2013-08-20 07:10:18Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-chess
-pkgver=3.8.3
+pkgver=3.8.4
 pkgrel=1
 pkgdesc="Play the classic two-player boardgame of chess"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ install=gnome-chess.install
 url="https://live.gnome.org/Chess"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c45493ca7de778029ea78bcf328410a6399dfd91f50241c6f6b4420115c2e786')
+sha256sums=('4b7f20d875585e1d36bc0e4dda8c66ccd2e014f8ef829c4a6ec87275c4418d6a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-mines/PKGBUILD b/extra/gnome-mines/PKGBUILD
index 5943c2dc1..0ed91876b 100644
--- a/extra/gnome-mines/PKGBUILD
+++ b/extra/gnome-mines/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183389 2013-04-21 22:10:07Z heftig $
+# $Id: PKGBUILD 193434 2013-08-20 07:06:23Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-mines
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="Clear hidden mines from a minefield"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ install=gnome-mines.install
 url="https://live.gnome.org/Mines"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('81a47cf8eeb81f1d54ccd42b8eb04f5c8a1e6dcc8fd4f1bc714b147a934da633')
+sha256sums=('e70f13056183f8d9a8aa3721516545364e10e9fde0a4b703de7cba1fe3af531d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD
index cd4827cbc..f62f6052e 100644
--- a/extra/goffice/PKGBUILD
+++ b/extra/goffice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 190847 2013-07-18 20:16:59Z jgc $
+# $Id: PKGBUILD 193438 2013-08-20 07:25:28Z jgc $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=goffice
-pkgver=0.10.4
+pkgver=0.10.5
 pkgrel=1
 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ options=('!libtool')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection')
 depends=('librsvg' 'gtk3' 'libgsf' 'libspectre')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('30cb91693abff241e1b14b741ac23bc588f428b4524b12e3fecd1ea3f0bc67ba')
+sha256sums=('63a7a7dd55fbe91991a66dbc78ab27d2ac55bd722d42d4dd3087e3ae33832570')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index d9e373f4f..266815bf9 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191763 2013-07-30 10:02:50Z heftig $
+# $Id: PKGBUILD 193457 2013-08-20 18:30:50Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.20.4
+pkgver=0.20.5
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk-doc vala)
 optdepends=('python2: gupnp-binding-tool')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('27eec44d62f6f60305cd65d7a488fc128700f8345ab37cc2ab42cf052fdd5b35')
+sha256sums=('be54bd5f3bfea36d689a5ce70679e51ec3ea3c94677e70ffc7c7ef160bffb260')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/iagno/PKGBUILD b/extra/iagno/PKGBUILD
index 005cc69cd..a75082082 100644
--- a/extra/iagno/PKGBUILD
+++ b/extra/iagno/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 183423 2013-04-21 22:11:05Z heftig $
+# $Id: PKGBUILD 193512 2013-08-21 14:33:53Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=iagno
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="Dominate the board in a classic version of Reversi"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
+depends=('hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
@@ -17,7 +17,7 @@ install=iagno.install
 url="https://live.gnome.org/Iagno"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('03e96eaada69d95b709e438ccb69911fea330be8827df320c5dff02d75a59efd')
+sha256sums=('c4687214262c9fd838e40ea27fac8ed7c23db32690ef2d0f569373a8eaeb1de7')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/iagno/iagno.install b/extra/iagno/iagno.install
index 0730c1a47..e9eb19f52 100644
--- a/extra/iagno/iagno.install
+++ b/extra/iagno/iagno.install
@@ -1,6 +1,5 @@
 post_install() {
   glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
   gtk-update-icon-cache -f -q usr/share/icons/hicolor
 }
 
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index f1055f735..1c39daf36 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193234 2013-08-19 09:54:29Z andrea $
+# $Id: PKGBUILD 193487 2013-08-21 09:33:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -27,7 +27,8 @@ install="${pkgname}.install"
 backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
-        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'plasma-desktop-dbus.patch')
 sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -36,7 +37,8 @@ sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d'
           'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
+          'd509dac592bd8b310df27991b208c95b6d907514'
+          '57315ab3adf4d7eed9410c4494f0a63204122763')
 
 prepare() {
         cd ${_pkgname}-${pkgver}
@@ -48,6 +50,8 @@ prepare() {
 
         # KDEBUG#202629
         patch -p0 -i "${srcdir}"/terminate-server.patch
+        # KDEBUG#321695
+        patch -p1 -i "${srcdir}"/plasma-desktop-dbus.patch
 }
 
 build() {
diff --git a/extra/kdebase-workspace/plasma-desktop-dbus.patch b/extra/kdebase-workspace/plasma-desktop-dbus.patch
new file mode 100644
index 000000000..70790dac3
--- /dev/null
+++ b/extra/kdebase-workspace/plasma-desktop-dbus.patch
@@ -0,0 +1,27 @@
+From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
+Date: Tue, 20 Aug 2013 11:35:57 +0000
+Subject: Partially revert commit 83d3018
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=bb2bddb083eb293786206ac91ae1feeaf942db32
+---
+Partially revert commit 83d3018
+
+Somehow unique made ksplash quit too soon and/or plasma start
+too late
+
+REVIEW: 112073
+BUG: 321695
+FIXED-IN: 4.11.1
+---
+
+
+--- a/plasma/desktop/shell/data/plasma-desktop.desktop
++++ b/plasma/desktop/shell/data/plasma-desktop.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Exec=plasma-desktop
+-X-DBUS-StartupType=unique
++X-DBUS-StartupType=multi
+ Name=Plasma Desktop Workspace
+ Name[ar]=مساحة عمل بلازما
+ Name[ast]=Espaciu de trabayu del escritoriu Plasma
+
diff --git a/extra/libgtop/PKGBUILD b/extra/libgtop/PKGBUILD
index 432a7b9e3..e2e8aa631 100644
--- a/extra/libgtop/PKGBUILD
+++ b/extra/libgtop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136578 2011-08-30 12:54:40Z ibiru $
+# $Id: PKGBUILD 193440 2013-08-20 08:09:13Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgtop
-pkgver=2.28.4
-pkgrel=1.1
+pkgver=2.28.5
+pkgrel=1
 pkgdesc="A library that read information about processes and the running system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -13,7 +13,7 @@ install=libgtop.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz)
 options=('!libtool')
 url="http://www.gnome.org/"
-sha256sums=('b6619cfd1540267ee81d456d1a26c72c793261586f1b00a7b9a7a229d0abe1d8')
+sha256sums=('c812c174e44a8971a1f33265437cfd10f1e99869c7f5c05f8ee95846a70a3342')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD
index 8094c64ae..c941c0cd3 100644
--- a/extra/libwnck3/PKGBUILD
+++ b/extra/libwnck3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192146 2013-08-06 11:30:34Z heftig $
+# $Id: PKGBUILD 193459 2013-08-20 18:34:44Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libwnck3
 _pkgbasename=libwnck
-pkgver=3.4.6
+pkgver=3.4.7
 pkgrel=1
 pkgdesc="Window Navigator Construction Kit (GTK+3)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('e3ae2d25b684910f49fc548dc96b8a54b77c431d94ad1fd5a37cbecab7bb1851')
+sha256sums=('d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723')
 
 build() {
     cd "$_pkgbasename-$pkgver"
diff --git a/extra/nacl-toolchain-newlib/PKGBUILD b/extra/nacl-toolchain-newlib/PKGBUILD
index 0635d1e79..362f962aa 100644
--- a/extra/nacl-toolchain-newlib/PKGBUILD
+++ b/extra/nacl-toolchain-newlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165618 2012-08-27 12:19:30Z foutrelis $
+# $Id: PKGBUILD 193478 2013-08-21 02:11:50Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=nacl-toolchain-newlib
-pkgver=9513
+pkgver=12029
 pkgrel=1
 _binutilsver=2.20.1
 _newlibver=1.20.0
@@ -20,16 +20,20 @@ source=(http://ftp.gnu.org/gnu/binutils/binutils-$_binutilsver.tar.bz2
         http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/nacltoolchain-buildscripts-r$pkgver.tar.gz
         http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclbinutils-$_binutilsver-r$pkgver.patch.bz2
         http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclnewlib-$_newlibver-r$pkgver.patch.bz2
-        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2)
+        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2
+        binutils-texinfo-r0.patch
+        gcc-texinfo-r0.patch)
 sha256sums=('71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64'
             'c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692'
             '97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040'
-            '3c3d6e63ef8caec24a9e368b72e6c94a28edc8c016da5fef73a312b4a3514909'
-            'caaefc2bf90325f152bd0998a29fcad425522a22c6ce373366c4dde2b76c5338'
-            'be9e48f8714eaadfc3349ac6d8b077050b719d16a3e7592573670cee7a3c4934'
-            'ccbc83627bc7c36f7bbe994ccffe4d51584d8812f2ed62f08528c173e06dcf85')
+            'a77912c4aac01142bd1c2f684f9933d6fcd39f0e67a1058858be50f0db18da7e'
+            '3b0e41b7923a90d611e598b31ed30062cfa3cf2fc2cbe7304e340a0acc780186'
+            '2de88079c500a694b73dab5a6a3690b2126ea0df498f1e27c5819b7d4256cb1a'
+            'c98bda783fbc9726a9d0374118b1315f4ade4fe3bb5cbc96511b7a80b385dd70'
+            '64ba7c3f5edbe33b17312ab6da6c4b9e244e47289bde796a3078bf73072a0139'
+            '7eab20b6db6a7224984fd4b5bff1742571b0429428ea2af02f83f82f3de63070')
 
-build() {
+prepare() {
   cd "$srcdir"
 
   mkdir SRC
@@ -37,10 +41,24 @@ build() {
   mv newlib-$_newlibver SRC/newlib
   mv gcc-$_gccver SRC/gcc
 
-  for _patch in *.patch; do
+  for _patch in *-r$pkgver.patch; do
     patch -d SRC -Np0 -i "$srcdir/$_patch"
   done
 
+  cd SRC
+
+  # Fix build with texinfo 5.1
+  patch -d binutils -Np1 -i "$srcdir/binutils-texinfo-r0.patch"
+  patch -d gcc -Np1 -i "$srcdir/gcc-texinfo-r0.patch"
+}
+
+build() {
+  cd "$srcdir"
+
+  CFLAGS+=" $CPPFLAGS"
+  CXXFLAGS+=" $CPPFLAGS"
+  unset CPPFLAGS
+
   make PREFIX="$srcdir/$pkgname" CANNED_REVISION="yes" build-with-newlib
 }
 
@@ -49,6 +67,13 @@ package() {
 
   install -d "$pkgdir/usr/lib"
   mv $pkgname "$pkgdir/usr/lib/$pkgname"
+
+  # NaCL license
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Newlib license
+  install -m644 -t "$pkgdir/usr/share/licenses/$pkgname/" \
+    SRC/newlib/COPYING.{NEWLIB,LIBGLOSS}
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch b/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch
new file mode 100644
index 000000000..ab81d8a49
--- /dev/null
+++ b/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/show_bug.cgi?id=464168
+
+commit 935f85422863b42b6fbca30885885e3fa28eea36
+Author: Nick Clifton <nickc@redhat.com>
+Date:   Mon Jan 7 12:11:11 2013 +0000
+
+    	* ld.texinfo: Replace @ with @@ when it is part of the text.
+    	Correct ordering of M68HC11 entry.
+    
+    	* doc/binutils.texi: Fix ordering of top level nodes.
+    	Replace erroneous uses of @itemx with @item.
+    
+    	* bfd.texinfo: Replace @ with @@ when it is part of the text.
+
+diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
+index 45ffa73..3aa3300 100644
+--- a/bfd/doc/bfd.texinfo
++++ b/bfd/doc/bfd.texinfo
+@@ -322,7 +324,7 @@ All of BFD lives in one directory.
+ @printindex cp
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -333,7 +335,7 @@ All of BFD lives in one directory.
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+ 
+ @bye
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index c7ae2a5..4777ad5 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same
+ @printindex cp
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+ 
+ @bye
diff --git a/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch b/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch
new file mode 100644
index 000000000..852337351
--- /dev/null
+++ b/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch
@@ -0,0 +1,132 @@
+https://bugs.gentoo.org/show_bug.cgi?id=464168
+
+commit 85ad240e47dcdc1bf20ef6a95e921ac1f766d995
+Author: schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date:   Sun Oct 28 09:19:54 2012 +0000
+
+    * doc/cppopts.texi: Fix use of @item vs. @itemx inside @table.
+    * doc/extend.texi: Likewise.
+    * doc/generic.texi: Likewise.
+    * doc/invoke.texi: Likewise.
+    * doc/md.texi: Likewise.
+    * doc/sourcebuild.texi: Likewise.
+    
+    
+    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192887 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi
+index 27b1095..a2eb79d 100644
+--- a/gcc/doc/cppopts.texi
++++ b/gcc/doc/cppopts.texi
+@@ -805,7 +805,7 @@ Replacement:      [    ]    @{    @}    #    \    ^    |    ~
+ Enable special code to work around file systems which only permit very
+ short file names, such as MS-DOS@.
+ 
+-@itemx --help
++@item --help
+ @itemx --target-help
+ @opindex help
+ @opindex target-help
+diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi
+index dfbdc4c..bca0d8f 100644
+--- a/gcc/doc/md.texi
++++ b/gcc/doc/md.texi
+@@ -4483,8 +4483,8 @@ means of constraints requiring operands 1 and 0 to be the same location.
+ @cindex @code{ior@var{m}3} instruction pattern
+ @cindex @code{xor@var{m}3} instruction pattern
+ @item @samp{ssadd@var{m}3}, @samp{usadd@var{m}3}
+-@item @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3}
+-@item @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3}
++@itemx @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3}
++@itemx @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3}
+ @itemx @samp{div@var{m}3}, @samp{ssdiv@var{m}3}
+ @itemx @samp{udiv@var{m}3}, @samp{usdiv@var{m}3}
+ @itemx @samp{mod@var{m}3}, @samp{umod@var{m}3}
+diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
+index 89e7712..ec8263f 100644
+--- a/gcc/doc/sourcebuild.texi
++++ b/gcc/doc/sourcebuild.texi
+@@ -691,7 +691,7 @@ standard rule in @file{gcc/Makefile.in} to the variable
+ @code{lang_checks}.
+ 
+ @table @code
+-@itemx all.cross
++@item all.cross
+ @itemx start.encap
+ @itemx rest.encap
+ FIXME: exactly what goes in each of these targets?
+--- a/gcc/doc/c-tree.texi
++++ b/gcc/doc/c-tree.texi
+@@ -2338,13 +2338,13 @@
+ not matter.  The type of the operands and that of the result are
+ always of @code{BOOLEAN_TYPE} or @code{INTEGER_TYPE}.
+ 
+-@itemx POINTER_PLUS_EXPR
++@item POINTER_PLUS_EXPR
+ This node represents pointer arithmetic.  The first operand is always
+ a pointer/reference type.  The second operand is always an unsigned
+ integer type compatible with sizetype.  This is the only binary
+ arithmetic operand that can operate on pointer types.
+ 
+-@itemx PLUS_EXPR
++@item PLUS_EXPR
+ @itemx MINUS_EXPR
+ @itemx MULT_EXPR
+ These nodes represent various binary arithmetic operations.
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -4645,11 +4652,11 @@
+ @option{-fdump-rtl-ce3} enable dumping after the three
+ if conversion passes. 
+ 
+-@itemx -fdump-rtl-cprop_hardreg
++@item -fdump-rtl-cprop_hardreg
+ @opindex fdump-rtl-cprop_hardreg
+ Dump after hard register copy propagation.
+ 
+-@itemx -fdump-rtl-csa
++@item -fdump-rtl-csa
+ @opindex fdump-rtl-csa
+ Dump after combining stack adjustments.
+ 
+@@ -4660,11 +4667,11 @@
+ @option{-fdump-rtl-cse1} and @option{-fdump-rtl-cse2} enable dumping after
+ the two common sub-expression elimination passes.
+ 
+-@itemx -fdump-rtl-dce
++@item -fdump-rtl-dce
+ @opindex fdump-rtl-dce
+ Dump after the standalone dead code elimination passes.
+ 
+-@itemx -fdump-rtl-dbr
++@item -fdump-rtl-dbr
+ @opindex fdump-rtl-dbr
+ Dump after delayed branch scheduling.
+ 
+@@ -4709,7 +4716,7 @@
+ @opindex fdump-rtl-initvals
+ Dump after the computation of the initial value sets.
+ 
+-@itemx -fdump-rtl-into_cfglayout
++@item -fdump-rtl-into_cfglayout
+ @opindex fdump-rtl-into_cfglayout
+ Dump after converting to cfglayout mode.
+ 
+@@ -4739,7 +4746,7 @@
+ @opindex fdump-rtl-rnreg
+ Dump after register renumbering.
+ 
+-@itemx -fdump-rtl-outof_cfglayout
++@item -fdump-rtl-outof_cfglayout
+ @opindex fdump-rtl-outof_cfglayout
+ Dump after converting from cfglayout mode.
+ 
+@@ -4751,7 +4758,7 @@
+ @opindex fdump-rtl-postreload
+ Dump after post-reload optimizations.
+ 
+-@itemx -fdump-rtl-pro_and_epilogue
++@item -fdump-rtl-pro_and_epilogue
+ @opindex fdump-rtl-pro_and_epilogue
+ Dump after generating the function pro and epilogues.
+ 
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 039094166..1ef2573b0 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 186390 2013-05-26 09:24:49Z bluewind $
+# $Id: PKGBUILD 193416 2013-08-20 06:10:03Z angvp $
 # Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=net-snmp
 pkgver=5.7.2
-pkgrel=7
+pkgrel=8
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.net-snmp.org/"
 license=('BSD')
 depends=('openssl' 'libnl' 'pciutils')
-makedepends=('python2-distribute')
+makedepends=('python2-setuptools')
 optdepends=('perl-term-readkey: for snmpcheck application'
             'perl-tk: for snmpcheck and tkmib applications'
             'python2: for the python modules')
diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD
index e6d9d6f38..0da520e6a 100644
--- a/extra/python-markupsafe/PKGBUILD
+++ b/extra/python-markupsafe/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 189977 2013-07-12 06:16:17Z eric $
+# $Id: PKGBUILD 193420 2013-08-20 06:10:07Z angvp $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alex Anthony <alex.anthony28991@gmail.com>
 
 pkgname=('python-markupsafe' 'python2-markupsafe')
 pkgver=0.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/MarkupSafe"
 license=('custom')
-makedepends=('python-distribute' 'python2-distribute')
+makedepends=('python-setuptools' 'python2-setuptools')
 source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
 md5sums=('f8d252fd05371e51dec2fe9a36890687')
 
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index 06dfbcde1..b6bdc5f06 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182931 2013-04-16 08:33:21Z jgc $
+# $Id: PKGBUILD 193422 2013-08-20 06:10:08Z angvp $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
@@ -6,12 +6,12 @@
 pkgbase=python-numpy
 pkgname=('python2-numpy' 'python-numpy')
 pkgver=1.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.numpy.org/"
-makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
+makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose')
 source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
 md5sums=('0ab72b3b83528a7ae79c6df9042d61c6')
 
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 570fd2d63..4ff6ed60a 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -10,11 +10,11 @@
 
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.0.8
+pkgver=4.0.9
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=4.0.8
+_realver=4.0.9
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
@@ -245,8 +245,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-
-md5sums=('03819bc1132e417feac1b39299365b73'
+md5sums=('f5f2ad0e2aabf024e2e3e2f297a0631a'
          '5697da77590ec092cc8a883bae06093c'
          'ee8507839745cf17d2fb5401be7da6a8'
          '96f82c38f3f540b53f3e5144900acf17'
diff --git a/extra/swell-foop/PKGBUILD b/extra/swell-foop/PKGBUILD
index 4b20245b8..ccd122837 100644
--- a/extra/swell-foop/PKGBUILD
+++ b/extra/swell-foop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183460 2013-04-21 22:12:12Z heftig $
+# $Id: PKGBUILD 193432 2013-08-20 07:00:28Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=swell-foop
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="Clear the screen by removing groups of colored and shaped tiles"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ install=swell-foop.install
 url="https://live.gnome.org/Swell%20Foop"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('50d6b53d7507c1176ade9227f04d1c260143a5ebf8cf812c359c89eaeec9ee99')
+sha256sums=('33b72da1f5378801ae41cb13f3bc35ce44368c104327f68dd51f45653ca62cb9')
 
 build() {
   cd $pkgname-$pkgver