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

Conflicts: community/codeblocks/PKGBUILD community/gnash/PKGBUILD community/i3lock/PKGBUILD community/instead/PKGBUILD extra/asio/PKGBUILD extra/cups/PKGBUILD extra/libdrm/PKGBUILD extra/liborigin2/PKGBUILD extra/mesa/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/ocrad/PKGBUILD extra/qtiplot/PKGBUILD extra/scribus/PKGBUILD extra/xdg-user-dirs/PKGBUILD
author: Nicolás Reynolds <fauno@endefensadelsl.org> 2013-07-14 15:27:23 -0300
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2013-07-14 15:27:23 -0300
commit: a594ebe149ad81798984a410c036a0965df1581a (patch)
tree: 9f92df878175fe438860b196b7394ec8f0bac4cd
parent: 03d128385c4ca773e67c93729a45899590d0d99e (diff)
parent: d525d9a731f5d79c1128a192b9d2977a2967570f (diff)
198 files changed, 2691 insertions, 939 deletions
diff --git a/.hgignore b/.hgignore
index 248e3a4e3..9cae9ff14 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,10 +4,14 @@ syntax: glob
 *.log
 *~
 \#*\#
-src/
-pkg/
+src/*
+pkg/*
 *.pkg.tar.*
 *.src.tar.*
 *.log
 *.gz
-*.tar.*
-\ No newline at end of file
+*.tar.*
+*/src-libre/*
+*/pkg-libre/*
+*.orig
+*.bck
+\ No newline at end of file
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index 7be1fe0f5..fa23ed236 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90002 2013-05-06 19:36:12Z foutrelis $
+# $Id: PKGBUILD 94012 2013-07-13 12:30:26Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
 # Contributor: AdriÃ¡n Chaves FernÃ¡ndez (Gallaecio) <adriyetichaves@gmail.com>
 pkgname=0ad
 pkgver=a13
 _pkgver=0.0.13-alpha
-pkgrel=4
+pkgrel=5
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
 url="http://play0ad.com/"
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 572ddd10c..665dd1db8 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93162 2013-06-26 14:39:47Z tredaelli $
+# $Id: PKGBUILD 94013 2013-07-13 12:30:36Z svenstaro $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt')
 pkgver=0.8.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
 makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index 03554f011..cddb91ecf 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,30 +1,28 @@
-# $Id: PKGBUILD 92313 2013-06-03 21:39:22Z lfleischer $
+# $Id: PKGBUILD 94015 2013-07-13 12:31:02Z svenstaro $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 # Contributor: nathan owe ndowens04 at gmail dot com
 
 pkgname=cclive
 pkgver=0.7.13
-pkgrel=1
+pkgrel=2
 pkgdesc='Commandline downloader for popular video websites.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://cclive.sourceforge.net/'
 license=('GPL3')
 depends=('boost-libs' 'pcre' 'curl' 'libquvi')
-makedepends=('boost')
+makedepends=('boost' 'chrpath')
 source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz")
 md5sums=('654892be303c2738dd078dbe6c78595d')
 
 build() {
   cd $pkgname-$pkgver
-
   ./configure --prefix=/usr
-
   make
 }
 
 package() {
   cd $pkgname-$pkgver
-
   make DESTDIR="$pkgdir" install
+  chrpath --delete "$pkgdir"/usr/bin/cclive
 }
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index bb2a5e659..22c4a7fa0 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93820 2013-07-10 15:57:17Z svenstaro $
+# $Id: PKGBUILD 94016 2013-07-13 12:31:10Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>, 
@@ -6,13 +6,13 @@
 
 pkgname=cegui
 pkgver=0.8.2
-pkgrel=1
+pkgrel=4
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://crayzedsgui.sourceforge.net"
 license=("MIT")
-depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua51' 'silly')
-makedepends=('cmake' 'python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz' 'irrlicht')
+depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua51' 'silly' 'glfw')
+makedepends=('cmake' 'python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz' 'irrlicht' 'glm' 'mesa')
 optdepends=("python2: python bindings"
             "ogre: ogre module"
             "gtk2: gtk2 module"
diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD
index 41704dd93..3094044db 100644
--- a/community/codeblocks/PKGBUILD
+++ b/community/codeblocks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81177 2012-12-12 19:46:48Z bpiotrowski $
+# $Id: PKGBUILD 94017 2013-07-13 12:31:23Z svenstaro $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Robert Hollencamp <rhollencamp@gmail.com>
 # Contributor: Daniel J Griffiths <griffithsdj@inbox.com>
@@ -6,10 +6,10 @@
 
 pkgname=codeblocks
 pkgver=12.11
-pkgrel=2.1
+pkgrel=3
 pkgdesc='Open source and cross-platform C/C++ IDE'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.codeblocks.org"
+url='http://www.codeblocks.org'
 license=('GPL3')
 depends=('boost-libs' 'bzip2' 'desktop-file-utils' 'gamin' 'gtk-update-icon-cache'
          'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk')
@@ -20,7 +20,7 @@ source=(http://download.berlios.de/$pkgname/${pkgname}_${pkgver}-1.tar.gz)
 md5sums=('4fa8980a8c578b8b5589fceb9b0890d6')
 
 build() {
-  cd $srcdir/$pkgname-${pkgver}release*
+  cd $pkgname-${pkgver}release*
  
   LDFLAGS+=' -lX11'
   ./configure --prefix=/usr --with-contrib-plugins=all
@@ -28,6 +28,6 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-${pkgver}release*
-  make DESTDIR=$pkgdir install
+  cd $pkgname-${pkgver}release*
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/codeblocks/prefix.diff b/community/codeblocks/prefix.diff
deleted file mode 100644
index 3c88d4067..000000000
--- a/community/codeblocks/prefix.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -aur codeblocks-8.02.orig/src/src/prefix.cpp codeblocks-8.02.new/src/src/prefix.cpp
---- codeblocks-8.02.orig/src/src/prefix.cpp	2009-07-27 22:53:45.000000000 +0200
-+++ codeblocks-8.02.new/src/src/prefix.cpp	2009-07-27 22:56:24.000000000 +0200
-@@ -389,7 +389,8 @@
- char *
- br_extract_dir (const char *path)
- {
--	char *end, *result;
-+  const char *end;
-+  char *result;
- 
- 	br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
- 
-@@ -424,7 +425,8 @@
- char *
- br_extract_prefix (const char *path)
- {
--	char *end, *tmp, *result;
-+  const char *end;
-+  char *tmp, *result;
- 
- 	br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
- 
diff --git a/community/easystroke/PKGBUILD b/community/easystroke/PKGBUILD
index 7110d1574..fac3b9565 100644
--- a/community/easystroke/PKGBUILD
+++ b/community/easystroke/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=easystroke
 pkgver=0.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Use mouse gestures to initiate commands and hotkeys.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://easystroke.sourceforge.net/'
@@ -15,14 +15,14 @@ source=("http://downloads.sourceforge.net/easystroke/${pkgname}-${pkgver}.tar.gz
 md5sums=('3b4f25d02a6b5ac57a8b7a06545869db')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   make
   make man
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   make PREFIX=/usr DESTDIR="${pkgdir}" install
 
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index 06df1afe6..a997b5b3e 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90019 2013-05-06 19:36:47Z foutrelis $
+# $Id: PKGBUILD 94019 2013-07-13 12:31:42Z svenstaro $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=electricsheep
 pkgver=2.7b33
-pkgrel=8
+pkgrel=9
 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.electricsheep.org/"
diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD
index d338ce110..599cee548 100644
--- a/community/encfs/PKGBUILD
+++ b/community/encfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87409 2013-03-31 19:18:12Z stephane $
+# $Id: PKGBUILD 94020 2013-07-13 12:31:50Z svenstaro $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Sven Kauber, <celeon@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=encfs
 pkgver=1.7.4
-pkgrel=10
+pkgrel=11
 pkgdesc='Encrypted filesystem in user-space'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.arg0.net/encfs'
diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD
index 6135df685..36d13afa3 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 89533 2013-04-29 19:20:35Z stativ $
+# $Id: PKGBUILD 94068 2013-07-13 16:36:05Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=fatrat
 pkgver=1.2.0_beta2
-pkgrel=7
+pkgrel=8
 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fatrat.dolezel.info/"
diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD
index c9fff9a34..95f839ee9 100644
--- a/community/gigi/PKGBUILD
+++ b/community/gigi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93708 2013-07-08 14:58:25Z arodseth $
+# $Id: PKGBUILD 94022 2013-07-13 12:32:08Z svenstaro $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: fana-m <geminin@gmx.net>
@@ -6,7 +6,7 @@
 # Contributor: Manuel Gaul <inkaine@hotmail.com>
 
 pkgname=gigi
-pkgver=6141
+pkgver=6142
 pkgrel=1
 pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)'
 #url='http://gigi.sourceforge.net/'
@@ -16,7 +16,7 @@ license=('LGPL')
 depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python')
 makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa-libgl')
 #https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/
-source=("$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/#revision=6141") # 5780 # 5407
+source=("$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/#revision=6142") # 5780 # 5407
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD
index 98c8c8c3c..d27106429 100644
--- a/community/glob2/PKGBUILD
+++ b/community/glob2/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 87413 2013-03-31 19:18:17Z stephane $
+# $Id: PKGBUILD 94023 2013-07-13 12:32:16Z svenstaro $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=17
+pkgrel=19
 pkgdesc='RTS game which minimizes micro-management by automatically assigning tasks to units'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.globulation2.org/'
 license=('GPL3')
 depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu'
-         'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libgl')
+         'fribidi' 'xdg-utils' 'libgl')
 makedepends=('scons' 'boost' 'mesa-libgl')
 install="$pkgname.install"
 source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz"
@@ -19,10 +19,15 @@ source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
             '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np0 -i "$srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   scons LINKFLAGS="-lboost_system"
 }
 
diff --git a/community/glob2/glob2.install b/community/glob2/glob2.install
index 20264b3a8..d2b1a678b 100644
--- a/community/glob2/glob2.install
+++ b/community/glob2/glob2.install
@@ -1,13 +1,13 @@
 post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
+  xdg-icon-resource forceupdate
 }
 
 post_upgrade() {
-  post_install $1
+  xdg-icon-resource forceupdate
 }
 
 post_remove() {
-  post_install $1
+  xdg-icon-resource forceupdate
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index 9aac29fc0..bb691a69f 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91057 2013-05-18 15:35:53Z jlichtblau $
+# $Id: PKGBUILD 94024 2013-07-13 12:32:26Z svenstaro $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=glom
 pkgver=1.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An easy-to-use database designer and user interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.glom.org/"
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index 5d7eb3d42..68083e094 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90040 2013-05-06 19:37:33Z foutrelis $
+# $Id: PKGBUILD 94025 2013-07-13 12:32:36Z svenstaro $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=gnash
 pkgname=(gnash-common gnash-gtk)
 pkgver=0.8.10
-pkgrel=8
+pkgrel=9
 arch=(i686 x86_64 mips64el)
 url="http://www.gnu.org/software/gnash/"
 license=(GPL3)
diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD
index 9d605467a..e7aafe995 100644
--- a/community/gource/PKGBUILD
+++ b/community/gource/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89529 2013-04-29 19:09:10Z svenstaro $
+# $Id: PKGBUILD 94026 2013-07-13 12:32:46Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
 pkgname=gource
 pkgver=0.40
-pkgrel=1
+pkgrel=2
 pkgdesc="software version control visualization"
 license=(GPL3)
 arch=(i686 x86_64 'mips64el')
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index 762b88ef9..c1e642f31 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92874 2013-06-17 12:07:05Z spupykin $
+# $Id: PKGBUILD 94027 2013-07-13 12:32:55Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=gpsdrive
 pkgver=2.11
 _pkgver=20120928
-pkgrel=18
+pkgrel=19
 pkgdesc="A car (bike, ship, plane) navigation system"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.gpsdrive.de/"
diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD
index f79ba1793..dd2e5e335 100644
--- a/community/i3lock/PKGBUILD
+++ b/community/i3lock/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 92605 2013-06-09 19:07:52Z ttoepper $
+# $Id: PKGBUILD 93991 2013-07-12 19:24:57Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3lock
 pkgver=2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="An improved screenlocker based upon XCB and PAM"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://i3wm.org/i3lock/"
 license=('MIT')
 groups=("i3")
-depends=('xcb-util-image' 'libev' 'cairo' 'libxkbcommon' 'libxkbfile')
+depends=('xcb-util-image' 'libev' 'cairo' 'libxkbcommon' 'libxkbfile' 'xorg-xkbcomp')
 options=('docs')
 backup=("etc/pam.d/i3lock")
 source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2"
diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD
index 42e769c6f..bbce4c008 100644
--- a/community/instead/PKGBUILD
+++ b/community/instead/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 88145 2013-04-12 13:33:50Z spupykin $
+# $Id: PKGBUILD 94060 2013-07-13 14:11:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead
-pkgver=1.9.0
+pkgver=1.9.1
 pkgrel=1
 pkgdesc="a quest interpreter"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://instead.googlecode.com/"
+url="http://sourceforge.net/projects/instead/"
 license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua')
 optdepends=('instead-launcher: install and update INSTEAD games from net')
-source=(http://instead.googlecode.com/files/instead_${pkgver}.tar.gz)
-md5sums=('c7082772f7cb972d825e8e183e9af90f')
+source=(http://downloads.sourceforge.net/project/instead/instead/${pkgver}/instead_${pkgver}.tar.gz)
+md5sums=('e6ef7cdac1daf3b3795dcd309d028468')
 
 build() {
   cd "${srcdir}/instead-${pkgver}"
diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD
index c452c7218..4d5dd3cb0 100644
--- a/community/kmymoney/PKGBUILD
+++ b/community/kmymoney/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90852 2013-05-14 21:40:38Z andrea $
+# $Id: PKGBUILD 94028 2013-07-13 12:33:04Z svenstaro $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Vamp898 <vamp898@web.de>
@@ -8,7 +8,7 @@
 
 pkgname=kmymoney
 pkgver=4.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kmymoney2.sourceforge.net/"
diff --git a/community/libc++/PKGBUILD b/community/libc++/PKGBUILD
new file mode 100644
index 000000000..51e254233
--- /dev/null
+++ b/community/libc++/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: MThinkCpp <mtc.maintainer[at]outlook.com>
+pkgname='libc++'
+pkgver=3.3
+pkgrel=1
+pkgdesc='A new implementation of the C++ standard library, targeting C++11.'
+url='http://libcxx.llvm.org'
+license=('custom:University of Illinois/NCSA Open Source License')
+arch=('i686' 'x86_64')
+depends=('glibc' 'gcc-libs') # gcc-libs for libsupc++ binary
+makedepends=('clang' 'subversion' 'cmake' 'gcc') # gcc provides libsupc++ headers
+source=("http://www.llvm.org/releases/${pkgver}/libcxx-${pkgver}.src.tar.gz")
+md5sums=('SKIP')
+
+build() {
+  _gcc_include_dir=/usr/include/c++/$(gcc -dumpversion)
+  _gcc_platform_include_dir=$_gcc_include_dir/$(gcc -dumpmachine)
+  mkdir -p libcxx-${pkgver}.src/build
+  cd libcxx-${pkgver}.src/build
+  cmake -G "Unix Makefiles" -DLIBCXX_CXX_ABI=libsupc++ \
+    -DLIBCXX_LIBSUPCXX_INCLUDE_PATHS="${_gcc_include_dir};${_gcc_platform_include_dir}" \
+    -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr "${srcdir}/libcxx-${pkgver}.src"
+  make
+}
+package() {
+  install -Dm644 libcxx-${pkgver}.src/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+  cd libcxx-${pkgver}.src/build
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD
index 68f7eb69d..38c3c941d 100644
--- a/community/librime/PKGBUILD
+++ b/community/librime/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90135 2013-05-07 05:26:30Z fyan $
+# $Id: PKGBUILD 94029 2013-07-13 12:33:16Z svenstaro $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: GONG Chen <chen dot sst at gmail dot com>
 # Contributor: 網軍總司令
 
 pkgname=librime
 pkgver=0.9.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Rime input method engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/rimeime/"
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index 693101a11..9d3769717 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 93109 2013-06-24 13:55:35Z stativ $
+# $Id: PKGBUILD 94030 2013-07-13 12:33:25Z svenstaro $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=('luxrays' 'luxmark')
-pkgver=1.2
+pkgver=1.2.1
 _pkgver=475fbf15f0ca
-pkgrel=3
+pkgrel=1
 pkgdesc="Accelerate the ray intersection process by using GPUs"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 099fbc4f0..1ca7ab84d 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 92865 2013-06-17 10:56:31Z spupykin $
+# $Id: PKGBUILD 94032 2013-07-13 12:33:54Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Dent <thewinch@gmail.com>
 # Contributor: orbisvicis <orbisvicis@gmail.com>
 
 pkgname=mapnik
 pkgver=2.2.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mapnik.org/"
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index dcd5fbad6..b6beaf176 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93615 2013-07-07 11:23:57Z fyan $
+# $Id: PKGBUILD 94033 2013-07-13 12:34:05Z svenstaro $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 
 pkgname=mongodb
 pkgver=2.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD
index 86ca0ac94..b937f5ace 100644
--- a/community/mygui/PKGBUILD
+++ b/community/mygui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87423 2013-03-31 19:18:29Z stephane $
+# $Id: PKGBUILD 94034 2013-07-13 12:34:24Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Andrew Belitsky <belitsky.a@gmail.com>
 pkgbase=mygui
 pkgname=('mygui' 'mygui-docs')
 pkgver=3.2.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A multilayer and overlappable GUI System for OGRE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mygui.info/"
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index 4771c0852..d634e9832 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92161 2013-06-01 22:17:04Z faidoc $
+# $Id: PKGBUILD 94000 2013-07-12 22:37:49Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=1.8.3
+pkgver=1.8.4
 pkgrel=1
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ install=nemo.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
         "tracker-0.16.patch"
         "remove-desktop-background.patch")
-sha256sums=('1d3404dc66d3f8ec686dfc1b02523331e66d3e942e2a57d6b29e9f2ae998945a'
+sha256sums=('c8805302144c1aba72707eed22501cdd4f008a4c4090dea94fde5c05cd6c25f6'
             '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626'
             '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5')
 
diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD
index f7041dc5a..1b737b3d0 100644
--- a/community/nomacs/PKGBUILD
+++ b/community/nomacs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 93593 2013-07-06 18:56:13Z speps $
+# $Id: PKGBUILD 94002 2013-07-13 00:27:24Z speps $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 
 pkgname=nomacs
-pkgver=1.2.0
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="A Qt image viewer"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('qt4' 'exiv2' 'libraw' 'opencv')
 makedepends=('cmake')
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver-source.tar.bz2")
-md5sums=('0fdef67b960276375024f270dfaa4b93')
+md5sums=('ede84986dce5f67c270bb5ff7354e867')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index 8bb5be989..4a8953754 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90071 2013-05-06 19:38:49Z foutrelis $
+# $Id: PKGBUILD 94036 2013-07-13 12:34:57Z svenstaro $
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=openimageio
-pkgver=1.1.10
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications"
 arch=(i686 x86_64)
 url="http://www.openimageio.org/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa')
 optdepends=('qt4: iv image viewer'
             'python2: bindings support')
 source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
-md5sums=('e5c5cd77238f74c3a6a3610c211430f2')
+md5sums=('8738dd9b24fc4f0cb3eebb094347104a')
 
 build() {
   cd "$srcdir"/$_pkgname*
@@ -28,6 +28,7 @@ build() {
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
       -DUSE_EXTERNAL_TBB=ON \
+      -DOIIO_BUILD_TESTS=OFF \
       ..
   make
 }
diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD
index 1ff9bef08..d0092cdb9 100644
--- a/community/openshadinglanguage/PKGBUILD
+++ b/community/openshadinglanguage/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 88615 2013-04-20 16:45:08Z heftig $
+# $Id: PKGBUILD 94037 2013-07-13 12:35:07Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=openshadinglanguage
-pkgver=1.3.0
-pkgrel=4
+pkgver=1.3.3
+pkgrel=2
 pkgdesc="Advanced shading language for production GI renderers"
 arch=(i686 x86_64)
 url="http://code.google.com/p/openshadinglanguage/"
@@ -10,19 +10,18 @@ license=('custom')
 depends=('boost-libs' 'openimageio' 'openexr' 'llvm' 'intel-tbb' 'freetype2' 'libpng' 'libtiff')
 makedepends=('boost' 'cmake' 'clang')
 source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
-md5sums=('1e8c47475cb092cec0aada843b2893ed')
+md5sums=('17aaa01987963220e164522c29281f14')
 
 build() {
-  cd OpenShadingLanguage-Release-$pkgver/src
+  cd OpenShadingLanguage-Release-$pkgver
+
+  cd src
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  # TODO: Remove LLVM_STATIC with llvm 3.3 when we'll have shared libs
-  # Check blender for crash with llvm pipe (run LIBGL_ALWAYS_SOFTWARE=1 blender)
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLLVM_STATIC=ON \
     ..
   make
 }
diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD
index 8762871c3..58a45ff3e 100644
--- a/community/pdns/PKGBUILD
+++ b/community/pdns/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93870 2013-07-11 15:55:45Z arodseth $
+# $Id: PKGBUILD 94038 2013-07-13 12:35:15Z svenstaro $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 
 pkgname=pdns
 pkgver=3.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Modern, advanced and high performance authoritative-only nameserver'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.powerdns.com/'
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index 7dfa16a58..201bb53e2 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91562 2013-05-23 19:50:14Z lcarlier $
+# $Id: PKGBUILD 94039 2013-07-13 12:35:25Z svenstaro $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
 pkgver=0.7.0
-pkgrel=7
+pkgrel=8
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://performous.org/"
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index b5c6d6413..3f5470c8e 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90077 2013-05-06 19:39:04Z foutrelis $
+# $Id: PKGBUILD 94040 2013-07-13 12:35:34Z svenstaro $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=pingus
 pkgver=0.7.6
-pkgrel=8
+pkgrel=9
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pingus.seul.org"
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 13633cbc0..7b03cf85e 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87430 2013-03-31 19:18:40Z stephane $
+# $Id: PKGBUILD 94041 2013-07-13 12:35:45Z svenstaro $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,8 +6,8 @@
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=pinot
-pkgver=1.03
-pkgrel=2
+pkgver=1.06
+pkgrel=1
 pkgdesc='Personal search and metasearch tool'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/pinot-search/'
@@ -27,7 +27,7 @@ options=('!emptydirs')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha256sums=('1fb0087fb67a58e45f9fd6e1e4c3aa048e51811d7853ee3e89fca6259cd9c202')
+sha256sums=('bba6f412553890ef7cccd6d7bb28df9a6c4d122ea74a2902e5de33953cd1872d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD
index 1750cff5e..c8ce2666e 100644
--- a/community/pion/PKGBUILD
+++ b/community/pion/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 89527 2013-04-29 18:57:40Z stativ $
+# $Id: PKGBUILD 94042 2013-07-13 12:35:54Z svenstaro $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=pion
-pkgver=5.0.1
+pkgver=5.0.2
 pkgrel=1
 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
 url="https://github.com/cloudmeter/pion"
@@ -13,7 +13,7 @@ provides=('pion-net')
 conflicts=('pion-net')
 replaces=('pion-net')
 source=(https://github.com/cloudmeter/pion/archive/$pkgver.zip)
-md5sums=('9f8af4f3e600a5b0573fb66132a86528')
+md5sums=('1f6a9f69114235ca98756cbcab16d162')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index 62d4463ef..bd5f6a453 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88844 2013-04-23 22:37:15Z svenstaro $
+# $Id: PKGBUILD 94043 2013-07-13 12:36:03Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
@@ -8,7 +8,7 @@
 pkgname=pokerth
 _realname=PokerTH
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Poker game written in C++/QT4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pokerth.net/"
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index 09adc8368..fe0e49475 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 93848 2013-07-11 09:47:42Z seblu $
+# $Id: PKGBUILD 94009 2013-07-13 10:59:45Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=python-psutil
 pkgname=('python-psutil' 'python2-psutil')
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/psutil/'
 license=('custom: BSD')
 makedepends=('python' 'python-distribute' 'python2' 'python2-distribute')
 source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz")
-sha1sums=('f1a8cbdad2f4254b8c0c84c79d5c2229fd6e65d9')
+sha1sums=('3d3abb8b7a5479b7299a8d170ec25179410f24d1')
 
 build() {
   cd psutil-$pkgver
diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD
index 8e9407c26..13e7212ca 100644
--- a/community/python-pyopencl/PKGBUILD
+++ b/community/python-pyopencl/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 87434 2013-03-31 19:18:48Z stephane $
+# $Id: PKGBUILD 94047 2013-07-13 12:36:45Z svenstaro $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgbase=python-pyopencl
 pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers')
-pkgver=2012.1
-pkgrel=8
+pkgver=2013.1
+pkgrel=1
 pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
 arch=('i686' 'x86_64')
 url="http://mathema.tician.de/software/pyopencl"
 license=('custom')
-makedepends=('ctags' 'python2-distribute' 'python-distribute' 'libcl' 'opencl-headers' 'mesa' 'boost>=1.53.0' 'python2-mako' 'python-mako' 'python-numpy' 'python2-numpy')
+makedepends=('boost-libs' 'ctags' 'python2-distribute' 'python-distribute' 'libcl' 'opencl-headers' 'mesa' 'boost' 'python2-mako' 'python-mako' 'python-numpy' 'python2-numpy')
 source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz"
         'LICENSE.txt')
-sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff'
+sha1sums=('76331c9042d0286c7c722407dec0fb975a6b340c'
           '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7')
 
 build() {
@@ -25,37 +25,37 @@ build() {
    python3 setup.py build
 
    cd "$srcdir/pyopencl-$pkgver-python2"
-   python2 ./configure.py --cl-enable-gl --no-use-shipped-boost
+   python2 ./configure.py --cl-enable-gl --no-use-shipped-boost --boost-python-libname=boost_python
    python2 setup.py build
 }
 
 package_python-pyopencl() {
-   depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers')
+   depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers')
 
    cd "${srcdir}/pyopencl-${pkgver}"
    python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
 
    rm -fr "${pkgdir}"/usr/include
 
-   install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+   install -D -m644 $srcdir/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_python2-pyopencl() {
-   depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'pyopencl-headers')
+   depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'pyopencl-headers')
 
    cd "${srcdir}/pyopencl-${pkgver}-python2"
    python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
 
-   rm -fr "${pkgdir}"/usr/include
+    rm -fr "${pkgdir}"/usr/include/
 
-   install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+   install -D -m644 $srcdir/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_pyopencl-headers() {
-   cd "${srcdir}/pyopencl-${pkgver}"
+   cd "${srcdir}/pyopencl-${pkgver}/"
    install -dm755 "${pkgdir}"/usr/include/pyopencl
 
-   for file in pyopencl-bessel-j.cl pyopencl-cephes.cl pyopencl-airy.cl pyopencl-ranluxcl.cl pyopencl-complex.h; do
-      install -m644 src/cl/${file} "${pkgdir}"/usr/include/pyopencl
+  for file in pyopencl-airy.cl  pyopencl-bessel-j.cl  pyopencl-bessel-y.cl  pyopencl-complex.h  pyopencl-eval-tbl.cl  pyopencl-ranluxcl.cl; do
+      install -m644 pyopencl/cl/${file} "${pkgdir}"/usr/include/pyopencl
    done
 }
diff --git a/community/python2-tagpy/PKGBUILD b/community/python2-tagpy/PKGBUILD
index c122c14af..7989e8964 100644
--- a/community/python2-tagpy/PKGBUILD
+++ b/community/python2-tagpy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87435 2013-03-31 19:18:49Z stephane $
+# $Id: PKGBUILD 94045 2013-07-13 12:36:26Z svenstaro $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Callan Barrett <wizzomafizzo@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=python2-tagpy
 pkgver=0.94.8
-pkgrel=3
+pkgrel=4
 pkgdesc='Python bindings for TagLib'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://pypi.python.org/pypi/tagpy'
@@ -20,14 +20,17 @@ source=("http://pypi.python.org/packages/source/t/tagpy/tagpy-$pkgver.tar.gz"
 sha256sums=('56eab8dd81510f8af18e19375a0ffd5cd25c8e555104be46a92c3dc08634a0dc'
             'f6cc34f8d4d1186270943cd7e1ad3c9478ae7064ab9b2cddf7760d493295cd26')
 
-build() {
+prepare() {
   cd "tagpy-$pkgver"
 
   patch -p1 -i "$srcdir/taglib1.7.patch"
-
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py') 
- 
+}
+
+build() {
+  cd "tagpy-$pkgver"
+
   ./configure.py \
     --taglib-lib-dir=/usr/lib/ \
     --taglib-inc-dir=/usr/include/taglib/ \
diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD
index e1539851b..1ff7d7cb1 100644
--- a/community/qucs/PKGBUILD
+++ b/community/qucs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92667 2013-06-11 16:18:02Z spupykin $
+# $Id: PKGBUILD 94064 2013-07-13 14:17:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Víctor Martínez Romanos <vmromanos@gmail.com>
 
 pkgname=qucs
-pkgver=0.0.17s130610
+pkgver=0.0.17
 pkgrel=1
 pkgdesc="An integrated circuit simulator with a graphical user interface"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,9 @@ depends=('gcc-libs' 'qt4')
 optdepends=('freehdl: to permit digital circuit simulation'
 	    'asco: to enable circuit optimization'
 	    'perl')
-source=("http://downloads.sourceforge.net/project/qucs/qucs/$(echo $pkgver | cut -f1 -ds)-snapshots/qucs-${pkgver/s/.}.tar.gz")
-md5sums=('47dead7df86419bf121d9c1c45f3cdfa')
+#source=("http://downloads.sourceforge.net/project/qucs/qucs/$(echo $pkgver | cut -f1 -ds)-snapshots/qucs-${pkgver/s/.}.tar.gz")
+source=("http://downloads.sourceforge.net/project/qucs/qucs/$pkgver/qucs-$pkgver.tar.gz")
+md5sums=('4b93ffcc2ef3dbbd6fa53a5743721532')
 
 build() {
   cd $srcdir/$pkgname-${pkgver/s/.}
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index caeabc279..aa6dbbf67 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87436 2013-03-31 19:18:51Z stephane $
+# $Id: PKGBUILD 94048 2013-07-13 12:36:56Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=schroot
 pkgver=1.6.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
 url="http://packages.qa.debian.org/s/schroot.html"
 license=('GPL3')
diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD
index 210848517..b39c09740 100644
--- a/community/sdcc/PKGBUILD
+++ b/community/sdcc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91250 2013-05-20 17:00:47Z spupykin $
+# $Id: PKGBUILD 94049 2013-07-13 12:37:05Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jose Negron <josenj.arch@mailnull.net>
 
 pkgname=sdcc
 pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index 7107202c1..972735efd 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88284 2013-04-15 17:29:41Z giovanni $
+# $Id: PKGBUILD 94050 2013-07-13 12:37:15Z svenstaro $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
 pkgver=0.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="WYSIWYG ebook editor"
 arch=('i686' 'x86_64') 
 url="http://code.google.com/p/sigil/"
@@ -17,7 +17,7 @@ md5sums=('540745983db57a2150cc2f4057455b19')
 
 build() {
   cd "${srcdir}"
-  gendesk -n
+  gendesk -n "$startdir"/PKGBUILD
 
   mkdir build
   cd build
diff --git a/community/smtube/PKGBUILD b/community/smtube/PKGBUILD
new file mode 100644
index 000000000..75e841a48
--- /dev/null
+++ b/community/smtube/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 93959 2013-07-12 01:36:36Z speps $
+# Maintainer : speps <speps at aur dot archlinux dot org>
+# Contributor: Andreas Schnaiter <rc.poison@gmail.com>
+
+pkgname=smtube
+pkgver=1.7
+pkgrel=1
+pkgdesc="A small youtube browser"
+arch=('i686' 'x86_64')
+url="http://smplayer.sourceforge.net"
+license=('GPL')
+depends=('qt4')
+optdepends=('mplayer: play videos with MPlayer'
+            'smplayer: play videos with SMPlayer'
+            'gnome-mplayer: play videos with GNOME MPlayer'
+            'kdemultimedia-dragonplayer: play videos with Dragon Player'
+            'totem: play videos with Totem'
+            'vlc: play videos with VLC')
+install="$pkgname.install"
+source=("http://downloads.sourceforge.net/smplayer/$pkgname-$pkgver.tar.bz2")
+md5sums=('d9a954e1b337f0c850dcfc6063255056')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make PREFIX=/usr QMAKE=qmake-qt4 LRELEASE=lrelease-qt4
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make PREFIX=/usr DESTDIR="$pkgdir/" install
+}
diff --git a/community/smtube/smtube.install b/community/smtube/smtube.install
new file mode 100644
index 000000000..029294d67
--- /dev/null
+++ b/community/smtube/smtube.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 9e93a8fb1..20939b939 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87439 2013-03-31 19:18:57Z stephane $
+# $Id: PKGBUILD 94070 2013-07-13 20:40:02Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -6,7 +6,7 @@
 pkgname=spring
 pkgver=0.94.1
 _pkgver=94.1
-pkgrel=2
+pkgrel=4
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springrts.com/"
@@ -17,14 +17,18 @@ makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'me
 optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
 install=spring.install
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('bafc1e889bed31666553efc387a13b49')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma
+        gcc48.patch)
+md5sums=('bafc1e889bed31666553efc387a13b49'
+         '8de391795f4a2e78be51a129dcd4dec2')
 
 build() {
   bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
   
   cd spring_${_pkgver}
 
+  patch -Np1 < $srcdir/gcc48.patch
+
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATADIR=share/spring \
diff --git a/community/spring/gcc48.patch b/community/spring/gcc48.patch
new file mode 100644
index 000000000..ea69a42c4
--- /dev/null
+++ b/community/spring/gcc48.patch
@@ -0,0 +1,22 @@
+diff --git a/rts/System/Sound/EFX.cpp b/rts/System/Sound/EFX.cpp
+index 08fe9f4..3b197f0 100644
+--- a/rts/System/Sound/EFX.cpp
++++ b/rts/System/Sound/EFX.cpp
+@@ -83,7 +83,7 @@ CEFX::CEFX(ALCdevice* device)
+ 		ALuint alFx;
+ 		alGenEffects(1, &alFx);
+ 		if (alGetError() == AL_NO_ERROR) {
+-			for(size_t i = 0; i < sizeof(effects); i++) {
++			for(size_t i = 0; i < sizeof(effects)/sizeof(effects[0]); i++) {
+ 				const ALuint fx = effects[i];
+ 				alEffecti(alFx, AL_EFFECT_TYPE, fx);
+ 				effectsSupported[fx] = (alGetError() == AL_NO_ERROR);
+@@ -103,7 +103,7 @@ CEFX::CEFX(ALCdevice* device)
+ 		ALuint alFilter;
+ 		alGenFilters(1, &alFilter);
+ 		if (alGetError() == AL_NO_ERROR) {
+-			for(size_t i = 0; i < sizeof(filters); i++) {
++			for(size_t i = 0; i < sizeof(filters)/sizeof(filters[0]); i++) {
+ 				const ALuint filter = filters[i];
+ 				alFilteri(alFilter, AL_FILTER_TYPE, filter);
+ 				filtersSupported[filter] = (alGetError() == AL_NO_ERROR);
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index f5d7593a6..ea05e95b4 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87440 2013-03-31 19:18:58Z stephane $
+# $Id: PKGBUILD 94052 2013-07-13 12:37:38Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: DuGi <dugi@irc.pl>
 
 pkgname=springlobby
 pkgver=0.169
-pkgrel=1
+pkgrel=2
 pkgdesc="A free cross-platform lobby client for the Spring RTS project."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springlobby.info/"
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index 484a6d042..7addc08af 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92523 2013-06-07 16:54:42Z spupykin $
+# $Id: PKGBUILD 94053 2013-07-13 12:37:47Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfig
 pkgver=0.64.0
-pkgrel=2
+pkgrel=4
 pkgdesc="Professional vector animation program (CLI renderer only)"
 arch=(i686 x86_64 'mips64el')
 url="http://synfig.org"
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index 6d88c59c0..fa4c88209 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92472 2013-06-06 09:43:01Z spupykin $
+# $Id: PKGBUILD 93973 2013-07-12 10:33:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
 
 pkgname=tea
-pkgver=36.0.0
+pkgver=36.0.2
 pkgrel=1
 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ depends=('qt4' 'aspell' 'hunspell')
 install=tea.install
 source=(http://semiletov.org/tea/dloads/tea-$pkgver.tar.bz2
         tea.desktop)
-md5sums=('50a6eeae9cf940afdb4cf8e815453886'
+md5sums=('c8657c664af35d2032a78c645cb38d16'
          '377ace3363124f4c086de0babb820761')
 
 build() {
diff --git a/community/unpaper/PKGBUILD b/community/unpaper/PKGBUILD
index 80c070dc7..026f780ad 100644
--- a/community/unpaper/PKGBUILD
+++ b/community/unpaper/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 74323 2012-07-24 16:20:43Z spupykin $
+# $Id: PKGBUILD 94062 2013-07-13 14:11:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Hauser <andy-aur@splashground.de>
 
 pkgname=unpaper
-pkgver=0.4.2
+pkgver=5.1
 pkgrel=1
 pkgdesc="post-processing tool for scanned sheets of paper"
 arch=('i686' 'x86_64' 'mips64el')
 #url="http://$pkgname.berlios.de/"
 url="https://github.com/Flameeyes/unpaper"
 license="GPL"
-depends=('libxslt')
-makedepends=('gcc')
+depends=()
+makedepends=('gcc' 'libxslt')
 source=("$pkgname-${pkgver}.tar.gz::https://github.com/Flameeyes/unpaper/tarball/unpaper-$pkgver")
-md5sums=('7dcee730cdbeffbbd840cbe6f2bb9693')
+md5sums=('06fe02a2e460c0ea218b6cd05bf573fe')
 
 build() {
   cd $srcdir/Flameeyes-unpaper-*
@@ -22,5 +22,9 @@ build() {
   autoconf
   [ -f Makefile ] || ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/Flameeyes-unpaper-*
   make install DESTDIR=$pkgdir
 }
diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD
index e915453bf..56a743d06 100644
--- a/community/wesnoth/PKGBUILD
+++ b/community/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90785 2013-05-13 21:57:41Z svenstaro $
+# $Id: PKGBUILD 94054 2013-07-13 12:37:56Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=wesnoth
 pkgver=1.10.6
-pkgrel=5
+pkgrel=6
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,12 +18,10 @@ install=wesnoth.install
 options=(!emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
         wesnothd.tmpfiles.conf
-        wesnothd.rc.d
         wesnothd.service
         https://github.com/wesnoth/wesnoth-old/commit/bbd7f6.patch)
 md5sums=('547e3489bbfa778912b11dbee612c380'
          '2d2fea6b3d86dfd589f5ad35a3be1f97'
-         '85659b47d22dfdf4e4d046556973fc3e'
          'd1b6bf1d3dc05086ee6a370adff0ae4a'
          'edc7c0547e67cba4ca4f813ca261f572')
 
@@ -54,5 +52,4 @@ package() {
 
   install -Dm644 "$srcdir/wesnothd.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnothd.conf"
   install -Dm644 "$srcdir/wesnothd.service" "$pkgdir/usr/lib/systemd/system/wesnothd.service"
-  install -Dm755 "$srcdir/wesnothd.rc.d" "$pkgdir/etc/rc.d/wesnothd"
 }
diff --git a/community/wesnoth/wesnothd.rc.d b/community/wesnoth/wesnothd.rc.d
deleted file mode 100644
index 95e312b7b..000000000
--- a/community/wesnoth/wesnothd.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/wesnothd)
-
-case "$1" in
-  start)
-    stat_busy "Starting Wesnoth Server Daemon"
-    [[ -d /var/run/wesnothd ]] || mkdir /var/run/wesnothd
-    [ -z "$PID" ] && /usr/bin/wesnothd -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -o %PPID /usr/bin/wesnothd)
-      echo $PID > /var/run/wesnotd/pid
-      add_daemon wesnothd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Wesnoth Server Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon wesnothd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index be6de20ac..b0626e98b 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90108 2013-05-06 19:40:08Z foutrelis $
+# $Id: PKGBUILD 94055 2013-07-13 12:38:06Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,7 +6,7 @@
 pkgname=widelands
 pkgver=17
 _realver=build17
-pkgrel=7
+pkgrel=8
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://widelands.org/"
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 67fe2ec4e..1e68f7a95 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,21 +1,18 @@
-# $Id: PKGBUILD 88025 2013-04-10 08:22:45Z svenstaro $
+# $Id: PKGBUILD 93696 2013-07-08 13:32:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
-# TODO: Remove this note and change back to gcc once gcc 4.8.1 is out
-# It fixes a segfault while building the examples.
-
 pkgname=wt
 pkgver=3.3.0
 _pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webtoolkit.eu/"
 license=('GPL')
 depends=('boost-libs' 'libharu')
-makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt4' 'clang')
+makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt4')
 optdepends=('openssl: for SSL support in built-in webserver'
 	    'zlib: for compression in HTTP protocol'
 	    'fcgi: for FastCGI support'
@@ -34,7 +31,7 @@ build() {
 
   [[ -d build ]] && rm -r build
   mkdir -p build && cd build
-  CXX=clang++ cmake \
+  cmake \
       -DCONNECTOR_HTTP=ON \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DWEBUSER=http \
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 3d301b70d..5f2e409b9 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189912 2013-07-11 09:04:56Z andrea $
+# $Id: PKGBUILD 190032 2013-07-13 12:39:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://community.kde.org/KDE_PIM/Akonadi'
diff --git a/extra/asio/PKGBUILD b/extra/asio/PKGBUILD
index 1d86a8db5..27f94d9a4 100644
--- a/extra/asio/PKGBUILD
+++ b/extra/asio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143711 2011-11-28 16:30:10Z giovanni $
+# $Id: PKGBUILD 190033 2013-07-13 12:40:05Z svenstaro $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=asio
 pkgver=1.4.8
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Cross-platform C++ library for ASynchronous network I/O"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://asio.sourceforge.net"
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 9631d7030..197ff2368 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 181116 2013-03-31 19:16:38Z stephane $
+# $Id: PKGBUILD 190034 2013-07-13 12:40:13Z svenstaro $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
 pkgver=1.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index dc47b2857..3ec7e8cfa 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181117 2013-03-31 19:16:40Z stephane $
+# $Id: PKGBUILD 190035 2013-07-13 12:40:22Z svenstaro $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
@@ -8,7 +8,7 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.53.0
+pkgver=1.54.0
 _boostver=${pkgver//./_}
 pkgrel=2
 url="http://www.boost.org/"
@@ -16,17 +16,21 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        boost-1.53.0-python3.patch)
-sha1sums=('0e4ef26cc7780c6bbc63987ef2f29be920e2395b'
-          '34026072a7cb2534164f20e77bb71a5c75093307')
+        boost-1.53.0-python3.patch
+        boost-1.54.0-Fix-macro-for-int128-detection.patch)
+sha1sums=('069501636097d3f40ddfd996d29748bb23591c53'
+          '34026072a7cb2534164f20e77bb71a5c75093307'
+          'bf5177694ab8a0df6bc13aa47b05727c40febebb')
 
-_stagedir="${srcdir}/stagedir"
 
 build() {
+   export _stagedir="${srcdir}/stagedir"
    local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
 
    cd "${srcdir}/${pkgbase}_${_boostver}"
 
+   patch -Np2 -i ../boost-1.54.0-Fix-macro-for-int128-detection.patch
+
    # Fix build errors with python 3
    sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh
    patch -Np1 -i ../boost-1.53.0-python3.patch
diff --git a/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch b/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch
new file mode 100644
index 000000000..1f337bedf
--- /dev/null
+++ b/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch
@@ -0,0 +1,35 @@
+Index: /trunk/boost/lexical_cast.hpp
+===================================================================
+--- /trunk/boost/lexical_cast.hpp	(revision 84136)
++++ /trunk/boost/lexical_cast.hpp	(revision 84965)
+@@ -70,8 +70,8 @@
+ #endif
+ 
+-#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
++// GCC 4.6 has some issues with int128 and uint128. Issues were fixed in GCC 4.7
++#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
+ #define BOOST_LCAST_HAS_INT128
+ #endif
+-
+ 
+ namespace boost
+Index: /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp
+===================================================================
+--- /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp	(revision 83717)
++++ /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp	(revision 84965)
+@@ -49,5 +49,5 @@
+ #endif
+ 
+-#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
++#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
+ #define BOOST_LCAST_HAS_INT128
+ #endif
+@@ -445,6 +445,6 @@
+ 
+     // Overflow test case from David W. Birdsall
+-    std::string must_owerflow_str = "160000000000000000000";
+-    std::string must_owerflow_negative_str = "-160000000000000000000";
++    std::string must_owerflow_str =             (sizeof(T) < 16 ?  "160000000000000000000" :  "1600000000000000000000000000000000000000");
++    std::string must_owerflow_negative_str =    (sizeof(T) < 16 ? "-160000000000000000000" : "-1600000000000000000000000000000000000000");
+     for (int i = 0; i < 15; ++i) {
+         BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_str), bad_lexical_cast);
diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD
index 88d792a93..ff7ba1976 100644
--- a/extra/clucene/PKGBUILD
+++ b/extra/clucene/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 163973 2012-07-23 03:04:22Z allan $
+# $Id: PKGBUILD 190036 2013-07-13 12:40:33Z svenstaro $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Alexander Rødseth
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=clucene
 pkgver=2.3.3.4
-pkgrel=6
+pkgrel=7
 pkgdesc="C++ port of the high-performance text search engine Lucene"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://clucene.sourceforge.net/"
 license=('APACHE' 'LGPL')
 depends=('gcc-libs>=4.7.1-5' 'zlib' 'boost-libs')
-makedepends=('cmake' 'boost')
+makedepends=('cmake' 'boost>=1.54.0')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz
 		# Fedora patches
 		clucene-core-2.3.3.4-pkgconfig.patch
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 9c7fb3531..991c98f64 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188723 2013-06-18 15:31:30Z andyrtr $
+# $Id: PKGBUILD 190057 2013-07-13 17:35:12Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.6.2
-pkgrel=3
+pkgver=1.6.3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
@@ -27,13 +27,10 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
         cups-1.6.0-fix-install-perms.patch
         cups-1.6.2-statedir.patch
         # Debian
-        usb-backend-more-quirk-rules.patch
         cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
         get-ppd-file-for-statically-configured-ipp-shared-queues.patch
-        ppd-poll-with-client-conf.patch
-        usb-backend-do-not-crash-if-usb-disabled-in-bios.patch)
-#options=('!emptydirs')
-md5sums=('8b8e40560b67e28607b1f04dafd9a94d'
+        ppd-poll-with-client-conf.patch)
+md5sums=('3c50d396fef2ba721224fe65880fe3c3'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
@@ -46,15 +43,14 @@ md5sums=('8b8e40560b67e28607b1f04dafd9a94d'
          'f30c2a161caaf27854581507cde8cac6'
          '5117f65342fcc69c6a506529e4daca9e'
          '9247e218eea94ebda0aebc8ee0e77db8'
-         '52675e2d7a7f77005f1fc0212b86dbe3'
          'cb58bf4e0b80eaee383712e5c84a1ab4'
          'b578bcd17949a7203237ba1e31f78ef9'
-         '0becd6ab8782b97f19a02c1dc174c75e'
-         'f1f0ee65296d438a8c83467ff03f652d')
+         '0becd6ab8782b97f19a02c1dc174c75e')
 
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
+prepare() {
 
+  cd ${pkgbase}-${pkgver}
+	
   # add systemd socket support - Fedora patch, also used in Gentoo
   # modified now to the changes done by Gentoo in their svn ebuild
   # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
@@ -74,9 +70,6 @@ build() {
   # Ensure attributes are valid UTF-8 in dbus notifier
   patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
 
-  # More USB quirks for the libusb-based backend (STR #4311)
-  # Fixed in 1.6.3
-  patch -Np1 -i ${srcdir}/usb-backend-more-quirk-rules.patch
   # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll.
   patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
   # Applications could not get the PPD file for statically-configured IPP-shared print queues
@@ -84,9 +77,6 @@ build() {
   # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs
   # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763
   patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
-  # Add more error handling to the libusb-based USB backend, especially to avoid a crash when USB is disabled in the BIOS. Also
-  # discard that error when counting warning messages.
-  patch -Np1 -i ${srcdir}/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
   # fix permissions on some files - alternative: cups-0755.patch by FC
   patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
   # move /var/run -> /run for pid file
@@ -101,6 +91,10 @@ build() {
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
   autoconf -I config-scripts
+}
+
+build() {
+  cd ${pkgbase}-${pkgver}
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --sbindir=/usr/bin \
@@ -122,7 +116,7 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd ${pkgbase}-${pkgver}
   #httpAddrGetList(workstation64): FAIL
   #1 TESTS FAILED!
   #make[1]: *** [testhttp] Error 1
@@ -134,7 +128,7 @@ pkgdesc="The CUPS Printing System - client libraries and headers"
 depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
 backup=(etc/cups/client.conf)
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-headers install-libs
   # put this into the libs pkg to make other software find the libs(no pkg-config file included)
   mkdir -p ${pkgdir}/usr/bin 
@@ -166,7 +160,7 @@ backup=(etc/cups/cupsd.conf
 depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
 optdepends=('xdg-utils: xdg .desktop file support')
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-data install-exec
 
   # this one we ship in the libcups pkg
diff --git a/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch b/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
deleted file mode 100644
index 711dab8ce..000000000
--- a/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Add more error handling to the libusb-based USB backend,
- especially to avoid a crash when USB is disabled in the BIOS. Also
- discard that error when counting warning messages.
-Author: Till Kamppeter <till.kamppeter@gmail.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1108719
-Last-Update: 2013-05-03
---- a/backend/usb-libusb.c
-+++ b/backend/usb-libusb.c
-@@ -898,7 +898,8 @@
- 					/* Pointer to current alternate setting */
-   const struct libusb_endpoint_descriptor *endpptr = NULL;
- 					/* Pointer to current endpoint */
--  ssize_t               numdevs,        /* number of connected devices */
-+  ssize_t               err = 0,
-+                        numdevs,        /* number of connected devices */
-                         i = 0;
-   uint8_t		conf,		/* Current configuration */
- 			iface,		/* Current interface */
-@@ -917,7 +918,13 @@
-   * Initialize libusb...
-   */
- 
--  libusb_init(NULL);
-+  err = libusb_init(NULL);
-+  if (err)
-+  {
-+    fprintf(stderr, "WARNING: Unable to initialize USB access via libusb, libusb error %i\n", err);
-+    return (NULL);
-+  }
-+
-   numdevs = libusb_get_device_list(NULL, &list);
-   fprintf(stderr, "DEBUG: libusb_get_device_list=%d\n", (int)numdevs);
- 
-@@ -1087,7 +1094,8 @@
-   * Clean up ....
-   */
- 
--  libusb_free_device_list(list, 1);
-+  if (numdevs >= 0)
-+    libusb_free_device_list(list, 1);
-   libusb_exit(NULL);
- 
-   return (NULL);
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -838,7 +838,7 @@
- fi
- 
- # Warning log messages
--count=`$GREP '^W ' /tmp/cups-$user/log/error_log | wc -l | awk '{print $1}'`
-+count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'Unable to initialize USB access via libusb, libusb error' | wc -l | awk '{print $1}'`
- if test $count != 9; then
- 	echo "FAIL: $count warning messages, expected 9."
- 	$GREP '^W ' /tmp/cups-$user/log/error_log
diff --git a/extra/cups/usb-backend-more-quirk-rules.patch b/extra/cups/usb-backend-more-quirk-rules.patch
deleted file mode 100644
index 3b72011d6..000000000
--- a/extra/cups/usb-backend-more-quirk-rules.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: USB backend quirk rule for Epson Stylus Photo 750 (and maybe others)
-Author: Didier Raboud <odyx@debian.org>
-Bugs-Debian: http://bugs.debian.org/697970
-Last-Update: 2013-03-11
-
---- a/backend/usb-libusb.c
-+++ b/backend/usb-libusb.c
-@@ -142,8 +142,12 @@
- 	{ 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */
- 	{ 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */
- 	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
-+	{ 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International,
-+		       Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */
- 	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
- 						  by zut <kernel@zut.de> */
-+	{ 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D
-+			    Printer, https://bugs.launchpad.net/bugs/1160638 */
- 	{ 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200
- 			    Printer, http://www.cups.org/str.php?L4155 */
- 	{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
-@@ -158,6 +162,8 @@
- 			    Printer, http://www.cups.org/str.php?L4155 */
- 	{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
- 			    Printer, http://www.cups.org/str.php?L4155 */
-+	{ 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150
-+		            Printer, https://bugs.launchpad.net/bugs/1160638 */
- 	{ 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
- 						  HL-1430 Laser Printer,
- 				     https://bugs.launchpad.net/bugs/1038695 */
-@@ -165,24 +171,33 @@
- 			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
- 						  HL-1440 Laser Printer,
- 				     https://bugs.launchpad.net/bugs/1000253 */
-+	{ 0x04f9, 0x000e, USBLP_QUIRK_BIDIR |
-+			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
-+						  HL-1450 Laser Printer,
-+				     https://bugs.launchpad.net/bugs/1000253 */
- 	{ 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp.
- 						  Okipage 14ex Printer,
- 				     https://bugs.launchpad.net/bugs/872483 */
- 	{ 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d,
- 				     https://bugs.launchpad.net/bugs/872483 */
--	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
-+	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR |
-+			  USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
- 				     http://bugs.debian.org/697970 */
-+	{ 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670,
-+				     https://bugs.launchpad.net/bugs/872483 */
- 	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
- 						      Printer M129C */
- 	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
- 			  USBLP_QUIRK_NO_REATTACH |
- 	                  USBLP_QUIRK_RESET },
-+	/* Prolific Technology, Inc. PL2305 Parallel Port
-+	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
- 	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
- 			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
- 	{ 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210
- 				     https://bugs.launchpad.net/bugs/1102470 */
--	/* Prolific Technology, Inc. PL2305 Parallel Port
--	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
-+	{ 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics
-+   CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */
- 	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,
- 				     https://bugs.launchpad.net/bugs/1032456 */
- 	{ 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices,
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 550c9c36f..a324d9bb3 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185578 2013-05-15 08:05:39Z bpiotrowski $
+# $Id: PKGBUILD 190037 2013-07-13 12:40:41Z svenstaro $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=4.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index 1ecd13eff..8633e1d17 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183281 2013-04-20 16:41:14Z heftig $
+# $Id: PKGBUILD 190038 2013-07-13 12:40:51Z svenstaro $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=enblend-enfuse
 pkgver=4.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
index c7b564e55..51abbdd64 100644
--- a/extra/gst-libav/PKGBUILD
+++ b/extra/gst-libav/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183690 2013-04-26 16:10:07Z heftig $
+# $Id: PKGBUILD 190013 2013-07-12 20:37:31Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-libav
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="Gstreamer libav Plugin"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('yasm')
 options=(!libtool !emptydirs)
 provides=("gst-ffmpeg=$pkgver-$pkgrel")
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('aefa679d14e7a6558673cfbf401b9c01f1903bb52e5dc08332e9001d25a7ba7a')
+sha256sums=('e6e538290e585c993609337761d894dd1b6b53ef625798b2a511d5314579995f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
index a4502f3d4..ee250f344 100644
--- a/extra/gst-plugins-base/PKGBUILD
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183686 2013-04-26 16:05:42Z heftig $
+# $Id: PKGBUILD 190006 2013-07-12 20:19:50Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gst-plugins-base
 pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Base Plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv
 options=(!libtool !emptydirs)
 url="http://gstreamer.freedesktop.org/"
 source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('014805e50b696bc06c3862ea656df079fc0b5fef0c10f16e9f085f290545677a')
+sha256sums=('b55c9deea00acf789f82845c088b7c7c17b3ecef24a94831a819071b3dd8ef0d')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index ed95af3df..6219e1256 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184388 2013-05-06 19:37:41Z foutrelis $
+# $Id: PKGBUILD 190007 2013-07-12 20:23:55Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-good
-pkgver=1.0.7
-pkgrel=2
+pkgver=1.0.8
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -12,7 +12,7 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' '
 makedepends=('gstreamer' 'speex' 'flac' 'libraw1394')
 options=(!libtool !emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('a016a3b377c86658627aef902b9204108209100b2e88fcc3b695c392af1b4035')
+sha256sums=('97831570ccdd8e15557f18858b965e54433d572d27fdabebb8b710cee276cfad')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index a79ca738a..631682bf7 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183689 2013-04-26 16:08:19Z heftig $
+# $Id: PKGBUILD 190010 2013-07-12 20:29:57Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-ugly
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
 options=(!libtool !emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('b78b8cfabe322497da432a0f297dbb21862a033f95e8d4cd8f207eccb5288f2b')
+sha256sums=('58cbae3cad52a91526d599fc90793147e934078055126865ee019bf97f1e0b84')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index 59733108c..30f4661a1 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183685 2013-04-26 16:04:28Z heftig $
+# $Id: PKGBUILD 190004 2013-07-12 20:15:01Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ optdepends=('sh: feedback script')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
 source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('68cada7ee24ede23e15dc81ccde11898eed1a7a3c6a2d81a8c31596fccb1b5ce')
+sha256sums=('ff70f45509566b88e35986971ace5e89cb6cb232e9ca249f84502abceef1762d')
 
 build() {
   cd "${srcdir}/gstreamer-${pkgver}"
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 604b8ad6f..cdf426508 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182988 2013-04-16 16:24:02Z giovanni $
+# $Id: PKGBUILD 190025 2013-07-13 02:56:23Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.41.2
+pkgver=1.43.3
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('48cb7fa1d9cca2ebea1844694668c8a8')
+md5sums=('a84868db7c139238df8add5d86a0b54f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 7f91356de..3915aa1ec 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184392 2013-05-06 19:37:52Z foutrelis $
+# $Id: PKGBUILD 190039 2013-07-13 12:40:59Z svenstaro $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=hugin
 pkgver=2012.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Panorama photo stitcher'
 url='http://hugin.sourceforge.net/'
 license=('GPL')
@@ -19,6 +19,12 @@ sha1sums=('53f97d030716e66dc5a49c7e786686a9d5262b8d')
 
 install=install
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's/Luk.... Jirkovsk../Lukas Jirkovsky/g' -i doc/deghosting_mask.pod
+	# pod2man limitation (makepkg uses LC_ALL=C and Unicode chars take two bytes)
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	export CXXFLAGS+=" -fpermissive" 
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 93312bb7e..e60ba8abf 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,31 +1,35 @@
-# $Id: PKGBUILD 189301 2013-07-02 19:57:06Z lcarlier $
+# $Id: PKGBUILD 190056 2013-07-13 17:35:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
 pkgver=2.4.46
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
 depends=('glibc' 'libpciaccess')
-makedepends=('cairo')
+makedepends=('cairo' 'clang')
 [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 replaces=('libdrm-new' 'libdrm-nouveau')
 options=('!libtool')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
-        no-pthread-stubs.patch
         COPYING)
 sha256sums=('33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1'
-            'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../no-pthread-stubs.patch
 
-  #libtoolize --force
+  # pthread is useless in Linux
+  sed -i "/pthread-stubs/d" configure.ac
   autoreconf --force --install
+  
+  # gcc 4.8 introduces graphic corruption and X crashes with nouveau cards (nv44)
+  # http://gcc.gnu.org/ml/gcc-help/2013-07/msg00103.html
+  # we use clang compiler meanwhile
+  export CC=clang
+
   ./configure --prefix=/usr --enable-udev
   make
 }
diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
deleted file mode 100644
index d49e397b7..000000000
--- a/extra/libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	$(VALGRIND_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-@@ -35,7 +34,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm \
- 	-DDEBUG
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = nouveau.c \
- 			    pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.40/omap/Makefile.am	2012-06-14 23:32:50.000000000 +0200
-+++ libdrm-2.4.40/omap/Makefile.am	2012-11-06 19:24:44.183224706 +0100
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/omap \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_omap_la_LTLIBRARIES = libdrm_omap.la
- libdrm_omap_ladir = $(libdir)
- libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_omap_la_LIBADD = ../libdrm.la
- 
- libdrm_omap_la_SOURCES = omap_drm.c
- 
---- libdrm-2.4.40/exynos/Makefile.am	2012-06-14 23:32:50.000000000 +0200
-+++ libdrm-2.4.40/exynos/Makefile.am	2012-11-06 19:26:01.975323106 +0100
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/exynos \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la
- libdrm_exynos_ladir = $(libdir)
- libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_exynos_la_LIBADD = ../libdrm.la
- 
- libdrm_exynos_la_SOURCES = exynos_drm.c
- 
---- libdrm-2.4.44/freedreno/Makefile.am	2013-04-19 00:59:07.000000000 +0200
-+++ libdrm-2.4.44/freedreno/Makefile.am.new	2013-04-19 17:19:03.153950143 +0200
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/freedreno \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la
- libdrm_freedreno_ladir = $(libdir)
- libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_freedreno_la_LIBADD = ../libdrm.la
- 
- libdrm_freedreno_la_SOURCES = \
- 	freedreno_device.c \
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 4784fa300..ea824fdd0 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183429 2013-04-21 22:11:15Z heftig $
+# $Id: PKGBUILD 190014 2013-07-12 20:40:29Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
@@ -13,7 +13,7 @@ depends=(glib2)
 makedepends=(gobject-introspection vala)
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f50c103107314daee6dc68054e359d5169a19c562902e323ba798b380a2a2c96')
+sha256sums=('b365b3afccbf9a9ecf4282be0b8ce7dcd56afa3c59c19d2ca79bb7f2724a966c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index e1ba0323e..f5954e389 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188185 2013-06-11 20:41:28Z andrea $
+# $Id: PKGBUILD 190040 2013-07-13 12:41:09Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libindi
 pkgver=0.9.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
 license=('GPL2')
@@ -15,8 +15,11 @@ options=('!libtool')
 source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz")
 md5sums=('c1456544a36f543e2884f88913cf3eb0')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD
index bf56184d1..85d66d4ea 100644
--- a/extra/libkolabxml/PKGBUILD
+++ b/extra/libkolabxml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182677 2013-04-12 14:30:48Z andrea $
+# $Id: PKGBUILD 190041 2013-07-13 12:41:18Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkolabxml
 pkgver=0.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Kolab XML Format Schema Definitions Library"
 url='http://git.kolab.org/libkolabxml/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,11 @@ source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.
 md5sums=('64887f52c6629bbd8e2390d591ef5892'
          '55fcdaff82818c4a0eac50570db31e53')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index bbb3bd0b8..73c2fa1a6 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178967 2013-03-01 10:21:49Z andrea $
+# $Id: PKGBUILD 190042 2013-07-13 12:41:27Z svenstaro $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
 pkgver=20110829
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
@@ -22,11 +22,10 @@ sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be'
 build() {
 	cd "${srcdir}/${pkgbase}"
 
-    . /etc/profile.d/qt4.sh
-
 	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro
-        install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
-	qmake liborigin2.pro QMAKESPEC=linux-g++
+	install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
+
+	qmake-qt4 liborigin2.pro QMAKESPEC=linux-g++
   	make QTDIR=/usr/ QMAKESPEC=linux-g++
 
 	 # create documentation
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index b00864a6e..fe99ba444 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186514 2013-05-28 09:58:04Z ioni $
+# $Id: PKGBUILD 190043 2013-07-13 12:41:37Z svenstaro $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
 pkgver=0.16.10
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
@@ -13,8 +13,15 @@ license=('BSD')
 depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('8b24442132e52f8765c79b20ffdea8b33bc5aa42')
+source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz
+        'boost-154.patch')
+sha1sums=('8b24442132e52f8765c79b20ffdea8b33bc5aa42'
+          'b1e66ffbeba5c2b217bc0d02bc2c49aa6b603fa3')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i "${srcdir}"/boost-154.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libtorrent-rasterbar/boost-154.patch b/extra/libtorrent-rasterbar/boost-154.patch
new file mode 100644
index 000000000..5d556310b
--- /dev/null
+++ b/extra/libtorrent-rasterbar/boost-154.patch
@@ -0,0 +1,11 @@
+--- libtorrent-rasterbar-0.16.10/include/libtorrent/disk_buffer_pool.hpp~	2013-07-11 07:37:03.057798742 +0000
++++ libtorrent-rasterbar-0.16.10/include/libtorrent/disk_buffer_pool.hpp	2013-07-11 07:37:27.110960260 +0000
+@@ -33,6 +33,8 @@
+ #ifndef TORRENT_DISK_BUFFER_POOL
+ #define TORRENT_DISK_BUFFER_POOL
+ 
++#include <boost/noncopyable.hpp>
++
+ #include "libtorrent/config.hpp"
+ #include "libtorrent/thread.hpp"
+ #include "libtorrent/session_settings.hpp"
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index ea2478447..003d8654e 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186068 2013-05-20 21:46:39Z foutrelis $
+# $Id: PKGBUILD 190044 2013-07-13 12:41:46Z svenstaro $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
 pkgver=1.7.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Advanced graphical ICQ clone and more for Unix"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.licq.org"
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index b997e25b3..4a2246fa2 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185005 2013-05-09 20:48:29Z ronald $
+# $Id: PKGBUILD 190045 2013-07-13 12:41:55Z svenstaro $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
 pkgver=2.0.6
-pkgrel=1
+pkgrel=3
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lyx.org"
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index a22906d59..d544f0ab8 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189755 2013-07-07 09:05:23Z andyrtr $
+# $Id: PKGBUILD 190055 2013-07-13 17:35:09Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('mesa' 'mesa-libgl')
 pkgver=9.1.4
-pkgrel=3
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'wayland' 'systemd')
@@ -17,10 +17,17 @@ url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+        git_fixes.patch
         LICENSE)
 md5sums=('a2c4e25d0e27918bc67f61bae04d0cb8'
+         '8ec30e1bd7abe5e8e540df4fa618540f'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
+prepare() {
+    cd ?esa-*
+    patch -Np1 -i ../git_fixes.patch
+}
+
 build() {
     cd ${srcdir}/?esa-*
 
@@ -55,7 +62,6 @@ build() {
     --enable-vdpau \
     $extraconf
     # --help
-    # --with-llvm-shared-libs \ # enabling this would force us to move llvm-amdgpu-snapshot from community to extra, delay it until llvm 3.3 / Mesa 9.2/10.0
 
     make
     # fake installation
diff --git a/extra/mesa/git_fixes.patch b/extra/mesa/git_fixes.patch
new file mode 100644
index 000000000..51b0b8f8e
--- /dev/null
+++ b/extra/mesa/git_fixes.patch
@@ -0,0 +1,476 @@
+From 6194644a49f841488e23ce021e7817ec02927eef Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 01 Jul 2013 21:31:03 +0000
+Subject: docs: Add 9.1.4 release md5sums
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+---
+diff --git a/docs/relnotes-9.1.4.html b/docs/relnotes-9.1.4.html
+index 48e421b..fa6fe67 100644
+--- a/docs/relnotes-9.1.4.html
++++ b/docs/relnotes-9.1.4.html
+@@ -30,7 +30,9 @@ because GL_ARB_compatibility is not supported.
+ 
+ <h2>MD5 checksums</h2>
+ <pre>
+-TBD
++a2c4e25d0e27918bc67f61bae04d0cb8  MesaLib-9.1.4.tar.bz2
++8c7e9ce5b05cb2223f0587396dd9dc08  MesaLib-9.1.4.tar.gz
++020459c5793d4279bdcb2daa1f7dd9f6  MesaLib-9.1.4.zip
+ </pre>
+ 
+ <h2>New features</h2>
+--
+cgit v0.9.0.2-2-gbebe
+
+From e94a89de4deeabd0f8347795385b2f098aa35365 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee@freedesktop.org>
+Date: Fri, 01 Feb 2013 07:28:41 +0000
+Subject: swrast: Fix memory leak.
+
+Fixes resource leak defect reported by Coverity.
+
+Signed-off-by: Vinson Lee <vlee@freedesktop.org>
+Reviewed-by: Brian Paul <brianp@vmware.com>
+(cherry picked from commit 985e710c0d1f4f3bbd18448f04e611bd57ae9100)
+---
+diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
+index 9638271..b380de3 100644
+--- a/src/mesa/drivers/dri/swrast/swrast.c
++++ b/src/mesa/drivers/dri/swrast/swrast.c
+@@ -363,6 +363,7 @@ swrast_new_renderbuffer(const struct gl_config *visual, __DRIdrawable *dPriv,
+ 	xrb->bpp = 8;
+ 	break;
+     default:
++	free(xrb);
+ 	return NULL;
+     }
+ 
+--
+cgit v0.9.0.2-2-gbebe
+
+From ab159327a7dc2dd41f9887d053d4abb3de69d195 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 10 Jun 2013 17:33:59 +0000
+Subject: glsl: Add a gl_shader_program parameter to _mesa_uniform_{merge,split}_location_offset
+
+This will be used in the next commit.
+
+NOTE: This is a candidate for stable release branches.
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com>
+(cherry picked from commit 5097f358419c067a71e96e39764b3bb0a716bdbb)
+---
+diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
+index b8335fe..fbbe577 100644
+--- a/src/mesa/main/uniform_query.cpp
++++ b/src/mesa/main/uniform_query.cpp
+@@ -234,7 +234,7 @@ validate_uniform_parameters(struct gl_context *ctx,
+       return false;
+    }
+ 
+-   _mesa_uniform_split_location_offset(location, loc, array_index);
++   _mesa_uniform_split_location_offset(shProg, location, loc, array_index);
+ 
+    if (*loc >= shProg->NumUserUniformStorage) {
+       _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)",
+diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
+index d902407..cee57a7 100644
+--- a/src/mesa/main/uniforms.c
++++ b/src/mesa/main/uniforms.c
+@@ -532,7 +532,7 @@ _mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name)
+    if (shProg->UniformStorage[index].block_index != -1)
+       return -1;
+ 
+-   return _mesa_uniform_merge_location_offset(index, offset);
++   return _mesa_uniform_merge_location_offset(shProg, index, offset);
+ }
+ 
+ GLuint GLAPIENTRY
+diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
+index a12ad9b..853a27c 100644
+--- a/src/mesa/main/uniforms.h
++++ b/src/mesa/main/uniforms.h
+@@ -268,7 +268,8 @@ struct gl_builtin_uniform_desc {
+  * Combine the uniform's base location and the offset
+  */
+ static inline GLint
+-_mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset)
++_mesa_uniform_merge_location_offset(const struct gl_shader_program *prog,
++                                    unsigned base_location, unsigned offset)
+ {
+    return (base_location << 16) | offset;
+ }
+@@ -277,7 +278,8 @@ _mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset)
+  * Separate the uniform base location and parameter offset
+  */
+ static inline void
+-_mesa_uniform_split_location_offset(GLint location, unsigned *base_location,
++_mesa_uniform_split_location_offset(const struct gl_shader_program *prog,
++                                    GLint location, unsigned *base_location,
+ 				    unsigned *offset)
+ {
+    *offset = location & 0xffff;
+diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+index 4286f0e..1e04f64 100644
+--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
++++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+@@ -3052,7 +3052,7 @@ set_uniform_initializer(struct gl_context *ctx, void *mem_ctx,
+         	"Couldn't find uniform for initializer %s\n", name);
+       return;
+    }
+-   int loc = _mesa_uniform_merge_location_offset(index, offset);
++   int loc = _mesa_uniform_merge_location_offset(shader_program, index, offset);
+ 
+    for (unsigned int i = 0; i < (type->is_array() ? type->length : 1); i++) {
+       ir_constant *element;
+--
+cgit v0.9.0.2-2-gbebe
+
+From 4d12a9c67c850ff2c92f301317bc3fae0bcb448a Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 10 Jun 2013 17:35:05 +0000
+Subject: glsl: Add gl_shader_program::UniformLocationBaseScale
+
+This is used by _mesa_uniform_merge_location_offset and
+_mesa_uniform_split_location_offset to determine how the base and offset
+are packed.  Previously, this value was hard coded as (1U<<16) in those
+functions via the shift and mask contained therein.  The value is still
+(1U<<16), but it can be changed in the future.
+
+The next patch dynamically generates this value.
+
+NOTE: This is a candidate for stable release branches.
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com>
+(cherry picked from commit 26d86d26f9f972b19c7040bdb1b1daf48537ef3e)
+---
+diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
+index d457e4d..ac726f4 100644
+--- a/src/glsl/link_uniforms.cpp
++++ b/src/glsl/link_uniforms.cpp
+@@ -730,6 +730,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog)
+ 
+    assert(sizeof(prog->SamplerTargets) == sizeof(parcel.targets));
+    memcpy(prog->SamplerTargets, parcel.targets, sizeof(prog->SamplerTargets));
++   prog->UniformLocationBaseScale = (1U<<16);
+ 
+ #ifndef NDEBUG
+    for (unsigned i = 0; i < num_user_uniforms; i++) {
+diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
+index 23c3a0d..3e440f5 100644
+--- a/src/mesa/main/mtypes.h
++++ b/src/mesa/main/mtypes.h
+@@ -2419,6 +2419,21 @@ struct gl_shader_program
+    unsigned NumUniformBlocks;
+ 
+    /**
++    * Scale factor for the uniform base location
++    *
++    * This is used to generate locations (returned by \c glGetUniformLocation)
++    * of uniforms.  The base location of the uniform is multiplied by this
++    * value, and the array index is added.
++    *
++    * \note
++    * Must be >= 1.
++    *
++    * \sa
++    * _mesa_uniform_merge_location_offset, _mesa_uniform_split_location_offset
++    */
++   unsigned UniformLocationBaseScale;
++
++   /**
+     * Indices into the _LinkedShaders's UniformBlocks[] array for each stage
+     * they're used in, or -1.
+     *
+diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
+index 59daff5..0494320 100644
+--- a/src/mesa/main/shaderobj.c
++++ b/src/mesa/main/shaderobj.c
+@@ -283,6 +283,7 @@ _mesa_clear_shader_program_data(struct gl_context *ctx,
+       ralloc_free(shProg->UniformStorage);
+       shProg->NumUserUniformStorage = 0;
+       shProg->UniformStorage = NULL;
++      shProg->UniformLocationBaseScale = 0;
+    }
+ 
+    if (shProg->UniformHash) {
+diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
+index 853a27c..421232d 100644
+--- a/src/mesa/main/uniforms.h
++++ b/src/mesa/main/uniforms.h
+@@ -271,7 +271,9 @@ static inline GLint
+ _mesa_uniform_merge_location_offset(const struct gl_shader_program *prog,
+                                     unsigned base_location, unsigned offset)
+ {
+-   return (base_location << 16) | offset;
++   assert(prog->UniformLocationBaseScale >= 0);
++   assert(offset < prog->UniformLocationBaseScale);
++   return (base_location * prog->UniformLocationBaseScale) + offset;
+ }
+ 
+ /**
+@@ -282,8 +284,8 @@ _mesa_uniform_split_location_offset(const struct gl_shader_program *prog,
+                                     GLint location, unsigned *base_location,
+ 				    unsigned *offset)
+ {
+-   *offset = location & 0xffff;
+-   *base_location = location >> 16;
++   *offset = location % prog->UniformLocationBaseScale;
++   *base_location = location / prog->UniformLocationBaseScale;
+ }
+ /*@}*/
+ 
+--
+cgit v0.9.0.2-2-gbebe
+
+From 307a703c759263bb37285b0919721ff2c413fc56 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 10 Jun 2013 17:39:28 +0000
+Subject: glsl: Generate smaller values for uniform locations
+
+Previously we would generate uniform locations as (slot << 16) +
+array_index.  We do this to handle applications that assume the location
+of a[2] will be +1 from the location of a[1].  This resulted in every
+uniform location being at least 0x10000.  The OpenGL 4.3 spec was
+amended to require this behavior, but previous versions did not require
+locations of array (or structure) members be sequential.
+
+We've now encountered two applications that assume uniform values will
+be "small."  As far as we can tell, these applications store the GLint
+returned by glGetUniformLocation in a int16_t or possibly an int8_t.
+
+THIS BEHAVIOR IS NOT GUARANTEED OR IMPLIED BY ANY VERSION OF OpenGL.
+
+Other implementations happen to have both these behaviors (sequential
+array elements and small values) since OpenGL 2.0, so let's just match
+their behavior.
+
+Fixes "3D Bowling" on Android.
+
+NOTE: This is a candidate for stable release branches.
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com>
+(cherry picked from commit cfa3c5ad828f56559a6cc2de299f993b8e748ea4)
+---
+diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
+index ac726f4..8e01d2e 100644
+--- a/src/glsl/link_uniforms.cpp
++++ b/src/glsl/link_uniforms.cpp
+@@ -730,7 +730,20 @@ link_assign_uniform_locations(struct gl_shader_program *prog)
+ 
+    assert(sizeof(prog->SamplerTargets) == sizeof(parcel.targets));
+    memcpy(prog->SamplerTargets, parcel.targets, sizeof(prog->SamplerTargets));
+-   prog->UniformLocationBaseScale = (1U<<16);
++
++   /* Determine the size of the largest uniform array queryable via
++    * glGetUniformLocation.  Using this as the location scale guarantees that
++    * there is enough "room" for the array index to be stored in the low order
++    * part of the uniform location.  It also makes the locations be more
++    * tightly packed.
++    */
++   unsigned max_array_size = 1;
++   for (unsigned i = 0; i < num_user_uniforms; i++) {
++      if (uniforms[i].array_elements > max_array_size)
++         max_array_size = uniforms[i].array_elements;
++   }
++
++   prog->UniformLocationBaseScale = max_array_size;
+ 
+ #ifndef NDEBUG
+    for (unsigned i = 0; i < num_user_uniforms; i++) {
+--
+cgit v0.9.0.2-2-gbebe
+
+From 2cfc0072a80cfd9503be7e57a1d8375d64d7eb98 Mon Sep 17 00:00:00 2001
+From: Richard Sandiford <r.sandiford@uk.ibm.com>
+Date: Mon, 17 Jun 2013 16:10:49 +0000
+Subject: st/xlib Fix XIMage bytes-per-pixel calculation
+
+Fixes a crash seen while running gnome on a 16-bit screen over vnc.
+
+NOTE: This is a candidate for stable release branches.
+
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com>
+(cherry picked from commit 876fefe2ff8901ae4b908cff89ac5dd4324f4fe5)
+---
+diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
+index 5c6d6a7..4f99e23 100644
+--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
++++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
+@@ -1392,9 +1392,8 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer,
+          return;
+       }
+ 
+-      /* The pipe transfer has a pitch rounded up to the nearest 64 pixels.
+-         We assume 32 bit pixels. */
+-      ximage_stride = w * 4;
++      /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */
++      ximage_stride = w * ((img->bits_per_pixel + 7) / 8);
+ 
+       for (line = 0; line < h; line++)
+          memcpy(&map[line * tex_xfer->stride],
+--
+cgit v0.9.0.2-2-gbebe
+
+From 8ed60f7f7fb060ccf939328bb03c9714b207236f Mon Sep 17 00:00:00 2001
+From: Richard Sandiford <r.sandiford@uk.ibm.com>
+Date: Mon, 17 Jun 2013 16:13:25 +0000
+Subject: st/xlib: Fix XImage stride calculation
+
+Fixes window skew seen while running gnome on a 16-bit screen over vnc.
+
+NOTE: This is a candidate for stable release branches.
+
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com>
+(cherry picked from commit c132c2978b02da7140462a633605a0127dfcceb4)
+---
+diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
+index 4f99e23..9bfd372 100644
+--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
++++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
+@@ -1366,7 +1366,7 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer,
+       enum pipe_format internal_format = res->format;
+       struct pipe_transfer *tex_xfer;
+       char *map;
+-      int line, ximage_stride;
++      int line, byte_width;
+       XImage *img;
+ 
+       internal_format = choose_pixel_format(drawable->xm_visual);
+@@ -1393,12 +1393,12 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer,
+       }
+ 
+       /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */
+-      ximage_stride = w * ((img->bits_per_pixel + 7) / 8);
++      byte_width = w * ((img->bits_per_pixel + 7) / 8);
+ 
+       for (line = 0; line < h; line++)
+          memcpy(&map[line * tex_xfer->stride],
+-                &img->data[line * ximage_stride],
+-                ximage_stride);
++                &img->data[line * img->bytes_per_line],
++                byte_width);
+ 
+       pipe_transfer_unmap(pipe, tex_xfer);
+ 
+--
+cgit v0.9.0.2-2-gbebe
+
+From 5412ae63dca1b1a6c43fccb5bafe56a0cd9c9a88 Mon Sep 17 00:00:00 2001
+From: Kristian Høgsberg <krh@bitplanet.net>
+Date: Tue, 18 Jun 2013 20:53:46 +0000
+Subject: wayland: Handle global_remove event as well
+
+We need to set up a handler for the global_remove event that gets sent
+out when a global gets removed.  Without the handler we end up calling
+a NULL pointer.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=65910
+
+NOTE: This is a candidate for the stable branches.
+
+Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+(cherry picked from commit 712269d6744a8849d1d0cf01fa0132d969b79ed4)
+---
+diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
+index 99d8729..e106dc2 100644
+--- a/src/egl/drivers/dri2/platform_wayland.c
++++ b/src/egl/drivers/dri2/platform_wayland.c
+@@ -643,8 +643,15 @@ registry_handle_global(void *data, struct wl_registry *registry, uint32_t name,
+    }
+ }
+ 
++static void
++registry_handle_global_remove(void *data, struct wl_registry *registry,
++			      uint32_t name)
++{
++}
++
+ static const struct wl_registry_listener registry_listener = {
+-	registry_handle_global
++   registry_handle_global,
++   registry_handle_global_remove
+ };
+ 
+ EGLBoolean
+--
+cgit v0.9.0.2-2-gbebe
+
+From cda92f5191cd2ed4782dbdd41143d520857861c9 Mon Sep 17 00:00:00 2001
+From: Richard Sandiford <rsandifo@linux.vnet.ibm.com>
+Date: Tue, 18 Jun 2013 15:41:43 +0000
+Subject: st/dri/sw: Fix pitch calculation in drisw_update_tex_buffer
+
+swrastGetImage rounds the pitch up to 4 bytes for compatibility reasons
+that are explained in drisw_glx.c:bytes_per_line, so drisw_update_tex_buffer
+must do the same.
+
+Fixes window skew seen while running firefox over vnc on a 16-bit screen.
+
+NOTE: This is a candidate for the stable branches.
+
+[ajax: fixed typo in comment]
+
+Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
+Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com>
+(cherry picked from commit 5a0556f061d9db00dd7637433d393beead3b3d85)
+---
+diff --git a/src/gallium/state_trackers/dri/sw/drisw.c b/src/gallium/state_trackers/dri/sw/drisw.c
+index 7a5f797..41f66d5 100644
+--- a/src/gallium/state_trackers/dri/sw/drisw.c
++++ b/src/gallium/state_trackers/dri/sw/drisw.c
+@@ -265,8 +265,9 @@ drisw_update_tex_buffer(struct dri_drawable *drawable,
+    /* Copy the Drawable content to the mapped texture buffer */
+    get_image(dPriv, x, y, w, h, map);
+ 
+-   /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */
+-   ximage_stride = w * cpp;
++   /* The pipe transfer has a pitch rounded up to the nearest 64 pixels.
++      get_image() has a pitch rounded up to 4 bytes.  */
++   ximage_stride = ((w * cpp) + 3) & -4;
+    for (line = h-1; line; --line) {
+       memmove(&map[line * transfer->stride],
+               &map[line * ximage_stride],
+--
+cgit v0.9.0.2-2-gbebe
+
+From 26f802d0635fc247bbc3ebf6f7e9bf126b6b5e69 Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Thu, 31 Jan 2013 00:44:25 +0000
+Subject: svga: check for NaN shader immediates
+
+The svga device doesn't handle them.  Replace with zeros.
+Fixes several piglit tests, such as "glsl-const-builtin-inversesqrt".
+
+Reviewed-by: Reviewed-by: José Fonseca <jfonseca@vmware.com>
+(cherry picked from commit 3cb491534493a52e9a88cb88d31727569afb8167)
+---
+diff --git a/src/gallium/drivers/svga/svga_tgsi_insn.c b/src/gallium/drivers/svga/svga_tgsi_insn.c
+index 36ed008..d439e5b 100644
+--- a/src/gallium/drivers/svga/svga_tgsi_insn.c
++++ b/src/gallium/drivers/svga/svga_tgsi_insn.c
+@@ -2716,8 +2716,10 @@ static boolean svga_emit_immediate( struct svga_shader_emitter *emit,
+    unsigned i;
+ 
+    assert(1 <= imm->Immediate.NrTokens && imm->Immediate.NrTokens <= 5);
+-   for (i = 0; i < imm->Immediate.NrTokens - 1; i++)
+-      value[i] = imm->u[i].Float;
++   for (i = 0; i < imm->Immediate.NrTokens - 1; i++) {
++      float f = imm->u[i].Float;
++      value[i] = util_is_inf_or_nan(f) ? 0.0f : f;
++   }
+ 
+    for ( ; i < 4; i++ )
+       value[i] = id[i];
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index ea2db4660..ebe172536 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189221 2013-06-30 05:10:45Z giovanni $
+# $Id: PKGBUILD 190046 2013-07-13 12:42:05Z svenstaro $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
 pkgver=6.3.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
diff --git a/extra/ocrad/PKGBUILD b/extra/ocrad/PKGBUILD
index cb16b8f40..9bf2bef38 100644
--- a/extra/ocrad/PKGBUILD
+++ b/extra/ocrad/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143923 2011-11-30 20:57:38Z giovanni $
+# $Id: PKGBUILD 190021 2013-07-12 22:00:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=ocrad
-pkgver=0.21
-pkgrel=2.1
+pkgver=0.22
+pkgrel=1
 pkgdesc="An Optical Character Recognition program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ocrad/ocrad.html"
 license=('GPL3')
 depends=('gcc-libs' 'texinfo')
 install=ocrad.install
-source=("http://ftp.gnu.org/gnu/ocrad/ocrad-$pkgver.tar.gz")
-md5sums=('83f9eae9d808f9d86c181538d3f64aed')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz")
+md5sums=('e84f0fb0dcd9b7b067201f9a3b89e06c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index a677f6969..068e5c9b0 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189712 2013-07-05 15:55:50Z schiv $
+# $Id: PKGBUILD 189985 2013-07-12 13:37:23Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.6
+pkgver=2.4.6.1
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,10 +24,12 @@ if [ "$CARCH" != "mips64el" ]; then
 fi
 source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz"
         'pkgconfig.patch'
-        'fsh.patch')
-md5sums=('c5e8758a419b4f258611b17fc83aafaf'
+        'fsh.patch'
+        'cldetect.patch')
+md5sums=('d756bfa460891697571d5c90050e1cfe'
          'cb916260b5ec594fe7a0cc2e54fc569f'
-         '35256e3ccace373feba8131d1540a0de')
+         '35256e3ccace373feba8131d1540a0de'
+         '0dd6572405adc2387ded4c95be0f189c')
 
 if [ "$CARCH" != "mips64el" ]; then
   _cmakeopts=('-D WITH_OPENCL=ON'
@@ -38,7 +40,6 @@ fi
 _cmakeopts+=(
             '-D WITH_OPENGL=ON'
             '-D WITH_XINE=ON'
-            '-D BUILD_PACKAGE=OFF'
             '-D BUILD_WITH_DEBUG_INFO=OFF'
             '-D BUILD_TESTS=OFF'
             '-D BUILD_PERF_TESTS=OFF'
@@ -61,6 +62,11 @@ _cmakeopts+=(
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # fix missing opencl module
+  # see https://bugs.archlinux.org/task/36076
+  # and http://code.opencv.org/issues/3140
+  patch -Np1 -i "$srcdir/cldetect.patch"
+
   # fix pkg-config mess
   # see https://bugs.archlinux.org/task/32430
   # and http://code.opencv.org/issues/1925
diff --git a/extra/opencv/cldetect.patch b/extra/opencv/cldetect.patch
new file mode 100644
index 000000000..6dbe1608c
--- /dev/null
+++ b/extra/opencv/cldetect.patch
@@ -0,0 +1,23 @@
+diff -ur opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake
+--- opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake	2013-07-11 18:57:27.363199736 +0000
++++ opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake	2013-07-11 19:04:00.577069207 +0000
+@@ -17,8 +17,7 @@
+               NAMES OpenCL/cl.h CL/cl.h
+               HINTS ${OPENCL_ROOT_DIR}
+               PATH_SUFFIXES include include/nvidia-current
+-              DOC "OpenCL include directory"
+-              NO_DEFAULT_PATH)
++              DOC "OpenCL include directory")
+ 
+     if (X86_64)
+       set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64)
+@@ -30,8 +29,7 @@
+               NAMES OpenCL
+               HINTS ${OPENCL_ROOT_DIR}
+               PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES}
+-              DOC "OpenCL library"
+-              NO_DEFAULT_PATH)
++              DOC "OpenCL library")
+ 
+     mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
+     include(FindPackageHandleStandardArgs)
diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD
index 96d8d09df..692a2f15f 100644
--- a/extra/opus/PKGBUILD
+++ b/extra/opus/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 184222 2013-05-04 08:38:14Z heftig $
+# $Id: PKGBUILD 190019 2013-07-12 21:33:32Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
 # Contributor: pumbur
 
 pkgname=opus
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.3
+pkgrel=1
 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
 arch=(i686 x86_64 mips64el)
 url="http://www.opus-codec.org/"
@@ -14,7 +14,7 @@ license=(BSD)
 depends=(glibc)
 options=('!libtool')
 source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('c503ad05a59ddb44deab96204401be03')
+md5sums=('86eedbd3c5a0171d2437850435e6edff')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/perl-bit-vector/Bit-Vector-destroy.patch b/extra/perl-bit-vector/Bit-Vector-destroy.patch
deleted file mode 100644
index 580f4cf21..000000000
--- a/extra/perl-bit-vector/Bit-Vector-destroy.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0646f34fc3eeb47627822df860986cf7bee4ebed Mon Sep 17 00:00:00 2001
-From: Gisle Aas <gisle@activestate.com>
-Date: Thu, 28 Mar 2013 00:41:07 -0700
-Subject: [PATCH] eval { 1->method } triggers different error in 5.17.11
-
----
- t/02_____destroy.t |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/t/02_____destroy.t b/t/02_____destroy.t
-index 41e3aa3..adcf995 100644
---- a/t/02_____destroy.t
-+++ b/t/02_____destroy.t
-@@ -17,7 +17,9 @@ if (ref($set) eq '')
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- eval { $set->DESTROY(); };
--if ($@ =~ /Can't call method "DESTROY" without a package or object reference/)
-+if ($@ =~ /Can't call method "DESTROY" without a package or object reference/ ||
-+    $@ =~ /Can't locate object method "DESTROY" via package "1"/
-+)
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- eval { Bit::Vector::DESTROY($set); };
--- 
-1.7.0.5
-
diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD
index e0852fbc8..08f175bfb 100644
--- a/extra/perl-bit-vector/PKGBUILD
+++ b/extra/perl-bit-vector/PKGBUILD
@@ -1,43 +1,31 @@
-# $Id: PKGBUILD 186393 2013-05-26 09:24:52Z bluewind $
+# $Id: PKGBUILD 189971 2013-07-12 02:57:43Z eric $
 # Maintainer:
 # Contributor: Kevin Piche <kevin@archlinux.org>
-# Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=perl-bit-vector
-_cpanname=Bit-Vector
-pkgver=7.2
-pkgrel=3
+pkgver=7.3
+pkgrel=1
 pkgdesc='Efficient bit vector, set of integers and "big int" math library'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/${_cpanname}/"
+url="http://search.cpan.org/dist/Bit-Vector/"
 depends=('perl-carp-clan' 'perl')
 options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz
-        Bit-Vector-destroy.patch)
-md5sums=('bc6ae34738b8f889290bf50099ff8aed'
-         'c86a55b84cb05dd04004ee8f56ee2ee3')
-
-prepare() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
-
-  # https://rt.cpan.org/Public/Bug/Display.html?id=84250
-  patch -Np1 -i "${srcdir}/Bit-Vector-destroy.patch"
-}
+source=(http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/Bit-Vector-${pkgver}.tar.gz)
+md5sums=('684e63a93db1e0eda25a103258b39725')
 
 build() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  cd Bit-Vector-$pkgver
+  perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
+  cd Bit-Vector-$pkgver
   make test
 }
 
 package() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
+  cd Bit-Vector-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD
index b18890417..e6d9d6f38 100644
--- a/extra/python-markupsafe/PKGBUILD
+++ b/extra/python-markupsafe/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 169021 2012-10-17 10:20:38Z allan $
+# $Id: PKGBUILD 189977 2013-07-12 06:16:17Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alex Anthony <alex.anthony28991@gmail.com>
 
 pkgname=('python-markupsafe' 'python2-markupsafe')
-pkgver=0.15
-pkgrel=2
+pkgver=0.18
+pkgrel=1
 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')
 source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
-md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186')
+md5sums=('f8d252fd05371e51dec2fe9a36890687')
 
 build() {
   cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
@@ -22,10 +22,18 @@ build() {
   python2 setup.py build
 }
 
+check() {
+  cd "${srcdir}/MarkupSafe-${pkgver}"
+  python setup.py test
+
+  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+  python2 setup.py test
+}
+
 package_python-markupsafe() {
   depends=('python')
 
-  cd "${srcdir}/MarkupSafe-${pkgver}"
+  cd MarkupSafe-${pkgver}
   python setup.py install --root="${pkgdir}" --optimize=1
 
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE"
@@ -34,7 +42,7 @@ package_python-markupsafe() {
 package_python2-markupsafe() {
   depends=('python2')
 
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+  cd python2-MarkupSafe-${pkgver}
   python2 setup.py install --root="${pkgdir}" --optimize=1
 
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE"
diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD
index ea3c69e54..6bb1b7e90 100644
--- a/extra/qtiplot/PKGBUILD
+++ b/extra/qtiplot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184803 2013-05-09 04:24:34Z bpiotrowski $
+# $Id: PKGBUILD 190047 2013-07-13 12:42:16Z svenstaro $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir.archlinux.org>
 # Contributor: Gergely Imreh <imrehg@gmail.com>
 
 pkgname=qtiplot
 pkgver=0.9.8.9
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 url="http://soft.proindependent.com/qtiplot.html"
 pkgdesc="Data analysis and scientific plotting - free clone of Origin"
diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD
index 1b19b9e24..b4cc1ea97 100644
--- a/extra/rtmpdump/PKGBUILD
+++ b/extra/rtmpdump/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 187070 2013-06-03 11:16:53Z allan $
+# $Id: PKGBUILD 189979 2013-07-12 06:44:58Z eric $
 # Maintainer:
 # Contributor: xduugu
 # Contributor: Elis Hughes <elishughes@googlemail.com>
 
 pkgname=rtmpdump
-pkgver=20121203
-pkgrel=2
+pkgver=20121230
+pkgrel=1
 pkgdesc="A tool to download rtmp streams"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://rtmpdump.mplayerhq.hu/"
@@ -14,16 +14,14 @@ depends=('openssl')
 options=(!makeflags)
 #git://git.ffmpeg.org/rtmpdump 
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('e5d9f7411bddd5a12be677f2a285c38100313db2b3b1f8d2a709d46e03741409')
+sha256sums=('89faf9df54204dbab211621809aa961ea6405e192cc0ce6633307e87aed400b7')
 
 build() {
-    make -C "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
+  make
 }
 
 package() {
-    make -C "$pkgname-$pkgver" prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install
-        # usrmove
-        cd "$pkgdir"
-        mv usr/sbin/* usr/bin
-        rmdir usr/sbin
+  cd $pkgname-$pkgver
+  make prefix=/usr sbindir=/usr/bin mandir=/usr/share/man DESTDIR="$pkgdir" install
 }
diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
index 51f2f93a6..ba4aad179 100644
--- a/extra/scribus/PKGBUILD
+++ b/extra/scribus/PKGBUILD
@@ -1,52 +1,49 @@
-# $Id: PKGBUILD 178994 2013-03-01 10:25:10Z andrea $
+# $Id: PKGBUILD 190048 2013-07-13 12:42:28Z svenstaro $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scribus
 pkgver=1.4.2
-pkgrel=2
-pkgdesc="A desktop publishing program"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.scribus.net"
+pkgrel=3
+pkgdesc='Desktop publishing software'
+url="http://www.scribus.net/"
 license=('GPL')
-install=scribus.install
-depends=('libcups>=1.3.11' 'lcms2' 'qt4' 'ghostscript>=8.70' \
-         'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
-         'desktop-file-utils' 'shared-mime-info' \
-         'hyphen' 'aspell' 'boost-libs')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('cmake' 'boost' 'mesa')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
+         'ghostscript' 'python2' 'aspell' 'boost-libs'
+         'desktop-file-utils' 'shared-mime-info')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
 
-build() {
-	cd "${srcdir}"
+options=('!libtool')
+install=install
 
-	sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-	       -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-               scribus-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop
+	sed \
+		-e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+		-e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+		-i scribus/plugins/scriptplugin/{samples,scripts}/*
+	install -d ../build
+}
 
-	mkdir build
-	cd build
-	cmake ../scribus-${pkgver} \
-	   -DCMAKE_INSTALL_PREFIX=/usr \
-	   -DCMAKE_BUILD_TYPE=Release \
-	   -DCMAKE_SKIP_RPATH=ON \
-	   -DWANT_CAIRO=1 \
-	   -DLIB_SUFFIX=""
+build() {
+	cd "${srcdir}/build"
+	cmake "../${pkgname}-${pkgver}" \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DLIB_SUFFIX=""
 	make
 }
 
 package() {
 	cd "${srcdir}/build"
 	make DESTDIR="${pkgdir}" install
-
-	# fix icon path in .desktop file
-	sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-	   "${srcdir}/scribus-${pkgver}/scribus.desktop"
-
-	install -Dm644 "${srcdir}/scribus-${pkgver}/scribus.desktop" \
-	   "${pkgdir}/usr/share/applications/scribus.desktop"
+	install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop"
 }
diff --git a/extra/scribus/install b/extra/scribus/install
new file mode 100644
index 000000000..8040f715b
--- /dev/null
+++ b/extra/scribus/install
@@ -0,0 +1,11 @@
+post_install() {
+	update-mime-database usr/share/mime &> /dev/null
+	update-desktop-database -q
+}
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/scribus/scribus.install b/extra/scribus/scribus.install
deleted file mode 100644
index 52a6286ac..000000000
--- a/extra/scribus/scribus.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 5328e64ea..95e0062a5 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 181128 2013-03-31 19:16:57Z stephane $
+# $Id: PKGBUILD 190049 2013-07-13 12:42:47Z svenstaro $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
 pkgver=3.1.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index 6b2f06e48..b78bd338a 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 187012 2013-06-03 08:51:25Z andrea $
+# $Id: PKGBUILD 190050 2013-07-13 12:42:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=strigi
 pkgver=0.7.8
-pkgrel=3
+pkgrel=4
 pkgdesc="Fast crawling desktop search engine with Qt GUI"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://strigi.sourceforge.net/'
 license=('GPL2')
-depends=('dbus' 'exiv2' 'libxml2' 'boost-libs')
-makedepends=('cmake' 'pkg-config' 'boost')
+depends=('dbus' 'exiv2' 'libxml2' 'bzip2')
+makedepends=('cmake')
 optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
             'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
 source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
@@ -19,12 +19,13 @@ md5sums=('d69443234f4286d71997db9de543331a'
          'd48d65014650644ba61821813101c2f4')
 
 prepare() {
+  mkdir build
+  
   cd ${pkgname}-${pkgver}/libstreams
   patch -p1 -i "${srcdir}"/gcc48.patch
 }
 
 build() {
-  mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/xdg-user-dirs/PKGBUILD b/extra/xdg-user-dirs/PKGBUILD
index 3efdbd2fe..9a2b73d29 100644
--- a/extra/xdg-user-dirs/PKGBUILD
+++ b/extra/xdg-user-dirs/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 153519 2012-03-15 14:03:02Z heftig $
+# $Id: PKGBUILD 189993 2013-07-12 15:01:21Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor:  <mathieu.clabaut@gmail.com>
 
 pkgname=xdg-user-dirs
-pkgver=0.14
-pkgrel=3
+pkgver=0.15
+pkgrel=1
 pkgdesc="Manage user directories like ~/Desktop and ~/Music"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('sh')
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-license=('GPL')
-backup=('etc/xdg/user-dirs.conf' 'etc/xdg/user-dirs.defaults')
+license=(GPL)
+depends=(sh)
+makedepends=(docbook-xsl)
+backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
 source=(http://user-dirs.freedesktop.org/releases/$pkgname-$pkgver.tar.gz
         xdg-user-dirs)
-sha256sums=('5f4e84f57c113f642ffdd646126855f45f1da955103119dbd2382edb516e6255'
+sha256sums=('20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786'
             'f0f27de23d849b2fa4ebf59e448b5a843b577d14dc2c1070e228999091fa7f5e')
 
 build() {
diff --git a/extra/xsd/PKGBUILD b/extra/xsd/PKGBUILD
index 4a0cf2a7f..8309fe961 100644
--- a/extra/xsd/PKGBUILD
+++ b/extra/xsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 181130 2013-03-31 19:17:00Z stephane $
+# $Id: PKGBUILD 190051 2013-07-13 12:43:05Z svenstaro $
 # Maintainer:
 # Contributor: kevku <kevku@gmx.com>
 
 pkgname=xsd
 pkgver=3.3.0
 _pkgver=3.3.0-2+dep
-pkgrel=8
+pkgrel=9
 pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding compiler"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.codesynthesis.com/products/xsd"
@@ -17,10 +17,13 @@ source=("http://www.codesynthesis.com/download/${pkgname}/3.3/${pkgname}-${_pkgv
 sha1sums=('1c9de9271f589b8ecf2be18f2e9ac87330fc8281'
           '8f7ca8bf0440b30d8f5823e0f528db19810706f2')
 
-build() {
+prepare() {
   cd "${pkgname}-${_pkgver}"
   patch -p0 -i "${srcdir}/xsdcxx.patch"
+}
 
+build() {
+  cd "${pkgname}-${_pkgver}"
   make CXXFLAGS="${CXXFLAGS}"
 }
 
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index e9dbc1f62..435a1b4a7 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -14,7 +14,7 @@ epoch=8
 pkgver=2.67b
 _jpgver=1.5
 _pyver=3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc"
 arch=(
   i686
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 7991897ce..652d6a6ba 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93610 2013-07-07 09:52:43Z jelle $
+# $Id: PKGBUILD 94003 2013-07-13 08:59:42Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.38
+pkgver=0.9.39
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,7 +30,7 @@ install=calibre.install
 source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('7dac0c5896d3affb87667fe5dbdf9019'
+md5sums=('7ac795465e8e28da415141f1ad15dd2d'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 prepare(){
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 59f49ee5d..eac23b4be 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180524 2013-03-22 19:07:19Z heftig $
+# $Id: PKGBUILD 190001 2013-07-12 20:00:03Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=gst-plugins-bad
 pkgname=gst-plugins-bad-libre
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
 arch=(
@@ -27,6 +27,8 @@ depends=(
   libgme
   libmms
   libmodplug
+  libofa
+  neon
   mjpegtools
   mpg123
   opus
@@ -58,7 +60,7 @@ source=(
   "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz"
 )
 sha256sums=(
-  5f49e6353fdc855834b5beb054b3a47ef5fa558006c7eda6d2ec07b36315c2ab
+  6949b5532034fc37d5a874e4e3330107767238bc4def9f769b8193124e2420cc
 )
 
 build() {
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 2e3126da7..443f45485 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 93800 2013-07-10 11:24:05Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: flixie <69one@gmx.net>
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
@@ -7,7 +7,7 @@ pkgname=luxrender-libre
 _pkgflag=libre
 pkgver=1.2.1
 _pkgver=3066b2161439
-pkgrel=3
+pkgrel=5
 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.${pkgname%-$_pkgflag}.net/"
diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD
index bcfbef9d8..b9ec08616 100644
--- a/libre/mc-libre/PKGBUILD
+++ b/libre/mc-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87679 2013-04-05 09:08:28Z schuay $
+# $Id: PKGBUILD 93857 2013-07-11 13:35:59Z schuay $
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 _pkgname=mc
 pkgname=mc-libre
-pkgver=4.8.8
+pkgver=4.8.9
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64' 'mips64el')
@@ -69,4 +69,4 @@ package() {
         -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
 }
 
-md5sums=('324ff5a192d30d3a3b234c130550eb0a')
+md5sums=('e701cc5ced4beed38e1977eba26dad50')
diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
index 57a04c290..da6f373c9 100644
--- a/pcr/miniupnpd/PKGBUILD
+++ b/pcr/miniupnpd/PKGBUILD
@@ -41,3 +41,5 @@ package() {
         cd "$pkgdir"
         mv usr/sbin usr/bin
 }
+md5sums=('484dbda7c428b2d5f3768500a48d3375'
+         'f862f79b673359adc80faf0be914394f')
diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD
index 81eb3d14d..e85f98bb8 100644
--- a/pcr/rfc5766-turn-server/PKGBUILD
+++ b/pcr/rfc5766-turn-server/PKGBUILD
@@ -3,20 +3,21 @@
 pkgname=rfc5766-turn-server
 _portname=turnserver
 pkgver=1.8.6.0
-pkgrel=1
+pkgrel=2
 epoch=
 pkgdesc="Free open source implementation of TURN and STUN Server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/rfc5766-turn-server/"
 license=('custom:BSDNew')
-makedepends=('gcc>=3.4.4' 'make')
+makedepends=('gcc>=3.4.4' 'make' 'hiredis' 'postgresql-libs' 'libmariadbclient')
 depends=('libevent')
-#no redis headers in redi package
-optdepends=('postgresql-client: to use postgresql' 'libmysqlclient')
+optdepends=('postgresql-client: to use postgresql'
+            'mariadb: mariadb backend'
+            'redis: redis backend')
 backup=("etc/turnserver.conf" "etc/turnuserdb.conf")
 changelog=ChangeLog
-source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz)
-sha1sums=('155990b95d399542db1bb497f1746c1b9bb290d2')
+source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz
+        turn.service stun.service)
 
 build() {
   cd "${srcdir}/$_portname-${pkgver}"
@@ -51,11 +52,20 @@ package() {
     install
   
   
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" "$pkgdir/etc/turnserver.conf"
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" "$pkgdir/etc/turnuserdb.conf"
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" \
+             "$pkgdir/etc/turnserver.conf"
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" \
+             "$pkgdir/etc/turnuserdb.conf"
+  install -D "$srcdir/stun.service" \
+             "$pkgdir/usr/lib/systemd/system/stun.service"
+  install -D "$srcdir/turn.service" \
+             "$pkgdir/usr/lib/systemd/system/turn.service"
   rm -r "$pkgdir/usr/etc"
 
   chmod 644 "$pkgdir/usr/lib/libturnclient.a"
 
   install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
+md5sums=('def4cc2ea6239795edab12b5eee5f8ed'
+         '1da26c3a1fe29a8961e6b9d73f9048d3'
+         '83670d79026c67c7701481ee9d39f100')
diff --git a/pcr/rfc5766-turn-server/stun.service b/pcr/rfc5766-turn-server/stun.service
new file mode 100644
index 000000000..bddb6168a
--- /dev/null
+++ b/pcr/rfc5766-turn-server/stun.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=STUN Server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/turnserver --stun-only
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/rfc5766-turn-server/turn.service b/pcr/rfc5766-turn-server/turn.service
new file mode 100644
index 000000000..54cc5f01a
--- /dev/null
+++ b/pcr/rfc5766-turn-server/turn.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TURN Server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/turnserver
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/ryzom-hg-client/PKGBUILD b/pcr/ryzom-hg-client/PKGBUILD
new file mode 100644
index 000000000..294e28024
--- /dev/null
+++ b/pcr/ryzom-hg-client/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Jorge Araya Navarro <jorge@abril>
+pkgname=ryzom-hg-client
+pkgver=20130706
+pkgrel=2
+pkgdesc="An awesome free software 3D MMORPG game, Game client."
+arch=('i686' 'x86_64')
+url="http://www.ryzom.com/"
+license=('AGPL')
+groups=("ryzom-hg")
+depends=('ryzom-hg-nel' 'expat')
+makedepends=('cpptest' 'cmake' 'bison' 'ryzom-hg-nel')
+provides=("ryzom-hg-client")
+conflicts=("ryzom-hg-client")
+replaces=("ryzom-hg-client")
+source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-$pkgrel-any.src.tar.gz")
+sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475')
+mksource=("ryzom-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
+_CMAKE_COMMON_ARGS=('-DWITH_STATIC=ON' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=ON') # cmake arguments for server and client
+
+_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
+
+build() {
+  mkdir -p "$srcdir/build-client"
+  cd "$srcdir/build-client"
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+
+  make
+}
+
+package() {
+  cd "$srcdir/build-client"
+  make DESTDIR="$pkgdir" install
+  install -Dm 644 "$srcdir/ryzom.desktop" "$pkgdir/usr/share/applications/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/ryzom-hg-nel/PKGBUILD b/pcr/ryzom-hg-nel/PKGBUILD
new file mode 100644
index 000000000..c66aaf567
--- /dev/null
+++ b/pcr/ryzom-hg-nel/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+pkgname=ryzom-hg-nel
+pkgver=20130706
+pkgrel=5
+pkgdesc="An awesome free software 3D MMORPG game, Game client."
+arch=('i686' 'x86_64')
+url="http://www.ryzom.com/"
+license=('AGPL')
+groups=("ryzom-hg")
+depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql')
+makedepends=('cpptest' 'cmake' 'bison')
+provides=("ryzom-hg-nel")
+conflicts=("ryzom-hg-nel")
+replaces=("ryzom-hg-nel")
+
+source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-2-any.src.tar.gz")
+sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475')
+
+mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
+
+_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client
+
+_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_NEL=ON')
+
+build() {
+  mkdir -p "$srcdir/build-nel"
+  cd "$srcdir/build-nel"
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+  
+  make
+}
+
+package() {
+  cd "$srcdir/build-nel"
+  make DESTDIR="$pkgdir" install
+  # WWWInit.h is in /usr/include/w3c-libwww according to libwww package!
+  sed -ie 's/WWWInit\.h/w3c-libwww\/WWWInit.h/' ${pkgdir}/usr/include/nel/gui/group_html.h
+}
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 8bc928115..8277ccf17 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,100 +1,64 @@
-# Maintainer:Bjoern Bidar <theodorstormgrade@gmail.com
-#_gui_toolkit=qt # qt or gtk
-_build_server=false # set true to build server (default:false)
-_build_client=true  # set false to don't build client (default:true)
-_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client
-_CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server
-_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client
-if [ $_build_client = true ] ; then
-  true && pkgname=( 'ryzom-client-hg'  )
-fi
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
 
-if [ $_build_server = true ] ; then
-  true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg')
-fi 
-pkgbase=ryzom-hg
-pkgname=ryzom-hg
-pkgver=20130331
-pkgrel=1
-pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server or launch a server"
+pkgname=('ryzom-hg-nel' 'ryzom-hg-client')
+pkgbase="ryzom-hg"
+pkgver=20130706
+pkgrel=2
+pkgdesc="An awesome free software 3D MMORPG game"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
 license=('AGPL3')
-depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2'  'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql') 
-conflicts=('ryzom-client-latest-hg')
-groups=('ryzom')
+groups=('ryzom-hg')
+depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql')
 makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
-provides=('ryzom')
-source=( 'ryzom.sh' 'ryzom.desktop' )
-md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f'
-         '71d5136d40ec4e76c2ac2b0c9e506aef')
+# ryzom-20130706-2-any.src.tar.gz
+source=("http://repo.parabolagnulinux.org/other/ryzom-20130706-2-any.src.tar.gz"
+  'ryzom.sh'
+  'ryzom.desktop')
+sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475'
+            'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
+            '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
 
+mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
 
+_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client
 
+_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' '-DWITH_NEL=ON')
 
-case $_gui_toolkit in
-  qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;;
-  gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;;
-esac 
+_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
 
+package_ryzom-hg-nel() {
+  # options and directives that can be overridden
+  #pkgver=20130706
+  #pkgrel=0
+  pkgdesc="An awesome free software 3D MMORPG game. NeL library."
+  #depends=()
+  
+  provides=('ryzom-hg-nel')
+  conflicts=('ryzom-hg-nel')
+  replaces=('ryzom-hg-nel')
 
-_hg_root='https://bitbucket.org/ryzom/ryzomcore'
-_hg_name='ryzomcore' 
+  mkdir -p "$srcdir/build-nel"
+  cd "$srcdir/build-nel"
 
-prepare() {
-    if [ -d "$_hg_name" ] ; then # fetch sources
-	cd "$_hg_name"
-	hg pull && hg update
-	cd ..
-    else
-	hg clone "$_hg_root"
-    fi
-    
-    msg2 "hg clone done or server timeout"
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+  make
+  make DESTDIR="$pkgdir" install
 }
-build() {
-    cd $_hg_name
-    
-    if [ $_build_client = true ] ; then	
-	mkdir -p "$srcdir/build-client"
-	cd "$srcdir/build-client"
-	msg "client is $_build_client, building client"
-	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
-	msg "Starting make, to build client"
-	make
-	
-    fi
-   
-    if [ $_build_server = true ] ; then
-	mkdir -p "$srcdir/build-server"
-	cd "$srcdir/build-server"
-	msg "client is $_build_server, building server"
-	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
-	msg "Starting make, to build server"   
-	make	
-    fi
-}
-
-if [ $_build_client = true ] ; then
-    
-    package_ryzom-client-hg() {
-	pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server"
-	depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql' 'ryzom-data' )
-	cd "$srcdir/build-client"
-	make DESTDIR="$pkgdir/" install
-	install -Dm 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications
-	sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script
-	install -Dm755  ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom	
-    }
-fi
 
-if [ $_build_server = true ] ; then
-    
-    package_ryzom-server-hg() {
-	pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server"
-	cd "$srcdir/build-server"
-	make DESTDIR="$pkgdir/" install	
-    }
-fi
+package_ryzom-hg-client() {
+  # options and directives overrides
+  pkgdesc="An awesome free software 3D MMORPG game. Game client."
+  provides=('ryzom-hg-client')
+  conflicts=('ryzom-hg-client')
+  replaces=('ryzom-hg-client')
+  depends=('ryzom-hg-nel')
 
+  mkdir -p "$srcdir/build-client"
+  cd "$srcdir/build-client"
 
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+  make
+  make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/ryzom-hg/SRCBUILD b/pcr/ryzom-hg/SRCBUILD
new file mode 100644
index 000000000..a04662b0d
--- /dev/null
+++ b/pcr/ryzom-hg/SRCBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+pkgname=("ryzom-hg")
+pkgver=20130708
+pkgrel=3
+pkgdesc="An awesome free software 3D MMORPG game"
+arch=(any)
+url="https://www.ryzom.com/"
+license=('AGPL3')
+makedepends=('mercurial')
+
+source=("ryzom.sh"
+  "ryzom.desktop")
+
+_hgroot='https://bitbucket.org/ryzom/ryzomcore'
+_hgrepo='ryzomcore'
+
+build() {
+  cd "$srcdir"
+  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"
+}
+
+package() {
+  PKGEXT=${SRCEXT}
+  PKGDEST=${SRCDEST}
+  cp ${srcdir}/ryzom.sh ${pkgdir}/
+  cp ${srcdir}/ryzom.desktop ${pkgdir}/
+  cp -a ${srcdir}/ryzomcore/code ${pkgdir}/
+}
+sha256sums=('d3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
+            '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
diff --git a/pcr/smtube/PKGBUILD b/pcr/smtube/PKGBUILD
deleted file mode 100644
index d54983bb0..000000000
--- a/pcr/smtube/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-pkgname=smtube
-pkgver=1.7
-pkgrel=1
-pkgdesc="Search and download videos from YouTube"
-arch=('i686' 'x86_64')
-url="http://smplayer.sourceforge.net"
-license=('GPL')
-depends=('qt4' 'smplayer')
-source=(http://downloads.sourceforge.net/smplayer/$pkgname-$pkgver.tar.bz2)
-
-md5sums=('d9a954e1b337f0c850dcfc6063255056')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr" DESTDIR="$pkgdir" install
-}
-\ No newline at end of file
diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD
index f7750d5ae..cb84cae3a 100644
--- a/~coadde/cross-binutils/PKGBUILD
+++ b/~coadde/cross-binutils/PKGBUILD
@@ -3,34 +3,57 @@
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
-#+-------------------+-----------------------+-------------+------------------------------+
-#| _CARCH            | _os (GNU/Linux-libre) | _os (GNU)   | _os (GNU/Linux-libre uClibc) |
-#+-------------------+-----------------------+-------------+------------------------------+
-#| mips64el          | unknown-linux-gnu     | -           | unknown-uclinux-gnu          |
-#| x86_64            | unknown-linux-gnu     | unknown-gnu | unknown-uclinux-gnu          |
-#| i[65]86           | pc-linux-gnu          | pc-gnu      | unknown-uclinux-gnu          |
-#| aarch64{,_be}     | unknown-linux-gnu     | -           | unknown-uclinux-gnu          |
-#| arm{,v[765]}{,eb} | unknown-linux-gnueabi | -           | unknown-uclinux-gnueabi      |
-#| sparc64           | unknown-linux-gnu     | -           | -                            |
-#| ia64              | unknown-linux-gnu     | -           | -                            |
-#+-------------------+-----------------------+-------------+------------------------------+
-
-#+----------------+--------------------+
-#| _CARCH         | _os (ELF/EABI)     |
-#+----------------+--------------------+
-#| xtensa         | unknown-elf        |
-#| mips64{,el}    | unknown-elf        |
-#| mips32{,el}    | unknown-elf        |
-#| x86_64         | unknown-elf        |
-#| i[653]86       | unknown-elf        |
-#| aarch64{,_be}  | unknown-elf        |
-#| arm{,eb}       | unknown-eabi       |
-#| powerpc64{,le} | unknown-{elf,eabi} |
-#| powerpc32{,le} | unknown-{elf,eabi} |
-#| sh64{,l}       | unknown-elf        |
-#| sh{,l}         | unknown-elf        |
-#| m68k           | unknown-elf        |
-#+----------------+--------------------+
+# +-------------+-------------+-----------------------------------------------------------+-----------+---------+
+# | -march      | CARCH       | CHOST (_target)                                           | Multilib  | QEMU    |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+# | _arch       | _CARCH      | _host       | _machine | _system (GNU/*)                  | _multilib | -       |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+# | mips64el    | mips64el    | mips64el    | unknown  | linux-gnu|elf                    | yes       | sys     |
+# | mips64      | mips64      | mips64      | unknown  | linux-gnu|elf                    | yes       | sys     |
+# | *           | mipsel      | mipsel      | unknown  | elf                              | no        | bin/sys |
+# | *           | mips        | mips        | unknown  | elf                              | no        | bin/sys |
+# | x86_64      | x86_64      | x86_64      | unknown  | linux-gnu|gnu<|elf               | yes       | bin/sys |
+# | i[5-7]86    | i[5-7]86    | i[5-7]86    | pc       | linux-gnu|gnu|elf                | no        | bin/sys |
+# | *           | i486        | i486        | unknown  | elf                              | no        | bin/sys |
+# | *           | i386        | i386        | unknown  | elf                              | no        | bin/sys |
+# | armv8-a     | aarch64     | aarch64     | unknown  | linux-gnu|elf                    | yes       | -       |
+# | armv8-a     | aarch64_be  | aarch64_be  | unknown  | linux-gnu|elf                    | yes       | -       |
+# | armv7-a     | armv7h      | armv7l      | unknown  | linux-gnueabihf                  | no        | bin/sys |
+# | armv6       | armv6h      | armv6l      | unknown  | linux-gnueabihf                  | no        | bin/sys |
+# | armv5te     | arm         | armv5tel    | unknown  | linux-gnueabi                    | no        | bin/sys |
+# | *           | arm         | arm         | unknown  | eabi                             | no        | bin/sys |
+# | arm         | armeb       | armeb       | unknown  | linux-gnueabi|eabi               | no        | bin     |
+# | sparc64     | sparc64     | sparc64     | unknown  | linux-gnu                        | yes       | bin/sys |
+# | sparc       | sparc       | sparc       | unknown  | linux-gnu                        | no        | bin/sys |
+# | -           | ia64        | ia64        | unknown  | linux-gnu                        | yes       | -       |
+# | -           | s390        | s390        | unknown  | linux-gnu                        | no        | -       |
+# | -           | s390x       | s390x       | unknown  | linux-gnu                        | no        | bin/sys |
+# | powerpc64   | powerpc64   | powerpc64   | unknown  | linux-gnu|linux-gnueabi|elf|eabi | yes       | bin/sys |
+# | powerpc64le | powerpc64le | powerpc64le | unknown  | linux-gnu|linux-gnueabi|elf|eabi | yes       | -       |
+# | powerpc     | powerpc     | powerpc     | unknown  | linux-gnu|linux-gnueabi|elf|eabi | no        | bin/sys |
+# | powerpcle   | powerpcle   | powerpcle   | unknown  | linux-gnu|linux-gnueabi|elf|eabi | no        | -       |
+# | -           | spu         | spu         | unknown  | elf                              | no        | -       |
+# | -           | sh64        | sh64        | unknown  | linux-gnu|elf                    | yes       | -       |
+# | -           | sh64l       | sh64l       | unknown  | linux-gnu|elf                    | yes       | -       |
+# | -           | sh4         | sh4         | unknown  | linux-gnu                        | no        | bin/sys |
+# | -           | sh4l        | sh4l        | unknown  | linux-gnu                        | no        | bin/sys |
+# | -           | sh          | sh          | unknown  | elf                              | no        | - @     |
+# | -           | shl         | shl         | unknown  | elf                              | no        | - @     |
+# | -           | xtensa      | xtensa      | unknown  | elf                              | no        | sys     |
+# | *           | m68k        | m68k        | unknown  | elf                              | no        | bin/sys |
+# | -           | lm32        | lm32        | unknown  | linux-gnu|elf                    | no        | sys     |
+# | -           | or32        | or32        | unknown  | linux-gnu<|elf<                  | no        | bin/sys |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+
+# * : Any supported by architecture.
+# - : None.
+# @ : bin/sys (Only sh4 and sh4l support)
+# < : I will support it. (future)
+
+_carch_list=('mips64el' 'mips64' 'x86_64' 'i786' 'i686' 'i586' 'i486' 'i386' 'aarch64' 'aarch64_be'
+             'armv7l' 'armv6l' 'armv5tel' 'armeb' 'sparc64' 'sparc' 'ia64' 's390' 's390x'
+             'powerpc64' 'powerpc64le' 'powerpc' 'powerpcle' 'sh64' 'sh64l' 'sh4' 'sh4l' 'lm32' 'or32')
+_multilib_list=('mips64el' 'mips64' 'x86_64' 'aarch64' 'aarch64_be' 'sparc64' 'ia64' 'powerpc64' 'powerpc64le''sh64' 'sh64l')
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -38,8 +61,9 @@ _pkgname="binutils"
 
 ### Base FLAGS: ###
 _CARCH="x86_64"
-_os="unknown-linux-gnu"
-_target="${_CARCH}-${_os}"
+_host="${_CARCH}"
+_machine="unknown"
+_system="linux-gnu"
 _multilib="no"
 
 ### Patch FLAGS: ###
@@ -47,30 +71,16 @@ _patch_ath9k_htc_fw="no"
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
+_target="${_host}-${_machine}-${_system}"
+
 # For "_multilib"
 [[ ${_multilib} == "yes" ]] && {
   _multilib_name="-multilib"
   _multilib_desc=" for multilib"
 }
-[[ ${_CARCH} == i686 ||
-   ${_CARCH} == i586 ||
-   ${_CARCH} == i386 ||
-   ${_CARCH} == xtensa ||
-   ${_CARCH} == mips32 ||
-   ${_CARCH} == mips32el ||
-   ${_CARCH} == arm ||
-   ${_CARCH} == armeb ||
-   ${_CARCH} == armv7 ||
-   ${_CARCH} == armv7eb ||
-   ${_CARCH} == armv6 ||
-   ${_CARCH} == armv6eb ||
-   ${_CARCH} == armv5 ||
-   ${_CARCH} == armv5eb ||
-   ${_CARCH} == powerpc32 ||
-   ${_CARCH} == powerpc32le ||
-   ${_CARCH} == sh ||
-   ${_CARCH} == shl ||
-   ${_CARCH} == m68k ]] && _multilib="no"
+for _arch_multilib in ${_multilib_list[@]}; do
+  [[ ${_CARCH} != ${_arch_multilib} ]] && _multilib="no"
+done
 
 # For "_patch_ath9k_htc_fw"
 [[ ${_patch_ath9k_htc_fw} == "yes" ]] && {
@@ -88,7 +98,7 @@ pkgname=(
 )
 pkgver=2.23.2
 pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
+arch=("${_carch_list[@]}")
 url="http://www.gnu.org/software/${_pkgname}/"
 license=('GPL2')
 groups=('cross-devel')
@@ -131,18 +141,14 @@ prepare() {
 build() {
   cd ${srcdir}/${_pkgname}-build
 
-  msg "The 'lib64(lib)' and 'lib(lib32)' will be fixed on _target-binutils() on ldscripts files"
   [[ $CARCH != ${_CARCH} ]] && _TARGET="--target=${_target}"
-  if [[ $CARCH == x86_64 ||
-        $CARCH == mips64el ||
-        $CARCH == aarch64 ||
-        $CARCH == aarch64_be ||
-        $CARCH == sparc64 ||
-        $CARCH == ia64 ]]; then
-    _LIB_PATH="--with-lib-path=/usr/lib64:/usr/lib:/usr/local/lib64:/usr/local/lib:/usr/${_target}/lib64:/usr/${_target}/lib"
-  else
-    _LIB_PATH="--with-lib-path=/usr/lib32:/usr/local/lib32:/usr/${_target}/lib32"
-  fi
+  for _arch_multilib2 in ${_multilib_list[@]}; do
+    if [[ ${_CARCH} == ${_arch_multilib2} ]]; then
+      _LIB_PATH="--with-lib-path=/usr/lib:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/${_target}/lib:/usr/${_target}/lib32"
+    else
+      _LIB_PATH="--with-lib-path=/usr/lib:/usr/local/lib:/usr/${_target}/lib"
+    fi
+  done
 
   if [[ ${_multilib} == "yes" ]]; then
     _MULTILIB='--enable-multilib'
@@ -186,13 +192,12 @@ _target-binutils() {
   depends=('glibc>=2.17' 'zlib' "${_pkgname}-common")
   [[ $CHOST == ${_target} ]] && provides=("${_pkgname}=${pkgver}")
   if [[ ${_multilib} == "yes" ]]; then
-    #conflicts=("${pkgname}")
     groups+=('multilib-devel')
   else
     groups+=('base-devel')
   fi
   groups+=("${_target}-devel")
-  install="${_target}-${_pkgname}.install"
+  install="${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}.install"
 
   cd ${srcdir}/${_pkgname}-build
   make prefix=${pkgdir}/opt/${pkgname}/${pkgver} tooldir=${pkgdir}/opt/${pkgname}/${pkgver} install
@@ -215,7 +220,7 @@ _target-binutils() {
   }
 
   msg "Change lib-path on ldscripts files"
-  sed -i "/^SEARCH_DIR/ s|/${_target}/lib|/lib|g;
+  sed -i "/^SEARCH_DIR/ s|/${pkgver}/${_target}/lib|/${pkgver}/lib|g;
           /^SEARCH_DIR/ s|/${pkgver}/lib|/${pkgver}/lib32|g;
           /^SEARCH_DIR/ s|/${pkgver}/lib3264|/${pkgver}/lib|g;
           /^SEARCH_DIR/ s|/${pkgver}/lib32x32|/${pkgver}/lib|g;
@@ -229,7 +234,7 @@ _target-binutils() {
 
   msg "Create links for libraries"
   install -vd ${pkgdir}/{usr/${_target},etc/ld.so.conf.d}
-  ln -vs ../../lib ${pkgdir}/usr/${_target}/lib
+  ln -vs ../lib ${pkgdir}/usr/${_target}/lib
   echo /opt/${pkgname}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf
 
   msg "Install PIC libiberty.a"
@@ -250,72 +255,95 @@ _target-binutils() {
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
-# GNU/Linux-libre with GNU C Library (glibc)
+# GNU/Linux-libre
 package_mips64el-unknown-linux-gnu-binutils() { _target-binutils; }
+package_mips64el-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_mips64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_mips64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
 package_x86_64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_x86_64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_i786-pc-linux-gnu-binutils() { _target-binutils; }
 package_i686-pc-linux-gnu-binutils() { _target-binutils; }
 package_i586-pc-linux-gnu-binutils() { _target-binutils; }
 package_aarch64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_aarch64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
 package_aarch64_be-unknown-linux-gnu-binutils() { _target-binutils; }
-package_arm-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_aarch64_be-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_arm7l-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_arm6l-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_arm5tel-unknown-linux-gnueabi-binutils() { _target-binutils; }
 package_armeb-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv7-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv7eb-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv6-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv6eb-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv5-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv5eb-unknown-linux-gnueabi-binutils() { _target-binutils; }
 package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_sparc-unknown-linux-gnu-binutils() { _target-binutils; }
 package_ia64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_ia64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_s390-unknown-linux-gnu-binutils() { _target-binutils; }
+package_s390x-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_powerpc64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_powerpc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_powerpc64le-unknown-linux-gnu-binutils() { _target-binutils; }
+package_powerpc64le-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_powerpc-unknown-linux-gnu-binutils() { _target-binutils; }
+package_powerpcle-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_sh64l-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh64l-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_sh4-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh4l-unknown-linux-gnu-binutils() { _target-binutils; }
+package_lm32-unknown-linux-gnu-binutils() { _target-binutils; }
+package_or32-unknown-linux-gnu-binutils() { _target-binutils; }
 
 # GNU
 package_x86_64-unknown-gnu-binutils() { _target-binutils; }
+package_x86_64-unknown-gnu-binutils-multilib() { _target-binutils; }
+package_i786-pc-gnu-binutils() { _target-binutils; }
 package_i686-pc-gnu-binutils() { _target-binutils; }
 package_i586-pc-gnu-binutils() { _target-binutils; }
 
-# GNU/Linux-libre with uClibc
-package_mips64el-unknown-uclinux-gnu-binutils() { _target-binutils; }
-package_x86_64-unknown-uclinux-gnu-binutils() { _target-binutils; }
-package_i686-pc-uclinux-gnu-binutils() { _target-binutils; }
-package_i586-pc-uclinux-gnu-binutils() { _target-binutils; }
-package_aarch64-unknown-uclinux-gnu-binutils() { _target-binutils; }
-package_arm-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armeb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv7-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv7eb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv6-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv6eb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv5-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv5eb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-
 # ELF or EABI only
-package_xtensa-unknown-elf-binutils() { _target-binutils; }
-package_xtensa-unknown-elf-binutils-ath9k_htc() { _target-binutils; }
 package_mips64el-unknown-elf-binutils() { _target-binutils; }
+package_mips64el-unknown-elf-binutils-multilib() { _target-binutils; }
 package_mips64-unknown-elf-binutils() { _target-binutils; }
-package_mips32el-unknown-elf-binutils() { _target-binutils; }
-package_mips32-unknown-elf-binutils() { _target-binutils; }
+package_mips64-unknown-elf-binutils-multilib() { _target-binutils; }
+package_mipsel-unknown-elf-binutils() { _target-binutils; }
+package_mips-unknown-elf-binutils() { _target-binutils; }
 package_x86_64-unknown-elf-binutils() { _target-binutils; }
-package_i686-unknown-elf-binutils() { _target-binutils; }
-package_i586-unknown-elf-binutils() { _target-binutils; }
+package_x86_64-unknown-elf-binutils-multilib() { _target-binutils; }
 package_i386-unknown-elf-binutils() { _target-binutils; }
 package_aarch64-unknown-elf-binutils() { _target-binutils; }
+package_aarch64-unknown-elf-binutils-multilib() { _target-binutils; }
 package_aarch64_be-unknown-elf-binutils() { _target-binutils; }
+package_aarch64_be-unknown-elf-binutils-multilib() { _target-binutils; }
 package_arm-unknown-eabi-binutils() { _target-binutils; }
 package_armeb-unknown-eabi-binutils() { _target-binutils; }
 package_powerpc64-unknown-elf-binutils() { _target-binutils; }
-package_powerpc64le-unknown-elf-binutils() { _target-binutils; }
-package_powerpc32-unknown-elf-binutils() { _target-binutils; }
-package_powerpc32le-unknown-elf-binutils() { _target-binutils; }
+package_powerpc64-unknown-elf-binutils-multilib() { _target-binutils; }
 package_powerpc64-unknown-eabi-binutils() { _target-binutils; }
+package_powerpc64-unknown-eabi-binutils-multilib() { _target-binutils; }
+package_powerpc64le-unknown-elf-binutils() { _target-binutils; }
+package_powerpc64le-unknown-elf-binutils-multilib() { _target-binutils; }
 package_powerpc64le-unknown-eabi-binutils() { _target-binutils; }
-package_powerpc32-unknown-eabi-binutils() { _target-binutils; }
-package_powerpc32le-unknown-eabi-binutils() { _target-binutils; }
+package_powerpc64le-unknown-eabi-binutils-multilib() { _target-binutils; }
+package_powerpc-unknown-elf-binutils() { _target-binutils; }
+package_powerpc-unknown-eabi-binutils() { _target-binutils; }
+package_powerpcle-unknown-elf-binutils() { _target-binutils; }
+package_powerpcle-unknown-eabi-binutils() { _target-binutils; }
+package_spu-unknown-elf-binutils() { _target-binutils; }
 package_sh64-unknown-elf-binutils() { _target-binutils; }
+package_sh64-unknown-elf-binutils-multilib() { _target-binutils; }
 package_sh64l-unknown-elf-binutils() { _target-binutils; }
+package_sh64l-unknown-elf-binutils-multilib() { _target-binutils; }
 package_sh-unknown-elf-binutils() { _target-binutils; }
 package_shl-unknown-elf-binutils() { _target-binutils; }
+package_xtensa-unknown-elf-binutils() { _target-binutils; }
+package_xtensa-unknown-elf-binutils-ath9k_htc() { _target-binutils; }
 package_m68k-unknown-elf-binutils() { _target-binutils; }
+package_lm32-unknown-elf-binutils() { _target-binutils; }
+package_or32-unknown-elf-binutils() { _target-binutils; }
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
diff --git a/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..e2cb3892c
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install b/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install
new file mode 100644
index 000000000..7546e29a1
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..6f986cd41
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..96d20da4a
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..ae71b8f32
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64_be-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install
new file mode 100644
index 000000000..886d38ddc
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64_be-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..21e87d4a6
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64_be-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..7c040a1d1
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=aarch64_be-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/arm-unknown-eabi-binutils.install b/~coadde/cross-binutils/arm-unknown-eabi-binutils.install
new file mode 100644
index 000000000..2a5ac8d12
--- /dev/null
+++ b/~coadde/cross-binutils/arm-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=arm-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..f1053cd1e
--- /dev/null
+++ b/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=arm5tel-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..fa11d3f92
--- /dev/null
+++ b/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=arm6l-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..4e9ca080f
--- /dev/null
+++ b/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=arm7l-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install b/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install
new file mode 100644
index 000000000..363e4b477
--- /dev/null
+++ b/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=armeb-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install
new file mode 100644
index 000000000..75fa9f797
--- /dev/null
+++ b/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_pkgname=armeb-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i386-unknown-elf-binutils.install b/~coadde/cross-binutils/i386-unknown-elf-binutils.install
new file mode 100644
index 000000000..572ecca6e
--- /dev/null
+++ b/~coadde/cross-binutils/i386-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i386-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i586-pc-gnu-binutils.install b/~coadde/cross-binutils/i586-pc-gnu-binutils.install
new file mode 100644
index 000000000..6e4dac15d
--- /dev/null
+++ b/~coadde/cross-binutils/i586-pc-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i586-pc-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i686-pc-gnu-binutils.install b/~coadde/cross-binutils/i686-pc-gnu-binutils.install
new file mode 100644
index 000000000..1fbfac209
--- /dev/null
+++ b/~coadde/cross-binutils/i686-pc-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i686-pc-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i786-pc-gnu-binutils.install b/~coadde/cross-binutils/i786-pc-gnu-binutils.install
new file mode 100644
index 000000000..f77927c8d
--- /dev/null
+++ b/~coadde/cross-binutils/i786-pc-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i786-pc-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install b/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install
new file mode 100644
index 000000000..b6422d2ce
--- /dev/null
+++ b/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=i786-pc-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..a31a76a41
--- /dev/null
+++ b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=ia64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..9853a7dce
--- /dev/null
+++ b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=ia64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/lm32-unknown-elf-binutils.install b/~coadde/cross-binutils/lm32-unknown-elf-binutils.install
new file mode 100644
index 000000000..c2481ba1f
--- /dev/null
+++ b/~coadde/cross-binutils/lm32-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=lm32-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..e59746dd4
--- /dev/null
+++ b/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=lm32-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/m68k-unknown-elf-binutils.install b/~coadde/cross-binutils/m68k-unknown-elf-binutils.install
new file mode 100644
index 000000000..b45dcea38
--- /dev/null
+++ b/~coadde/cross-binutils/m68k-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=m68k-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips-unknown-elf-binutils.install b/~coadde/cross-binutils/mips-unknown-elf-binutils.install
new file mode 100644
index 000000000..f8dd9a4ad
--- /dev/null
+++ b/~coadde/cross-binutils/mips-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..e24e260f6
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=mips64-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64-unknown-elf-binutils.install b/~coadde/cross-binutils/mips64-unknown-elf-binutils.install
new file mode 100644
index 000000000..8e5e0a192
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips64-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..7ae20c93c
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=mips64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..3da7b37e3
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..201c805dd
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=mips64el-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install b/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install
new file mode 100644
index 000000000..ab338a443
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips64el-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..cff96a72a
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=mips64el-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install b/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install
new file mode 100644
index 000000000..87c99efcf
--- /dev/null
+++ b/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mipsel-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/or32-unknown-elf-binutils.install b/~coadde/cross-binutils/or32-unknown-elf-binutils.install
new file mode 100644
index 000000000..92833bd5d
--- /dev/null
+++ b/~coadde/cross-binutils/or32-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=or32-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..8427c5c91
--- /dev/null
+++ b/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=or32-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install
new file mode 100644
index 000000000..eed9a2c98
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install
new file mode 100644
index 000000000..fbd5f0556
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..b7e544e48
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install
new file mode 100644
index 000000000..5667c84e2
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install
new file mode 100644
index 000000000..0c1b1d7b8
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64-unknown-eabi-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install
new file mode 100644
index 000000000..2e3ca0474
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..4000bde4f
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install
new file mode 100644
index 000000000..f9d4ff394
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..15a8c37c5
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install
new file mode 100644
index 000000000..28e4914c6
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install
new file mode 100644
index 000000000..0b6f6c848
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-eabi-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install
new file mode 100644
index 000000000..3798f1bfe
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..1e30719bf
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install
new file mode 100644
index 000000000..891b7f85b
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..f8872d8e1
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install
new file mode 100644
index 000000000..ae20ca33c
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install
new file mode 100644
index 000000000..850610fc6
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install
new file mode 100644
index 000000000..24e07a7ec
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..b681acc4b
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install
new file mode 100644
index 000000000..6559cdd29
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..0a583f543
--- /dev/null
+++ b/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=s390-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..dc576d75e
--- /dev/null
+++ b/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=s390x-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh-unknown-elf-binutils.install b/~coadde/cross-binutils/sh-unknown-elf-binutils.install
new file mode 100644
index 000000000..20d123559
--- /dev/null
+++ b/~coadde/cross-binutils/sh-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..5843ac274
--- /dev/null
+++ b/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh4-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..f97168df0
--- /dev/null
+++ b/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh4l-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..1f11dabbb
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sh64-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64-unknown-elf-binutils.install b/~coadde/cross-binutils/sh64-unknown-elf-binutils.install
new file mode 100644
index 000000000..04ee63c8c
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh64-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..451eedb44
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sh64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..2af6a7268
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..6e01ac61e
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sh64l-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install b/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install
new file mode 100644
index 000000000..ab95b36ec
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh64l-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..71c191e1c
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sh64l-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..cbe5c788a
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh64l-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/shl-unknown-elf-binutils.install b/~coadde/cross-binutils/shl-unknown-elf-binutils.install
new file mode 100644
index 000000000..cdb30916b
--- /dev/null
+++ b/~coadde/cross-binutils/shl-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=shl-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..f3dfca2d3
--- /dev/null
+++ b/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sparc-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..d0aff2a85
--- /dev/null
+++ b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sparc64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..2d24404e5
--- /dev/null
+++ b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sparc64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/spu-unknown-elf-binutils.install b/~coadde/cross-binutils/spu-unknown-elf-binutils.install
new file mode 100644
index 000000000..204d4bfb2
--- /dev/null
+++ b/~coadde/cross-binutils/spu-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=spu-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install
new file mode 100644
index 000000000..dcf66e30a
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-elf-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install b/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install
new file mode 100644
index 000000000..779e65ab3
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install
new file mode 100644
index 000000000..7c682ba82
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install
new file mode 100644
index 000000000..102a11fd0
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..96140638c
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=x86_64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install b/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install
new file mode 100644
index 000000000..643379261
--- /dev/null
+++ b/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install
@@ -0,0 +1,16 @@
+_pkgname=xtensa-unknown-elf-binutils-ath9k-htc
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install b/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install
new file mode 100644
index 000000000..120b40b1b
--- /dev/null
+++ b/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=xtensa-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2013-07-14 15:27:23 -0300
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2013-07-14 15:27:23 -0300
commit	a594ebe149ad81798984a410c036a0965df1581a (patch)
tree	9f92df878175fe438860b196b7394ec8f0bac4cd
parent	03d128385c4ca773e67c93729a45899590d0d99e (diff)
parent	d525d9a731f5d79c1128a192b9d2977a2967570f (diff)