Mon Sep 16 01:44:21 PDT 2013

25 files changed, 468 insertions, 175 deletions

diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 0b3ff7969..4ae84bafd 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91937 2013-05-29 23:05:51Z seblu $
+# $Id: PKGBUILD 97250 2013-09-15 20:35:17Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.19
+pkgver=2.0.20
 pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta
         'acpid.service'
         'anything'
         'handler.sh')
-md5sums=('0b07a982e3e28cf37645f2c6269af72e'
+md5sums=('1b740e6419cf45aaeb2bd78d589f27f9'
          'd11700eb136e0489835ddaf977a7905b'
          '79cc7a9dceacdeffd51f070c2ba5f023'
          '2d37b98d6e74bab815604b8b48c6cfd4'
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD
index 2cc98780c..0e6ad935b 100755
--- a/community/aegisub/PKGBUILD
+++ b/community/aegisub/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 96598 2013-09-02 08:35:43Z alucryd $
+# $Id: PKGBUILD 97224 2013-09-15 13:34:01Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: kozec <kozec@kozec.com>
 # Contributor: Limao Luo <luolimao+AUR@gmail.com>
 
 pkgname=aegisub
 pkgver=3.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
 arch=('i686' 'x86_64')
 url="http://www.aegisub.org"
 license=('GPL' 'BSD')
-depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9')
+depends=('desktop-file-utils' 'ffms2' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9')
 makedepends=('mesa')
 install="${pkgname}.install"
 source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz"
@@ -27,9 +27,7 @@ prepare() {
 build() {
   cd ${pkgname}/${pkgname}
 
-  export ACLOCAL=aclocal
-  export AUTOMAKE=automake
-  ./autogen.sh --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9'
+  ./configure --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9'
   make
 }
 
diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD
deleted file mode 100755
index 0bb3984f9..000000000
--- a/community/ffmpegsource/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 94878 2013-08-01 06:54:52Z bpiotrowski $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-
-pkgname=ffmpegsource
-pkgver=755
-pkgrel=1
-pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/ffmpegsource/"
-license=('MIT')
-depends=('ffmpeg')
-makedepends=('svn')
-options=('!libtool')
-source=("${pkgname}::svn+http://ffmpegsource.googlecode.com/svn/trunk/"
-        'autoconf.patch')
-sha256sums=('SKIP'
-            '2cfa7d2e0219a5c8df9a50fe2460a1a1e6b69df10e6d9eee1d723766e62535e7')
-
-pkgver() {
-  cd "${SRCDEST}"/${pkgname}
-
-  svnversion | tr -d [A-z]
-}
-
-prepare() {
-  cd "${srcdir}"/${pkgname}
-
-  patch -Np1 -i ../autoconf.patch
-}
-
-build() {
-  cd "${srcdir}"/${pkgname}
-
-  ./autogen.sh --prefix=/usr --enable-shared --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}
-
-  make DESTDIR="${pkgdir}" install
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource
-  install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch
deleted file mode 100755
index 2ed0d0f6e..000000000
--- a/community/ffmpegsource/autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,7 +6,7 @@ pkgconfig_DATA = ffms2.pc
- 
- dist_doc_DATA = doc/ffms2-api.html doc/ffms2-changelog.html doc/style.css
- 
--INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
-+AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
- 
- lib_LTLIBRARIES = src/core/libffms2.la
- src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
diff --git a/community/ffms2/PKGBUILD b/community/ffms2/PKGBUILD
new file mode 100644
index 000000000..bb2c78517
--- /dev/null
+++ b/community/ffms2/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 97223 2013-09-15 13:32:52Z alucryd $$
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+
+pkgname=ffms2
+pkgver=2.19
+pkgrel=1
+pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
+arch=('i686' 'x86_64')
+url="https://github.com/FFMS/ffms2"
+license=('MIT')
+depends=('ffmpeg')
+replaces=('ffmpegsource')
+options=('!libtool')
+source=("https://github.com/FFMS/ffms2/archive/${pkgver}.tar.gz")
+sha256sums=('6f1379514f03a14092fdfc9941960a9b86f5b78d86f9e000eeddf3bf50d42811')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix='/usr' --enable-shared --disable-static
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+
+# License
+  install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}COPYING
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD
index a68bdcbff..c3201b9ac 100644
--- a/community/gdc/PKGBUILD
+++ b/community/gdc/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=('gdc' 'libgphobos-devel')
 pkgver=4.8.1
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="https://github.com/D-Programming-GDC/GDC"
 license=('GPL')
@@ -93,5 +93,4 @@ package_libgphobos-devel()
     cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc
 
     install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a
-    install -D -m644 $srcdir/gcc-build/$CHOST/libatomic/.libs/libatomic.a $pkgdir/usr/lib/libatomic.a
 }
diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD
index 4ea1c0c20..133589843 100644
--- a/community/libkkc/PKGBUILD
+++ b/community/libkkc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97042 2013-09-11 09:43:26Z fyan $
+# $Id: PKGBUILD 97217 2013-09-15 11:42:40Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 pkgname=libkkc
-pkgver=0.3.0
+pkgver=0.3.1
 pkgrel=1
 pkgdesc="Japanese Kana Kanji conversion library"
 arch=('i686' 'x86_64')
@@ -31,4 +31,4 @@ package() {
     "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"  
 }
 
-sha512sums=('32b7268e4566acc7b13b9ae8ac06fe3ea3c23fef2a7157f8246f7ddb7b1f844da111334bea5b0b5ad9ac822a9be3a07ea5126ac59b8add1217aad2ba8157345f')
+sha512sums=('6b237930ec0fd0f788364a301b2cf97a0607d708c109cf619b73321255ec50f08c396afde767856a9db6f8e8ceb0117a95eda3a17f3c9c8065a32843b1e97fc0')
diff --git a/community/python2-gevent-beta/PKGBUILD b/community/python2-gevent-beta/PKGBUILD
index 6d727edbc..820a03cb6 100644
--- a/community/python2-gevent-beta/PKGBUILD
+++ b/community/python2-gevent-beta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95610 2013-08-15 01:52:53Z fyan $
+# $Id: PKGBUILD 97219 2013-09-15 11:50:12Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 _pkgbase=gevent
 pkgname=python2-${_pkgbase}-beta
-pkgver=1.0rc2
-pkgrel=4
+pkgver=1.0rc3
+pkgrel=1
 pkgdesc="Python networking library based on greenlet and libev - Beta version"
 arch=('i686' 'x86_64')
 url="http://www.gevent.org/"
@@ -19,9 +19,6 @@ package() {
   cd "$srcdir/${_pkgbase}-${pkgver}"
   msg "Starting make..."
   
-  # Workaround
-  unset MAKEFLAGS
-
   LIBEV_EMBED=1 \
   CARES_EMBED=1 \
   CYTHON=cython2 \
@@ -33,4 +30,4 @@ package() {
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-md5sums=('e1bce8e15c7ebb08788978c0f4860f9d')
+sha512sums=('b0c978a7d3690051175edb862ab5a3132ba31e58c6aaa12ea2715d16679650ec05b239c1fb776a410749dc60ff32f53882c2810789f4e89e1bcb76a7a32b1f48')
diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD
index 70947d5b6..033aadf9d 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 187873 2013-06-07 13:39:39Z foutrelis $
+# $Id: PKGBUILD 194392 2013-09-15 13:43:50Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=dialog
-pkgver=1.2_20130523
-pkgrel=2
+pkgver=1.2_20130902
+pkgrel=1
 pkgdesc="A tool to display dialog boxes from shell scripts"
 arch=('i686' 'x86_64')
 url="http://invisible-island.net/dialog/"
 license=('LGPL2.1')
 depends=('ncurses')
 source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz)
-sha256sums=('c8d114b7698022bcbd6c88f3c0b2296b0e846c60c5ed6bd28f86dd72b94fd36d')
+sha256sums=('92301c555e9b3d6be29b51f9a0fce4b482556f7b6b89e7de1d5030e523ef0467')
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 6a15b6b8c..929d166e7 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 191251 2013-07-22 09:20:17Z schiv $
+# $Id: PKGBUILD 194389 2013-09-15 12:35:01Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: see .contrib
 
 pkgname=ardour
 _pkgname=Ardour3
-pkgver=3.3
+pkgver=3.4
 pkgrel=1
 pkgdesc="Professional-grade digital audio workstation"
 arch=('i686' 'x86_64')
 url="http://ardour.org/"
 license=('GPL')
-depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0'
-         'aubio' 'libgnomecanvasmm' 'suil>=0.6.12')
+depends=('liblrdf' 'liblo' 'libsmf' 'lilv'
+         'aubio' 'libgnomecanvasmm' 'suil')
 makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz')
 optdepends=('xjadeo: video monitoring')
 install=$pkgname.install
 source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"
         "$pkgname.desktop")
-md5sums=('40edf6ab63488d52abf94a2a48d7ac97'
+md5sums=('4c2286d9c5de6846e2abaa2a8fab0349'
          '316bd21ece5e2208a104fd09cac521af')
 
 prepare() {
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 3b0b921f0..516df0bf0 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,30 +1,28 @@
-# $Id: PKGBUILD 194027 2013-09-10 08:59:45Z andrea $
+# $Id: PKGBUILD 194372 2013-09-15 07:17:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.15.1.908d49322dcf
-_pkgver=4.15.2-snapshot-908d49322dcf
+pkgver=4.15.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.riverbankcomputing.com/software/sip/intro'
 license=('custom:"sip"')
 makedepends=('python' 'python2')
-#source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgname}-${_pkgver}.tar.gz")
-md5sums=('a58484947c324dad2c99b5fd770fefea')
+source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
+md5sums=('52abe824ca7f530a5643abfa3ee715d7')
 
 build() {
-  cp -r ${pkgbase}-${_pkgver} python2-${pkgbase}-${_pkgver}
+  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
 
-  cd ${pkgbase}-${_pkgver}
+  cd ${pkgbase}-${pkgver}
   python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
   make
-  
+
   ### Python2 version ###
-  cd ../python2-${pkgbase}-${_pkgver}
+  cd ../python2-${pkgbase}-${pkgver}
   python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
   make
 }
@@ -33,7 +31,7 @@ package_sip() {
   pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
   depends=('glibc')
 
-  cd ${pkgbase}-${_pkgver}
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install -C sipgen
 
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
@@ -43,12 +41,12 @@ package_python-sip() {
   pkgdesc="Python 3.x SIP bindings for C and C++ libraries"
   depends=('sip' 'python')
 
-  cd ${pkgbase}-${_pkgver}
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install -C siplib
-  
+
   install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py
   install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py
-  
+
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
@@ -56,11 +54,11 @@ package_python2-sip() {
   pkgdesc="Python 2.x SIP bindings for C and C++ libraries"
   depends=('sip' 'python2')
 
-  cd python2-${pkgbase}-${_pkgver}
+  cd python2-${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install -C siplib
-  
+
   install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py
   install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py
-  
+
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 44b5394c8..a27f7cabb 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 193067 2013-08-15 12:08:37Z allan $
+# $Id: PKGBUILD 194381 2013-09-15 10:04:52Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
 pkgver=3.8.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,10 +14,12 @@ makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
         valgrind-3.8.1-glibc-2.18.patch
-        valgrind-3.8.1-ptrace-build-fix.patch)
+        valgrind-3.8.1-ptrace-build-fix.patch
+        valgrind-3.8.1-xaddb.patch)
 md5sums=('288758010b271119a0ffc0183f1d6e38'
          'f3f911e6f5b0ab9d176d40b47d6cae24'
-         '9d429e62255621a0c190a8180d8ab1a4')
+         '9d429e62255621a0c190a8180d8ab1a4'
+         'aad7751a3e4ee899093dcfa9f70a449b')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -27,6 +29,9 @@ prepare() {
   # based on svn commits 13471 & 13482
   patch -p0 -i $srcdir/valgrind-3.8.1-ptrace-build-fix.patch
   
+  # https://bugs.kde.org/show_bug.cgi?id=307106
+  patch -p0 -i $srcdir/valgrind-3.8.1-xaddb.patch
+  
   ./autogen.sh
 }
 
diff --git a/extra/valgrind/valgrind-3.8.1-xaddb.patch b/extra/valgrind/valgrind-3.8.1-xaddb.patch
new file mode 100644
index 000000000..ca5a59700
--- /dev/null
+++ b/extra/valgrind/valgrind-3.8.1-xaddb.patch
@@ -0,0 +1,34 @@
+Index: priv/guest_amd64_toIR.c
+===================================================================
+--- VEX/priv/guest_amd64_toIR.c	(revision 2580)
++++ VEX/priv/guest_amd64_toIR.c	(revision 2581)
+@@ -20268,6 +20268,14 @@
+       delta = dis_movx_E_G ( vbi, pfx, delta, 2, sz, True );
+       return delta;
+ 
++   case 0xC0: { /* XADD Gb,Eb */ 
++      Bool decode_OK = False;
++      delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta );
++      if (!decode_OK)
++         goto decode_failure;
++      return delta;
++   }
++
+    case 0xC1: { /* XADD Gv,Ev */ 
+       Bool decode_OK = False;
+       delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, sz, delta );
+@@ -27143,14 +27151,6 @@
+ 
+       /* =-=-=-=-=-=-=-=-=- XADD -=-=-=-=-=-=-=-=-=-= */
+ 
+-      case 0xC0: { /* XADD Gb,Eb */ 
+-         Bool decode_OK = False;
+-         delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta );
+-         if (!decode_OK)
+-            goto decode_failure;
+-         break;
+-      }
+-
+       /* =-=-=-=-=-=-=-=-=- SGDT and SIDT =-=-=-=-=-=-=-=-=-=-= */
+ 
+       /* =-=-=-=-=-=-=-=-=- unimp2 =-=-=-=-=-=-=-=-=-=-= */
diff --git a/extra/xorg-luit/PKGBUILD b/extra/xorg-luit/PKGBUILD
index 16f9cebf1..6e6878e1f 100644
--- a/extra/xorg-luit/PKGBUILD
+++ b/extra/xorg-luit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154146 2012-03-23 17:27:51Z andyrtr $
+# $Id: PKGBUILD 194394 2013-09-15 18:16:48Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-luit
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Filter that can be run between an arbitrary application and a UTF-8 terminal emulator"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -11,11 +11,15 @@ license=('custom')
 depends=('libfontenc')
 groups=('xorg' 'xorg-apps')
 makedepends=('xorg-util-macros')
-source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2)
-sha1sums=('3130c14d7267cecce0ba2280643844b48cca49b0')
+source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2
+        git_fixes.diff)
+sha256sums=('30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636'
+            'aa5d83b8cc772e135e57ae0f0d2b7662b51981f4a120a136a7b201c254b23327')
 
 build() {
-  cd "${srcdir}/luit-${pkgver}"
+  cd luit-${pkgver}
+  patch -Np1 -i $srcdir/git_fixes.diff
+  autoreconf -vfi
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xorg-luit/git_fixes.diff b/extra/xorg-luit/git_fixes.diff
new file mode 100644
index 000000000..928caca0f
--- /dev/null
+++ b/extra/xorg-luit/git_fixes.diff
@@ -0,0 +1,254 @@
+From 473959141641b6779e6ff3c3c5b6ef326073bcd4 Mon Sep 17 00:00:00 2001
+From: Mike FABIAN <mfabian@redhat.com>
+Date: Tue, 07 Jun 2011 11:42:00 +0000
+Subject: Set up terminal before fork.
+
+After the fork it is undefined wether parent or child runs
+first. So there can be a race: if the child runs before the
+terminal of the parent is set up correctly luit may hang.
+This patch sets up the terminal before forking and undoes
+the settings in the child.
+
+Signed-off-by: Mike FABIAN <mfabian@redhat.com>
+Signed-off-by: Egbert Eich <eich@freedesktop.org>
+---
+diff --git a/luit.c b/luit.c
+index 0ece7b6..5cb3b8f 100644
+--- a/luit.c
++++ b/luit.c
+@@ -577,6 +577,8 @@ condom(int argc, char **argv)
+ 	IGNORE_RC(pipe(c2p_waitpipe));
+     }
+ 
++    setup_io(pty);
++
+     pid = fork();
+     if (pid < 0) {
+ 	perror("Couldn't fork");
+@@ -584,6 +586,10 @@ condom(int argc, char **argv)
+     }
+ 
+     if (pid == 0) {
++#ifdef SIGWINCH
++	installHandler(SIGWINCH, SIG_DFL);
++#endif
++	installHandler(SIGCHLD, SIG_DFL);
+ 	close(pty);
+ 	if (pipe_option) {
+ 	    close_waitpipe(1);
+@@ -661,7 +667,6 @@ parent(int pid GCC_UNUSED, int pty)
+     if (verbose) {
+ 	reportIso2022(outputState);
+     }
+-    setup_io(pty);
+ 
+     if (pipe_option) {
+ 	write_waitpipe(p2c_waitpipe);
+--
+cgit v0.9.0.2-2-gbebe
+
+From 09f4907e4ab4ba3654de829bf3ac2a4a02bb9ef4 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 22 Jun 2013 04:11:43 +0000
+Subject: Fix GCC_UNUSED definition to actually work with -Wunused-parameter
+
+Silences warnings of:
+charset.c: In function ‘IdentityRecode’:
+charset.c:42:51: warning: unused parameter ‘self’ [-Wunused-parameter]
+charset.c: In function ‘NullReverse’:
+charset.c:84:26: warning: unused parameter ‘n’ [-Wunused-parameter]
+charset.c:84:59: warning: unused parameter ‘self’ [-Wunused-parameter]
+other.c: In function ‘mapping_utf8’:
+other.c:108:44: warning: unused parameter ‘s’ [-Wunused-parameter]
+other.c: In function ‘reverse_utf8’:
+other.c:114:44: warning: unused parameter ‘s’ [-Wunused-parameter]
+luit.c: In function ‘sigwinchHandler’:
+luit.c:463:21: warning: unused parameter ‘sig’ [-Wunused-parameter]
+luit.c: In function ‘sigchldHandler’:
+luit.c:470:20: warning: unused parameter ‘sig’ [-Wunused-parameter]
+luit.c: In function ‘parent’:
+luit.c:657:12: warning: unused parameter ‘pid’ [-Wunused-parameter]
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/other.h b/other.h
+index 9d814a3..d18b586 100644
+--- a/other.h
++++ b/other.h
+@@ -26,7 +26,11 @@ THE SOFTWARE.
+ #include "config.h"		/* include this, for self-contained headers */
+ 
+ #ifndef GCC_UNUSED
+-#define GCC_UNUSED		/* ARGSUSED */
++# if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
++#  define GCC_UNUSED		__attribute__((__unused__))
++# else
++#  define GCC_UNUSED		/* ARGSUSED */
++# endif
+ #endif
+ 
+ #include <X11/fonts/fontenc.h>
+--
+cgit v0.9.0.2-2-gbebe
+
+From 445863f8b5059692ac7a4df785af6920849faa82 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 13 Jul 2013 16:08:34 +0000
+Subject: config: Add missing AC_CONFIG_SRCDIR
+
+Regroup AC statements under the Autoconf initialization section.
+Regroup AM statements under the Automake initialization section.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+---
+diff --git a/configure.ac b/configure.ac
+index c214d85..946db23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,9 +20,14 @@ dnl  PERFORMANCE OF THIS SOFTWARE.
+ dnl
+ dnl Process this file with autoconf to create configure.
+ 
++# Initialize Autoconf
+ AC_PREREQ([2.60])
+ AC_INIT([luit], [1.1.1],
+ 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [luit])
++AC_CONFIG_SRCDIR([Makefile.am])
++AC_CONFIG_HEADERS([config.h])
++
++# Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+@@ -32,8 +37,6 @@ m4_ifndef([XORG_MACROS_VERSION],
+ XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-AC_CONFIG_HEADERS([config.h])
+-
+ AC_CANONICAL_HOST
+ 
+ 
+--
+cgit v0.9.0.2-2-gbebe
+
+From 800f55f8dcd195dd0cdfc1c4d7487d00bb7745f4 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 13 Jul 2013 16:11:20 +0000
+Subject: Replace hardcoded _XOPEN_SOURCE=500 with AC_USE_SYSTEM_EXTENSIONS
+
+-D_XOPEN_SOURCE was originally added for Linux in commit e751086392e837
+and then updated to -D_XOPEN_SOURCE=500 in commit e1a002217cabdb to
+expose strdup() in glibc headers.
+
+As noted in bug 47792 though, the posix_openpt() function is not
+visible unless that's raised to 600.
+
+Instead of continually chasing the standards ourselves, switch to letting
+autoconf handle that for us.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+---
+diff --git a/Makefile.am b/Makefile.am
+index 8069670..ef042e3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,7 +25,6 @@ bin_PROGRAMS = luit
+ AM_CFLAGS =		\
+ 	$(CWARNFLAGS)	\
+ 	$(LUIT_CFLAGS)	\
+-	$(OS_CFLAGS)	\
+ 	-DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
+ 
+ luit_LDADD = $(LUIT_LIBS)
+diff --git a/configure.ac b/configure.ac
+index 946db23..0ec4664 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,6 +26,7 @@ AC_INIT([luit], [1.1.1],
+ 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [luit])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS([config.h])
++AC_USE_SYSTEM_EXTENSIONS
+ 
+ # Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+@@ -37,9 +38,6 @@ m4_ifndef([XORG_MACROS_VERSION],
+ XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-AC_CANONICAL_HOST
+-
+-
+ AC_CHECK_HEADERS([pty.h stropts.h sys/param.h sys/select.h])
+ AC_CHECK_FUNCS([select grantpt posix_openpt])
+ 
+@@ -57,23 +55,16 @@ PKG_CHECK_MODULES(LUIT, fontenc)
+ PKG_CHECK_EXISTS(x11, [],
+ 	[AC_MSG_WARN([libX11 not found.  luit may not be able to find locale aliases without it.])])
+ 
++AC_CANONICAL_HOST
+ case $host_os in
+     # darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard)
+     darwin*)
+-        OS_CFLAGS=
+-        ;;
+-    linux*)
+-        AC_CHECK_HEADERS([poll.h])
+-        AC_CHECK_FUNCS([poll])
+-        OS_CFLAGS="-D_XOPEN_SOURCE=500"
+         ;;
+     *)
+         AC_CHECK_HEADERS([poll.h])
+         AC_CHECK_FUNCS([poll])
+-        OS_CFLAGS=
+         ;;
+ esac
+-AC_SUBST(OS_CFLAGS)
+ 
+ AC_CHECK_HEADERS([pty.h stropts.h sys/ioctl.h sys/param.h sys/poll.h sys/select.h sys/time.h termios.h]) 
+ AC_CHECK_FUNCS([grantpt putenv select strdup])
+--
+cgit v0.9.0.2-2-gbebe
+
+From e1f495359a74342352c4d6641c0002c7c79327ba Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 13 Jul 2013 16:15:16 +0000
+Subject: Merge overlapping AC_CHECK_HEADERS & AC_CHECK_FUNCS calls into one set
+
+Duplication introduced when merging in changes in commit fddfe30c3ff91c
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+---
+diff --git a/configure.ac b/configure.ac
+index 0ec4664..1c6f2c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,9 +38,6 @@ m4_ifndef([XORG_MACROS_VERSION],
+ XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-AC_CHECK_HEADERS([pty.h stropts.h sys/param.h sys/select.h])
+-AC_CHECK_FUNCS([select grantpt posix_openpt])
+-
+ AC_ARG_WITH(localealiasfile,
+         AS_HELP_STRING([--with-localealiasfile=<path>],
+                        [The locale alias file (default: ${datadir}/X11/locale/locale.alias)]),
+@@ -67,7 +64,7 @@ case $host_os in
+ esac
+ 
+ AC_CHECK_HEADERS([pty.h stropts.h sys/ioctl.h sys/param.h sys/poll.h sys/select.h sys/time.h termios.h]) 
+-AC_CHECK_FUNCS([grantpt putenv select strdup])
++AC_CHECK_FUNCS([grantpt posix_openpt putenv select strdup])
+ 
+ if test "x$ac_cv_func_grantpt" != "xyes" ; then
+         AC_CHECK_LIB(util, openpty, [cf_have_openpty=yes],[cf_have_openpty=no])
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 0bb678eb6..e6e01ef2a 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189247 2013-07-01 10:57:37Z jgc $
+# $Id: PKGBUILD 194374 2013-09-15 07:40:13Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.14.2
-pkgrel=2
+pkgver=1.14.3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -24,7 +24,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run.1
         10-quirks.conf
         fb-rename-wfbDestroyGlyphCache.patch)
-sha256sums=('f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b'
+sha256sums=('02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
@@ -44,7 +44,7 @@ prepare() {
   patch -Np0 -i ../autoconfig-sis.patch
 
   # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo
-  patch -Np1 -i ../bug59825.patch
+#  patch -Np1 -i ../bug59825.patch
 
   # From Fedora. Do not build acpid code, it is buggy and we do not need it
   patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index f9bb1c658..513071a5c 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170012 2012-10-31 00:12:04Z thomas $
+# $Id: PKGBUILD 194377 2013-09-15 08:07:59Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xorg-xinit
-pkgver=1.3.2
-pkgrel=3
+pkgver=1.3.3
+pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -23,15 +23,15 @@ source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
         xsession
         xserverrc)
 options=(!emptydirs)
-md5sums=('9c0943cbd83e489ad1b05221b97efd44'
-         'abd072ec435ce084cf4e89c58f83d45c'
-         '73a597d3fb7f5b9487318ac8cfd4bedf'
-         'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
-         '7873d97db30d6c279ed37e3559e7c59d'
-         '4deba1b7f2cc7f93b304b956023e65d6')
+sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
+            'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
+            '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
+            '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
+            '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
+            '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
 
 build() {
-  cd "${srcdir}/xinit-${pkgver}"
+  cd xinit-${pkgver}
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
   patch -Np1 -i "${srcdir}/fs25361.patch"
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
@@ -40,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/xinit-${pkgver}"
+  cd xinit-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/etc/skel"
diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD
index bc4e821dd..70d9f739b 100644
--- a/libre-testing/linux-libre/PKGBUILD
+++ b/libre-testing/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193873 2013-09-03 07:49:19Z tpowa $
+# $Id: PKGBUILD 194378 2013-09-15 09:16:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -10,9 +10,8 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.11
-#_sublevel=10
-#pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}
+_sublevel=1
+pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +20,7 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -33,16 +32,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'criu-no-expert.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
-         #'673ae6d60b4ce8acad930a06f9fe2e3f'
-         'b677535858e784fbfe924884941ea81c'
-         '0048b12cb4bbb449c25e83e38f99f5b8'
+         '7b051faf375c76d4763a24048c52600b'
+         'b7718a81faf845ab53234336122ad631'
+         'f7ee88ffc93b665345b6ee89ff192e1f'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '36e90334b12b2e9d53fd92129ee98f5b'
          '98beb36f9b8cf16e58de2483ea9985e3'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '57770a810cc7efb650a7ea15f8cba633')
+         '135ff203ec680a91e87eed4df72f453d')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre-testing/linux-libre/config.i686 b/libre-testing/linux-libre/config.i686
index 65bb11f0a..a19c09d75 100644
--- a/libre-testing/linux-libre/config.i686
+++ b/libre-testing/linux-libre/config.i686
@@ -5661,9 +5661,7 @@ CONFIG_ISCSI_IBFT=m
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS is not set
 
 #
 # File systems
@@ -6186,10 +6184,12 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
diff --git a/libre-testing/linux-libre/config.x86_64 b/libre-testing/linux-libre/config.x86_64
index 707d093aa..169a2285b 100644
--- a/libre-testing/linux-libre/config.x86_64
+++ b/libre-testing/linux-libre/config.x86_64
@@ -5452,9 +5452,7 @@ CONFIG_ISCSI_IBFT=m
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS is not set
 
 #
 # File systems
@@ -5979,10 +5977,12 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index 11b1c33ce..161f78e82 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 97109 2013-09-13 07:40:07Z alucryd $
+# $Id: PKGBUILD 97268 2013-09-15 22:44:23Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: TingPing <tingping@tingping.se>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=hexchat
 pkgname=hexchat-libre
-pkgver=2.9.6
-pkgrel=2
+pkgver=2.9.6.1
+pkgrel=1
 pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.hexchat.org/"
+url="http://hexchat.github.io/"
 license=('GPL')
 depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils')
 makedepends=('perl' 'python')
@@ -17,12 +17,12 @@ optdepends=('enchant: Spell check'
             'perl: Perl plugin'
             'python: Python plugin')
 options=('!libtool')
-install=${_pkgname}.install
+install="${_pkgname}.install"
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-source=("http://dl.hexchat.org/hexchat/hexchat-${pkgver}.tar.xz")
-sha256sums=('eaefc07867a6e546cd9e19a4ccc976b4736c759ba3f946020eeae3cd6f4684b0')
+source=("http://dl.hexchat.org/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
+sha256sums=('6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470')
 
 build() {
   cd ${_pkgname}-${pkgver}
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 3039dfdd7..d2c020a75 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193075 2013-08-15 15:25:13Z andyrtr $
+# $Id: PKGBUILD 194375 2013-09-15 08:00:33Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,7 +6,7 @@
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.13.8
+pkgver=3.13.9
 pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64')
@@ -31,7 +31,7 @@ options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
         hp-mkuri.patch)
-md5sums=('44de6a1e4d295ae6f1f0f0ef1cdc7301'
+md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9'
          'SKIP'
          '0bd7779fdbc4d7a9386df04dce2cb8d4')
 
diff --git a/pcr/debootstrap-libre/PKGBUILD b/pcr/debootstrap-libre/PKGBUILD
index e4f4ef65e..b4ea8c09f 100644
--- a/pcr/debootstrap-libre/PKGBUILD
+++ b/pcr/debootstrap-libre/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=debootstrap
 pkgname=debootstrap-libre
 pkgver=1.0.53
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt (Debian support removed)"
 arch=('any')
 license=('GPL')
 url="http://packages.debian.org/sid/debootstrap"
-depends=('wget')
+depends=('binutils' 'wget')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
diff --git a/pcr/ruby-bundler/PKGBUILD b/pcr/ruby-bundler/PKGBUILD
index a1fb32449..44a1a883b 100644
--- a/pcr/ruby-bundler/PKGBUILD
+++ b/pcr/ruby-bundler/PKGBUILD
@@ -1,22 +1,24 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgname=ruby-bundler
-_gemname=${pkgname#ruby-}
-pkgver=1.1.5
+_pkgname=bundler
+pkgname=ruby-$_pkgname
+pkgver=1.3.5
 pkgrel=1
 pkgdesc="Is manages an application's dependencies through its entire life, across many machines, systematically and repeatably."
-arch=('any')
-url="http://gembundler.com"
-license=('MIT')
-depends=('ruby' 'rubygems')
-source=(http://rubygems.org/downloads/${_gemname}-${pkgver}.gem)
-noextract=(${_gemname}-${pkgver}.gem)
-md5sums=('ecced17bc29a761db4ea5ca57b0d8795')
+arch=any
+url=http://gem$_pkgname.com
+license=MIT
+depends=ruby
+source=http://rubygems.org/downloads/$_pkgname-$pkgver.gem
+noextract=$_pkgname-$pkgver.gem
+sha256sums=08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4
+
+package() {
+  cd $srcdir
 
-build() {
-  cd "${srcdir}"
-  export HOME=/tmp
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --no-user-install --ignore-dependencies -i "${pkgdir}${_gemdir}" -n "${pkgdir}/usr/bin" ${_gemname}-${pkgver}.gem
+  local _gemdir=$(ruby -rubygems -e'puts Gem.default_dir')
+  HOME=/tmp gem install --no-user-install --ignore-dependencies\
+  -i $pkgdir$_gemdir -n $pkgdir/usr/bin\
+  $_pkgname-$pkgver.gem
 }
diff --git a/pcr/ruby1-bundler/PKGBUILD b/pcr/ruby1-bundler/PKGBUILD
new file mode 100644
index 000000000..d06f7af08
--- /dev/null
+++ b/pcr/ruby1-bundler/PKGBUILD
@@ -0,0 +1,27 @@
+# Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=bundler
+pkgname=ruby1-$_pkgname
+pkgver=1.3.5
+pkgrel=1
+pkgdesc="Is manages an application's dependencies through its entire life, across many machines, systematically and repeatably."
+arch=any
+url=http://gem$_pkgname.com
+license=MIT
+depends=ruby1
+source=http://rubygems.org/downloads/$_pkgname-$pkgver.gem
+noextract=$_pkgname-$pkgver.gem
+sha256sums=08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4
+
+package() {
+  cd $srcdir
+
+  local _gemdir=$(ruby1 -rubygems -e'puts Gem.default_dir')
+  HOME=/tmp gem1 install --no-user-install --ignore-dependencies\
+  -i $pkgdir$_gemdir -n $pkgdir/usr/bin\
+  $_pkgname-$pkgver.gem
+
+  msg "renaming $_pkgname to ${_pkgname}1"
+  mv -v $pkgdir/usr/bin/${_pkgname%r}{,1}
+}