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

Conflicts: community/btanks/PKGBUILD community/highlight/PKGBUILD community/luaexpat/PKGBUILD community/luakit/PKGBUILD community/luasec/PKGBUILD community/luasocket/PKGBUILD extra/graphviz/PKGBUILD extra/gvfs/PKGBUILD extra/lua/PKGBUILD extra/openal/PKGBUILD extra/sane/PKGBUILD extra/vim/PKGBUILD extra/vlc/PKGBUILD
author: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-12-12 09:40:29 -0300
committer: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-12-12 09:40:29 -0300
commit: eef796260fb7cc9b81044e43df8f313c3c8e768a (patch)
tree: db6c6a07c0da415fe2e68648fbd39473cba2ccd2
parent: 6767b6bbf9829a692c85c3dcd5ee0280982bd252 (diff)
parent: ef947957a5734ba25be3cdb6595491c816592133 (diff)
104 files changed, 1861 insertions, 517 deletions
diff --git a/community/atanks/PKGBUILD b/community/atanks/PKGBUILD
index 31c6118c8..6c459831d 100644
--- a/community/atanks/PKGBUILD
+++ b/community/atanks/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 76226 2012-09-14 12:01:49Z spupykin $
+# $Id: PKGBUILD 81091 2012-12-11 19:04:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com>
 # Contributor: Charlie Cox <ccoxiv@yahoo.com>
 
 pkgname=atanks
-pkgver=5.5
+pkgver=5.7
 pkgrel=1
 pkgdesc="Atomic Tanks"
 url="http://atanks.sourceforge.net"
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el')
 makedepends=('sed')
 depends=('allegro4>=4.4.0.1' 'gcc-libs')
 source=("http://downloads.sourceforge.net/project/atanks/atanks/atanks-${pkgver}/atanks-${pkgver}.tar.gz")
-md5sums=('1ba5a8bae3e7e49a0fdb7d21a480e70d')
+md5sums=('135f8cb55e99a4a7b34996f260a9de6a')
 
 build() {
   cd atanks-${pkgver}
diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD
index 6ed44edd8..5b3ff69a7 100644
--- a/community/awesome/PKGBUILD
+++ b/community/awesome/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73742 2012-07-15 11:16:56Z seblu $
+# $Id: PKGBUILD 81099 2012-12-12 00:47:25Z eric $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: xduugu
 # Contributor: Ronald van Haren <ronald.archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=awesome
 pkgver=3.4.13
-pkgrel=1
+pkgrel=2
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://awesome.naquadah.org/'
@@ -17,7 +17,7 @@ depends=(
   'imlib2'
   'libev'
   'libxdg-basedir'
-  'lua'
+  'lua51'
   'pango'
   'startup-notification'
   'xcb-util-image'
@@ -32,12 +32,14 @@ makedepends=(
   'doxygen'
   'gperf'
   'imagemagick'
-  'luadoc'
+  'lua51-doc'
   'xmlto'
 )
 optdepends=(
   'rlwrap: readline support for awesome-client'
   'feh: image background setter for awsetbg'
+  'dex: autostart your desktop files'
+  'vicious: widgets for the Awesome window manager'
 )
 provides=('notification-daemon')
 source=("$url/download/$pkgname-$pkgver.tar.xz"
diff --git a/community/btanks/PKGBUILD b/community/btanks/PKGBUILD
index 08c12793a..cc03d2bb4 100644
--- a/community/btanks/PKGBUILD
+++ b/community/btanks/PKGBUILD
@@ -1,36 +1,39 @@
-# $Id: PKGBUILD 59272 2011-11-22 09:39:15Z spupykin $
+# $Id: PKGBUILD 81100 2012-12-12 00:47:26Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_ com>
 
 pkgname=btanks
 pkgver=0.9.8083
-pkgrel=3
+pkgrel=4
 pkgdesc="Fast 2d tank arcade game with multiplayer and split-screen modes."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://btanks.sourceforge.net"
 license=('GPL')
 depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image'
-	 'smpeg' "btanks-data=$pkgver")
+	 'smpeg' 'glu' "btanks-data=$pkgver")
 makedepends=('scons' 'chrpath' 'mesa')
 source=(http://downloads.sourceforge.net/btanks/btanks-$pkgver.tar.bz2
 	btanks_desktop
 	btanks_script
 	bted_script
 	gcc-4.6.patch
-	btanks-0.9.8083-gcc47.patch)
+	lua52.patch)
 install=btanks.install
 md5sums=('49cb95c0eec47d3436c4fdf65e7c9d12'
          'a2ddeb1e79dff8d3fd702984c8d3aab5'
          '07657cfa71b1de1d008cc5e3ade9749b'
          '91a61c0f581ea27281bdaecb7a3cd58b'
-         '173f0ffe46bb1bab2c8aa240fe5331f3'
-	 '5588fc87105b45fe4d09ae93098388fb')
+         'b816c5f3ae2d6cd954c15569d4baf123'
+         'e7af4af59255166bee530cbabd953226')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+
+  sed -i '1,1i#include <sys/types.h>' mrt/base_file.h
   patch -p1 <$srcdir/gcc-4.6.patch
-  patch -Np1 -i "${srcdir}/btanks-0.9.8083-gcc47.patch"
-  #python2 engine/sl08/sl08.py >engine/sl08/sl08.h
+  patch -p1 <$srcdir/lua52.patch
+
+  python2 engine/sl08/sl08.py >engine/sl08/sl08.h
   scons
 
   mkdir -p $pkgdir/usr/share/btanks
diff --git a/community/btanks/gcc-4.6.patch b/community/btanks/gcc-4.6.patch
index d371abd53..c944378fd 100644
--- a/community/btanks/gcc-4.6.patch
+++ b/community/btanks/gcc-4.6.patch
@@ -1,10 +1,7 @@
-From: Ansgar Burchardt <ansgar@debian.org>
-Bug-Debian: http://bugs.debian.org/624916
-Subject: Fix FTBFS with gcc-4.6
-
---- btanks-0.9.8083.orig/engine/sl08/sl08.py
-+++ btanks-0.9.8083/engine/sl08/sl08.py
-@@ -152,8 +152,8 @@ class Generator(object):
+diff -wbBur btanks-0.9.8083/engine/sl08/sl08.py btanks-0.9.8083.my/engine/sl08/sl08.py
+--- btanks-0.9.8083/engine/sl08/sl08.py	2008-08-13 13:10:45.000000000 +0400
++++ btanks-0.9.8083.my/engine/sl08/sl08.py	2012-11-15 18:04:44.002524495 +0400
+@@ -152,11 +152,11 @@
  			typedef base_signalXXX %s signal_type; 
  			typedef return_type (object_type::*func_t) %s; 
  
@@ -14,8 +11,23 @@ Subject: Fix FTBFS with gcc-4.6
 +			inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
  
  			inline void assign(object_type *o, func_t f) { object = o; func = f; }
- 			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
-@@ -187,7 +187,7 @@ class Generator(object):
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; base_slotXXX%s::connect(signal_ref); }
+ 	
+ 			inline return_type operator() %s const { 
+ 				return (object->*func) %s ;
+@@ -175,7 +175,9 @@
+ 			self.template_declaration('slot'), 
+ 			self.template_parameters('base-slot'), 
+ 			self.template_parameters('base-slot'), 
+-			self.prototype(True), self.prototype(True), self.prototype(False),
++			self.prototype(True),
++			self.template_parameters('base-signal'), 
++			self.prototype(True), self.prototype(False),
+ 			)
+ 			
+ 		#specialized version of the slot
+@@ -187,10 +189,10 @@
  			typedef base_signalXXX %s signal_type; 
  			typedef void (object_type::*func_t) %s ;
  
@@ -23,4 +35,36 @@ Subject: Fix FTBFS with gcc-4.6
 +			inline slotXXX () : object(0), func(0) {}
  			inline slotXXX (object_type *object, func_t func) : object(object), func(func) {}
  			inline void assign(object_type *o, func_t f) { object = o; func = f; }
- 			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; base_slotXXX%s::connect(signal_ref); }
+ 	
+ 			inline void operator() %s const { 
+ 				(object->*func) %s; 
+@@ -206,6 +208,7 @@
+ 			self.template_parameters('base-slot', True), 
+ 			self.template_parameters('base-slot', True), 
+ 			self.prototype(True), 
++			self.template_parameters('base-slot', True), 
+ 			self.prototype(True), 
+ 			self.prototype(False), 
+ 		)
+diff -wbBur btanks-0.9.8083/math/range_list.h btanks-0.9.8083.my/math/range_list.h
+--- btanks-0.9.8083/math/range_list.h	2008-10-24 18:15:55.000000000 +0400
++++ btanks-0.9.8083.my/math/range_list.h	2012-11-15 18:11:52.049236706 +0400
+@@ -53,14 +53,14 @@
+ 			return;
+ 		}
+ 	
+-		typename parent_type::iterator i = lower_bound(value);
++		typename parent_type::iterator i = std::map<const T, T>::lower_bound(value);
+ 		if (i != parent_type::end()) {
+ 			if (i->first == value)
+ 				return;
+ 
+ 			if (value + 1 == i->first) {
+ 				T e = i->second;
+-				erase(i);
++				std::map<const T, T>::erase(i);
+ 				i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning
+ 				i = pack_left(i);
+ 			}
diff --git a/community/btanks/lua52.patch b/community/btanks/lua52.patch
new file mode 100644
index 000000000..e27d5fdb7
--- /dev/null
+++ b/community/btanks/lua52.patch
@@ -0,0 +1,21 @@
+diff -wbBur btanks-0.9.8083/engine/luaxx/state.cpp btanks-0.9.8083.my/engine/luaxx/state.cpp
+--- btanks-0.9.8083/engine/luaxx/state.cpp	2008-06-08 13:02:39.000000000 +0400
++++ btanks-0.9.8083.my/engine/luaxx/state.cpp	2012-11-15 18:59:07.000000000 +0400
+@@ -59,7 +59,7 @@
+ void State::load(const std::string &fname, const mrt::Chunk &data) {
+ 	//throw_ex(("implement me[%s]", fname.c_str()));
+ 	reader_state x(data);
+-	int err = lua_load(state, chunk_reader, &x, fname.c_str());
++	int err = lua_load(state, chunk_reader, &x, fname.c_str(), NULL);
+ 	check_error(state, err);
+ }
+ 
+@@ -81,7 +81,7 @@
+ 	assert(state == NULL);
+ 
+ 	//state = lua_newstate(l_alloc, this);
+-	state = lua_open();
++	state = luaL_newstate();
+ 	if (state == NULL)
+ 		throw_ex(("cannot create lua interpreter"));
+ 
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index b9e0a61fa..8a4525737 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79010 2012-10-29 03:17:07Z svenstaro $
+# $Id: PKGBUILD 81101 2012-12-12 00:47:27Z eric $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>, 
@@ -7,17 +7,17 @@
 pkgbase=cegui
 pkgname=('cegui' 'cegui-docs')
 pkgver=0.7.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://crayzedsgui.sourceforge.net"
 #options=('!libtool')
 license=("MIT")
-depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly')
-makedepends=('python2' 'doxygen' 'ogre' 'irrlicht' 'gtk2' 'boost' 'graphviz')
+depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua51' 'silly')
+makedepends=('python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz')
 optdepends=("python2: python bindings"
-            "ogre: ogre module"
-            "irrlicht: irrlicht module")
+            "ogre: ogre module")
+            #"irrlicht: irrlicht module") maybe again at some point
 options=(!libtool)
 source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
 md5sums=('8b83577f86eaa1581765dd155c7c8f24')
diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD
index e6dbde9c8..732ed1e12 100644
--- a/community/cgminer/PKGBUILD
+++ b/community/cgminer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81029 2012-12-10 12:02:49Z fyan $
+# $Id: PKGBUILD 81049 2012-12-11 07:09:49Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 pkgname=cgminer
 pkgver=2.10.0
 _build=
-pkgrel=1
+pkgrel=2
 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer."
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
 license=('GPL3')
@@ -53,4 +53,4 @@ package() {
 md5sums=('93437f0a26a409d9c06f7361befe9d0f'
          'fe4a243fabe24608f5c05e40f0f118f6'
          'ee39698273671fee0e98d4af16014c36'
-         'c2bb974adf92cc234fbf0136ebcb355d')
+         'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/community/cgminer/cgminer.service b/community/cgminer/cgminer.service
index 9d6595047..84461879f 100644
--- a/community/cgminer/cgminer.service
+++ b/community/cgminer/cgminer.service
@@ -2,7 +2,7 @@
 Description=Multi-threaded multi-pool CPU and GPU miner for bitcoin
 
 [Service]
-ExecStart=/usr/bin/cgminer -T --config /etc/cgminer.conf
+ExecStart=/usr/bin/cgminer -T --config /etc/cgminer.conf --syslog
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index 799e98e20..ffae5b5c2 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80581 2012-11-26 09:25:03Z spupykin $
+# $Id: PKGBUILD 81093 2012-12-11 19:04:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
 
 pkgname=darktable
-pkgver=1.1
+pkgver=1.1.1
 _pkgver=1.1
 pkgrel=1
 pkgdesc="Utility to organize and develop raw images"
@@ -19,7 +19,7 @@ optdepends=('librsvg')
 install=darktable.install
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
-md5sums=('1b399636a0386f2167521a0d30c29032')
+md5sums=('735b9c42f4a4c93a482a195800002b10')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index b63b58ba4..c87c32327 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 74059 2012-07-19 05:01:20Z ebelanger $
+# $Id: PKGBUILD 81103 2012-12-12 00:47:29Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=electricsheep
 pkgver=2.7b33
-pkgrel=3
+pkgrel=4
 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/"
 license=('GPL')
-depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua' 'libgtop' 'boost-libs' 'freeglut' 'glee')
-makedepends=('boost' 'tinyxml')
+depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee')
+makedepends=('boost' 'mesa' 'glu' 'tinyxml')
 optdepends=('xscreensaver: to use electricsheep with xscreensaver')
 options=('!emptydirs')
 source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
@@ -40,7 +40,8 @@ build() {
   sed -i '12 i\
 #include <cstdio>' Common/Singleton.h
   ./autogen.sh
-  ./configure --prefix=/usr
+  CPPFLAGS+="-I/usr/include/lua5.1" ./configure --prefix=/usr
+  sed -i 's|-I /usr/include/libavutil||' MSVC/SettingsGUI/Makefile 
   make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1"
 }
 
diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD
index 7c08678fa..52ecfc373 100644
--- a/community/elinks/PKGBUILD
+++ b/community/elinks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72041 2012-06-06 18:55:27Z kkeen $
+# $Id: PKGBUILD 81104 2012-12-12 00:47:30Z eric $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
@@ -8,12 +8,12 @@
 pkgname=elinks
 pkgver=0.13
 _commit="9313aae9062e1d9ff084858fa6844259cd8237d6"
-pkgrel=10
+pkgrel=11
 pkgdesc="An advanced and well-established feature-rich text mode web browser."
 arch=("i686" "x86_64" 'mips64el')
 url="http://elinks.or.cz"
 license=('GPL')
-depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua>=5.1.1' 'libidn' 'js'
+depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js'
 	 'gc' 'tre')
 makedepends=('git')
 source=()
diff --git a/community/fcitx-hangul/PKGBUILD b/community/fcitx-hangul/PKGBUILD
index d0732f8ff..9cadde6a5 100644
--- a/community/fcitx-hangul/PKGBUILD
+++ b/community/fcitx-hangul/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 80966 2012-12-08 01:28:14Z fyan $
+# $Id: PKGBUILD 81140 2012-12-12 01:20:35Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-hangul
-pkgver=0.1.2
-pkgrel=2
+pkgver=0.2.0
+pkgrel=1
 pkgdesc="Hangul (Korean) support for fcitx"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx/"
 license=('GPL2')
-depends=('fcitx>=4.2.2' 'libhangul')
+depends=('fcitx>=4.2.3' 'libhangul')
 makedepends=('cmake' 'intltool')
-install="$pkgname.install"
+install=$pkgname.install
 source=("http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz")
-sha1sums=('30648e569ea75e2a734ed98f8cc90b0a656a6bf5')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
@@ -33,3 +32,4 @@ package() {
 }
 
 
+md5sums=('168b51487797879cf41ed6f6d086694a')
diff --git a/community/fillets-ng/PKGBUILD b/community/fillets-ng/PKGBUILD
index 79c44cef7..b7673f12c 100644
--- a/community/fillets-ng/PKGBUILD
+++ b/community/fillets-ng/PKGBUILD
@@ -1,39 +1,41 @@
-# $Id: PKGBUILD 65307 2012-02-20 20:47:47Z jlichtblau $
+# $Id: PKGBUILD 81105 2012-12-12 00:47:31Z eric $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=fillets-ng
 pkgver=1.0.1
-pkgrel=1
-pkgdesc="A port of the wonderful puzzle game Fish Fillets"
+pkgrel=3
+pkgdesc="Port of the wonderful puzzle game Fish Fillets"
 url="http://fillets.sf.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('fillets-ng-data' 'lua' 'fribidi' 'gcc-libs' 'libx11' 'sdl_mixer' 'sdl_ttf' 'sdl_image' 'desktop-file-utils')
+depends=('fillets-ng-data' 'lua51' 'fribidi' 'gcc-libs' 'libx11' 'sdl_mixer' 'sdl_ttf' 'sdl_image' 'desktop-file-utils')
+makedepends=('gendesk')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/fillets/$pkgname-$pkgver.tar.gz \
-        http://fillets.sourceforge.net/img/icon.png \
-        $pkgname.desktop)
+source=("http://downloads.sourceforge.net/fillets/$pkgname-$pkgver.tar.gz"
+       "$pkgname.png::http://img.1mobile.com/market/i/4/9/49ec5e5520844b66c189c7e0ef6eedfc.png"
+        'lua-config')
 sha256sums=('329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da'
-            'dec9d93c33b8e0f039e14228aad6be142109b0689bd216bcda2d91265500e2a0'
-            '6283237a582c90cb9734ee420e79cfccaa5c8c35aae9a19000202ceb96ad3254')
+            '338c9e1b8ac4ef5bb167f4a6090c341897bd2c7f8b4e5afc3ac3131a57bb8c88'
+            '849fb1410387dc7df0617e12a9472cfbe3b1179600011c0365f9099ff5af6214')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
+  gendesk
+  export PATH=$PATH:$PWD
+  chmod a+rx lua-config
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --datadir=/usr/share/$pkgname
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
+  cd $pkgname-$pkgver
 
-#.desktop and icon files
-  install -D -m644 ${srcdir}/icon.png \
-    ${pkgdir}/usr/share/pixmaps/$pkgname.png
-  install -D -m644 ${srcdir}/$pkgname.desktop \
-    ${pkgdir}/usr/share/applications/$pkgname.desktop
+  make DESTDIR="${pkgdir}" install
 
+  # desktop and icon files
+  install -D -m644 "${srcdir}/$pkgname.png" \
+    "${pkgdir}/usr/share/pixmaps/$pkgname.png"
+  install -D -m644 "${srcdir}/$pkgname.desktop" \
+    "${pkgdir}/usr/share/applications/$pkgname.desktop"
 }
diff --git a/community/fillets-ng/lua-config b/community/fillets-ng/lua-config
new file mode 100644
index 000000000..ef9b96b71
--- /dev/null
+++ b/community/fillets-ng/lua-config
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [[ $1 == --include ]]; then
+	pkg-config --cflags lua5.1
+    exit 0
+elif [[ $1 == --static ]]; then
+	pkg-config --libs lua5.1
+fi
+
+exit 1
diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD
index 7ba67dc0b..1c6f29bdb 100644
--- a/community/geany-plugins/PKGBUILD
+++ b/community/geany-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79259 2012-11-01 23:43:48Z arodseth $
+# $Id: PKGBUILD 81106 2012-12-12 00:47:32Z eric $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>  
 # Contributor: djgera
@@ -6,7 +6,7 @@
 
 pkgname=geany-plugins
 pkgver=1.22
-pkgrel=3
+pkgrel=4
 pkgdesc='Combined plugins release for Geany'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://plugins.geany.org/'
@@ -22,7 +22,7 @@ sha256sums=('a0dcf0cb00ac260670ef8fae682aade60c7c3075c88121fd21f3aecdff84e1ce')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --libexecdir=/usr/lib
+  ./configure --prefix=/usr --libexecdir=/usr/lib --disable-geanylua
   make 
 }
 
diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD
index 698ac86bd..54107a1e3 100644
--- a/community/grafx2/PKGBUILD
+++ b/community/grafx2/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 77732 2012-10-14 01:28:09Z arodseth $
+# $Id: PKGBUILD 81107 2012-12-12 00:47:33Z eric $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Simon Parzer <simon.parzer@gmail.com>
 
 pkgname=grafx2
 pkgver=2.4
-pkgrel=1
-_pkgrev=2027
+pkgrel=2
+_pkgrev=2035
 pkgdesc='Pixelart-oriented painting program'
 arch=('x86_64' 'i686')
 url='http://code.google.com/p/grafx2/'
 license=('GPL2')
 install=grafx2.install
-depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils')
+depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils' 'gtk-update-icon-cache')
 makedepends=('gendesk' 'setconf')
 options=('!emptydirs')
 source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.$_pkgrev-src.tgz")
-sha256sums=('97088d07f1bcd668c619da9f1efe7c5782da707306c90c05564df91f51afe9d7')
+sha256sums=('5818caea63cd3cf3318baf01dd20f81ec61e4514443000c80a41b68ab3f17a6b')
 _name=('GrafX2')
 _exec=('grafx2 %U')
 _genericname=('Drawing program')
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index 8b2e80db6..c6d953b6a 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 79325 2012-11-02 19:21:48Z spupykin $
+# $Id: PKGBUILD 81108 2012-12-12 00:47:34Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
 pkgver=0.9.18
-pkgrel=3
+pkgrel=4
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hedgewars.org"
 license=('GPL' 'custom')
-depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
+depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51')
 makedepends=('fpc' 'cmake'
 	     # haskell specific
 	     'ghc'
@@ -25,6 +25,7 @@ md5sums=('02465736fdcf48feea1cacaa0aa5960e'
 build() {
   cd $pkgname-src-$pkgver
   sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs
+#  sed -i 's|lua51 lua5.1 lua-5.1|lua lua51 lua5.1 lua-5.1|g' cmake_modules/FindLua.cmake
   cmake \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATA_INSTALL_DIR=/usr/share \
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index 31bb2505a..497291cc2 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 77163 2012-10-06 07:36:47Z bluewind $
+# $Id: PKGBUILD 81109 2012-12-12 00:47:35Z eric $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Jan Fader <jan.fader@web.de>
 pkgbase=highlight
 pkgname=(highlight highlight-gui)
 pkgver=3.12
-pkgrel=1
+pkgrel=2
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=(qt lua boost)
-source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2)
-md5sums=('4b3f01e86a6b3fa25f3c4905a9cd63c7')
+makedepends=(qt lua51 boost)
+source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc})
+md5sums=('4b3f01e86a6b3fa25f3c4905a9cd63c7'
+         'b784cd3f264a0f281da36f26c0c7f2c2')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
 
+  sed -i 's#pkg-config --cflags lua#pkg-config --cflags lua5.1#' src/makefile
+  sed -i 's#pkg-config --libs lua#pkg-config --libs lua5.1#' src/makefile
+  sed -i 's#lua#lua5.1#g' src/gui-qt/highlight.pro
+
   make
   make gui
 }
diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD
index ea5d5e576..c71e18106 100644
--- a/community/ibus-pinyin/PKGBUILD
+++ b/community/ibus-pinyin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79511 2012-11-06 12:01:15Z arodseth $
+# $Id: PKGBUILD 81110 2012-12-12 00:47:35Z eric $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.maRS<leemars at gmail.com>
@@ -7,12 +7,12 @@
 
 pkgname=ibus-pinyin
 pkgver=1.4.99.20120808
-pkgrel=1
+pkgrel=2
 pkgdesc='Pinyin (Chinese) input method for the IBus framework'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://ibus.googlecode.com'
-depends=('ibus' 'pyzy' 'lua')
+depends=('ibus' 'pyzy' 'lua51')
 makedepends=('intltool')
 source=("https://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('aa298212d9f63acab48cf9f6370c94cdc6920c2a')
diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD
index 5cc378466..9a132bcea 100644
--- a/community/instead/PKGBUILD
+++ b/community/instead/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 76494 2012-09-19 14:03:04Z spupykin $
+# $Id: PKGBUILD 81111 2012-12-12 00:47:36Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
 pkgdesc="instead quest interpreter"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ 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=('08acf9f7de60b8e1c23d6e9368093d1f')
+md5sums=('a26dd0b2785787639dd1bbfed66af77a')
 
 build() {
   cd "${srcdir}/instead-${pkgver}"
diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD
index a2ad97c2c..ce7b21d48 100644
--- a/community/lua-zlib/PKGBUILD
+++ b/community/lua-zlib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66222 2012-02-23 03:34:22Z spupykin $
+# $Id: PKGBUILD 81123 2012-12-12 00:49:35Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=lua-zlib
 pkgver=0.2
-pkgrel=2
+pkgrel=3
 _gitver=8d07669
-_luaver=5.1
+_luaver=5.2
 url="http://github.com/brimworks/lua-zlib"
 pkgdesc='Simple streaming interface to zlib for Lua.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,17 +14,17 @@ depends=('lua' 'zlib')
 makedepends=('cmake')
 conflicts=('lua-lzlib')
 source=("lua-zlib-$pkgver.zip::https://github.com/brimworks/lua-zlib/zipball/v$pkgver")
-md5sums=('d7ca7d12b6e50e3ec4c2057f65ca87d1')
+md5sums=('28ce556fccb2d364bc5392f63c6f89ee')
 
 build() {
-    cd $srcdir/brimworks-lua-zlib-${_gitver}
-    sed -i "s#share/lua/cmod#lib/lua/${_luaver}#" CMakeLists.txt
-    cmake -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_INSTALL_PREFIX=/usr .
+  cd $srcdir/brimworks-lua-zlib-${_gitver}
+  sed -i "s#share/lua/cmod#lib/lua/${_luaver}#" CMakeLists.txt
+  cmake -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX=/usr .
 }
 
 package() {
-    cd $srcdir/brimworks-lua-zlib-${_gitver}
-    make DESTDIR="$pkgdir" install
-    install -D -m644 "README" "$pkgdir/usr/share/licenses/lua-zlib/README"
+  cd $srcdir/brimworks-lua-zlib-${_gitver}
+  make DESTDIR="$pkgdir" install
+  install -D -m644 "README" "$pkgdir/usr/share/licenses/lua-zlib/README"
 }
diff --git a/community/luabitop/PKGBUILD b/community/luabitop/PKGBUILD
index 755ec5ea8..06647f867 100644
--- a/community/luabitop/PKGBUILD
+++ b/community/luabitop/PKGBUILD
@@ -1,26 +1,45 @@
-# $Id: PKGBUILD 73728 2012-07-14 17:39:06Z seblu $
+# $Id: PKGBUILD 81112 2012-12-12 00:47:37Z eric $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Lucas Hermann Negri <kkndrox@gmail.com>
 
-pkgname=luabitop
+pkgbase=luabitop
+pkgname=(lua-bitop lua51-bitop)
 pkgver=1.0.2
 pkgrel=1
 pkgdesc='C extension adding bitwise operations on numbers'
 arch=(i686 x86_64 mips64el)
 url='http://bitop.luajit.org/index.html'
-depends=('lua')
+makedepends=('lua' 'lua51')
+conflicts=('luabitop')
+replaces=('luabitop')
 source=("http://bitop.luajit.org/download/LuaBitOp-$pkgver.tar.gz")
 md5sums=('d0c1080fe0c844e8477279668e2d0d06')
 license=('MIT')
 
 build() {
+  cp -a LuaBitOp-$pkgver LuaBitOp51-$pkgver
+  msg2 'Building with lua 5.2'
   cd LuaBitOp-$pkgver
-  make
+  make INCLUDES=' -I/usr/include' LUA='lua'
+  msg2 'Building with lua 5.1'
+  cd ../LuaBitOp51-$pkgver
+  make INCLUDES=' -I/usr/include/lua5.1' LUA='lua5.1'
 }
 
-package() {
+package_lua-bitop() {
+  depends=('lua')
   cd LuaBitOp-$pkgver
+  install -Dm 644 bit.so "$pkgdir/usr/lib/lua/5.2/bit.so"
+  install -dm 755 "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s '../lua/COPYRIGHT' "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+}
+
+package_lua51-bitop() {
+  depends=('lua51')
+  cd LuaBitOp51-$pkgver
   install -Dm 644 bit.so "$pkgdir/usr/lib/lua/5.1/bit.so"
+  install -dm 755 "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s '../lua51/COPYRIGHT' "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/luaexpat/PKGBUILD b/community/luaexpat/PKGBUILD
index 1ee938ed0..a770c784a 100644
--- a/community/luaexpat/PKGBUILD
+++ b/community/luaexpat/PKGBUILD
@@ -1,30 +1,36 @@
-# $Id: PKGBUILD 66195 2012-02-23 03:06:28Z spupykin $
+# $Id: PKGBUILD 81114 2012-12-12 00:47:39Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Lucas Hermann Negri <kkndrox@gmail.com>
 
-pkgname=luaexpat
+pkgbase=luaexpat
+pkgname=(lua-expat)
 pkgver=1.2.0
-pkgrel=2
-pkgdesc='LuaExpat is a SAX XML parser based on the Expat library. LuaExpat is free software and uses the same license as Lua 5.0.'
+pkgrel=1
+pkgdesc='SAX XML parser based on the Expat library'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.matthewwild.co.uk/lua-expat'
 license=('MIT')
-makedepends=('gcc' 'lua>=5.1' 'expat>=2')
-depends=('lua' 'expat')
+makedepends=('gcc' 'lua' 'expat>=2')
+replaces=(luaexpat)
+conflicts=(luaexpat)
 source=("http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz"
-	'newconfig')
+	'newconfig'
+	'lua52.patch')
 md5sums=('03efe50c7f30a34580701e6527d7bfee'
-         'b89a09379d3e46e6496255e44cecc316')
+         '60ae0633ac6f829cc3359f3533252eb0'
+         '21da93cbf0d3cef80d00e2380b7c2679')
 
 build() {
-  cd $srcdir/
-  mv newconfig $pkgname-$pkgver/config
-  cd $pkgname-$pkgver
+  cd $pkgbase-$pkgver
+  patch -p1 < "$srcdir/lua52.patch"
+  cp -L "$srcdir/newconfig" config
   make
 }
 
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  mv usr $pkgdir
+package_lua-expat() {
+  depends=('lua' 'expat')
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir" install
+  mv usr "$pkgdir"
+  install -Dm0644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
 }
diff --git a/community/luaexpat/lua52.patch b/community/luaexpat/lua52.patch
new file mode 100644
index 000000000..8b418e3a7
--- /dev/null
+++ b/community/luaexpat/lua52.patch
@@ -0,0 +1,372 @@
+diff -wbBur luaexpat-1.2.0/config lua-expat-b4e6b167e020/config
+--- luaexpat-1.2.0/config	2011-06-03 18:17:04.000000000 +0400
++++ lua-expat-b4e6b167e020/config	2012-07-28 04:59:45.000000000 +0400
+@@ -17,8 +17,7 @@
+ # (according to Lua 5.1 definition:
+ # first version digit * 100 + second version digit
+ # e.g. Lua 5.0.2 => 500, Lua 5.1 => 501, Lua 5.1.1 => 501)
+-LUA_VERSION_NUM= 500
+-COMPAT_DIR= ../compat/src
++LUA_VERSION_NUM= 502
+ 
+ # Compilation parameters
+ CWARNS = -Wall -pedantic \
+@@ -31,6 +30,6 @@
+         -Wshadow \
+         -Wwrite-strings
+ 
+-CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \
+-   -I$(COMPAT_DIR) -I$(EXPAT_INC)
++CFLAGS = $(CWARNS) -ansi -O2 -fPIC -I$(LUA_INC) \
++   -I$(EXPAT_INC)
+ CC = gcc
+diff -wbBur luaexpat-1.2.0/.hg_archival.txt lua-expat-b4e6b167e020/.hg_archival.txt
+--- luaexpat-1.2.0/.hg_archival.txt	2011-06-03 18:17:04.000000000 +0400
++++ lua-expat-b4e6b167e020/.hg_archival.txt	2012-07-28 04:59:45.000000000 +0400
+@@ -1,4 +1,5 @@
+ repo: 24d141cb2d1e66a1bb42b445f049fcc037972f2b
+-node: 30c2491fe44a485caf2dd24643052670c91b91e3
++node: b4e6b167e020ba1bd9402acd0a142ef6e91d912a
+ branch: default
+-tag: 1.2.0
++latesttag: 1.2.0
++latesttagdistance: 7
+diff -wbBur luaexpat-1.2.0/makefile lua-expat-b4e6b167e020/makefile
+--- luaexpat-1.2.0/makefile	2011-06-03 18:17:04.000000000 +0400
++++ lua-expat-b4e6b167e020/makefile	2012-07-28 04:59:45.000000000 +0400
+@@ -1,22 +1,15 @@
+ T= lxp
+-V= 1.2.0
++V= 1.3.0
+ CONFIG= ./config
+ 
+ include $(CONFIG)
+ 
+-ifeq "$(LUA_VERSION_NUM)" "500"
+-COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
+-endif
+-
+-OBJS= src/lxplib.o $(COMPAT_O)
++OBJS= src/lxplib.o
+ lib: src/$(LIBNAME)
+ 
+ src/$(LIBNAME) : $(OBJS)
+ 	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
+ 
+-$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
+-	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
+-
+ install:
+ 	mkdir -p $(LUA_LIBDIR)
+ 	cp src/$(LIBNAME) $(LUA_LIBDIR)
+diff -wbBur luaexpat-1.2.0/README lua-expat-b4e6b167e020/README
+--- luaexpat-1.2.0/README	2011-06-03 18:17:04.000000000 +0400
++++ lua-expat-b4e6b167e020/README	2012-07-28 04:59:45.000000000 +0400
+@@ -47,11 +47,11 @@
+ 
+ Credits
+ 
+-Version 1.0 was designed by Roberto Ierusalimschy, Andr� Carregal and Tom�s Guisasola
++Version 1.0 was designed by Roberto Ierusalimschy, André Carregal and Tomás Guisasola
+ as part of the Kepler Project which holds its copyright. The implementation was coded
+ by Roberto Ierusalimschy, based on a previous design by Jay Carlson.
+ 
+-LuaExpat development was sponsored by F�brica Digital and FINEP.
++LuaExpat development was sponsored by Fábrica Digital and FINEP.
+ 
+ Contact
+ 
+diff -wbBur luaexpat-1.2.0/src/lxp/lom.lua lua-expat-b4e6b167e020/src/lxp/lom.lua
+--- luaexpat-1.2.0/src/lxp/lom.lua	2011-06-03 18:17:04.000000000 +0400
++++ lua-expat-b4e6b167e020/src/lxp/lom.lua	2012-07-28 04:59:45.000000000 +0400
+@@ -1,13 +1,11 @@
+ -- See Copyright Notice in license.html
+ -- $Id: lom.lua,v 1.6 2005/06/09 19:18:40 tuler Exp $
+ 
+-require "lxp"
++local lxp = require "lxp"
+ 
+-local tinsert, tremove, getn = table.insert, table.remove, table.getn
++local tinsert, tremove = table.insert, table.remove
+ local assert, type, print = assert, type, print
+-local lxp = lxp
+ 
+-module ("lxp.lom")
+ 
+ local function starttag (p, tag, attr)
+   local stack = p:getcallbacks().stack
+@@ -19,14 +17,14 @@
+   local stack = p:getcallbacks().stack
+   local element = tremove(stack)
+   assert(element.tag == tag)
+-  local level = getn(stack)
++  local level = #stack
+   tinsert(stack[level], element)
+ end
+ 
+ local function text (p, txt)
+   local stack = p:getcallbacks().stack
+-  local element = stack[getn(stack)]
+-  local n = getn(element)
++  local element = stack[#stack]
++  local n = #element
+   if type(element[n]) == "string" then
+     element[n] = element[n] .. txt
+   else
+@@ -34,7 +32,7 @@
+   end
+ end
+ 
+-function  parse (o)
++local function parse (o)
+   local c = { StartElement = starttag,
+               EndElement = endtag,
+               CharacterData = text,
+@@ -47,7 +45,7 @@
+     status, err = p:parse(o)
+     if not status then return nil, err end
+   else
+-    for l in o do
++    for l in pairs(o) do
+       status, err = p:parse(l)
+       if not status then return nil, err end
+     end
+@@ -58,3 +56,4 @@
+   return c.stack[1][1]
+ end
+ 
++return { parse = parse }
+diff -wbBur luaexpat-1.2.0/src/lxplib.c lua-expat-b4e6b167e020/src/lxplib.c
+--- luaexpat-1.2.0/src/lxplib.c	2011-06-03 18:17:04.000000000 +0400
++++ lua-expat-b4e6b167e020/src/lxplib.c	2012-07-28 04:59:45.000000000 +0400
+@@ -13,14 +13,16 @@
+ 
+ #include "lua.h"
+ #include "lauxlib.h"
+-#if ! defined (LUA_VERSION_NUM) || LUA_VERSION_NUM < 501
+-#include "compat-5.1.h"
+-#endif
+ 
+ 
+ #include "lxplib.h"
+ 
+ 
++#if !defined(lua_pushliteral)
++#define lua_pushliteral(L, s)	\
++	lua_pushstring(L, "" s, (sizeof(s)/sizeof(char))-1)
++#endif
++
+ 
+ enum XPState {
+   XPSpre,  /* parser just initialized */
+@@ -66,7 +68,7 @@
+ 
+ 
+ static void lxpclose (lua_State *L, lxp_userdata *xpu) {
+-  lua_unref(L, xpu->tableref);
++  luaL_unref(L, LUA_REGISTRYINDEX, xpu->tableref);
+   xpu->tableref = LUA_REFNIL;
+   if (xpu->parser)
+     XML_ParserFree(xpu->parser);
+@@ -225,7 +227,7 @@
+   child->parser = XML_ExternalEntityParserCreate(p, context, NULL);
+   if (!child->parser)
+     luaL_error(L, "XML_ParserCreate failed");
+-  lua_getref(L, xpu->tableref);  /* child uses the same table of its father */
++  lua_rawgeti(L, LUA_REGISTRYINDEX, xpu->tableref); /*lua_getref(L, xpu->tableref); */ /* child uses the same table of its father */
+   child->tableref = luaL_ref(L, LUA_REGISTRYINDEX);
+   lua_pushstring(L, base);
+   lua_pushstring(L, systemId);
+@@ -449,7 +451,7 @@
+   xpu->state = XPSok;
+   xpu->b = &b;
+   lua_settop(L, 2);
+-  lua_getref(L, xpu->tableref);  /* to be used by handlers */
++  lua_rawgeti(L, LUA_REGISTRYINDEX, xpu->tableref); /*lua_getref(L, xpu->tableref);*/  /* to be used by handlers */
+   status = XML_Parse(xpu->parser, s, (int)len, s == NULL);
+   if (xpu->state == XPSstring) dischargestring(xpu);
+   if (xpu->state == XPSerror) {  /* callback error? */
+@@ -517,7 +519,12 @@
+   return 1;
+ }
+ 
+-static const struct luaL_reg lxp_meths[] = {
++#if !defined LUA_VERSION_NUM
++/* Lua 5.0 */
++#define luaL_Reg luaL_reg
++#endif
++
++static const struct luaL_Reg lxp_meths[] = {
+   {"parse", lxp_parse},
+   {"close", lxp_close},
+   {"__gc", parser_gc},
+@@ -530,7 +537,7 @@
+   {NULL, NULL}
+ };
+ 
+-static const struct luaL_reg lxp_funcs[] = {
++static const struct luaL_Reg lxp_funcs[] = {
+   {"new", lxp_make_parser},
+   {NULL, NULL}
+ };
+@@ -541,19 +548,39 @@
+ */
+ static void set_info (lua_State *L) {
+ 	lua_pushliteral (L, "_COPYRIGHT");
+-	lua_pushliteral (L, "Copyright (C) 2003-2007 Kepler Project");
++	lua_pushliteral (L, "Copyright (C) 2003-2012 Kepler Project");
+ 	lua_settable (L, -3);
+ 	lua_pushliteral (L, "_DESCRIPTION");
+ 	lua_pushliteral (L, "LuaExpat is a SAX XML parser based on the Expat library");
+ 	lua_settable (L, -3);
+ 	lua_pushliteral (L, "_VERSION");
+-	lua_pushliteral (L, "LuaExpat 1.2.0");
++	lua_pushliteral (L, "LuaExpat 1.3.0");
+ 	lua_settable (L, -3);
+ }
+ 
+ 
++#if !defined LUA_VERSION_NUM || LUA_VERSION_NUM==501
++/*
++** Adapted from Lua 5.2.0
++*/
++static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
++  luaL_checkstack(L, nup, "too many upvalues");
++  for (; l->name != NULL; l++) {  /* fill the table with given functions */
++    int i;
++    for (i = 0; i < nup; i++)  /* copy upvalues to the top */
++      lua_pushvalue(L, -nup);
++    lua_pushstring(L, l->name);
++    lua_pushcclosure(L, l->func, nup);  /* closure with those upvalues */
++    lua_settable(L, -(nup + 3));
++  }
++  lua_pop(L, nup);  /* remove upvalues */
++}
++#endif
++
++
+ int luaopen_lxp (lua_State *L) {
+   luaL_newmetatable(L, ParserType);
++
+   lua_pushliteral(L, "__index");
+   lua_pushvalue(L, -2);
+   lua_rawset(L, -3);
+@@ -557,9 +584,12 @@
+   lua_pushliteral(L, "__index");
+   lua_pushvalue(L, -2);
+   lua_rawset(L, -3);
+-  luaL_openlib (L, NULL, lxp_meths, 0);
+-  luaL_openlib (L, "lxp", lxp_funcs, 0);
+-  set_info (L);
+ 
++	luaL_setfuncs (L, lxp_meths, 0);
++	lua_pop (L, 1); /* remove metatable */
++
++	lua_newtable (L);
++	luaL_setfuncs (L, lxp_funcs, 0);
++	set_info (L);
+   return 1;
+ }
+diff -wbBur luaexpat-1.2.0/tests/test.lua lua-expat-b4e6b167e020/tests/test.lua
+--- luaexpat-1.2.0/tests/test.lua	2011-06-03 18:17:04.000000000 +0400
++++ lua-expat-b4e6b167e020/tests/test.lua	2012-07-28 04:59:45.000000000 +0400
+@@ -2,8 +2,14 @@
+ -- See Copyright Notice in license.html
+ -- $Id: test.lua,v 1.6 2006/06/08 20:34:52 tomas Exp $
+ 
+-require"lxp"
++if string.find(_VERSION, " 5.0") then
++	lxp = assert(loadlib("./lxp.so", "luaopen_lxp"))()
++else
++	lxp = require"lxp"
++	gcinfo = function () return collectgarbage"count" end
++end
+ print (lxp._VERSION)
++assert(lxp.new, "Cannot find function lxp.new ("..tostring(lxp.new)..")")
+ 
+ -- basic test with no preamble
+ local p = lxp.new{}
+@@ -35,9 +41,9 @@
+ ]>
+ ]]
+ 
+-local X
++X = {}
++if string.find(_VERSION, " 5.0") then
+ function getargs (...) X = arg end
+-
+ function xgetargs (c)
+   return function (...)
+     table.insert(arg, 1, c)
+@@ -44,6 +50,35 @@
+     table.insert(X, arg)
+   end
+ end
++else
++	(loadstring or load)[[
++	function getargs (...)
++		X = { ... }
++		X.n = select('#', ...)
++	end
++	function xgetargs (c)
++	  return function (...)
++	    local arg = { ... }
++	    arg.n = select('#', ...) + 1
++	    table.insert(arg, 1, c)
++	    table.insert(X, arg)
++	  end
++	end
++	table.getn = function (t)
++		if t.n then
++			return t.n
++		else
++			local n = 0
++			for i in pairs(t) do
++				if type(i) == "number" then
++					n = math.max(n, i)
++				end
++			end
++			return n
++		end
++	end]]()
++end
++
+ 
+ 
+ -------------------------------
+@@ -61,7 +96,7 @@
+ assert(X.n == 3 and X[1] == p and X[2] == "to")
+ x = X[3]
+ assert(x.priority=="10" and x.xu=="hi" and x.method=="POST")
+-assert(x[1] == "priority" and x[2] == "xu" and table.getn(x) == 2)
++assert(x[1] == "priority" and x[2] == "xu" and table.getn(x) == 2, "x[1] == "..tostring(x[1])..", x[2] == "..tostring(x[2])..", #x == "..tostring(table.getn(x)))
+ assert(p:parse("</to>"))
+ assert(p:parse())
+ p:close()
+@@ -95,7 +130,7 @@
+ assert(p:parse"<to>")
+ assert(p:parse"<![CDATA[hi]]>")
+ assert(table.getn(X) == 3)
+-assert(X[1][1] == "s" and X[1][2] == p)
++assert(X[1][1] == "s" and X[1][2] == p, "X[1][1] == "..tostring(X[1][1])..", X[1][2] == "..tostring(X[1][2])..", p == "..tostring(p))
+ assert(X[2][1] == "c" and X[2][2] == p and X[2][3] == "hi")
+ assert(X[3][1] == "e" and X[3][2] == p)
+ assert(p:parse"</to>")
+@@ -220,7 +255,7 @@
+ ]])
+ p:close()
+ x = X[1]
+-assert(x[1] == "sn" and x[3] == "space" and x[4] == "a/namespace" and table.getn(x) == 4)
++assert(x[1] == "sn" and x[3] == "space" and x[4] == "a/namespace" and table.getn(x) == 4, "x[1] == "..tostring(x[1])..", x[3] == "..tostring(x[3])..", x[4] == "..tostring(x[4])..", #x == "..tostring(table.getn(x)))
+ x = X[3]
+ assert(x[1] == "s" and x[3] == "a/namespace?a")
+ x = X[4]
+@@ -316,7 +351,7 @@
+ local x = gcinfo()
+ for i=1,100000 do
+   -- due to a small bug in Lua...
+-  if math.mod(i, 100) == 0 then collectgarbage() end
++  if (math.mod or math.fmod)(i, 100) == 0 then collectgarbage() end
+   lxp.new({})
+ end
+ collectgarbage(); collectgarbage()
diff --git a/community/luaexpat/newconfig b/community/luaexpat/newconfig
index 095c0800e..bc5b25d8f 100644
--- a/community/luaexpat/newconfig
+++ b/community/luaexpat/newconfig
@@ -1,5 +1,5 @@
-LUA_LIBDIR= usr/lib/lua/5.1
-LUA_DIR= usr/share/lua/5.1
+LUA_LIBDIR= usr/lib/lua/5.2
+LUA_DIR= usr/share/lua/5.2
 LUA_INC= /usr/include
 EXPAT_INC= /usr/include
 
@@ -7,7 +7,7 @@ EXPAT_INC= /usr/include
 LIB_OPTION= -shared
 
 LIBNAME= $T.so.$V
-LUA_VERSION_NUM= 512
+LUA_VERSION_NUM= 521
 COMPAT_DIR= ../compat/src
 
 # Compilation parameters
diff --git a/community/luafilesystem/PKGBUILD b/community/luafilesystem/PKGBUILD
index 737148c23..8ace811c0 100644
--- a/community/luafilesystem/PKGBUILD
+++ b/community/luafilesystem/PKGBUILD
@@ -1,28 +1,46 @@
-# $Id: PKGBUILD 78389 2012-10-17 16:41:35Z bpiotrowski $
+# $Id: PKGBUILD 81115 2012-12-12 00:47:40Z eric $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
-pkgname=luafilesystem
+pkgbase=luafilesystem
+pkgname=(lua-filesystem lua51-filesystem)
 pkgver=1.6.2
 pkgrel=1
 pkgdesc='File System Library for the Lua Programming Language'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keplerproject.org/luafilesystem/'
 license=('MIT')
-depends=('lua')
-source=(http://github.com/downloads/keplerproject/$pkgname/$pkgname-$pkgver.tar.gz
+replaces=(luafilesystem)
+conflicts=(luafilesystem)
+makedepends=(lua lua51)
+source=(http://github.com/downloads/keplerproject/$pkgbase/$pkgbase-$pkgver.tar.gz
         LICENSE)
 md5sums=('4e7ec93678c760c4e42cea7d28aafa13'
          'beb2b58c4b5c2782304a5b0267a5651b')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  make PREFIX=$pkgdir/usr
+  msg2 "Building $pkgbase with lua 5.1"
+  cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51
+  cd $pkgbase-$pkgver-51
+  make LUA_INC=/usr/include/lua5.1
+  msg2 "Building $pkgbase with lua 5.2"
+  cd "$srcdir/$pkgbase-$pkgver"
+  make
 }
 
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make PREFIX=$pkgdir/usr install
+package_lua-filesystem() {
+  depends=('lua')
+
+  cd $pkgbase-$pkgver
+  make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.2' install
+  install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_lua51-filesystem() {
+  depends=('lua51')
+
+  cd $pkgbase-$pkgver-51
+  make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.1' install
   install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
index abdf94d70..f9bae6792 100644
--- a/community/luajit/PKGBUILD
+++ b/community/luajit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79833 2012-11-13 17:51:21Z bpiotrowski $
+# $Id: PKGBUILD 81136 2012-12-12 00:57:15Z eric $
 # Maintainer:  Chris Brannon <chris@the-brannons.com>
 # Maintainer:  Bartłomiej Piotrowski 
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
@@ -6,7 +6,7 @@
 
 pkgname=luajit
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A Just-In-Time Compiler for Lua'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://luajit.org/'
diff --git a/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch b/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch
index 0e5a9d1a2..8cccb88c1 100644
--- a/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch
+++ b/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch
@@ -4,7 +4,7 @@ Date: Thu, 12 Apr 2012 16:43:41 +0200
 Subject: [PATCH] Don't mark desktop file as executable.
 
 ---
- Makefile | 2 +-
+ Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
@@ -12,13 +12,13 @@ index be1567b..50973d6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -78,7 +78,7 @@ install:
- install -d $(DESTDIR)/usr/share/pixmaps
- install extras/luakit.png $(DESTDIR)/usr/share/pixmaps/
- install -d $(DESTDIR)/usr/share/applications
-- install extras/luakit.desktop $(DESTDIR)/usr/share/applications/
-+ install -m0644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/
- install -d $(MANPREFIX)/man1/
- install -m644 luakit.1 $(MANPREFIX)/man1/
+	install -d $(DESTDIR)/usr/share/pixmaps
+	install extras/luakit.png $(DESTDIR)/usr/share/pixmaps/
+	install -d $(DESTDIR)/usr/share/applications
+-	install extras/luakit.desktop $(DESTDIR)/usr/share/applications/
++	install -m0644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/
+	install -d $(MANPREFIX)/man1/
+	install -m644 luakit.1 $(MANPREFIX)/man1/
 
----
+--
 1.7.10
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index 09392ace9..36e8b0902 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78446 2012-10-18 17:40:26Z bpiotrowski $
+# $Id: PKGBUILD 81116 2012-12-12 00:49:28Z eric $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com>
@@ -6,12 +6,12 @@
 pkgname=luakit
 pkgver=2012.09.13.r1
 _pkgver=2012.09.13-r1
-pkgrel=3
+pkgrel=5
 pkgdesc='Fast, small, webkit based browser framework extensible by Lua'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.luakit.org/projects/luakit'
+url='http://mason-larobina.github.com/luakit/'
 license=('GPL3')
-depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils' 'luajit')
+depends=('libwebkit' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit')
 makedepends=('git' 'help2man')
 options=(!makeflags)
 install='luakit.install'
@@ -20,10 +20,16 @@ md5sums=('77b02e6d19ba021409f1778fddd94a42')
 
 build() {
   cd mason-larobina-luakit-*
+
+  # use luajit to run script needed at build
+  sed -i '1s,lua,luajit,' build-utils/gentokens.lua
+
   make USE_LUAJIT=1 PREFIX=/usr all
 }
 
 package() {
   cd mason-larobina-luakit-*
   make PREFIX=/usr DESTDIR=$pkgdir install 
+
+  chmod -x $pkgdir/usr/share/pixmaps/luakit.png # FS#32938
 }
diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD
index d81969ca7..fce0bdcff 100644
--- a/community/luaposix/PKGBUILD
+++ b/community/luaposix/PKGBUILD
@@ -1,41 +1,57 @@
-# $Id: PKGBUILD 77213 2012-10-07 01:13:25Z seblu $
+# $Id: PKGBUILD 81118 2012-12-12 00:49:30Z eric $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Laszlo Papp <djszapi at archlinux us>
 # Contributor: Donald Ephraim Curtis <dcurtis@gmail.com>
 
-pkgname=luaposix
+pkgbase=luaposix
+pkgname=('lua-posix' 'lua51-posix')
 pkgver=5.1.23
 pkgrel=1
 pkgdesc='A POSIX library for Lua programming language'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://luaforge.net/projects/luaposix/'
 license=('GPL' 'LGPL')
-depends=('lua' 'luabitop')
-#checkdepends=('lunit')
+makedepends=('lua' 'lua51' 'lua51-bitop')
+conflicts=('luaposix')
+replaces=('luaposix')
 options=('!libtool')
-source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz")
+source=("https://github.com/downloads/$pkgbase/$pkgbase/$pkgbase-$pkgver.tar.gz")
 md5sums=('ebe7d335741ca736e003a6844a0fbf92')
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib/lua/5.1 \
-              --datadir=/usr/share/lua/5.1
+  cd $pkgbase-$pkgver
+  mkdir build_51 build_52
+  msg2 'Build with lua 5.2'
+  cd build_52
+  ../configure \
+      --prefix=/usr \
+      --libdir=/usr/lib/lua/5.2 \
+      --datadir=/usr/share/lua/5.2 \
+      --docdir=/usr/share/doc/lua-posix
   make
+  msg2 'Build with lua 5.1'
+  cd ../build_51
+  ../configure CFLAGS=-I/usr/include/lua5.1 \
+      --prefix=/usr \
+      --libdir=/usr/lib/lua/5.1 \
+      --datadir=/usr/share/lua/5.1 \
+      --docdir=/usr/share/doc/lua51-posix
+  make
+}
+
+package_lua-posix() {
+  depends=('lua')
+
+  cd $pkgbase-$pkgver/build_52
+  make DESTDIR="$pkgdir/" install
 }
 
-#check() {
-#  cd $pkgname-$pkgver
-#  make check
-#}
+package_lua51-posix() {
+  depends=('lua51' 'lua51-bitop')
 
-package() {
-  cd $pkgname-$pkgver
-  make PREFIX=/usr DESTDIR="$pkgdir/" install
-  # examples
-  install -d "$pkgdir/usr/share/$pkgname/examples"
-  install -D -m 644 *.lua "$pkgdir/usr/share/$pkgname/examples"
+  cd $pkgbase-$pkgver/build_51
+  make DESTDIR="$pkgdir/" install
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD
index 50ecd0af9..ff1c0eb63 100644
--- a/community/luasec/PKGBUILD
+++ b/community/luasec/PKGBUILD
@@ -1,30 +1,48 @@
-# $Id: PKGBUILD 66219 2012-02-23 03:33:12Z spupykin $
+# $Id: PKGBUILD 81120 2012-12-12 00:49:31Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Dwayne Bent <dbb.1@liqd.org>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
 
-pkgname=luasec
-pkgver=0.4
-pkgrel=3
-pkgdesc="Lua bindings for OpenSSL library to provide TLS/SSL communication."
+pkgbase=luasec
+pkgname=(lua-sec lua51-sec)
+pkgver=0.4.1
+pkgrel=1
+pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://luasec.luaforge.net/"
+url='http://luasec.luaforge.net/'
 license=('MIT')
-depends=('openssl>=0.9.7' 'lua>=5.1' 'luasocket>=2.0.2')
-source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/$pkgname-$pkgver.tar.gz"
-        'luasec.patch')
-md5sums=('712158d60207bdbb6215fc7e07d8db24'
-         '25e48c1115225d9884cdb7f5ca4949a9')
+makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket')
+conflicts=('luasec')
+replaces=('luasec')
+source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/$pkgbase-$pkgver.tar.gz")
+md5sums=('b8a5fde3b3fdb6174f54cd51d7f53e12')
 
 build() {
-    install -d "$pkgdir/usr/share/lua/5.1"
-    install -d "$pkgdir/usr/lib/lua/5.1"
-    install -d "$pkgdir/usr/share/licenses/$pkgname"
-
-    cd "$srcdir/$pkgname-$pkgver"
-    patch -p1 Makefile "$srcdir/luasec.patch"
+    cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51
+    msg2 'Building with lua 5.2'
+    cd $pkgbase-$pkgver
     make linux
-    make DESTDIR=$pkgdir install
+    msg2 'Building with lua 5.1'
+    cd ../$pkgbase-$pkgver-51
+    make INCDIR=-I/usr/include/lua5.1 linux
+}
 
-    install -m644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+package_lua-sec() {
+    depends=('openssl' 'lua' 'lua-socket')
+
+    install -dm755 "$pkgdir/usr/lib/lua/5.2"
+    cd $pkgbase-$pkgver
+    make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install
+    install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+package_lua51-sec() {
+    depends=('openssl' 'lua51' 'lua51-socket')
+
+    install -dm755 "$pkgdir/usr/lib/lua/5.1"
+    cd $pkgbase-$pkgver-51
+    make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install
+    install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=4 sw=4 et:
diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD
index 488f518d7..e94694e5a 100644
--- a/community/luasocket/PKGBUILD
+++ b/community/luasocket/PKGBUILD
@@ -1,27 +1,52 @@
-# $Id: PKGBUILD 49637 2011-06-18 20:20:18Z foutrelis $
+# $Id: PKGBUILD 81121 2012-12-12 00:49:32Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
-pkgname=luasocket
+pkgbase=luasocket
+pkgname=(lua-socket lua51-socket)
 pkgver=2.0.2
-pkgrel=5
-pkgdesc="Luasocket is the most comprehensive networking support library for the Lua language."
+pkgrel=1
+pkgdesc='Networking support library for the Lua language'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.cs.princeton.edu/~diego/professional/luasocket/"
+url='http://www.cs.princeton.edu/~diego/professional/luasocket/'
 license=('MIT')
-depends=(lua)
+replaces=('luasocket')
+conflicts=('luasocket')
+makedepends=('lua' 'lua51')
 source=(http://luaforge.net/frs/download.php/2664/luasocket-$pkgver.tar.gz
-	luasocket-arch.patch
-	luasocket-unixsocket.patch)
+	luasocket-unixsocket.patch
+	lua52.patch)
 md5sums=('41445b138deb7bcfe97bff957503da8e'
-         '3270f42ff374f230c6450f49132f8625'
-         '8d116bb70bd7a2fa15cbe949d4cfc35e')
+         '8d116bb70bd7a2fa15cbe949d4cfc35e'
+         '6f9c6416dd70a7bc1a867003f08c2752')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 < $srcdir/luasocket-arch.patch
-  patch -p1 < $srcdir/luasocket-unixsocket.patch
+  msg2 'Building with lua 5.2'
+  cp -a $pkgbase-$pkgver $pkgbase-$pkgver-52
+  cd $pkgbase-$pkgver-52
+  patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
+  patch -Np1 -i "$srcdir/lua52.patch"
   make
-  make DESTDIR="$pkgdir" install
-  install -D -m0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  msg2 'Building with lua 5.1'
+  cd ../$pkgbase-$pkgver
+  patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
+  make LUAINC=-I/usr/include/lua5.1
+}
+
+package_lua-socket() {
+  depends=('lua')
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir/" \
+    INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.1' \
+    INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.1' install
+  install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_lua51-socket() {
+  depends=('lua51')
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir/" \
+    INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.2' \
+    INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.2' install
+  install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/luasocket/lua52.patch b/community/luasocket/lua52.patch
new file mode 100644
index 000000000..4eef574ee
--- /dev/null
+++ b/community/luasocket/lua52.patch
@@ -0,0 +1,168 @@
+diff -wbBur luasocket-2.0.2/src/auxiliar.c luasocket-2.0.2.my/src/auxiliar.c
+--- luasocket-2.0.2/src/auxiliar.c	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/auxiliar.c	2012-11-14 18:23:14.000000000 +0400
+@@ -24,7 +24,7 @@
+ * Creates a new class with given methods
+ * Methods whose names start with __ are passed directly to the metatable.
+ \*-------------------------------------------------------------------------*/
+-void auxiliar_newclass(lua_State *L, const char *classname, luaL_reg *func) {
++void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) {
+     luaL_newmetatable(L, classname); /* mt */
+     /* create __index table to place methods */
+     lua_pushstring(L, "__index");    /* mt,"__index" */
+diff -wbBur luasocket-2.0.2/src/auxiliar.h luasocket-2.0.2.my/src/auxiliar.h
+--- luasocket-2.0.2/src/auxiliar.h	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/auxiliar.h	2012-11-14 18:23:42.000000000 +0400
+@@ -35,7 +35,7 @@
+ #include "lauxlib.h"
+ 
+ int auxiliar_open(lua_State *L);
+-void auxiliar_newclass(lua_State *L, const char *classname, luaL_reg *func);
++void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func);
+ void auxiliar_add2group(lua_State *L, const char *classname, const char *group);
+ void auxiliar_setclass(lua_State *L, const char *classname, int objidx);
+ void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx);
+diff -wbBur luasocket-2.0.2/src/except.c luasocket-2.0.2.my/src/except.c
+--- luasocket-2.0.2/src/except.c	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/except.c	2012-11-14 18:23:23.000000000 +0400
+@@ -21,7 +21,7 @@
+ static int do_nothing(lua_State *L);
+ 
+ /* except functions */
+-static luaL_reg func[] = {
++static luaL_Reg func[] = {
+     {"newtry",    global_newtry},
+     {"protect",   global_protect},
+     {NULL,        NULL}
+diff -wbBur luasocket-2.0.2/src/inet.c luasocket-2.0.2.my/src/inet.c
+--- luasocket-2.0.2/src/inet.c	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/inet.c	2012-11-14 18:23:47.000000000 +0400
+@@ -21,7 +21,7 @@
+ static int inet_global_gethostname(lua_State *L);
+ 
+ /* DNS functions */
+-static luaL_reg func[] = {
++static luaL_Reg func[] = {
+     { "toip", inet_global_toip },
+     { "tohostname", inet_global_tohostname },
+     { "gethostname", inet_global_gethostname},
+diff -wbBur luasocket-2.0.2/src/luasocket.c luasocket-2.0.2.my/src/luasocket.c
+--- luasocket-2.0.2/src/luasocket.c	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/luasocket.c	2012-11-14 18:23:26.000000000 +0400
+@@ -47,7 +47,7 @@
+ /*-------------------------------------------------------------------------*\
+ * Modules and functions
+ \*-------------------------------------------------------------------------*/
+-static const luaL_reg mod[] = {
++static const luaL_Reg mod[] = {
+     {"auxiliar", auxiliar_open},
+     {"except", except_open},
+     {"timeout", timeout_open},
+@@ -59,7 +59,7 @@
+     {NULL, NULL}
+ };
+ 
+-static luaL_reg func[] = {
++static luaL_Reg func[] = {
+     {"skip",      global_skip},
+     {"__unload",  global_unload},
+     {NULL,        NULL}
+diff -wbBur luasocket-2.0.2/src/mime.c luasocket-2.0.2.my/src/mime.c
+--- luasocket-2.0.2/src/mime.c	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/mime.c	2012-11-14 18:23:31.000000000 +0400
+@@ -48,7 +48,7 @@
+ static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer);
+ 
+ /* code support functions */
+-static luaL_reg func[] = {
++static luaL_Reg func[] = {
+     { "dot", mime_global_dot },
+     { "b64", mime_global_b64 },
+     { "eol", mime_global_eol },
+diff -wbBur luasocket-2.0.2/src/select.c luasocket-2.0.2.my/src/select.c
+--- luasocket-2.0.2/src/select.c	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/select.c	2012-11-14 18:23:35.000000000 +0400
+@@ -27,7 +27,7 @@
+ static int global_select(lua_State *L);
+ 
+ /* functions in library namespace */
+-static luaL_reg func[] = {
++static luaL_Reg func[] = {
+     {"select", global_select},
+     {NULL,     NULL}
+ };
+diff -wbBur luasocket-2.0.2/src/tcp.c luasocket-2.0.2.my/src/tcp.c
+--- luasocket-2.0.2/src/tcp.c	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/tcp.c	2012-11-14 18:23:38.000000000 +0400
+@@ -38,7 +38,7 @@
+ static int meth_dirty(lua_State *L);
+ 
+ /* tcp object methods */
+-static luaL_reg tcp[] = {
++static luaL_Reg tcp[] = {
+     {"__gc",        meth_close},
+     {"__tostring",  auxiliar_tostring},
+     {"accept",      meth_accept},
+@@ -73,7 +73,7 @@
+ };
+ 
+ /* functions in library namespace */
+-static luaL_reg func[] = {
++static luaL_Reg func[] = {
+     {"tcp", global_create},
+     {NULL, NULL}
+ };
+diff -wbBur luasocket-2.0.2/src/timeout.c luasocket-2.0.2.my/src/timeout.c
+--- luasocket-2.0.2/src/timeout.c	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/timeout.c	2012-11-14 18:23:21.000000000 +0400
+@@ -33,7 +33,7 @@
+ static int timeout_lua_gettime(lua_State *L);
+ static int timeout_lua_sleep(lua_State *L);
+ 
+-static luaL_reg func[] = {
++static luaL_Reg func[] = {
+     { "gettime", timeout_lua_gettime },
+     { "sleep", timeout_lua_sleep },
+     { NULL, NULL }
+diff -wbBur luasocket-2.0.2/src/udp.c luasocket-2.0.2.my/src/udp.c
+--- luasocket-2.0.2/src/udp.c	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/udp.c	2012-11-14 18:23:44.000000000 +0400
+@@ -43,7 +43,7 @@
+ static int meth_dirty(lua_State *L);
+ 
+ /* udp object methods */
+-static luaL_reg udp[] = {
++static luaL_Reg udp[] = {
+     {"__gc",        meth_close},
+     {"__tostring",  auxiliar_tostring},
+     {"close",       meth_close},
+@@ -76,7 +76,7 @@
+ };
+ 
+ /* functions in library namespace */
+-static luaL_reg func[] = {
++static luaL_Reg func[] = {
+     {"udp", global_create},
+     {NULL, NULL}
+ };
+diff -wbBur luasocket-2.0.2/src/unix.c luasocket-2.0.2.my/src/unix.c
+--- luasocket-2.0.2/src/unix.c	2007-10-15 08:21:05.000000000 +0400
++++ luasocket-2.0.2.my/src/unix.c	2012-11-14 18:23:17.000000000 +0400
+@@ -39,7 +39,7 @@
+ static const char *unix_trybind(p_unix un, const char *path);
+ 
+ /* unix object methods */
+-static luaL_reg un[] = {
++static luaL_Reg un[] = {
+     {"__gc",        meth_close},
+     {"__tostring",  auxiliar_tostring},
+     {"accept",      meth_accept},
+@@ -71,7 +71,7 @@
+ };
+ 
+ /* our socket creation function */
+-static luaL_reg func[] = {
++static luaL_Reg func[] = {
+     {"unix", global_create},
+     {NULL,          NULL}
+ };
diff --git a/community/luasql/PKGBUILD b/community/luasql/PKGBUILD
index 54aff4c20..399192c50 100644
--- a/community/luasql/PKGBUILD
+++ b/community/luasql/PKGBUILD
@@ -1,22 +1,60 @@
-# $Id: PKGBUILD 61380 2011-12-29 16:34:45Z spupykin $
+# $Id: PKGBUILD 81122 2012-12-12 00:49:33Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Anders Bergh <anders1@gmail.com>
+# Contributor: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Anders Bergh <anders1@gmail.com>
 
-pkgname=luasql-mysql
+pkgbase=luasql
+pkgname=('lua-sql-mysql' 'lua-sql-postgres' 'lua-sql-sqlite')
 pkgver=2.2.0
 pkgrel=1
-pkgdesc="MySQL module for Lua"
 arch=('i686' 'x86_64')
-url="http://www.keplerproject.org/luasql/"
+url='http://www.keplerproject.org/luasql/'
 license=('MIT')
-depends=('lua' 'libmysqlclient')
-source=(https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz)
-md5sums=('59d72db444c6369c936d4f03694db6b7')
+conflicts=('luasql-mysql')
+makedepends=('lua' 'libmysqlclient' 'postgresql-libs' 'sqlite')
+source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz"
+        'lua52.patch')
+md5sums=('59d72db444c6369c936d4f03694db6b7'
+         'a1d6083215e7a83cfc08621b6998914c')
 
 build() {
-  cd "$srcdir/luasql-$pkgver"
+  cd $pkgbase-$pkgver
+  patch -p1 < "$srcdir/lua52.patch"
+  msg2 'Building sqlite support'
+  make T=sqlite3 PREFIX=/usr DRIVER_LIBS='-lsqlite3' DRIVER_INCS='-fPIC -std=c99'
+  msg2 'Building PostgreSQL support'
+  make T=postgres PREFIX=/usr DRIVER_LIBS='-lpq' DRIVER_INCS='-fPIC'
+  msg2 'Building MySQL support'
   make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \
-	DRIVER_INCS="$(mysql_config --include) -fPIC"
-  install -Dm644 src/mysql.so $pkgdir/usr/lib/lua/5.1/luasql/mysql.so
-  install -Dm644 doc/us/license.html $pkgdir/usr/share/licenses/$pkgname/license.html
+    DRIVER_INCS="$(mysql_config --include) -fPIC"
 }
+
+package_lua-sql-mysql() {
+  pkgdesc='MySQL module for Lua'
+  depends=('lua' 'libmysqlclient')
+  replaces=('luasql-mysql')
+
+  cd $pkgbase-$pkgver
+  install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.2/luasql/mysql.so"
+  install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+}
+
+package_lua-sql-postgres() {
+  pkgdesc='PostgreSQL module for Lua'
+  depends=('lua' 'postgresql-libs')
+
+  cd $pkgbase-$pkgver
+  install -Dm644 src/postgres.so "$pkgdir/usr/lib/lua/5.2/luasql/postgres.so"
+  install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+}
+
+package_lua-sql-sqlite() {
+  pkgdesc='SQLite module for Lua'
+  depends=('lua' 'sqlite')
+
+  cd $pkgbase-$pkgver
+  install -Dm644 src/sqlite3.so "$pkgdir/usr/lib/lua/5.2/luasql/sqlite3.so"
+  install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/luasql/lua52.patch b/community/luasql/lua52.patch
new file mode 100644
index 000000000..6f4eb59e0
--- /dev/null
+++ b/community/luasql/lua52.patch
@@ -0,0 +1,283 @@
+diff -wbBur luasql-2.2.0/src/ls_firebird.c luasql-2.2.0.my/src/ls_firebird.c
+--- luasql-2.2.0/src/ls_firebird.c	2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_firebird.c	2012-11-14 19:06:50.508901839 +0400
+@@ -1008,13 +1008,13 @@
+ ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+-	struct luaL_reg environment_methods[] = {
++	struct luaL_Reg environment_methods[] = {
+ 		{"__gc", env_gc},
+ 		{"close", env_close},
+ 		{"connect", env_connect},
+ 		{NULL, NULL},
+ 	};
+-	struct luaL_reg connection_methods[] = {
++	struct luaL_Reg connection_methods[] = {
+ 		{"__gc", conn_gc},
+ 		{"close", conn_close},
+ 		{"execute", conn_execute},
+@@ -1024,7 +1024,7 @@
+ 		{"escape", conn_escape},
+ 		{NULL, NULL},
+ 	};
+-	struct luaL_reg cursor_methods[] = {
++	struct luaL_Reg cursor_methods[] = {
+ 		{"__gc", cur_gc},
+ 		{"close", cur_close},
+ 		{"fetch", cur_fetch},
+@@ -1043,7 +1043,7 @@
+ ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_firebird (lua_State *L) {
+-	struct luaL_reg driver[] = {
++	struct luaL_Reg driver[] = {
+ 		{"firebird", create_environment},
+ 		{NULL, NULL},
+ 	};
+diff -wbBur luasql-2.2.0/src/ls_mysql.c luasql-2.2.0.my/src/ls_mysql.c
+--- luasql-2.2.0/src/ls_mysql.c	2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_mysql.c	2012-11-14 19:06:56.782236770 +0400
+@@ -511,13 +511,13 @@
+ ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+-    struct luaL_reg environment_methods[] = {
++    struct luaL_Reg environment_methods[] = {
+         {"__gc", env_close},
+         {"close", env_close},
+         {"connect", env_connect},
+ 		{NULL, NULL},
+ 	};
+-    struct luaL_reg connection_methods[] = {
++    struct luaL_Reg connection_methods[] = {
+         {"__gc", conn_close},
+         {"close", conn_close},
+         {"escape", escape_string},
+@@ -528,7 +528,7 @@
+ 		{"getlastautoid", conn_getlastautoid},
+ 		{NULL, NULL},
+     };
+-    struct luaL_reg cursor_methods[] = {
++    struct luaL_Reg cursor_methods[] = {
+         {"__gc", cur_close},
+         {"close", cur_close},
+         {"getcolnames", cur_getcolnames},
+@@ -562,7 +562,7 @@
+ ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_mysql (lua_State *L) { 
+-	struct luaL_reg driver[] = {
++	struct luaL_Reg driver[] = {
+ 		{"mysql", create_environment},
+ 		{NULL, NULL},
+ 	};
+diff -wbBur luasql-2.2.0/src/ls_oci8.c luasql-2.2.0.my/src/ls_oci8.c
+--- luasql-2.2.0/src/ls_oci8.c	2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_oci8.c	2012-11-14 19:06:39.182232288 +0400
+@@ -814,13 +814,13 @@
+ ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+-	struct luaL_reg environment_methods[] = {
++	struct luaL_Reg environment_methods[] = {
+ 		{"__gc", env_close},
+ 		{"close", env_close},
+ 		{"connect", env_connect},
+ 		{NULL, NULL},
+ 	};
+-	struct luaL_reg connection_methods[] = {
++	struct luaL_Reg connection_methods[] = {
+ 		{"__gc", conn_close},
+ 		{"close", conn_close},
+ 		{"execute", conn_execute},
+@@ -829,7 +829,7 @@
+ 		{"setautocommit", conn_setautocommit},
+ 		{NULL, NULL},
+ 	};
+-	struct luaL_reg cursor_methods[] = {
++	struct luaL_Reg cursor_methods[] = {
+ 		{"__gc", cur_close},
+ 		{"close", cur_close},
+ 		{"getcolnames", cur_getcolnames},
+@@ -850,7 +850,7 @@
+ ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_oci8 (lua_State *L) {
+-	struct luaL_reg driver[] = {
++	struct luaL_Reg driver[] = {
+ 		{"oci8", create_environment},
+ 		{NULL, NULL},
+ 	};
+diff -wbBur luasql-2.2.0/src/ls_odbc.c luasql-2.2.0.my/src/ls_odbc.c
+--- luasql-2.2.0/src/ls_odbc.c	2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_odbc.c	2012-11-14 19:06:53.652235973 +0400
+@@ -638,13 +638,13 @@
+ ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+-	struct luaL_reg environment_methods[] = {
++	struct luaL_Reg environment_methods[] = {
+ 		{"__gc", env_close},
+ 		{"close", env_close},
+ 		{"connect", env_connect},
+ 		{NULL, NULL},
+ 	};
+-	struct luaL_reg connection_methods[] = {
++	struct luaL_Reg connection_methods[] = {
+ 		{"__gc", conn_close},
+ 		{"close", conn_close},
+ 		{"execute", conn_execute},
+@@ -653,7 +653,7 @@
+ 		{"setautocommit", conn_setautocommit},
+ 		{NULL, NULL},
+ 	};
+-	struct luaL_reg cursor_methods[] = {
++	struct luaL_Reg cursor_methods[] = {
+ 		{"__gc", cur_close},
+ 		{"close", cur_close},
+ 		{"fetch", cur_fetch},
+@@ -701,7 +701,7 @@
+ ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_odbc (lua_State *L) {
+-	struct luaL_reg driver[] = {
++	struct luaL_Reg driver[] = {
+ 		{"odbc", create_environment},
+ 		{NULL, NULL},
+ 	};
+diff -wbBur luasql-2.2.0/src/ls_postgres.c luasql-2.2.0.my/src/ls_postgres.c
+--- luasql-2.2.0/src/ls_postgres.c	2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_postgres.c	2012-11-14 19:06:47.275567683 +0400
+@@ -551,13 +551,13 @@
+ ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+-	struct luaL_reg environment_methods[] = {
++	struct luaL_Reg environment_methods[] = {
+ 		{"__gc",    env_gc},
+ 		{"close",   env_close},
+ 		{"connect", env_connect},
+ 		{NULL, NULL},
+ 	};
+-	struct luaL_reg connection_methods[] = {
++	struct luaL_Reg connection_methods[] = {
+ 		{"__gc",          conn_gc},
+ 		{"close",         conn_close},
+ 		{"escape",        conn_escape},
+@@ -567,7 +567,7 @@
+ 		{"setautocommit", conn_setautocommit},
+ 		{NULL, NULL},
+ 	};
+-	struct luaL_reg cursor_methods[] = {
++	struct luaL_Reg cursor_methods[] = {
+ 		{"__gc",        cur_gc},
+ 		{"close",       cur_close},
+ 		{"getcolnames", cur_getcolnames},
+@@ -600,7 +600,7 @@
+ ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_postgres (lua_State *L) {
+-	struct luaL_reg driver[] = {
++	struct luaL_Reg driver[] = {
+ 		{"postgres", create_environment},
+ 		{NULL, NULL},
+ 	};
+diff -wbBur luasql-2.2.0/src/ls_sqlite3.c luasql-2.2.0.my/src/ls_sqlite3.c
+--- luasql-2.2.0/src/ls_sqlite3.c	2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_sqlite3.c	2012-11-14 19:06:26.115562295 +0400
+@@ -560,13 +560,13 @@
+ */
+ static void create_metatables (lua_State *L)
+ {
+-  struct luaL_reg environment_methods[] = {
++  struct luaL_Reg environment_methods[] = {
+     {"__gc", env_close},
+     {"close", env_close},
+     {"connect", env_connect},
+     {NULL, NULL},
+   };
+-  struct luaL_reg connection_methods[] = {
++  struct luaL_Reg connection_methods[] = {
+     {"__gc", conn_close},
+     {"close", conn_close},
+     {"escape", conn_escape},
+@@ -577,7 +577,7 @@
+     {"getlastautoid", conn_getlastautoid},
+     {NULL, NULL},
+   };
+-  struct luaL_reg cursor_methods[] = {
++  struct luaL_Reg cursor_methods[] = {
+     {"__gc", cur_close},
+     {"close", cur_close},
+     {"getcolnames", cur_getcolnames},
+@@ -611,7 +611,7 @@
+ */
+ LUASQL_API int luaopen_luasql_sqlite3(lua_State *L)
+ {
+-  struct luaL_reg driver[] = {
++  struct luaL_Reg driver[] = {
+     {"sqlite3", create_environment},
+     {NULL, NULL},
+   };
+diff -wbBur luasql-2.2.0/src/ls_sqlite.c luasql-2.2.0.my/src/ls_sqlite.c
+--- luasql-2.2.0/src/ls_sqlite.c	2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_sqlite.c	2012-11-14 19:06:43.845566808 +0400
+@@ -518,13 +518,13 @@
+ */
+ static void create_metatables (lua_State *L)
+ {
+-    struct luaL_reg environment_methods[] = {
++    struct luaL_Reg environment_methods[] = {
+         {"__gc", env_close},
+         {"close", env_close},
+         {"connect", env_connect},
+ 		{NULL, NULL},
+ 	};
+-    struct luaL_reg connection_methods[] = {
++    struct luaL_Reg connection_methods[] = {
+         {"__gc", conn_close},
+         {"close", conn_close},
+ 		{"escape", conn_escape},
+@@ -534,7 +534,7 @@
+         {"setautocommit", conn_setautocommit},
+ 		{NULL, NULL},
+     };
+-    struct luaL_reg cursor_methods[] = {
++    struct luaL_Reg cursor_methods[] = {
+         {"__gc", cur_close},
+         {"close", cur_close},
+         {"getcolnames", cur_getcolnames},
+@@ -568,7 +568,7 @@
+ */
+ LUASQL_API int luaopen_luasql_sqlite(lua_State *L)
+ {
+-	struct luaL_reg driver[] = {
++	struct luaL_Reg driver[] = {
+ 		{"sqlite", create_environment},
+ 		{NULL, NULL},
+ 	};
+diff -wbBur luasql-2.2.0/src/luasql.c luasql-2.2.0.my/src/luasql.c
+--- luasql-2.2.0/src/luasql.c	2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/luasql.c	2012-11-14 19:06:32.412230565 +0400
+@@ -60,7 +60,7 @@
+ /*
+ ** Create a metatable and leave it on top of the stack.
+ */
+-LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_reg *methods) {
++LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_Reg *methods) {
+ 	if (!luaL_newmetatable (L, name))
+ 		return 0;
+ 
+diff -wbBur luasql-2.2.0/src/luasql.h luasql-2.2.0.my/src/luasql.h
+--- luasql-2.2.0/src/luasql.h	2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/luasql.h	2012-11-14 19:06:29.002229695 +0400
+@@ -22,7 +22,7 @@
+ 
+ LUASQL_API int luasql_faildirect (lua_State *L, const char *err);
+ LUASQL_API int luasql_failmsg (lua_State *L, const char *err, const char *m);
+-LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_reg *methods);
++LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_Reg *methods);
+ LUASQL_API void luasql_setmeta (lua_State *L, const char *name);
+ LUASQL_API void luasql_set_info (lua_State *L);
+ 
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index cfbdcca9c..930e27f90 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 78936 2012-10-27 23:45:03Z ebelanger $
+# $Id: PKGBUILD 81124 2012-12-12 00:49:36Z eric $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=megaglest
-pkgver=3.6.0.3
-pkgrel=5
+pkgver=3.7.1
+pkgrel=1
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/megaglest/"
 license=('GPL3')
-depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew'
+depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl' 'glew'
 'libircclient' 'miniupnpc' 'wxgtk' 'glu')
 makedepends=('ftjam' 'cmake' 'mesa')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz"
         lol.patch)
-md5sums=('5a4a2429435031d9f9cc5d9535a9de9d'
+md5sums=('e7a960ec73784aa0f7b951d2ad963456'
          '68fd326b73ed1c75981004fbdef6b73a')
 
 build() {
   cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
 
-  patch -Np1 < "$srcdir/lol.patch"
+  #patch -Np1 < "$srcdir/lol.patch"
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index e56fa63ec..7baeaa3d5 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79563 2012-11-07 15:09:45Z spupykin $
+# $Id: PKGBUILD 81125 2012-12-12 00:49:36Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20121107
+pkgver=20121114
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index a730c20b3..cd2b88464 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79619 2012-11-08 23:54:27Z lfleischer $
+# $Id: PKGBUILD 81126 2012-12-12 00:49:38Z eric $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=ntop
 pkgver=5.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A network traffic probe that shows the network usage.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ntop.org/'
diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD
index ca1450341..1d52dd8af 100644
--- a/community/pdns/PKGBUILD
+++ b/community/pdns/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 79811 2012-11-12 22:20:45Z arodseth $
+# $Id: PKGBUILD 81127 2012-12-12 00:49:39Z eric $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 
 pkgname=pdns
 pkgver=3.1
-pkgrel=3
+pkgrel=5
 pkgdesc="Modern, advanced and high performance authoritative-only nameserver"
 arch=('x86_64' 'i686')
 url='http://www.powerdns.com/'
@@ -31,11 +31,6 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   touch AUTHORS NEWS
-  libtoolize --force --copy
-  aclocal
-  autoconf
-  automake --add-missing
-  sed -i 's/BOOST/#BOOST/g' configure
   ./configure --prefix=/usr \
     --sysconfdir=/etc/powerdns \
     --libexecdir=/usr/lib \
@@ -45,8 +40,7 @@ build() {
     --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \
     --disable-recursor \
     --disable-static
-  make \
-    CXXFLAGS=" -lboost_serialization -lboost_program_options $CXXFLAGS"
+  make  
 }
 
 package() {
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 9eaa21f02..f652bae14 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79088 2012-10-30 10:54:31Z mtorromeo $
+# $Id: PKGBUILD 81055 2012-12-11 09:51:48Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
-pkgver=5.5.28_rel29.1
-pkgrel=2
+pkgver=5.5.28_rel29.2
+pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation"
 arch=('i686' 'x86_64' 'mips64el')
 
@@ -102,7 +102,7 @@ package() {
 	install -dm700 "${pkgdir}"/var/lib/mysql
 }
 
-sha256sums=('2cacf3bd0f059c7ae3cb391bf2e4a2bdcbf490ed3465bfd4db9a02f0944f2d51'
+sha256sums=('4f2ca2b4bf8ebdde0d5c643cc382fd7242492c084715b5c7d83619a9ff7a40a4'
             'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4'
             'dd5dc155de468d4ab26971109861ae19b53574f28785bac5ff7b717fb65c0760'
             '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32'
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index cba279558..52296256c 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78387 2012-10-17 16:24:59Z spupykin $
+# $Id: PKGBUILD 81128 2012-12-12 00:49:40Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Dwayne Bent <dbb.0@liqd.org>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
 
 pkgname=prosody
 pkgver=0.8.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://prosody.im/"
diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD
index 99d21d039..5695a8399 100644
--- a/community/rawstudio/PKGBUILD
+++ b/community/rawstudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74841 2012-08-06 23:09:31Z andrea $
+# $Id: PKGBUILD 81067 2012-12-11 14:37:23Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=rawstudio
 pkgver=2.0
-pkgrel=7
+pkgrel=8
 pkgdesc="An open source raw-image converter written in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 0b8e19650..e83633dc6 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80877 2012-12-05 06:02:30Z bgyorgy $
+# $Id: PKGBUILD 81068 2012-12-11 14:37:24Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
 pkgver=0.13.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://yorba.org/shotwell/"
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index f2dfc58ed..b559c9b6c 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80766 2012-12-03 10:12:25Z spupykin $
+# $Id: PKGBUILD 81053 2012-12-11 09:28:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=squid
-pkgver=3.2.4
+pkgver=3.2.5
 pkgrel=1
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686')
@@ -24,7 +24,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2"
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('5fd7d120c429aaeacdf008938a36cb94'
+md5sums=('ddb329f92056aa58a56db6a2eeea0c02'
          '02f7b5bd793f778e40834fd6457d2199'
          '2383772ef94efddc7b920628bc7ac5b0'
          '270977cdd9b47ef44c0c427ab9034777'
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 19e9a6567..9e47b2a40 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -2,12 +2,12 @@
 
 pkgname=stone-soup
 pkgver=0.11.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://crawl.develz.org/'
-depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'glu' 'freetype2' 'ttf-dejavu')
-makedepends=('bison' 'flex' 'gendesk')
+depends=('lua51' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'glu' 'freetype2' 'ttf-dejavu')
+makedepends=('bison' 'flex' 'gendesk' 'mesa')
 conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git')
 license=('custom')
 install=stone-soup.install
diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD
index 481bfbd75..859f47777 100644
--- a/community/task/PKGBUILD
+++ b/community/task/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=task
 pkgver=2.1.2
-pkgrel=1
+pkgrel=3
 pkgdesc="A command-line todo list manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://taskwarrior.org/projects/show/taskwarrior/"
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index 6365f785b..74342dab5 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75679 2012-08-29 05:52:39Z spupykin $
+# $Id: PKGBUILD 81096 2012-12-11 19:14:52Z 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=33.3.0
+pkgver=33.4.0
 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,11 +16,12 @@ depends=('qt' 'aspell' 'hunspell')
 install=tea.install
 source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2
         tea.desktop)
-md5sums=('5830f177056d65f74ac52c97f5637815'
+md5sums=('5e553e3061b978b368e1dc70ee369c8d'
          '377ace3363124f4c086de0babb820761')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|i + j|(int)(i + j)|' textproc.cpp
   qmake PREFIX=/usr/bin
   make
 }
diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD
index cf9a95311..6e6436642 100644
--- a/community/wesnoth/PKGBUILD
+++ b/community/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75697 2012-08-29 08:31:11Z svenstaro $
+# $Id: PKGBUILD 81132 2012-12-12 00:49:44Z eric $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,13 +6,13 @@
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=wesnoth
-pkgver=1.10.4
+pkgver=1.10.5
 pkgrel=1
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.wesnoth.org/"
-depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data" 'dbus-core' 'python2')
+depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data>=$pkgver" 'dbus-core' 'python2')
 makedepends=('boost' 'cmake')
 install=wesnoth.install
 options=(!emptydirs)
@@ -20,7 +20,7 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
         wesnothd.tmpfiles.conf
         wesnothd.rc.d
         wesnothd.service)
-md5sums=('1a673f12e4521fc66e60ec584fa7c98f'
+md5sums=('03d9683cd83d17c6536bdf5c4940bbc8'
          '2d2fea6b3d86dfd589f5ad35a3be1f97'
          '85659b47d22dfdf4e4d046556973fc3e'
          'd1b6bf1d3dc05086ee6a370adff0ae4a')
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 46c336e42..29a7bc55d 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78944 2012-10-27 23:46:00Z ebelanger $
+# $Id: PKGBUILD 81133 2012-12-12 00:49:45Z eric $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,12 +6,12 @@
 pkgname=widelands
 pkgver=17
 _realver=build17
-pkgrel=5
+pkgrel=6
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://widelands.org/"
 license=('GPL')
-depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2')
+depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua51' 'glew' 'python2')
 makedepends=('cmake' 'boost' 'mesa')
 source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2"
         $pkgname.desktop
diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD
index 638a59ccf..081ac181c 100644
--- a/community/xmoto/PKGBUILD
+++ b/community/xmoto/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 77670 2012-10-13 11:46:18Z allan $
+# $Id: PKGBUILD 81134 2012-12-12 00:49:46Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca> 
 # Contributor: Denis (dtonator@gmail.com)
 
 pkgname=xmoto
 pkgver=0.5.10
-pkgrel=2
+pkgrel=3
 pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmoto.tuxfamily.org"
diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD
index fb8887541..ad85cb082 100644
--- a/extra/celestia/PKGBUILD
+++ b/extra/celestia/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 168599 2012-10-13 11:46:55Z andyrtr $
+# $Id: PKGBUILD 173170 2012-12-12 00:31:40Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=celestia
 pkgver=1.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Real-time space simulation"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.shatters.net/celestia/"
-depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg')
+depends=('gtk2' 'libtheora' 'lua51' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg' 'mesa')
 options=('!makeflags')
 source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz"
         'celestia-1.6.1-gcc46.patch' 
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index ee9bcd613..71916a267 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172158 2012-11-30 10:06:04Z ronald $
+# $Id: PKGBUILD 173132 2012-12-11 14:42:23Z jgc $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=2.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD
index 029d262c6..4f5655242 100644
--- a/extra/edje/PKGBUILD
+++ b/extra/edje/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 172968 2012-12-07 19:27:48Z ronald $
+# $Id: PKGBUILD 173171 2012-12-12 00:31:43Z eric $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=edje
 pkgver=1.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical design and layout library based on Evas"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
-depends=('eina' 'ecore' 'evas' 'eio' 'lua' 'shared-mime-info' 'embryo')
+depends=('eina' 'ecore' 'evas' 'eio' 'lua51' 'shared-mime-info' 'embryo')
 optdepends=('python2: inkscape2edc')
 install=edje.install
 options=('!libtool' '!emptydirs')
@@ -29,8 +29,6 @@ build() {
   ./configure \
     --prefix=/usr \
     --disable-static \
-    --enable-ecore-imf \
-    --enable-eio \
     --disable-sndfile \
     --disable-remix \
     --disable-vorbisenc \
diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
index 4711396e0..f06ee4092 100644
--- a/extra/enlightenment17/PKGBUILD
+++ b/extra/enlightenment17/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172937 2012-12-07 14:57:50Z ronald $
+# $Id: PKGBUILD 173152 2012-12-11 17:28:51Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=enlightenment17
 _pkgname=enlightenment
-pkgver=0.17.0beta1
-_pkgver=0.17.0-beta
+pkgver=0.17.0gamma1
+_pkgver=0.17.0-gamma
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,7 +22,7 @@ options=('!libtool' '!emptydirs')
 install=enlightenment17.install
 source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz
   'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
-sha1sums=('2ff60e4dfe050b27d597836dfb524dd205d595d9'
+sha1sums=('365672de47b6db371af9eff45f7758a7c52c9280'
           'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
           '3f53931ae86de8fe99e386aeb097521aac0decd8'
           '86f1c5e36dc274c3101362532378be034e89c593')
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index 401338a03..42433bb7b 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 166406 2012-09-07 16:52:15Z pierre $
+# $Id: PKGBUILD 173148 2012-12-11 16:53:09Z pierre $
 
 pkgname=fetchmail
-pkgver=6.3.22
+pkgver=6.3.23
 pkgrel=1
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,11 +14,11 @@ optdepends=('tk: for using fetchmailconf'
 backup=('etc/conf.d/fetchmail')
 options=('!makeflags')
 install='fetchmail.install'
-source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz"
-        "http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz.asc"
+source=("http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz"
+        "http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz.asc"
         'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service')
-sha1sums=('3bb755010dbe568d53840e22d8e87d8d5db25b19'
-          '27184b75ef09c5202bede9863ae8abc3d0cdb1d2'
+sha1sums=('ac3a4a16dff60fe2651fdcf3d146c91399af2a27'
+          'ec1268dad146d55b45dd3fb043613a7af77b890d'
           'fc25180f1add26df0a3bdaac03fd9d2e3473ff88'
           '30401729386d6f774c6c36ab8530842166de54a8'
           '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6'
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 70c45a19c..188069d38 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 172027 2012-11-26 16:17:46Z dan $
+# $Id: PKGBUILD 173146 2012-12-11 15:31:20Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.0.1
+pkgver=1.8.0.2
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -109,8 +109,8 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('3d598a31bd8ff04f6a72c65a4cd015a8'
-         '0354726bd084cace4318142b53ce5aa2'
+md5sums=('1aca109d4a719fe5bc43d25927fbc7d9'
+         'ab83283a5b3c73ab711a9f02896ca12e'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78'
          '042524f942785772d7bd52a1f02fe5ae'
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 2eaea5260..ec2efafb7 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168770 2012-10-15 19:50:22Z ronald $
+# $Id: PKGBUILD 173172 2012-12-12 00:31:46Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuplot 
 pkgver=4.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://www.gnuplot.info" 
diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index a4f102a5f..46c3a9191 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 156272 2012-04-16 14:41:22Z jgc $
+# $Id: PKGBUILD 173131 2012-12-11 14:42:20Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 pkgname=gphoto2
-pkgver=2.4.14
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="A digital camera download and access program."
 arch=(i686 x86_64 'mips64el')
 url="http://www.gphoto.org"
 license=('GPL' 'LGPL')
-depends=('libgphoto2>=2.4.14' 'popt' 'readline')
+depends=('libgphoto2' 'popt' 'readline')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('60fd6e44d89592f6172227be67227636')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,3 +22,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('64c6d291c5bd50388af0c51da71efb59')
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index de4ceda8a..b6dc5d8f7 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160483 2012-06-02 10:26:16Z bluewind $
+# $Id: PKGBUILD 173173 2012-12-12 00:31:48Z eric $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.28.0
-pkgrel=10
+pkgrel=11
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
@@ -15,7 +15,7 @@ case $CARCH in
     mips64el)
 # r and ocaml aren't ported yet
 # no one's interested on mono
-makedepends=('swig' 'guile' 'lua' 'perl' 'php' 'python2' 'ruby' 'tk' 'qt')
+makedepends=('swig' 'guile' 'lua51' 'perl' 'php' 'python2' 'ruby' 'tk' 'qt')
 optdepends=('guile: guile bindings'
             'lua: lua bindings'
             'perl: perl bindings'
@@ -26,10 +26,10 @@ optdepends=('guile: guile bindings'
             'qt: gvedit')
     ;;
     *)
-makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt')
+makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt')
 optdepends=('mono: sharp bindings'
             'guile: guile bindings'
-            'lua: lua bindings'
+            'lua51: lua bindings'
             'ocaml: ocaml bindings'
             'perl: perl bindings'
             'php: php bindings'
@@ -57,8 +57,10 @@ build() {
 
 	sed '/LIBPOSTFIX="64"/d' -i configure
 	export PYTHON=python2
+	export LUA=lua5.1
 
 	./configure --prefix=/usr
+	make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky
 	make
 }
 
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index c8005bb0c..26cbdba3f 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 172923 2012-12-06 20:31:50Z heftig $
+# $Id: PKGBUILD 173150 2012-12-11 17:04:18Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
-pkgver=0.2.4
+pkgver=0.2.5
 pkgrel=1
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
@@ -23,7 +23,7 @@ optdepends=('gupnp-av: uPnP plugin'
             'json-glib: TMDb plugin')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('7e96aee95abc22897db4c62738b65f31fab66a26a22a628f2dfe682384c09350')
+sha256sums=('32ae6c8ebf624e5662f209435d8aae6a5db23d7c52d446c9b9479c0b441a3ab3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 2c5065393..22276c35f 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170856 2012-11-12 20:04:56Z heftig $
+# $Id: PKGBUILD 173130 2012-12-11 14:42:18Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
 pkgver=1.14.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3')
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 21b1afad3..12dd7b93c 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172786 2012-12-06 00:11:28Z bisson $
+# $Id: PKGBUILD 173184 2012-12-12 00:37:13Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -6,14 +6,14 @@
 
 pkgname=hugin
 pkgver=2012.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Panorama photo stitcher'
 url='http://hugin.sourceforge.net/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
          'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils')
-makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python' 'swig')
+makedepends=('cmake' 'boost' 'tclap' 'mesa')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('53f97d030716e66dc5a49c7e786686a9d5262b8d')
 
@@ -26,7 +26,8 @@ build() {
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
-		-DENABLE_LAPACK=yes
+		-DENABLE_LAPACK=yes \
+		-DBUILD_HSI=no
 	make
 }
 
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 18b609e4e..6c16f0c10 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170363 2012-11-06 14:16:10Z stephane $
+# $Id: PKGBUILD 173120 2012-12-11 12:57:48Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.5.1
+pkgver=1.6
 pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('BSD')
 depends=('sh' 'pciutils' 'cairo' 'libxml2')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
-source=(http://www.open-mpi.org/software/hwloc/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('5ce00444d7ffc261ff7877ce685a920fb38a771a')
+source=(http://www.open-mpi.org/software/hwloc/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('a9c0bbcd49350b6cbe45efdc75e5962863239ebb')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index 338d50320..839db9b80 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172983 2012-12-08 02:06:48Z eric $
+# $Id: PKGBUILD 173164 2012-12-11 22:33:51Z eric $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=ibus
-pkgver=1.5.0
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool')
 options=('!libtool')
 install=ibus.install
 source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('ca810499ca21ab85e4faa8a103cfd461361b723a')
+sha1sums=('31d732c17d0a103565fa29995c5610e8be8b2dca')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index 7c9d46dbe..bdbcdb702 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172855 2012-12-06 08:21:55Z andrea $
+# $Id: PKGBUILD 173129 2012-12-11 14:42:15Z jgc $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
 pkgver=4.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD
index 9319b51aa..0247eecad 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156270 2012-04-16 14:30:06Z jgc $
+# $Id: PKGBUILD 173128 2012-12-11 14:42:12Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=libgphoto2
-pkgver=2.4.14
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb')
 install=libgphoto2.install
 options=('libtool')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('492bec63dd610906c3a28030be77e650')
+md5sums=('ea9b3b07a3738c0a77958d6fe13ae524')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD
index 6acd76380..44f4e9230 100644
--- a/extra/libquvi/PKGBUILD
+++ b/extra/libquvi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167326 2012-10-01 10:01:23Z heftig $
+# $Id: PKGBUILD 173175 2012-12-12 00:31:54Z eric $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=libquvi
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Library for parsing video download links.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://quvi.sourceforge.net/'
diff --git a/extra/libutempter/PKGBUILD b/extra/libutempter/PKGBUILD
new file mode 100644
index 000000000..8d5145a0a
--- /dev/null
+++ b/extra/libutempter/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libutempter
+pkgver=1.1.6
+pkgrel=1
+pkgdesc="Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files"
+arch=('i686' 'x86_64')
+url="ftp://ftp.altlinux.org/pub/people/ldv/utempter"
+license=('LGPL')
+depends=('glibc')
+source=(ftp://ftp.altlinux.org/pub/people/ldv/utempter/$pkgname-$pkgver.tar.bz2)
+md5sums=('b43827806923903aba2bc7cd3a2d45b7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  RPM_OPT_FLAGS="$CFLAGS" make
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  chown root:utmp "$pkgdir/usr/lib/utempter/utempter"
+  chmod 2755 "$pkgdir/usr/lib/utempter/utempter"
+}
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index ff6772900..42e92bded 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 171703 2012-11-21 16:00:29Z pierre $
+# $Id: PKGBUILD 173176 2012-12-12 00:31:57Z eric $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.32
-pkgrel=1
+pkgrel=2
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lighttpd.net/"
 depends=('pcre' 'bzip2' 'libldap' 'util-linux')
-makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
+makedepends=('fcgi' 'libmysqlclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
 optdepends=('libxml2: mod_webdav'
-            'lua: mod_cml/mod_magnet'
+            'lua51: mod_cml/mod_magnet'
             'libmysqlclient: mod_mysql_vhost'
             'sqlite: mod_webdav')
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
diff --git a/extra/lua/LICENSE b/extra/lua/LICENSE
new file mode 100644
index 000000000..3ef29409a
--- /dev/null
+++ b/extra/lua/LICENSE
@@ -0,0 +1,30 @@
+License
+
+Lua is free software distributed under the terms of the MIT license
+reproduced below; it may be used for any purpose, including commercial
+purposes, at absolutely no cost without having to ask us. The only
+requirement is that if you do use Lua, then you should give us credit
+by including the appropriate copyright notice somewhere in your
+product or its documentation.
+
+    Copyright © 1994–2012 Lua.org, PUC-Rio.
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions: 
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software. 
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.  
diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD
index 1c3d9ee33..cf6f3c389 100644
--- a/extra/lua/PKGBUILD
+++ b/extra/lua/PKGBUILD
@@ -1,42 +1,45 @@
-# $Id: PKGBUILD 156332 2012-04-17 10:35:09Z bluewind $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# $Id: PKGBUILD 173169 2012-12-12 00:31:37Z eric $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
-pkgname=lua 
-pkgver=5.1.5
-pkgrel=2
-pkgdesc="A powerful light-weight programming language designed for extending applications" 
+pkgname=lua
+pkgver=5.2.1
+pkgrel=3
+pkgdesc='A powerful light-weight programming language designed for extending applications'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.lua.org/"
+url='http://www.lua.org/'
 depends=('readline')
 license=('MIT')
 options=('!makeflags' '!emptydirs')
-source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz
-        lua-arch.patch lua-5.1-cflags.diff)
-md5sums=('2e115fe26e435e33b0d5c022e4490567'
-         'fa25feb70ef9fec975b1c20da5098b3c'
-         '249582bf1fd861ccf492d2c35a9fe732')
+source=("http://www.lua.org/ftp/$pkgname-$pkgver.tar.gz"
+        'liblua.so.patch' 'lua.pc' 'LICENSE')
+md5sums=('ae08f641b45d737d12d30291a5e5f6e3'
+         'bdc663c7b82ffc0b5df67611621fb625'
+         'e7ba6c2b695b0b84a5ea0cbff5fc9067'
+         '0e2bd67b909b9ff673da844ca3480df2')
 
-build() { 
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/lua-arch.patch"
-  patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
-  export CFLAGS="$CFLAGS -fPIC"
-
-  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \
-    INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
-    linux
+build() {
+  cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir/liblua.so.patch"
+  [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC"
+  make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
+  sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.$pkgver" \
-    INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
+  cd $pkgname-$pkgver
+  make \
+    TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.$pkgver" \
+    INSTALL_DATA="cp -d" \
+    INSTALL_TOP="$pkgdir/usr" \
+    INSTALL_MAN="$pkgdir/usr/share/man/man1" \
     install
-  install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
-
+  install -Dm644 lua.pc "$pkgdir/usr/lib/pkgconfig/lua.pc"
   # Install the documentation
-  install -d "${pkgdir}/usr/share/doc/lua"
-  install -m644 doc/*.{gif,png,css,html} "${pkgdir}/usr/share/doc/lua"
+  install -d "$pkgdir/usr/share/doc/lua"
+  install -m644 doc/*.{gif,png,css,html} "$pkgdir/usr/share/doc/lua"
+  install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim:set ts=4 sw=4 et:
diff --git a/extra/lua/liblua.so.patch b/extra/lua/liblua.so.patch
new file mode 100644
index 000000000..92c1f3ac4
--- /dev/null
+++ b/extra/lua/liblua.so.patch
@@ -0,0 +1,57 @@
+diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile
+--- lua-5.2.1/Makefile	2012-05-17 16:05:54.000000000 +0200
++++ lua-5.2.1.new/Makefile	2012-09-12 22:39:07.162748096 +0200
+@@ -52,7 +52,7 @@
+ all:	$(PLAT)
+ 
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ test:	dummy
+ 	src/lua -v
+diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h
+--- lua-5.2.1/src/luaconf.h	2012-05-11 16:14:42.000000000 +0200
++++ lua-5.2.1.new/src/luaconf.h	2012-09-12 22:40:27.986622772 +0200
+@@ -100,7 +100,7 @@
+ #else			/* }{ */
+ 
+ #define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
+-#define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR
+ #define LUA_PATH_DEFAULT  \
+diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile
+--- lua-5.2.1/src/Makefile	2012-03-09 17:32:16.000000000 +0100
++++ lua-5.2.1.new/src/Makefile	2012-09-12 22:38:08.591386896 +0200
+@@ -29,6 +29,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO= liblua.so
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+ 	ltm.o lundump.o lvm.o lzio.o
+@@ -43,7 +44,7 @@
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+ 
+ # Targets start here.
+@@ -59,6 +60,12 @@
+ 	$(AR) $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
diff --git a/extra/lua/lua.pc b/extra/lua/lua.pc
new file mode 100644
index 000000000..bf7977bcd
--- /dev/null
+++ b/extra/lua/lua.pc
@@ -0,0 +1,20 @@
+V=%VER%
+R=%REL%
+
+prefix=/usr
+INSTALL_BIN=${prefix}/bin
+INSTALL_INC=${prefix}/include
+INSTALL_LIB=${prefix}/lib
+INSTALL_MAN=${prefix}/man/man1
+INSTALL_LMOD=${prefix}/share/lua/${V}
+INSTALL_CMOD=${prefix}/lib/lua/${V}
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires: 
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
diff --git a/extra/lua51/PKGBUILD b/extra/lua51/PKGBUILD
new file mode 100644
index 000000000..1ba21ab1b
--- /dev/null
+++ b/extra/lua51/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+
+pkgname=lua51
+pkgver=5.1.5
+pkgrel=3
+pkgdesc='A powerful light-weight programming language designed for extending applications'
+arch=('i686' 'x86_64')
+url='http://www.lua.org/'
+depends=('readline')
+license=('MIT')
+options=('!makeflags' '!emptydirs')
+source=("http://www.lua.org/ftp/lua-$pkgver.tar.gz"
+        'lua-arch.patch'
+        'lua-5.1-cflags.diff')
+md5sums=('2e115fe26e435e33b0d5c022e4490567'
+         'fa25feb70ef9fec975b1c20da5098b3c'
+         '249582bf1fd861ccf492d2c35a9fe732')
+
+build() {
+    cd lua-$pkgver
+    patch -p1 -i "$srcdir/lua-arch.patch"
+    patch -p1 -i "$srcdir/lua-5.1-cflags.diff"
+    [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC"
+    sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc
+    sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' -i src/Makefile
+    make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
+}
+
+package() {
+    cd lua-$pkgver
+    make \
+      TO_BIN="lua5.1 luac5.1" \
+      TO_LIB="liblua5.1.a liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.$pkgver" \
+      INSTALL_DATA='cp -d' \
+      INSTALL_TOP="$pkgdir/usr" \
+      INSTALL_INC="$pkgdir/usr/include/lua5.1" \
+      INSTALL_MAN="$pkgdir/usr/share/man/man1" \
+      install
+    install -D -m644 etc/lua.pc "$pkgdir/usr/lib/pkgconfig/lua5.1.pc"
+    # Install the documentation
+    install -d "$pkgdir/usr/share/doc/$pkgname"
+    install -m644 doc/*.{gif,png,css,html} "$pkgdir/usr/share/doc/$pkgname"
+    # Install copyrigth file
+    install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+    # fixups
+    ln -s liblua5.1.so "$pkgdir/usr/lib/liblua.so.5.1"
+    ln -s liblua5.1.so "$pkgdir/usr/lib/liblua.so.$pkgver"
+    cd "$pkgdir/usr/share/man/man1"
+    mv lua.1 lua5.1.1
+    mv luac.1 luac5.1.1
+}
+
+# vim:set ts=4 sw=4 et:
diff --git a/extra/lua51/lua-5.1-cflags.diff b/extra/lua51/lua-5.1-cflags.diff
new file mode 100644
index 000000000..db658aeca
--- /dev/null
+++ b/extra/lua51/lua-5.1-cflags.diff
@@ -0,0 +1,13 @@
+diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
+--- lua-5.1.orig/src/Makefile	2006-02-16 16:45:09.000000000 +0100
++++ lua-5.1/src/Makefile	2006-03-01 14:55:29.000000000 +0100
+@@ -8,7 +8,8 @@
+ PLAT= none
+ 
+ CC= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
++CFLAGS ?= -O2 -Wall
++CFLAGS += $(MYCFLAGS)
+ AR= ar rcu
+ RANLIB= ranlib
+ RM= rm -f
diff --git a/extra/lua51/lua-arch.patch b/extra/lua51/lua-arch.patch
new file mode 100644
index 000000000..d8650c3a2
--- /dev/null
+++ b/extra/lua51/lua-arch.patch
@@ -0,0 +1,66 @@
+diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc
+--- lua-5.1.4/etc/lua.pc	2008-08-08 14:46:11.000000000 +0200
++++ lua-5.1.4-new/etc/lua.pc	2012-02-23 18:25:34.000000000 +0100
+@@ -8,6 +8,6 @@
+ 
+ # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+-prefix= /usr/local
++prefix= /usr
+ INSTALL_BIN= ${prefix}/bin
+ INSTALL_INC= ${prefix}/include
+ INSTALL_LIB= ${prefix}/lib
+diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h
+--- lua-5.1.4/src/luaconf.h	2008-02-11 17:25:08.000000000 +0100
++++ lua-5.1.4-new/src/luaconf.h	2012-02-23 18:25:34.000000000 +0100
+@@ -94,7 +94,7 @@
+ 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ 
+ #else
+-#define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT  \
+diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
+--- lua-5.1.4/src/Makefile	2008-01-19 20:37:58.000000000 +0100
++++ lua-5.1.4-new/src/Makefile	2012-02-23 18:26:43.000000000 +0100
+@@ -23,6 +23,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO=	liblua.so
+ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+ 	lundump.o lvm.o lzio.o
+@@ -36,7 +37,7 @@
+ LUAC_O=	luac.o print.o
+ 
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
+ 
+ default: $(PLAT)
+@@ -51,6 +52,11 @@
+ 	$(AR) $@ $?
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+--- lua-5.1.4/Makefile	2008-08-12 02:40:48.000000000 +0200
++++ lua-5.1.4-new/Makefile	2012-02-23 19:06:32.000000000 +0100
+@@ -53,7 +53,7 @@
+ all:	$(PLAT)
+ 
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ test:	dummy
+ 	src/lua test/hello.lua
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index 5f6f3fbc2..05bcf81d0 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172141 2012-11-30 02:54:16Z bisson $
+# $Id: PKGBUILD 173177 2012-12-12 00:31:59Z eric $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=nmap
 pkgver=6.25
-pkgrel=1
+pkgrel=2
 pkgdesc='Utility for network discovery and security auditing'
 url='http://nmap.org/'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD
index 0247e1edd..fd96bc6b1 100644
--- a/extra/openal/PKGBUILD
+++ b/extra/openal/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173007 2012-12-08 13:24:36Z heftig $
+# $Id: PKGBUILD 173158 2012-12-11 21:59:43Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=openal
-pkgver=1.15
+pkgver=1.15.1
 pkgrel=1
 pkgdesc="A cross-platform 3D audio library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=(alsa-lib sdl pkgconfig cmake libpulse)
 options=('!libtool')
 source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2
 	fpu.patch)
-md5sums=('0eeb0551420b8fec300fe5db6d9a7902'
+md5sums=('ea83dec3b9655a27d28e7bc7cae9cd71'
 	 '902d3f0e6cb16584f2b21d65235c3168')
 
 build() {
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 9d8e0ed75..78a2a2159 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 160575 2012-06-02 10:28:55Z bluewind $
+# $Id: PKGBUILD 173178 2012-12-12 00:32:02Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rrdtool.org"
 license=('GPL' 'custom')
 depends=('libxml2' 'pango' 'ttf-dejavu')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
+makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua51')
 optdepends=('tcl: to use corresponding binding' \
             'python2: to use corresponding binding' \
             'ruby: to use corresponding binding' \
-            'lua: to use corresponding binding')
+            'lua51: to use corresponding binding')
 options=('!libtool' '!emptydirs' '!makeflags')
 source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
 sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b')
@@ -24,7 +24,9 @@ build() {
   # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
   sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in
 
-  PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
+  PYTHON=python2 LUA=/usr/bin/lua5.1 \
+    LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
+    ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
     --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
     --enable-ruby --enable-ruby-site-install --enable-python \
     --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index f7ab7c6b4..f91ca3d6c 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165659 2012-08-28 10:12:18Z tpowa $
+# $Id: PKGBUILD 173127 2012-12-11 14:42:10Z jgc $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,12 +6,12 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
 install=$pkgname.install
 backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 95d3391de..44f1a5452 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 169591 2012-10-24 01:48:33Z tdziedzic $
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: tobias [ tobias at archlinux org ]
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: tobias [ tobias at archlinux org ]
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=712
-__hgrev=57e8b75298d6
+_patchlevel=754
+__hgrev=52bfa939fc07
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-md5sums=('368435a6494a2559565ce4d668c4513c'
-         '1613bbbd2a794cd321db09c6cfe2d35f'
+md5sums=('187bec934962a7b5418dbe233e606eef'
+         '3a41d935a372c712088cdee997e1287f'
          '6e7adfbd5d26c1d161030ec203a7f243'
          '20fceda56badf201695c57999b0bc609'
          '10353a61aadc3f276692d0e17db1478e'
@@ -30,7 +30,6 @@ md5sums=('368435a6494a2559565ce4d668c4513c'
 
 # source PKGBUILD && mksource
 mksource() {
-
   [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1)
 
   __hgroot='http://vim.googlecode.com/hg/'
@@ -51,7 +50,11 @@ mksource() {
   rm ${pkgname}-${pkgver}/{.hgignore,.hgtags}
   tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
   rm -r ${pkgname}-${pkgver}
-  #gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
+
+  gpg --detach-sign ${pkgname}-${pkgver}.tar.xz
+
+  scp ${pkgname}-${pkgver}.tar.xz ger:/srv/ftp/other/vim/
+  scp ${pkgname}-${pkgver}.tar.xz.sig ger:/srv/ftp/other/vim/
 }
 
 build() {
@@ -71,23 +74,45 @@ build() {
 
   cd "${srcdir}"/vim-build
 
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --with-features=big --with-compiledby=Parabola \
-    --enable-gpm --enable-acl --with-x=no \
-    --disable-gui --enable-multibyte --enable-cscope \
-    --disable-netbeans --enable-perlinterp --disable-pythoninterp \
-    --disable-python3interp --disable-rubyinterp --disable-luainterp
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var/lib/vim \
+    --with-features=big \
+    --with-compiledby=Parabola \
+    --enable-gpm \
+    --enable-acl \
+    --with-x=no \
+    --disable-gui \
+    --enable-multibyte \
+    --enable-cscope \
+    --disable-netbeans \
+    --enable-perlinterp \
+    --disable-pythoninterp \
+    --disable-python3interp \
+    --disable-rubyinterp \
+    --disable-luainterp
 
   make
 
   cd "${srcdir}"/gvim-build
 
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --with-features=big --with-compiledby=Parabola \
-    --enable-gpm --enable-acl --with-x=yes \
-    --enable-gui=gtk2 --enable-multibyte --enable-cscope \
-    --enable-netbeans --enable-perlinterp --enable-pythoninterp \
-    --disable-python3interp --enable-rubyinterp --enable-luainterp
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var/lib/vim \
+    --with-features=big \
+    --with-compiledby=Parabola \
+    --enable-gpm \
+    --enable-acl \
+    --with-x=yes \
+    --enable-gui=gtk2 \
+    --enable-multibyte \
+    --enable-cscope \
+    --enable-netbeans \
+    --enable-perlinterp \
+    --enable-pythoninterp \
+    --disable-python3interp \
+    --enable-rubyinterp \
+    --enable-luainterp
 
   make
 }
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 0a3ceae07..cbbc4e3e9 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 171268 2012-11-16 23:35:53Z ibiru $
+# $Id: PKGBUILD 173179 2012-12-12 00:32:08Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.0.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
 license=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 
-         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 
+         'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 
          'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
          'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' 
          'xcb-util-keysyms')
@@ -19,7 +19,8 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
              'fluidsynth' 'libdc1394' 'libavc1394'
              'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd'
              'twolame' 'aalib' 'libmtp' 'libdvdcss'
-             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2')
+             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2'
+             'mesa')
 [ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss' 'projectm')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
@@ -85,7 +86,8 @@ build() {
               --enable-upnp \
               --enable-opus \
               --enable-sftp \
-              $extraconf
+              $extraconf \
+              LUAC=luac5.1
   make
 }
 
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index f647530b6..ce0828e68 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171536 2012-11-18 15:48:02Z giovanni $
+# $Id: PKGBUILD 173180 2012-12-12 00:32:10Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
 pkgver=0.3.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.weechat.org/"
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 99c35c775..3f5ec35dc 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 168916 2012-10-16 14:27:05Z guillaume $
+# $Id: PKGBUILD 173181 2012-12-12 00:32:12Z eric $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.8.3
+pkgver=1.8.4
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
-             'libgcrypt' 'lua' 'python' 'portaudio')
-url="http://www.wireshark.org/"
+             'libgcrypt' 'lua51' 'python' 'portaudio')
+url='http://www.wireshark.org/'
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
         enable_version.patch)
-sha1sums=('3e1322eea5794c71de752b7923af9379bcc95299'
-          '9a56a9153b6903e508b0375cde4f6e57ffc544e6')
+sha256sums=('cae9ec0cb9fa0b732a76c0f72f8c15d763f8cdc2e389cda2da6c48c24559faac'
+            '0cf13fb0a53909dd737e44f3c3f62b824527d7c96eaffb69d9a8bf4772d54cbd')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -32,8 +32,8 @@ build() {
 }
 
 package_wireshark-cli() {
-  pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version"
-  depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua' 'portaudio')
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
+  depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'portaudio' 'lua51')
   install=wireshark.install
   conflicts=(wireshark)
 
@@ -56,7 +56,7 @@ package_wireshark-cli() {
 }
 
 package_wireshark-gtk() {
-  pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - GTK frontend"
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
   depends=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
   install=wireshark-gtk.install
   replaces=(wireshark)
diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD
index b2dadf7f7..fbcf063ec 100644
--- a/extra/xf86-input-joystick/PKGBUILD
+++ b/extra/xf86-input-joystick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168557 2012-10-13 11:43:35Z andyrtr $
+# $Id: PKGBUILD 173112 2012-12-11 10:08:00Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-joystick
 pkgver=1.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org Joystick input driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -11,17 +11,16 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+backup=('etc/X11/xorg.conf.d/50-joystick.conf')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        #git-fixes.patch
         50-joystick.conf)
 sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580'
           'e1ff3699a0470c6bb78a53f718df9d8521621e11')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index dcb294250..a385413a0 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 172019 2012-11-26 14:56:12Z andyrtr $
+# $Id: PKGBUILD 173116 2012-12-11 10:32:56Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
 pkgver=287
-pkgrel=1
+pkgrel=2
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/xterm/"
 license=('custom')
-depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
+depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
 md5sums=('0e4385e66d40b5dd6017d02c3db2a4af'
@@ -43,7 +43,7 @@ build() {
       --enable-narrowproto \
       --enable-exec-xterm \
       --with-tty-group=tty \
-      --with-utmp-setgid=utmp
+      --with-utempter
   make
 }
 
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 88a8406c7..55f88a97f 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 166974 2012-09-23 22:57:12Z bisson $
+# $Id: PKGBUILD 173107 2012-12-11 04:46:40Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
@@ -7,7 +8,7 @@
 
 _pkgname=audacious-plugins
 pkgname=audacious-plugins-libre
-pkgver=3.3.2
+pkgver=3.3.3
 pkgrel=1
 pkgdesc='Plugins for Audacious without unfree plugins'
 url='http://audacious-media-player.org/'
@@ -60,7 +61,7 @@ optdepends=('oss: Open Sound System v4 output'
             'libcue: CUE playlist format')
 
 source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('869d3820263ff35609bfc6f2e69885a00d660513')
+sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e')
 
 build() {
 	# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 2360945ee..e6c684b1e 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -15,9 +15,9 @@ else
   )
   spndesc=''
 fi
-pkgdesc="A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
-pkgver=2.64a
-pkgrel=4
+pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
+pkgver=2.65
+pkgrel=1
 pkgaev=5
 arch=(
   i686
@@ -137,7 +137,7 @@ source=(
   "http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz"
 )
 sha512sums=(
-  77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5
+  92488691c25d390eabf35569cb37ec62437dd42f57e096334a6ed804b3265efe6f81871eba15dad67399ff4e6bf4262d4043298a3ceb90e5dc57586eb9f2870f
 )
 
 build() {
@@ -148,7 +148,7 @@ build() {
 
   [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
 
-  cmake .. \
+  setarch $CARCH cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m \
@@ -171,13 +171,13 @@ build() {
     -DWITH_PYTHON_INSTALL=OFF \
     -DWITH_SYSTEM_GLEW=ON
 
-  make $MAKEFLAGS
+  setarch $CARCH make $MAKEFLAGS
 
-  make
+  setarch $CARCH make
 }
 
 package() {
   cd $srcdir/${pkgbase%$pkgflag}-$pkgver/build
-  make DESTDIR=$pkgdir install
-  python -m compileall $pkgdir/usr/share/${pkgbase%$pkgflag}
+  setarch $CARCH make DESTDIR=$pkgdir install
+  setarch $CARCH python -m compileall $pkgdir/usr/share/${pkgbase%$pkgflag}
 }
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 0170fdfac..28fd3d71b 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=54
+_sublevel=56
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.53 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.55 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -30,10 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         'module-symbol-waiting-3.0.patch'
         'module-init-wait-3.0.patch'
-        '3.0.54-ptrace-i686-build.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '2fd5511915299a3f60b0494914881e3f'
+         '49061818ee1c6d38095f5614be9a0eac'
          'a5d98603d79d3ab7f979af49b2970f26'
          '0ed396b368d8cdf8845f7ef2f62fc93c'
          'c072b17032e80debc6a8626299245d46'
@@ -45,8 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '80889d526d86e516757b52fc99dca64d'
-         '461adf81c9df997b57bfb3fa07d13746')
+         '0dbe7bf91cc9461d7394cf46ac37ff68')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -89,9 +87,6 @@ build() {
   patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch"
   patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch"
 
-  # fix building on i686 platform
-  patch -Np1 -i "${srcdir}/3.0.54-ptrace-i686-build.patch"
-
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 1251b68c7..a2029fd2e 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.54-1-LIBRE-LTS
+KERNEL_VERSION=3.0.56-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 5f3fffbd8..16afa09ce 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,7 +10,7 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.6
-_sublevel=9
+_sublevel=10
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
@@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'fat-3.6.x.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
-         '2127e118d09154c7a44dd2dfed2cfecd'
+         'd0382e715c9ce5f28dea840fd89c6434'
          'e4a3a4677e1fac6ecf0e0fb44c41ca08'
          '68fc36a4efb6ade0eca409b9444fef0c'
          'e49ac236dfeef709f91a3d993ea7b62c'
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 89024bf96..1e065da77 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.6.9-1-LIBRE
+KERNEL_VERSION=3.6.10-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
index 245aba247..26640795f 100644
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -4,12 +4,12 @@
 pkgbase=luxrender
 pkgname=luxblend25
 srcver=3a928b723b29
-pkgver=1.1.v2.64
+pkgver=1.1.v2.65
 _pkgver=${pkgver::3}
 reqname=blender
 reqver=${pkgver:5}
-pkgrel=2
-pkgdesc='A LuxRender exporter for Blender-libre'
+pkgrel=1
+pkgdesc='LuxRender exporter for Blender-libre'
 arch=(
   any
 )
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 5fdd12bdb..e3d9444ce 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
-. helper.sh
+. "${startdir:-.}/helper.sh"
 # provides:
-#  _get_pkgver
 #  _get_depends
 #  _get_depends_nover (no version requirements)
 
 pkgname=parabolaweb-utils
-pkgver=`_get_pkgver`
-pkgrel=8
+pkgver=20121115.1554
+pkgrel=1
 pkgdesc="Utils for the Parabola website"
 arch=('any')
 url="https://projects.parabolagnulinux.org/parabolaweb.git/"
@@ -20,11 +19,8 @@ depends=(
     'git'          # used in parabolaweb-download
     'libretools'   # used in parabolaweb-{download,update} (libremessages)
     `_get_depends`)
-backup=('etc/conf.d/parabolaweb')
-
-export pkgver
-
 makedepends=(makepkg-git)
+backup=('etc/conf.d/parabolaweb')
 
 source=(git://parabolagnulinux.org/parabolaweb.git
 	parabolaweb-download
@@ -34,6 +30,13 @@ source=(git://parabolagnulinux.org/parabolaweb.git
 	parabolaweb.service
 	parabolaweb.conf)
 
+pkgver() {
+	cd "$srcdir/parabolaweb"
+	# get the date requirements_prod.txt was last modified
+	gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
+	date -u +%Y%m%d.%H%M -d "$gitdate"
+}
+
 build() {
 	:
 }
diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh
index 5ce4182b3..5212571a8 100644
--- a/libre/parabolaweb-utils/helper.sh
+++ b/libre/parabolaweb-utils/helper.sh
@@ -1,35 +1,21 @@
 _mksource() {
-	if [[ -z _DO_NOT_RUN_MKSOURCE ]]; then
-		_DO_NOT_RUN_MKSOURCE=true makepkg -o
-	fi
-}
-
-_get_pkgver() {
-	if [[ -n $pkgver ]] && [[ $pkgver != 0.bogus ]]; then
-		echo $pkgver
-	else
-		_mksource 1>&2
-		if [[ -f "${srcdir:-src}/parabolaweb/requirements_prod.txt" ]]; then
-			pushd "${srcdir:-src}/parabolaweb" >/dev/null
-			# get the date requirements_prod.txt was last modified 
-			gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
-			date -u +%Y%m%d.%H%M -d "$gitdate"
-			popd >/dev/null
-		else
-			echo 0.bogus
-		fi
+	pushd "${startdir:-.}" >/dev/null
+	if [[ -z $_DO_NOT_RUN_MKSOURCE && $0 =~ ^makepkg ]]; then
+		local flags=(-o)
+		(( EUID )) || flags+=(--asroot)
+		_DO_NOT_RUN_MKSOURCE=true "${0}" "${flags[@]}"
 	fi
+	popd >/dev/null
 }
 
 _get_depends() {
 	_mksource 1>&2
-	if [[ -f "${srcdir:-src}/parabolaweb/requirements_prod.txt" ]]; then
+	if [[ -f "${srcdir:-${startdir:-.}/src}/parabolaweb/requirements_prod.txt" ]]; then
 		pushd "${srcdir:-src}" >/dev/null
-		python2_packages='markdown|psycopg2|pyinotify|pytz|south'
 		< parabolaweb/requirements_prod.txt sed -r \
 			-e 's/.*/\L&/' -e 's/==/=/' \
-			-e 's/^python-memcached/python2-memcached/' \
-			-e "s/^(${python2_packages})/python2-&/"
+			-e 's/^(python2?-)?/python2-/' \
+			-e 's/python2-django/django/'
 		popd >/dev/null
 	fi
 }
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index 41021cf24..1e3d5534b 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=texlive-core-libre
 _pkgname=texlive-core
-pkgver=2012.26892
+pkgver=2012.28273
 _revnr=${pkgver#2012.}
-pkgrel=2
+pkgrel=1
 pkgdesc="TeX Live core distribution"
 license=('GPL')
 arch=(any)
@@ -30,7 +30,7 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
 options=(!strip)
 install=texlive.install
 #backup=(etc/texmf/tex/context/config/cont-usr.tex)
-md5sums=('c913b3c01bdcf81da80e4833cd4cc691'
+md5sums=('42ce6cf5a7728f2ebb9a1a2bbf9dc4ed'
          '82c03f7226e1df4440f30c89c05ee653')
 
 build() {
diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install
index 601c4af19..14ca7c531 100644
--- a/libre/texlive-core-libre/texlive.install
+++ b/libre/texlive-core-libre/texlive.install
@@ -9,7 +9,7 @@ post_install() {
   TMPFILE=`mktemp`
   echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
   cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
   cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
   cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
@@ -31,7 +31,7 @@ post_upgrade() {
   TMPFILE=`mktemp`
   echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
   cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
   cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
   cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index cabf58619..a445de005 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=texlive-fontsextra-libre
 _pkgname=texlive-fontsextra
-pkgver=2012.26866
+pkgver=2012.28268
 _revnr=${pkgver#2012.}
 pkgrel=1
 pkgdesc="TeX Live - all sorts of extra fonts"
@@ -20,8 +20,8 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('f75e552c4573ce73d3eee03fffee723f'
-         '4a2f2b3b4527655fb47ab0d59b01bfea')
+md5sums=('2c900d7eaa4506b057e25be64b4ad24b'
+         'd1d90a08bbea59c2f925a4b07c355828')
 
 build() {
    cd "$srcdir"
diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
index fbced973a..771bf3607 100644
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
@@ -24,6 +24,8 @@ Map Romantik.map
 Map Rothdn.map
 Map RoyalIn.map
 Map Sanremo.map
+Map SourceCodePro.map
+Map SourceSansPro.map
 Map Starburst.map
 Map Typocaps.map
 Map Zallman.map
@@ -38,7 +40,10 @@ Map auncial.map
 Map aurical.map
 Map belleek.map
 Map bera.map
+Map bguq.map
+Map biolinum-type1.map
 Map boondox.map
+Map cabin.map
 Map calligra.map
 Map cantarell.map
 Map ccicons.map
@@ -69,19 +74,20 @@ Map gfsdidot.map
 Map gfsneohellenic.map
 Map gfssolomos.map
 Map gptimes.map
+Map hacm.map
 Map icelandic.map
 Map iwona.map
 Map kpfonts.map
 Map kurier.map
 Map lato.map
-Map libertine.map
+Map libertine-type1.map
 Map linearA.map
 Map mathabx.map
 Map mdbch.map
 Map mdput.map
 Map mdsymbol.map
 Map mdugm.map
-Map ntx.map
+Map newtx.map
 Map ocrb.map
 Map opensans.map
 Map paratype-type1.map
@@ -94,6 +100,7 @@ Map rsfso.map
 Map sansmathaccent.map
 Map sqrcaps.map
 Map starfont.map
+Map superiors.map
 Map tfrupee.map
 Map uaq.map
 Map ugq.map
diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install
index c2c5e8165..6f81bd4ba 100644
--- a/libre/texlive-fontsextra-libre/texlive.install
+++ b/libre/texlive-fontsextra-libre/texlive.install
@@ -9,7 +9,7 @@ post_install() {
   TMPFILE=`mktemp`
   echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
   cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
   cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
   cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
@@ -25,7 +25,7 @@ post_upgrade() {
   TMPFILE=`mktemp`
   echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
   cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
   cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
   cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index d806b73fd..533a0aa6e 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer: Firmicus <firmicus āt gmx dōt net>
+# $Id: PKGBUILD 171569 2012-11-19 07:37:56Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=texlive-latexextra-libre
 _pkgname=texlive-latexextra
-pkgver=2012.26807
+pkgver=2012.28272
 _revnr=${pkgver#2012.}
 pkgrel=1
 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX"
@@ -25,7 +25,7 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('868dc1824391768e120fdd71ba28e520'
+md5sums=('75db29b9e9bea30e9b6c1b77c4fca964'
          '9e4825f47dac663dd62c4bfa67899e84')
 
 build() {
@@ -40,35 +40,34 @@ build() {
    rm -rf {tlpkg,doc,source} || true
 }
 package() {
-   install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
+   install -m755 -d "$pkgdir"/var/lib/texmf/arch/installedpkgs
    sed -i '/^#/d' CONTENTS
-   install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
-   install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
-   install -m755 -d $pkgdir/usr/share
+   install -m644 CONTENTS "$pkgdir"/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
+   install -m644 $_pkgname.maps "$pkgdir"/var/lib/texmf/arch/installedpkgs/
+   install -m755 -d "$pkgdir"/usr/share
    wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
    for dir in $wanteddirs; do
-     find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \;
-     find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \;
+     find $dir -type d -exec install -d -m755 "$pkgdir"/usr/share/texmf-dist/'{}' \;
+     find $dir -type f -exec install -m644 '{}' "$pkgdir"/usr/share/texmf-dist/'{}' \;
    done
    if [[ -d texmf-dist ]]; then
-     find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \;
-     find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \;
+     find texmf-dist -type d -exec install -d -m755 "$pkgdir"/usr/share/'{}' \;
+     find texmf-dist -type f -exec install -m644 '{}' "$pkgdir"/usr/share/'{}' \;
    fi
-   if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then
-     find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
+   if [[ -d "$pkgdir"/usr/share/texmf-dist/scripts ]]; then
+     find "$pkgdir"/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
    fi
    #add symlinks that were in texlive-bin:
-   install -m755 -d $pkgdir/usr/bin
-   ln -s /usr/share/texmf-dist/scripts/authorindex/authorindex $pkgdir/usr/bin/authorindex
-   ln -s /usr/share/texmf-dist/scripts/exceltex/exceltex $pkgdir/usr/bin/exceltex
-   ln -s /usr/share/texmf-dist/scripts/glossaries/makeglossaries $pkgdir/usr/bin/makeglossaries
-   ln -s /usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl $pkgdir/usr/bin/pdfannotextractor
-   ln -s /usr/share/texmf-dist/scripts/ppower4/pdfthumb.tlu $pkgdir/usr/bin/pdfthumb
-   ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl $pkgdir/usr/bin/perltex
-   ln -s /usr/share/texmf-dist/scripts/pst-pdf/ps4pdf $pkgdir/usr/bin/ps4pdf
-   ln -s /usr/share/texmf-dist/scripts/splitindex/perl/splitindex.pl $pkgdir/usr/bin/splitindex
-   ln -s /usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl $pkgdir/usr/bin/svn-multi
-   ln -s /usr/share/texmf-dist/scripts/vpe/vpe.pl $pkgdir/usr/bin/vpe
+   install -m755 -d "$pkgdir"/usr/bin
+   ln -s /usr/share/texmf-dist/scripts/authorindex/authorindex "$pkgdir"/usr/bin/authorindex
+   ln -s /usr/share/texmf-dist/scripts/exceltex/exceltex "$pkgdir"/usr/bin/exceltex
+   ln -s /usr/share/texmf-dist/scripts/glossaries/makeglossaries "$pkgdir"/usr/bin/makeglossaries
+   ln -s /usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl "$pkgdir"/usr/bin/pdfannotextractor
+    ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl "$pkgdir"/usr/bin/perltex
+   ln -s /usr/share/texmf-dist/scripts/pst-pdf/ps4pdf "$pkgdir"/usr/bin/ps4pdf
+   ln -s /usr/share/texmf-dist/scripts/splitindex/perl/splitindex.pl "$pkgdir"/usr/bin/splitindex
+   ln -s /usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl "$pkgdir"/usr/bin/svn-multi
+   ln -s /usr/share/texmf-dist/scripts/vpe/vpe.pl "$pkgdir"/usr/bin/vpe
    # but ppower4 was a symlink to ppower4.tlu, which was broken, but this is far better:
    (
    cat <<"END"
@@ -76,8 +75,8 @@ package() {
 java -jar /usr/share/texmf-dist/scripts/ppower4/pp4p.jar $@
 END
    ) > /tmp/ppower4 
-   install -m755 /tmp/ppower4 $pkgdir/usr/bin/
-   rm $pkgdir/usr/share/texmf-dist/scripts/glossaries/makeglossaries.bat
-   rm $pkgdir/usr/share/texmf-dist/scripts/pst-pdf/ps4pdf.bat*
-   rm $pkgdir/usr/share/texmf-dist/scripts/shipunov/biokey2html.bat
+   install -m755 /tmp/ppower4 "$pkgdir"/usr/bin/
+   rm "$pkgdir"/usr/share/texmf-dist/scripts/glossaries/makeglossaries.bat
+   rm "$pkgdir"/usr/share/texmf-dist/scripts/pst-pdf/ps4pdf.bat*
+   rm "$pkgdir"/usr/share/texmf-dist/scripts/shipunov/biokey2html.bat
 }
diff --git a/libre/texlive-latexextra-libre/texlive.install b/libre/texlive-latexextra-libre/texlive.install
index e8878db08..3416a2732 100644
--- a/libre/texlive-latexextra-libre/texlive.install
+++ b/libre/texlive-latexextra-libre/texlive.install
@@ -9,7 +9,7 @@ post_install() {
   TMPFILE=`mktemp`
   echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
   cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
   cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
   cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
@@ -25,7 +25,7 @@ post_upgrade() {
   TMPFILE=`mktemp`
   echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
   cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
   cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
   cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 9c5f6242c..8aad59fe4 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -24,4 +24,4 @@ package() {
         ))
 }
 
-md5sums=('cc8ed9a33d0c58fcecc3323f831f687e')
+md5sums=('b8c939de5aa75a92299f65210e510d61')
diff --git a/pcr/ruby-shadow/PKGBUILD b/pcr/ruby-shadow/PKGBUILD
index 5b7ee1972..155835a3f 100644
--- a/pcr/ruby-shadow/PKGBUILD
+++ b/pcr/ruby-shadow/PKGBUILD
@@ -1,5 +1,5 @@
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
 
 pkgname=ruby-shadow
 pkgver=2.1.4
author	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-12-12 09:40:29 -0300
committer	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-12-12 09:40:29 -0300
commit	eef796260fb7cc9b81044e43df8f313c3c8e768a (patch)
tree	db6c6a07c0da415fe2e68648fbd39473cba2ccd2
parent	6767b6bbf9829a692c85c3dcd5ee0280982bd252 (diff)
parent	ef947957a5734ba25be3cdb6595491c816592133 (diff)