Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts: community/acpid/PKGBUILD core/btrfs-progs/PKGBUILD extra/calligra/PKGBUILD extra/libxcursor/PKGBUILD extra/xine-lib/PKGBUILD
author: Michał Masłowski <mtjm@mtjm.eu> 2013-05-31 12:35:56 +0200
committer: Michał Masłowski <mtjm@mtjm.eu> 2013-05-31 12:35:56 +0200
commit: 0dc1411695376442c13f473499a876f085074d75 (patch)
tree: 1ce41a87f86a15e6a72ae9e9198a05c755e293f0
parent: e6e5e22dc82259030c1c26dc78bb4e761861abfc (diff)
parent: 94a3b302f520438e919ef8706ce9cf42ad7c2e11 (diff)
54 files changed, 493 insertions, 889 deletions
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index b77060e57..0b3ff7969 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 90487 2013-05-12 22:11:59Z seblu $
+# $Id: PKGBUILD 91937 2013-05-29 23:05:51Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.18
-pkgrel=3
+pkgver=2.0.19
+pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://tedfelix.com/linux/acpid-netlink.html'
+arch=('i686' 'x86_64')
+url='http://sourceforge.net/projects/acpid2/'
 license=('GPL')
 depends=('bash')
 optdepends=('perl: use perl based examples')
@@ -20,7 +20,7 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta
         'acpid.service'
         'anything'
         'handler.sh')
-md5sums=('7c4ff315ae960c54eea303c71c49f152'
+md5sums=('0b07a982e3e28cf37645f2c6269af72e'
          'd11700eb136e0489835ddaf977a7905b'
          '79cc7a9dceacdeffd51f070c2ba5f023'
          '2d37b98d6e74bab815604b8b48c6cfd4'
diff --git a/community/bind/01-remove-tools.patch b/community/bind/01-remove-tools.patch
deleted file mode 100644
index 29b4c9c5f..000000000
--- a/community/bind/01-remove-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
-@@ -19,7 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS =	named rndc dnssec tests tools nsupdate \
- 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
- TARGETS =
- 
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index 55857058c..1d4b89dc4 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 90480 2013-05-12 21:56:44Z seblu $
+# $Id: PKGBUILD 91985 2013-05-30 17:41:01Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
 
 pkgname=bind
-_pkgver=9.9.2-P2
+_pkgver=9.9.3
 pkgver=${_pkgver//-/.}
-pkgrel=3
+pkgrel=1
 pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
@@ -25,20 +25,19 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'named.service'
         'named.logrotate'
         'localhost.zone'
-        '127.0.0.zone'
-        '01-remove-tools.patch')
-sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d'
+        '127.0.0.zone')
+sha1sums=('0d770a68ccdb98db7930951cf380d5c7ed9b5b67'
           '029f89c49550c40ec7a95116b6a33f0e5a041094'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
           'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
           'cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec'
           '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
           '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9'
-          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b')
+          '53be0f1437ebe595240d8dbdd819939582b97fb9')
 
 prepare() {
-  patch -p1 -d bind-$_pkgver < 01-remove-tools.patch
+  # remove dig to avoid conflict with dnsutils
+  sed -i 's/dig//' $pkgname-$_pkgver/bin/Makefile.in
 }
 
 build() {
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD
index ab4ef1bfd..1c1df987d 100644
--- a/community/cython/PKGBUILD
+++ b/community/cython/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88776 2013-04-22 10:14:05Z spupykin $
+# $Id: PKGBUILD 91947 2013-05-30 09:41:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Igor Scabini <furester @ gmail.com>
 
 pkgname=('cython' 'cython2')
 pkgbase=cython
-pkgver=0.19
+pkgver=0.19.1
 pkgrel=1
 pkgdesc="C-Extensions for Python "
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ url="http://www.cython.org"
 license=('APACHE')
 makedepends=('python-distribute' 'python2-distribute')
 source=("http://cython.org/release/Cython-$pkgver.tar.gz")
-md5sums=('76989337dee4cf7afdcb5cde514423f8')
+md5sums=('df4cfb2b8e3345272e3fc451b76bd630')
 
 build() {
   true
diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD
index ff5b70969..a24c78732 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91858 2013-05-28 17:27:08Z spupykin $
+# $Id: PKGBUILD 91949 2013-05-30 09:42:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: scj <scj(at)archlinux(dot)us>
 
 pkgname=incron
 pkgver=0.5.10
-pkgrel=5
+pkgrel=6
 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://incron.aiken.cz/"
@@ -43,4 +43,5 @@ package() {
     SYSDATADIR="${pkgdir}"/etc/incron.d install
 
   install -Dm0644 "${srcdir}/incrond.service" "${pkgdir}/usr/lib/systemd/system/incrond.service"
+  rmdir $pkgdir/usr/sbin
 }
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index d480fae5f..4dc3c6229 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90274 2013-05-10 21:44:25Z thestinger $
+# $Id: PKGBUILD 91966 2013-05-30 13:14:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -8,25 +8,32 @@
 pkgname=lxc
 pkgver=0.9.0
 epoch=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux Containers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lxc.sourceforge.net/"
 depends=('bash' 'perl' 'libseccomp')
+makedepends=('docbook2x')
+optdepends=('arch-install-scripts: for archlinux template')
 license=('LGPL')
 source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz")
 md5sums=('8552a4479090616f4bc04d8473765fc9')
 
+prepare() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  sed -i "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" configure.ac
+}
+
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
+  ./autogen.sh
   ./configure \
-	--prefix=/usr \
-	--localstatedir=/var \
-	--libexecdir=/usr/bin \
-	--sysconfdir=/etc \
-	--disable-apparmor \
-	--disable-doc \
-        --enable-seccomp
+    --prefix=/usr \
+    --localstatedir=/var \
+    --libexecdir=/usr/bin \
+    --sysconfdir=/etc \
+    --disable-apparmor \
+    --enable-seccomp
   make
 }
 
diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD
index 3c6576657..4e959e0fa 100644
--- a/community/mcelog/PKGBUILD
+++ b/community/mcelog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91518 2013-05-23 11:14:52Z spupykin $
+# $Id: PKGBUILD 91951 2013-05-30 09:42:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 # Maintainer: Thomas Mudrunka <harvie@@email..cz>
 
 pkgname=mcelog
-pkgver=20130523
+pkgver=20130530
 pkgrel=1
 pkgdesc="Print machine check event log from x86-64 kernel"
 url="http://freshmeat.net/projects/mcelog/"
@@ -32,7 +32,7 @@ package() {
   cd "${srcdir}/mcelog"
   mkdir -p $pkgdir/usr/share/doc/mcelog
   make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog
-  install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron"
+  install -Dm0755 mcelog.cron "${pkgdir}/usr/bin/mcelog.cron"
   install -Dm0644 mcelog.logrotate "${pkgdir}/etc/logrotate.d/mcelog.logrotate"
   install -Dm0644 README "${pkgdir}/usr/share/doc/mcelog/README"
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index acf9f36d5..38cddc0e5 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 91522 2013-05-23 11:15:56Z spupykin $
+# $Id: PKGBUILD 91953 2013-05-30 09:43:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=miredo
-pkgver=1.2.5
-pkgrel=5
+pkgver=1.2.6
+pkgrel=1
 pkgdesc="Teredo client and server."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/miredo/"
@@ -15,7 +15,7 @@ options=('!libtool')
 source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz
 	miredo.install
 	miredo.service)
-md5sums=('5114debbf9fcab5d292176e4548f8cd1'
+md5sums=('5bcdbaced54f40b6cb1e9c9a8dbac411'
          'd1b655d7a851cdb46c91c3418ed1962f'
          'fd6d5b355b2356426eeefd6047f6bb7c')
 
diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD
index 00069ada2..717203c27 100644
--- a/community/pound/PKGBUILD
+++ b/community/pound/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91868 2013-05-28 17:43:52Z spupykin $
+# $Id: PKGBUILD 91955 2013-05-30 09:43:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=pound
 pkgver=2.6
-pkgrel=5
+pkgrel=6
 pkgdesc="A reverse proxy, load balancer, and SSL wrapper"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.apsis.ch/pound/index_html"
@@ -37,4 +37,5 @@ package() {
   install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run
   install -D -m0644 $srcdir/pound.cfg $pkgdir/etc/pound/pound.cfg
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+  rmdir $pkgdir/usr/sbin
 }
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index 9fbafcc11..5600762f0 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86900 2013-03-24 05:37:37Z foutrelis $
+# $Id: PKGBUILD 91995 2013-05-30 21:12:52Z lcarlier $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Xilon <xilonmu@gmail.com>
 
 pkgname=powertop
 pkgver=2.3
-pkgrel=1
+pkgrel=2
 pkgdesc='A tool to diagnose issues with power consumption and power management'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://01.org/powertop/'
@@ -18,7 +18,7 @@ sha256sums=('b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 2a94c6e94..2bee7ef10 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91930 2013-05-29 16:59:39Z spupykin $
+# $Id: PKGBUILD 91963 2013-05-30 10:15:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
@@ -14,28 +14,27 @@ license=('GPL2')
 depends=('qtwebkit')
 makedepends=('glu')
 options=(libtool)
-#source=(https://github.com/qcad/qcad/archive/v${pkgver}.zip
-source=(http://cl.ly/1u1Y3H290M1S/download/qcad-v${pkgver}.zip
+source=($pkgname-$pkgver.zip::https://github.com/qcad/qcad/archive/v${pkgver}.zip
         QCad.desktop)
-md5sums=('6f52fe016e915850ba942fa760909d4c'
+md5sums=('2c460838235a95a4d969e508a75b8206'
          '8c4288986b78b14a813b005e81b6ba53')
 
 prepare() {
-  cd ${srcdir}
+  cd ${srcdir}/qcad-$pkgver
 
   sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp
   sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp
 }
 
 build() {
-  cd ${srcdir}
+  cd ${srcdir}/qcad-$pkgver
 
   qmake-qt4
   make PREFIX=/usr CXX="g++ -fpermissive"
 }
 
 package() {
-  cd ${srcdir}
+  cd ${srcdir}/qcad-$pkgver
 
   # remove project files
   find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete
@@ -61,7 +60,7 @@ package() {
   done
 
   install -Dm644 scripts/qcad_icon.png ${pkgdir}/usr/share/pixmaps/qcad_icon.png
-  install -Dm644 QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
+  install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
 
   install -dm0755 $pkgdir/usr/bin
   echo -e '#!/bin/sh\ncd /usr/share/qcad\nexec ./qcad' >$pkgdir/usr/bin/qcad
diff --git a/community/sniffit/PKGBUILD b/community/sniffit/PKGBUILD
index 3c93a9cbd..4e1d69ae4 100644
--- a/community/sniffit/PKGBUILD
+++ b/community/sniffit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91886 2013-05-28 18:10:20Z spupykin $
+# $Id: PKGBUILD 91957 2013-05-30 09:44:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
 
 pkgname=sniffit
 pkgver=0.3.7.beta
-pkgrel=12
+pkgrel=13
 pkgdesc="Very good packet sniffer for unix with ncurses interactive mode"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.ubuntu.com/source/sniffit"
@@ -33,7 +33,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}.${pkgver}"
-  install -d -m0755 -g root -o root ${pkgdir}/usr/{sbin,share/licenses/${pkgname}}
-  install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/sbin/sniffit
+  install -d -m0755 -g root -o root ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
+  install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/bin/sniffit
   install -D -m0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}
 }
diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD
index 4376cea85..ffefbc54e 100644
--- a/community/squashfs-tools/PKGBUILD
+++ b/community/squashfs-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91872 2013-05-28 17:44:34Z spupykin $
+# $Id: PKGBUILD 91959 2013-05-30 09:44:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Original TU: Jeff Mickey <j@codemac.net>
@@ -6,7 +6,7 @@
 
 pkgname=squashfs-tools
 pkgver=4.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
 url="http://squashfs.sourceforge.net"
 license=("GPL")
@@ -17,13 +17,11 @@ md5sums=('1b7a781fb4cf8938842279bd3e8ee852')
 
 build() {
     cd ${srcdir}/squashfs${pkgver}/${pkgname}
-    sed -i 's|^#XZ_SUPPORT = 1|XZ_SUPPORT = 1|' Makefile
-    sed -i 's|^#LZO_SUPPORT = 1|LZO_SUPPORT = 1|' Makefile
-    make
+    make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1
 }
 
 package() {
     cd ${srcdir}/squashfs${pkgver}/${pkgname}
-    install -Dm755 mksquashfs ${pkgdir}/bin/mksquashfs
-    install -m755 unsquashfs ${pkgdir}/bin/unsquashfs
+    install -Dm755 mksquashfs ${pkgdir}/usr/bin/mksquashfs
+    install -m755 unsquashfs ${pkgdir}/usr/bin/unsquashfs
 }
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
index 1c4e76350..b55347e34 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -1,43 +1,46 @@
-# $Id: PKGBUILD 177869 2013-02-10 13:06:27Z tomegun $
+# $Id: PKGBUILD 186631 2013-05-30 10:13:30Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=btrfs-progs
-pkgver=0.20rc1.1
+pkgver=0.20rc1.2
 pkgrel=1
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64 mips64el)
-depends=('glibc' 'e2fsprogs')
+depends=('glibc' 'e2fsprogs' 'lzo2')
+makedepends=('git')
 url="http://btrfs.wiki.kernel.org/"
 replaces=('btrfs-progs-unstable')
 conflicts=('btrfs-progs-unstable')
 provides=('btrfs-progs-unstable')
 license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-0.20-rc1.1.tar.xz
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#commit=7854c8b667"
 	initcpio-install-btrfs
 	initcpio-hook-btrfs)
 install=btrfs-progs.install
+options=(!staticlibs)
 
 build() {
-   cd $srcdir/$pkgname-0.20-rc1.1
+   cd $pkgname
    make CFLAGS="$CFLAGS"
 
 }
 
 package() {
-   cd $srcdir/$pkgname-0.20-rc1.1
+   cd $pkgname
+
    make prefix=$pkgdir/usr install
+
    # fix manpage
    mkdir -p $pkgdir/usr/share/
    mv $pkgdir/usr/man $pkgdir/usr/share/man
-   mkdir -p ${pkgdir}/sbin
-   ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
+
    # install mkinitcpio hooks
    install -Dm644 "$srcdir/initcpio-install-btrfs" \
      "$pkgdir/usr/lib/initcpio/install/btrfs"
    install -Dm644 "$srcdir/initcpio-hook-btrfs" \
      "$pkgdir/usr/lib/initcpio/hooks/btrfs"
 }
-md5sums=('4046bebaae014db1fd50cec2da0e94c0'
+md5sums=('SKIP'
          '7241ba3a4286d08da0d50b7176941112'
          'b09688a915a0ec8f40e2f5aacbabc9ad')
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index e852b87fa..0bc1cb89e 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180028 2013-03-14 20:45:48Z foutrelis $
+# $Id: PKGBUILD 186735 2013-05-30 21:29:53Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=iptables
 pkgver=1.4.18
-pkgrel=1
+pkgrel=2
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -13,11 +13,8 @@ depends=('glibc' 'bash')
 makedepends=('linux-api-headers' 'chrpath')
 options=('!libtool')
 source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2"
-        iptables
-        ip6tables
         empty.rules
         simple_firewall.rules
-        iptables.conf.d
         empty-filter.rules
         empty-mangle.rules
         empty-nat.rules
@@ -27,21 +24,17 @@ source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.t
         iptables.service
         ip6tables.service
         iptables-flush)
-backup=(etc/conf.d/iptables)
 sha1sums=('34bf627c8755a61caf3635a998d2a5279f664f9e'
-          '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
-          '2db68906b603e5268736f48c8e251f3a49da1d75'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
           'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
-          'cdb830137192bbe002c6d01058656bd053ed0ddd'
           'd9f9f06b46b4187648e860afa0552335aafe3ce4'
           'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
           '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
           '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
           'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
           '44626980a52e49f345a0b1e1ca03060f3a35763c'
-          '5f2e76985a751f635a45612565a6e1bc9547398a'
-          'fe6bbe214b3a13bd084f62a8ee9631fd8326c464'
+          '9306cba67dbeaa004af084a816f66920a6a10faf'
+          '38fa2ffe7965e63b494d333f69193029c1258c28'
           'e7abda09c61142121b6695928d3b71ccd8fdf73a')
 
 build() {
@@ -55,7 +48,8 @@ build() {
  ./configure --prefix=/usr \
      --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
      --with-xtlibdir=/usr/lib/iptables \
-     --enable-devel --enable-shared
+     --enable-devel --enable-shared \
+     --sbindir=/usr/bin
   make
 }
 
@@ -69,11 +63,8 @@ package() {
   chrpath --delete "${pkgdir}"/usr/lib/iptables/*.so
 
   cd "${srcdir}"
-  install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables
-  install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables
   install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
   install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
-  install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables
 
   mkdir -p "${pkgdir}"/var/lib/{iptables,ip6tables}
   install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables
diff --git a/core/iptables/ip6tables b/core/iptables/ip6tables
deleted file mode 100755
index 2d119e3ed..000000000
--- a/core/iptables/ip6tables
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		if [ ! -f "$IP6TABLES_CONF" ]; then
-			echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2
-			exit 1
-		fi
-		stat_busy "Starting IP6 Tables"
-		if [ "$IPTABLES_FORWARD" = "1" ]; then
-			echo 1 >/proc/sys/net/ipv6/conf/default/forwarding
-			echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
-		fi
-		if ck_daemon ip6tables; then
-			/usr/sbin/ip6tables-restore < $IP6TABLES_CONF
-			if [ $? -gt 0 ]; then
-				stat_fail
-			else
-				add_daemon ip6tables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy "Stopping IP6 Tables"
-		if ! ck_daemon ip6tables; then
-			fail=0
-			for table in $(cat /proc/net/ip6_tables_names); do
-				ip6tables-restore < /var/lib/iptables/empty-$table.rules
-				[ $? -gt 0 ] && fail=1
-			done
-			if [ $fail -gt 0 ]; then
-				stat_fail
-			else
-				rm_daemon ip6tables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	save)
-		stat_busy "Saving IP6 Tables"
-		/usr/sbin/ip6tables-save >$IP6TABLES_CONF
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			stat_done
-		fi
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/core/iptables/ip6tables.service b/core/iptables/ip6tables.service
index 60d76becf..7a8d39ca0 100644
--- a/core/iptables/ip6tables.service
+++ b/core/iptables/ip6tables.service
@@ -3,8 +3,8 @@ Description=IPv6 Packet Filtering Framework
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
-ExecReload=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecStart=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecReload=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules
 ExecStop=/usr/lib/systemd/scripts/iptables-flush 6
 RemainAfterExit=yes
 
diff --git a/core/iptables/iptables b/core/iptables/iptables
deleted file mode 100755
index fbb02face..000000000
--- a/core/iptables/iptables
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		if [ ! -f "$IPTABLES_CONF" ]; then
-			echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2
-			exit 1
-		fi
-		stat_busy "Starting IP Tables"
-		if [ "$IPTABLES_FORWARD" = "1" ]; then
-			echo 1 >/proc/sys/net/ipv4/ip_forward
-		fi
-		if ck_daemon iptables; then
-			/usr/sbin/iptables-restore < $IPTABLES_CONF
-			if [ $? -gt 0 ]; then
-				stat_fail
-			else
-				add_daemon iptables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy "Stopping IP Tables"
-		if ! ck_daemon iptables; then
-			fail=0
-			for table in $(cat /proc/net/ip_tables_names); do
-				iptables-restore < /var/lib/iptables/empty-$table.rules
-				[ $? -gt 0 ] && fail=1
-			done
-			if [ $fail -gt 0 ]; then
-				stat_fail
-			else
-				rm_daemon iptables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	save)
-		stat_busy "Saving IP Tables"
-		/usr/sbin/iptables-save >$IPTABLES_CONF
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			stat_done
-		fi
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/core/iptables/iptables.conf.d b/core/iptables/iptables.conf.d
deleted file mode 100644
index 1c6cc7b5d..000000000
--- a/core/iptables/iptables.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration for iptables rules
-IPTABLES_CONF=/etc/iptables/iptables.rules
-IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-# Enable IP forwarding (both IPv4 and IPv6)
-# NOTE: this is not the recommended way to do this, and is supported only for
-# backward compatibility. Instead, use /etc/sysctl.conf and set the following
-# options:
-# * net.ipv4.ip_forward=1
-# * net.ipv6.conf.default.forwarding=1
-# * net.ipv6.conf.all.forwarding=1
-#IPTABLES_FORWARD=0
diff --git a/core/iptables/iptables.service b/core/iptables/iptables.service
index eb1a967f3..5441e4577 100644
--- a/core/iptables/iptables.service
+++ b/core/iptables/iptables.service
@@ -3,8 +3,8 @@ Description=Packet Filtering Framework
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
-ExecReload=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
+ExecStart=/usr/bin/iptables-restore /etc/iptables/iptables.rules
+ExecReload=/usr/bin/iptables-restore /etc/iptables/iptables.rules
 ExecStop=/usr/lib/systemd/scripts/iptables-flush
 RemainAfterExit=yes
 
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index e59222069..158f407f1 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186026 2013-05-20 14:49:45Z bisson $
+# $Id: PKGBUILD 186686 2013-05-30 13:43:55Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=procps-ng
-pkgver=3.3.7
-pkgrel=2
+pkgver=3.3.8
+pkgrel=1
 pkgdesc='Utilities for monitoring your system and its processes'
 url='http://gitorious.org/procps'
 license=('GPL' 'LGPL')
@@ -12,9 +12,9 @@ arch=('i686' 'x86_64' 'mips64el')
 groups=('base')
 depends=('ncurses')
 backup=('etc/sysctl.conf')
-source=("procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}"
+source=("${pkgname}-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}"
         'sysctl.conf')
-sha1sums=('436ce9e585210340ff1673157e402e07879a6239'
+sha1sums=('63aed46ba4b5b05698beb25d2aa3eee6779d7f45'
           '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53')
 
 conflicts=('procps')
diff --git a/core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch b/core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
deleted file mode 100644
index 26da877ef..000000000
--- a/core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e3b6cb87e0ba1304fa07ec316784de1c6243b28e Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 13 May 2013 10:54:41 +0200
-Subject: [PATCH] lib/loopdev: fix loopcxt_check_size() to work with blkdevs
-
-The loopcxt_check_size() is workaround for kernels < v3.9, kernel has
-been fixed by commit 541c742a7559eb65f0e36d3e2338c2ca532a3e61.
-
-The function sets loopdev size according to backing file size. The
-problem is that the backing file could be a block device where
-stat.st_size is zero, so we have to use blkdev_get_size() for block
-devices.
-
-Addresses: https://bugs.archlinux.org/task/35193
-Reported-by: Dave Reisner <d@falconindy.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- lib/loopdev.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/lib/loopdev.c b/lib/loopdev.c
-index c35e306..3b65b5d 100644
---- a/lib/loopdev.c
-+++ b/lib/loopdev.c
-@@ -1097,7 +1097,17 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd)
- 	if (fstat(file_fd, &st))
- 		return -errno;
- 
--	expected_size = st.st_size;
-+	if (S_ISBLK(st.st_mode)) {
-+		if (blkdev_get_size(file_fd,
-+				(unsigned long long *) &expected_size))
-+			return -errno;
-+	} else
-+		expected_size = st.st_size;
-+
-+	if (expected_size == 0 || expected_size <= lc->info.lo_offset) {
-+		DBG(lc, loopdev_debug("failed to determine expected size"));
-+		return 0;	/* ignore this error */
-+	}
- 
- 	if (lc->info.lo_offset > 0)
- 		expected_size -= lc->info.lo_offset;
-@@ -1113,6 +1123,10 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd)
- 		return -errno;
- 
- 	if (expected_size != size) {
-+		DBG(lc, loopdev_debug("warning: loopdev and expected "
-+				      "size dismatch (%ju/%ju)",
-+				      size, expected_size));
-+
- 		if (loopcxt_set_capacity(lc)) {
- 			/* ioctl not available */
- 			if (errno == ENOTTY || errno == EINVAL)
--- 
-1.8.2.3
-
diff --git a/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch b/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
deleted file mode 100644
index 86bb6e572..000000000
--- a/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 4fb18cde32a6cb672090762c785d89a6ed02ef57 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 9 May 2013 13:06:02 +0200
-Subject: [PATCH] libfdisk: do not use va_list in the Ask API
-
-  # fdisk /dev/sda
-  Welcome to fdisk (util-linux 2.23).
-
-  [...]
-
-  Command (m for help): a
-  Segmentation fault (core dumped)
-
-It's too fragile, the va_list implementation is architecture specific
-and it seems we need such thing in libfdisk at all.
-
-Reported-by: "Gabor Z. Papp" <gzp@papp.hu>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- fdisks/fdisk-ask.c      | 13 +++----------
- libfdisk/src/ask.c      | 35 +++++++++--------------------------
- libfdisk/src/fdiskP.h   |  2 --
- libfdisk/src/libfdisk.h |  2 --
- 4 files changed, 12 insertions(+), 40 deletions(-)
-
-diff --git a/fdisks/fdisk-ask.c b/fdisks/fdisk-ask.c
-index 7495d85..61dc0c2 100644
---- a/fdisks/fdisk-ask.c
-+++ b/fdisks/fdisk-ask.c
-@@ -167,7 +167,6 @@ static int ask_offset(struct fdisk_context *cxt,
- int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask,
- 		    void *data __attribute__((__unused__)))
- {
--	va_list ap;
- 	int rc = 0;
- 	char buf[BUFSIZ];
- 
-@@ -180,23 +179,17 @@ int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask,
- 	case FDISK_ASKTYPE_OFFSET:
- 		return ask_offset(cxt, ask, buf, sizeof(buf));
- 	case FDISK_ASKTYPE_INFO:
--		fdisk_ask_print_get_va(ask, ap);
--		vfprintf(stdout, fdisk_ask_print_get_mesg(ask), ap);
-+		fputs(fdisk_ask_print_get_mesg(ask), stdout);
- 		fputc('\n', stdout);
--		va_end(ap);
- 		break;
- 	case FDISK_ASKTYPE_WARNX:
--		fdisk_ask_print_get_va(ask, ap);
--		vfprintf(stderr, fdisk_ask_print_get_mesg(ask), ap);
-+		fputs(fdisk_ask_print_get_mesg(ask), stderr);
- 		fputc('\n', stderr);
--		va_end(ap);
- 		break;
- 	case FDISK_ASKTYPE_WARN:
--		fdisk_ask_print_get_va(ask, ap);
--		vfprintf(stderr, fdisk_ask_print_get_mesg(ask), ap);
-+		fputs(fdisk_ask_print_get_mesg(ask), stderr);
- 		errno = fdisk_ask_print_get_errno(ask);
- 		fprintf(stderr, ": %m\n");
--		va_end(ap);
- 		break;
- 	case FDISK_ASKTYPE_YESNO:
- 		fputc('\n', stdout);
-diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c
-index d2325d5..cdb4d01 100644
---- a/libfdisk/src/ask.c
-+++ b/libfdisk/src/ask.c
-@@ -18,11 +18,6 @@ void fdisk_reset_ask(struct fdisk_ask *ask)
- 	case FDISK_ASKTYPE_NUMBER:
- 		free(ask->data.num.range);
- 		break;
--	case FDISK_ASKTYPE_WARNX:
--	case FDISK_ASKTYPE_WARN:
--		if (ask->data.print.has_va)
--			va_end(ask->data.print.va);
--		break;
- 	default:
- 		break;
- 	}
-@@ -452,44 +447,32 @@ int fdisk_ask_print_set_mesg(struct fdisk_ask *ask, const char *mesg)
- 	return 0;
- }
- 
--/* caller has to call va_end(ap) */
--int fdisk_ask_print_get_va(struct fdisk_ask *ask, va_list ap)
--{
--	assert(ask);
--	assert(is_print_ask(ask));
--	va_copy(ap, ask->data.print.va);
--	return 0;
--}
--
--/* note that fdisk_free_ask() calls va_end() to free the private va list. */
--int fdisk_ask_print_set_va(struct fdisk_ask *ask, va_list ap)
--{
--	assert(ask);
--	va_copy(ask->data.print.va, ap);
--	ask->data.print.has_va = 1;
--	return 0;
--}
--
- static int do_vprint(struct fdisk_context *cxt, int errnum, int type,
- 		 const char *fmt, va_list va)
- {
- 	struct fdisk_ask *ask;
- 	int rc;
-+	char *mesg;
- 
- 	assert(cxt);
- 
-+	if (vasprintf(&mesg, fmt, va) < 0)
-+		return -ENOMEM;
-+
- 	ask = fdisk_new_ask();
--	if (!ask)
-+	if (!ask) {
-+		free(mesg);
- 		return -ENOMEM;
-+	}
- 
- 	fdisk_ask_set_type(ask, type);
--	fdisk_ask_print_set_mesg(ask, fmt);
--	fdisk_ask_print_set_va(ask, va);
-+	fdisk_ask_print_set_mesg(ask, mesg);
- 	if (errnum >= 0)
- 		fdisk_ask_print_set_errno(ask, errnum);
- 	rc = fdisk_do_ask(cxt, ask);
- 
- 	fdisk_free_ask(ask);
-+	free(mesg);
- 	return rc;
- }
- 
-diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h
-index 570108c..ce42860 100644
---- a/libfdisk/src/fdiskP.h
-+++ b/libfdisk/src/fdiskP.h
-@@ -231,8 +231,6 @@ struct fdisk_ask {
- 		/* FDISK_ASKTYPE_{WARN,WARNX,..} */
- 		struct ask_print {
- 			const char	*mesg;
--			va_list		va;
--			unsigned int	has_va:1;
- 			int		errnum;		/* errno */
- 		} print;
- 		/* FDISK_ASKTYPE_YESNO */
-diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h
-index 0a23236..8a44067 100644
---- a/libfdisk/src/libfdisk.h
-+++ b/libfdisk/src/libfdisk.h
-@@ -182,8 +182,6 @@ extern int fdisk_ask_print_get_errno(struct fdisk_ask *ask);
- extern int fdisk_ask_print_set_errno(struct fdisk_ask *ask, int errnum);
- extern const char *fdisk_ask_print_get_mesg(struct fdisk_ask *ask);
- extern int fdisk_ask_print_set_mesg(struct fdisk_ask *ask, const char *mesg);
--extern int fdisk_ask_print_get_va(struct fdisk_ask *ask, va_list ap);
--extern int fdisk_ask_print_set_va(struct fdisk_ask *ask, va_list ap);
- 
- #ifdef __cplusplus
- }
--- 
-1.8.2.3
-
diff --git a/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch b/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch
deleted file mode 100644
index afc875719..000000000
--- a/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b048b8af3a5568c90f6e0c2d56f6cb399dedb0d1 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 13 May 2013 11:00:47 +0200
-Subject: [PATCH] losetup: use warn_size() for regular files only
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- sys-utils/losetup.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
-index ccf120e..b44c9e5 100644
---- a/sys-utils/losetup.c
-+++ b/sys-utils/losetup.c
-@@ -380,7 +380,7 @@ static void warn_size(const char *filename, uint64_t size)
- 	struct stat st;
- 
- 	if (!size) {
--		if (stat(filename, &st))
-+		if (stat(filename, &st) || S_ISBLK(st.st_mode))
- 			return;
- 		size = st.st_size;
- 	}
--- 
-1.8.2.3
-
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 2172701f9..4f7e2c06e 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186531 2013-05-28 12:25:50Z dreisner $
+# $Id: PKGBUILD 186677 2013-05-30 12:45:22Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.23
-pkgrel=3
+pkgver=2.23.1
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,9 +17,6 @@ provides=("util-linux-ng=$pkgver" 'eject')
 license=('GPL2')
 options=('!libtool')
 source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz"
-        0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
-        0001-losetup-use-warn_size-for-regular-files-only.patch
-        0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
         uuidd.tmpfiles
         pam-login
         pam-common
@@ -30,25 +27,14 @@ backup=(etc/pam.d/chfn
         etc/pam.d/su
         etc/pam.d/su-l)
 install=util-linux.install
-md5sums=('cf5e9bb402371beaaffc3a5f276d5783'
-         'fdb627fbb3d6a42e0b36978649b4c064'
-         'de0ba450945a60f27c5df86e64523d57'
-         'df949d15dbff01fe9fcda5d999a35b15'
+md5sums=('33ba55ce82f8e3b8d7a38fac0f62779a'
          'a39554bfd65cccfd8254bb46922f4a67'
          '4368b3f98abd8a32662e094c54e7f9b1'
          'a31374fef2cba0ca34dfc7078e2969e4'
          'fa85e5cce5d723275b14365ba71a8aad')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir"/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
-  patch -Np1 <"$srcdir"/0001-losetup-use-warn_size-for-regular-files-only.patch
-  patch -Np1 <"$srcdir"/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
-}
-
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
   ./configure --prefix=/usr \
               --libdir=/usr/lib \
@@ -75,12 +61,10 @@ build() {
 #}
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="${pkgdir}" install
 
-  cd "${pkgdir}"
-
   # setuid chfn and chsh
   chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
 
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 8d3a91031..12f32c9a3 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183180 2013-04-18 13:14:56Z dreisner $
+# $Id: PKGBUILD 186657 2013-05-30 12:20:27Z dreisner $
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
@@ -9,7 +9,7 @@
 
 pkgname=bitlbee
 pkgver=3.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
@@ -35,6 +35,7 @@ build() {
   ./configure \
     --prefix=/usr \
     --etcdir=/etc/bitlbee \
+    --sbindir=/usr/bin \
     --pidfile=/run/bitlbee/bitlbee.pid \
     --ipcsocket=/run/bitlbee/bitlbee.sock \
     --systemdsystemunitdir=/usr/lib/systemd/system \
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index d82a4890a..cd20d86ff 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186337 2013-05-25 02:56:27Z foutrelis $
+# $Id: PKGBUILD 186633 2013-05-30 10:57:28Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -17,8 +17,8 @@ pkgname=('calligra-filters'
          'calligra-handbook'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.6.3
-pkgrel=5
+pkgver=2.6.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
@@ -29,7 +29,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
 [ "$CARCH" != "mips64el" ] && makedepends+=('vc')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('90d6bb619191abbcc94094379d47e225')
+md5sums=('a38fdc882888469ea8b0dea949c05dda')
 
 build() {
   mkdir build
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index 121c4688c..2433a321b 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185561 2013-05-15 07:16:35Z heftig $
+# $Id: PKGBUILD 186662 2013-05-30 12:24:29Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
 pkgver=1.14.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
@@ -20,6 +20,10 @@ build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --enable-introspection \
     --enable-wayland-{backend,compositor} --enable-egl-backend --enable-evdev-input
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 7a7a29698..39f90d60c 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183342 2013-04-21 22:08:43Z heftig $
+# $Id: PKGBUILD 186660 2013-05-30 12:23:15Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
 pkgver=1.14.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=(mips64el)
 url="http://www.clutter-project.org/"
@@ -18,6 +18,10 @@ build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr \
     --enable-wayland-egl-{platform,server} --enable-gles{1,2}
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD
index b7d0acc4b..ec298d33f 100644
--- a/extra/dosfstools/PKGBUILD
+++ b/extra/dosfstools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186197 2013-05-22 00:02:48Z eric $
+# $Id: PKGBUILD 186622 2013-05-30 05:56:36Z tpowa $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=dosfstools
-pkgver=3.0.16
-pkgrel=2
+pkgver=3.0.17
+pkgrel=1
 pkgdesc="DOS filesystem utilities"
 arch=(i686 x86_64 'mips64el')
 depends=('glibc')
@@ -20,5 +20,5 @@ package () {
    cd $srcdir/$pkgname-$pkgver
    make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
 }
-md5sums=('27aca18aeb8bb0851ccaeb47e7416a6e'
-         'e8b460ab9c27279e652ddbd1ce7fa4b2')
+md5sums=('468b953ddc8baf66e9881d1a5eae03e2'
+         'SKIP')
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 7c92bf002..949e5a37b 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186358 2013-05-25 15:54:34Z heftig $
+# $Id: PKGBUILD 186665 2013-05-30 12:26:35Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
 pkgver=3.8.2
-pkgrel=3
+pkgrel=4
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64 mips64el)
 url="http://live.gnome.org/GnomeShell"
@@ -40,6 +40,10 @@ build() {
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \
       --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index 76bcfe845..d0cf118a7 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183420 2013-04-21 22:11:00Z heftig $
+# $Id: PKGBUILD 186713 2013-05-30 17:40:28Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 
 pkgname=gupnp-av
-pkgver=0.12.1
+pkgver=0.12.2
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=(gupnp)
 makedepends=(gobject-introspection gtk-doc vala)
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('7c73f3c1e1c8f552079b8db8971348acf85078c82ed4da883b218bd993fcd4c4')
+sha256sums=('43597bdfb1c352338e706962ff7fcdbcb544c5a36f27c9c2aaa5a550b6990270')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp-dlna/PKGBUILD b/extra/gupnp-dlna/PKGBUILD
index f42e8dbd9..43a85b154 100644
--- a/extra/gupnp-dlna/PKGBUILD
+++ b/extra/gupnp-dlna/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183421 2013-04-21 22:11:02Z heftig $
+# $Id: PKGBUILD 186714 2013-05-30 17:41:26Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gupnp-dlna
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=1
 pkgdesc="Library to ease DLNA-related bits for applications using gupnp"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=(gst-plugins-base-libs)
 makedepends=(gobject-introspection gtk-doc vala)
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c514ec6edd2a427914ef79fed002f91b875fde127084f21d770401a1d2b95f7b')
+sha256sums=('158a22dc9c11645817596322e2516701f0d49e40f1892ddc8832afd26221c5c3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 498810474..14689e9e5 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183419 2013-04-21 22:10:59Z heftig $
+# $Id: PKGBUILD 186594 2013-05-30 00:27:58Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.20.2
+pkgver=0.20.3
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk-doc vala)
 optdepends=('python2: gupnp-binding-tool')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9b27b1bdd16f7f13e28e20bce85a117e577a8183f95615876a9d91f4d4a70812')
+sha256sums=('ed7db7506506434d0fd272e3866d7ae985af5b9d7e9e5e120f8581ade90869f0')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index a3f066062..bb1540cb2 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183678 2013-04-26 13:20:21Z andrea $
+# $Id: PKGBUILD 186676 2013-05-30 12:44:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
-pkgver=1.5.0
-_pkgver=4.5.0
+pkgver=1.5.1
+_pkgver=4.5.1
 pkgrel=1
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
 source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('778a1711c15458952e1e4765722a0839390f636c'
-          'fa282f0ace43d36a785e608c421c91437596fc79')
+sha1sums=('c047724c255417b361d3ce1898555c2b9183f5b2'
+          '9bdb654373970f46d01359fdcae6d879c405760a')
 
 build() {
   mkdir build
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index a9b9f3059..0ed239bc9 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183676 2013-04-26 13:20:05Z andrea $
+# $Id: PKGBUILD 186674 2013-05-30 12:43:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
-pkgver=4.5.0
+pkgver=4.5.1
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ optdepends=('kdesdk-okteta: hex editor'
             'qt-doc: qt documentation integration')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('21cdff814b5840d4b62b105b53c0b128e35c3c9f')
+sha1sums=('e27b77bca0b4c466f66b24167ec416f20b353f6f')
 
 build() {
   mkdir build
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index 68ac479b1..03ef9b94b 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183674 2013-04-26 13:19:47Z andrea $
+# $Id: PKGBUILD 186672 2013-05-30 12:43:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevplatform
-pkgver=1.5.0
-_pkgver=4.5.0
+pkgver=1.5.1
+_pkgver=4.5.1
 pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c5b887fdd9fe065ff8be5641859c80c020ba625e')
+sha1sums=('af3e78b55c4aec97e271bc06c59186cdf77fe3d1')
 
 build() {
   mkdir build
diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD
index 4ca0e6706..9369118e6 100644
--- a/extra/kwebkitpart/PKGBUILD
+++ b/extra/kwebkitpart/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186557 2013-05-28 23:46:47Z andrea $
+# $Id: PKGBUILD 186710 2013-05-30 17:03:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kwebkitpart
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A WebKit browser component for KDE"
 url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,9 @@ license=('LGPL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('0c90cc05b4f9b6cba9e62941ae4d3ba0')
+# Generate using kde releaseme scripts
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('82640f97f23ce72bed1da6527909bb5d')
 
 build() {
   sed -i '/add_subdirectory(kdelauncher)/d' ${pkgname}-${pkgver}/CMakeLists.txt
diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD
new file mode 100644
index 000000000..901429d4c
--- /dev/null
+++ b/extra/libmbim/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 186608 2013-05-30 04:01:37Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=libmbim
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="MBIM modem protocol helper library"
+arch=(i686 x86_64)
+url="http://cgit.freedesktop.org/libmbim/libmbim"
+license=(GPL2)
+depends=(glib2 bash systemd)
+makedepends=(gtk-doc python)
+options=('!libtool')
+source=($url/snapshot/$pkgname-$pkgver.tar.xz format.patch)
+sha256sums=('c3d668a5dc51700749a62fb5d50f149900e8dd4265e4d132c1d9cc4cb77eef0c'
+            'fbf54d12660c132f756c59cebd448a38750e3bbc9de8a7a97ceda466440dcb41')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../format.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --with-tests
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libmbim/format.patch b/extra/libmbim/format.patch
new file mode 100644
index 000000000..4bd4c0eea
--- /dev/null
+++ b/extra/libmbim/format.patch
@@ -0,0 +1,14 @@
+diff -u -r libmbim-1.0.0/cli/mbimcli-basic-connect.c libmbim-1.0.0-format/cli/mbimcli-basic-connect.c
+--- libmbim-1.0.0/cli/mbimcli-basic-connect.c	2013-05-22 16:20:29.000000000 +0200
++++ libmbim-1.0.0-format/cli/mbimcli-basic-connect.c	2013-05-30 05:53:49.269777442 +0200
+@@ -909,8 +909,8 @@
+              "\t         Network error: '%s'\n"
+              "\t  Packet service state: '%s'\n"
+              "\tAvailable data classes: '%s'\n"
+-             "\t          Uplink speed: '%lu bps'\n"
+-             "\t        Downlink speed: '%lu bps'\n",
++             "\t          Uplink speed: '%" G_GUINT64_FORMAT " bps'\n"
++             "\t        Downlink speed: '%" G_GUINT64_FORMAT " bps'\n",
+              mbim_device_get_path_display (device),
+              VALIDATE_UNKNOWN (mbim_nw_error_get_string (nw_error)),
+              VALIDATE_UNKNOWN (mbim_packet_service_state_get_string (packet_service_state)),
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index c646844a3..f2e695ec7 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177994 2013-02-12 20:05:14Z andyrtr $
+# $Id: PKGBUILD 186724 2013-05-30 19:02:49Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxcb
-pkgver=1.9
-pkgrel=3
+pkgver=1.9.1
+pkgrel=1
 pkgdesc="X11 client-side library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org/"
@@ -14,8 +14,8 @@ options=('!libtool')
 license=('custom')
 source=($url/dist/$pkgname-$pkgver.tar.bz2
         libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
-          'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
+sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f'
+            '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libxcursor/PKGBUILD b/extra/libxcursor/PKGBUILD
index e4e6e420f..c78fcd474 100644
--- a/extra/libxcursor/PKGBUILD
+++ b/extra/libxcursor/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 152769 2012-03-09 16:04:11Z andyrtr $
+# $Id: PKGBUILD 186698 2013-05-30 14:35:12Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxcursor
-pkgver=1.1.13
-pkgrel=1.1
+pkgver=1.1.14
+pkgrel=1
 pkgdesc="X cursor management library"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -13,7 +14,7 @@ depends=('libxfixes' 'libxrender')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2)
-sha1sums=('4e461d9e4324689ca8a84706926a8c0fe9470e47')
+sha256sums=('9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df')
 
 build() {
   cd "${srcdir}/libXcursor-${pkgver}"
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index c346d79c4..6df2b9bed 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185488 2013-05-14 11:23:26Z heftig $
+# $Id: PKGBUILD 186664 2013-05-30 12:25:27Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
 pkgver=3.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64 mips64el)
 license=('GPL')
@@ -24,6 +24,10 @@ build() {
       --libexecdir=/usr/lib/mutter \
       --localstatedir=/var --disable-static \
       --disable-schemas-compile --enable-compile-warnings=minimum
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD
index 4ee5fc2bf..f8fad946a 100644
--- a/extra/nettle/PKGBUILD
+++ b/extra/nettle/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183668 2013-04-26 12:45:09Z andyrtr $
+# $Id: PKGBUILD 186700 2013-05-30 14:40:21Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=nettle
-pkgver=2.7
+pkgver=2.7.1
 pkgrel=1
 pkgdesc="A low-level cryptographic library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,10 @@ url="http://www.lysator.liu.se/~nisse/nettle/"
 license=('GPL2')
 install=$pkgname.install
 depends=('gmp')
-source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('2caa1bd667c35db71becb93c5d89737f')
+source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
+md5sums=('003d5147911317931dd453520eb234a5'
+         'SKIP')
+
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index b3e7ff9ab..29125de86 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185508 2013-05-14 12:12:44Z heftig $
+# $Id: PKGBUILD 186680 2013-05-30 12:54:23Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=3.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -40,6 +40,10 @@ build() {
     --disable-static \
     --enable-python \
     --enable-nautilus
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 7d0726930..9b32a7176 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180316 2013-03-20 02:35:37Z eric $
+# $Id: PKGBUILD 186598 2013-05-30 03:34:04Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
-pkgver=1.2.2
-pkgrel=8
+pkgver=1.2.3
+pkgrel=1
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
@@ -31,29 +31,27 @@ optdepends+=('wavpack: for using the wavpack plugin' \
             'gnome-vfs: for using the gnome-vfs plugin')
 [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
-        xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz accel_vaapi.h
 	0001-fix-non-x86-build.patch)
-sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c'
-          '45500eca2aa40c133e1a6e8b23dbadc4b921b11f'
+sha1sums=('6f9ef4ba75688659052d21448d46527db2b77e57'
+          '08ed9947ef919c71c87151baa8fc0ce7d8f72050'
 	  '5f1a34c7bafa7ea96c0e4e14fbf6e31e53fe41e0')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Fix audio decoding with newest FFmpeg
-  # https://bugs.archlinux.org/task/33818
-  patch -Np1 -i "$srcdir/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch"
+prepare() {
+  cp accel_vaapi.h ${pkgname}-${pkgver}/src/xine-engine/
 
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/0001-fix-non-x86-build.patch
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
   [ "$CARCH" = "mips64el" ] || extraconf=--enable-vdpau
-
-  ./configure --prefix=/usr --with-wavpack --disable-optimizations $extra
+  ./configure --prefix=/usr --with-wavpack --disable-optimizations $extraconf
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xine-lib/accel_vaapi.h b/extra/xine-lib/accel_vaapi.h
new file mode 100644
index 000000000..666b23fd6
--- /dev/null
+++ b/extra/xine-lib/accel_vaapi.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2008 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ *
+ * Common acceleration definitions for vdpau
+ *
+ *
+ */
+
+#ifndef HAVE_XINE_ACCEL_VAAPI_H
+#define HAVE_XINE_ACCEL_VAAPI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <va/va_x11.h>
+#include <pthread.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <avcodec.h>
+#else
+#  include <libavcodec/avcodec.h>
+#endif
+
+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
+#  define AVVIDEO 2
+#else
+#  define AVVIDEO 1
+#  define pp_context	pp_context_t
+#  define pp_mode	pp_mode_t
+#endif
+
+#define NUM_OUTPUT_SURFACES 22
+
+#define SURFACE_FREE            0
+#define SURFACE_ALOC            1
+#define SURFACE_RELEASE         2
+#define SURFACE_RENDER          3
+#define SURFACE_RENDER_RELEASE  5
+
+struct vaapi_equalizer {
+  VADisplayAttribute brightness;
+  VADisplayAttribute contrast;
+  VADisplayAttribute hue;
+  VADisplayAttribute saturation;
+};
+
+typedef struct ff_vaapi_context_s ff_vaapi_context_t;
+
+struct ff_vaapi_context_s {
+  VADisplay         va_display;
+  VAContextID       va_context_id;
+  VAConfigID        va_config_id;
+  int               width;
+  int               height;
+  int               sw_width;
+  int               sw_height;
+  int               va_profile;
+  unsigned int      va_colorspace;
+  VAImage           va_subpic_image;
+  VASubpictureID    va_subpic_id;
+  int               va_subpic_width;
+  int               va_subpic_height;
+  int               is_bound;
+  void              *gl_surface;
+  unsigned int      soft_head;
+  unsigned int      valid_context;
+  unsigned int      va_head;
+  unsigned int      va_soft_head;
+  vo_driver_t       *driver;
+  unsigned int      last_sub_image_fmt;
+  VASurfaceID       last_sub_surface_id;
+  struct vaapi_equalizer va_equalizer;
+  VAImageFormat     *va_image_formats;
+  int               va_num_image_formats;
+  VAImageFormat     *va_subpic_formats;
+  int               va_num_subpic_formats;
+};
+
+typedef struct ff_vaapi_surface_s ff_vaapi_surface_t;
+typedef struct vaapi_accel_s vaapi_accel_t;
+
+struct ff_vaapi_surface_s {
+  unsigned int        index;
+  vaapi_accel_t       *accel;
+  VASurfaceID         va_surface_id;
+  unsigned int        status;
+};
+
+struct vaapi_accel_s {
+  unsigned int        index;
+  vo_frame_t          *vo_frame;
+
+#if AVVIDEO > 1
+  int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture,
+                               int *got_picture_ptr, AVPacket *avpkt);
+#else
+  int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture,
+                              int *got_picture_ptr, uint8_t *buf, int buf_size);
+#endif
+  VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender);
+  int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec);
+  ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen);
+  int (*guarded_render)(vo_frame_t *frame_gen);
+  ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen);
+  void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface);
+  void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface);
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch b/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch
deleted file mode 100644
index 255f56d0d..000000000
--- a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From 679582503c8ba2f91a82e44c4a2938550306fd07 Mon Sep 17 00:00:00 2001
-From: Torsten Jager <t.jager@gmx.de>
-Date: Thu, 21 Feb 2013 22:35:00 +0200
-Subject: [PATCH 3/5] ffmpeg_audio_decoder: support new av_decode_audio4 ()
-
----
- src/combined/ffmpeg/ff_audio_decoder.c | 153 +++++++++++++++++++++++++++------
- src/combined/ffmpeg/ffmpeg_compat.h    |   4 +-
- 2 files changed, 131 insertions(+), 26 deletions(-)
-
-diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
-index 4e64378..34a7a9e 100644
---- a/src/combined/ffmpeg/ff_audio_decoder.c
-+++ b/src/combined/ffmpeg/ff_audio_decoder.c
-@@ -71,7 +71,9 @@ typedef struct ff_audio_decoder_s {
-   int               decoder_ok;
- 
-   AVCodecParserContext *parser_context;
--
-+#if AVAUDIO > 3
-+  AVFrame          *av_frame;
-+#endif
- } ff_audio_decoder_t;
- 
- 
-@@ -150,6 +152,9 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ
-     return;
-   }
- 
-+  /* Try to make the following true */
-+  this->context->request_sample_fmt = AV_SAMPLE_FMT_S16;
-+
-   /* Current ffmpeg audio decoders usually use 16 bits/sample
-    * buf->decoder_info[2] can't be used as it doesn't refer to the output
-    * bits/sample for some codecs (e.g. MS ADPCM) */
-@@ -358,25 +363,19 @@ static void ff_audio_output_close(ff_audio_decoder_t *this)
-   this->audio_channels = 0;
- }
- 
--static int ff_audio_decode(xine_t *xine,
--                           AVCodecContext *ctx,
--                           AVCodecParserContext *parser_ctx,
--                           int16_t *decode_buffer, int *decode_buffer_size,
--                           uint8_t *buf, int size)
--{
-+static int ff_audio_decode (ff_audio_decoder_t *this,
-+  int16_t *decode_buffer, int *decode_buffer_size, uint8_t *buf, int size) {
-   int consumed;
-   int parser_consumed = 0;
- 
- #if AVPARSE > 1
--  if (parser_ctx) {
-+  if (this->parser_context) {
-     uint8_t *outbuf;
-     int      outsize;
- 
-     do {
--      int ret = av_parser_parse2(parser_ctx, ctx,
--                                 &outbuf, &outsize,
--                                 buf, size,
--                                 0, 0, 0); 
-+      int ret = av_parser_parse2 (this->parser_context, this->context,
-+        &outbuf, &outsize, buf, size, 0, 0, 0);
-       parser_consumed += ret;
-       buf             += ret;
-       size            -= ret;
-@@ -385,7 +384,7 @@ static int ff_audio_decode(xine_t *xine,
-     /* nothing to decode ? */
-     if (outsize <= 0) {
-       *decode_buffer_size = 0;
--      xprintf (xine, XINE_VERBOSITY_DEBUG,
-+      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-                "ffmpeg_audio_dec: not enough data to decode\n");
-       return parser_consumed;
-     }
-@@ -402,21 +401,115 @@ static int ff_audio_decode(xine_t *xine,
-   avpkt.data = buf;
-   avpkt.size = size;
-   avpkt.flags = AV_PKT_FLAG_KEY;
--  consumed = avcodec_decode_audio3 (ctx,
--                                    decode_buffer, decode_buffer_size,
--                                    &avpkt);
-+#  if AVAUDIO > 3
-+  int got_frame;
-+  if (!this->av_frame)
-+    this->av_frame = avcodec_alloc_frame ();
-+
-+  consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
-+  if ((consumed >= 0) && got_frame) {
-+    int16_t *q = decode_buffer;
-+    int samples = this->av_frame->nb_samples;
-+    int channels = this->context->channels;
-+    int bytes, i, j;
-+    /* limit buffer */
-+    if (channels > 12)
-+      channels = 12;
-+    if (*decode_buffer_size < samples * channels * 2)
-+      samples = *decode_buffer_size / (channels * 2);
-+    bytes = samples * channels * 2;
-+    *decode_buffer_size = bytes;
-+    /* convert to packed int16_t. I guess there is something
-+       in libavfilter but also another dependency... */
-+    switch (this->context->sample_fmt) {
-+      case AV_SAMPLE_FMT_U8P:
-+        if (channels > 1) {
-+          uint8_t *p[12];
-+          for (i = 0; i < channels; i++)
-+            p[i] = (uint8_t *)this->av_frame->extended_data[i];
-+          for (i = samples; i; i--) {
-+            for (j = 0; j < channels; j++)
-+              *q++ = ((uint16_t)(*p[j]++) << 8) ^ 0x8000;
-+          }
-+          break;
-+        }
-+      case AV_SAMPLE_FMT_U8:
-+        {
-+          uint8_t *p = (uint8_t *)this->av_frame->extended_data[0];
-+          for (i = samples * channels; i; i--)
-+            *q++ = ((uint16_t)(*p++) << 8) ^ 0x8000;
-+        }
-+      break;
-+      case AV_SAMPLE_FMT_S16P:
-+        if (channels > 1) {
-+          int16_t *p[12];
-+          for (i = 0; i < channels; i++)
-+            p[i] = (int16_t *)this->av_frame->extended_data[i];
-+          for (i = samples; i; i--) {
-+            for (j = 0; j < channels; j++)
-+              *q++ = *p[j]++;
-+          }
-+          break;
-+        }
-+      case AV_SAMPLE_FMT_S16:
-+        xine_fast_memcpy (q, this->av_frame->extended_data[0], bytes);
-+      break;
-+      case AV_SAMPLE_FMT_S32P:
-+        if (channels > 1) {
-+          int32_t *p[12];
-+          for (i = 0; i < channels; i++)
-+            p[i] = (int32_t *)this->av_frame->extended_data[i];
-+          for (i = samples; i; i--) {
-+            for (j = 0; j < channels; j++)
-+              *q++ = *p[j]++ >> 16;
-+          }
-+          break;
-+        }
-+      case AV_SAMPLE_FMT_S32:
-+        {
-+          int32_t *p = (int32_t *)this->av_frame->extended_data[0];
-+          for (i = samples * channels; i; i--)
-+            *q++ = *p++ >> 16;
-+        }
-+      break;
-+      case AV_SAMPLE_FMT_FLTP: /* the most popular one */
-+        if (channels > 1) {
-+          float *p[12];
-+          for (i = 0; i < channels; i++)
-+            p[i] = (float *)this->av_frame->extended_data[i];
-+          for (i = samples; i; i--) {
-+            for (j = 0; j < channels; j++) {
-+              int v = *p[j]++ * (float)0x7fff;
-+              *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v;
-+            }
-+          }
-+          break;
-+        }
-+      case AV_SAMPLE_FMT_FLT:
-+        {
-+          float *p = (float *)this->av_frame->extended_data[0];
-+          for (i = samples * channels; i; i--) {
-+            int v = *p++ * (float)0x7fff;
-+            *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v;
-+          }
-+        }
-+      break;
-+      default: ;
-+    }
-+  } else *decode_buffer_size = 0;
-+#  else
-+  consumed = avcodec_decode_audio3 (this->context, decode_buffer, decode_buffer_size, &avpkt);
-+#  endif
- #else
--  consumed = avcodec_decode_audio2 (ctx,
--                                    decode_buffer, decode_buffer_size,
--                                    buf, size);
-+  consumed = avcodec_decode_audio2 (this->context, decode_buffer, decode_buffer_size, buf, size);
- #endif
- 
-   if (consumed < 0) {
--    xprintf (xine, XINE_VERBOSITY_DEBUG,
-+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-              "ffmpeg_audio_dec: error decompressing audio frame (%d)\n", consumed);
-   } else if (parser_consumed && consumed != size) {
- 
--    xprintf (xine, XINE_VERBOSITY_DEBUG,
-+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-              "ffmpeg_audio_dec: decoder didn't consume all data\n");
-   }
- 
-@@ -469,8 +562,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
-         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- 
- 	bytes_consumed =
--          ff_audio_decode(this->stream->xine, this->context,
--                          this->parser_context,
-+          ff_audio_decode(this,
-                           (int16_t *)this->decode_buffer, &decode_buffer_size,
-                           &this->buf[offset], this->size);
- 
-@@ -539,6 +631,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
-           }
- 
-           /* fill up this buffer */
-+#if AVAUDIO < 4
-           if (codec_type == BUF_AUDIO_WMAPRO) {
-             /* the above codecs output float samples, not 16-bit integers */
-             int bytes_per_sample = sizeof(float);
-@@ -558,7 +651,9 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
-             bytes_to_send = bytes_to_send * 2 / bytes_per_sample;
-             xine_fast_memcpy(audio_buffer->mem, int_buffer, bytes_to_send);
-             free(int_buffer);
--          } else {
-+          } else
-+#endif
-+          {
-             if ((decode_buffer_size - out) > audio_buffer->mem_size)
-               bytes_to_send = audio_buffer->mem_size;
-             else
-@@ -595,6 +690,9 @@ static void ff_audio_reset (audio_decoder_t *this_gen) {
- 
-   /* try to reset the wma decoder */
-   if( this->decoder_ok ) {
-+#if AVAUDIO > 3
-+    avcodec_free_frame (&this->av_frame);
-+#endif
-     pthread_mutex_lock (&ffmpeg_lock);
-     avcodec_close (this->context);
-     if (avcodec_open (this->context, this->codec) < 0)
-@@ -626,6 +724,9 @@ static void ff_audio_dispose (audio_decoder_t *this_gen) {
-   }
- 
-   if( this->context && this->decoder_ok ) {
-+#if AVAUDIO > 3
-+    avcodec_free_frame (&this->av_frame);
-+#endif
-     pthread_mutex_lock (&ffmpeg_lock);
-     avcodec_close (this->context);
-     pthread_mutex_unlock (&ffmpeg_lock);
-@@ -668,7 +769,9 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen,
- 
-   this->context = avcodec_alloc_context();
-   this->decode_buffer = malloc16 (AVCODEC_MAX_AUDIO_FRAME_SIZE);
--
-+#if AVAUDIO > 3
-+  this->av_frame = NULL;
-+#endif
-   return &this->audio_decoder;
- }
- 
-diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h
-index 0acead8..b567dc1 100644
---- a/src/combined/ffmpeg/ffmpeg_compat.h
-+++ b/src/combined/ffmpeg/ffmpeg_compat.h
-@@ -94,7 +94,9 @@
- #endif
- 
- /* avcodec_decode_audio() */
--#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-+#if LIBAVCODEC_VERSION_MAJOR >= 54
-+#  define AVAUDIO 4
-+#elif LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
- #  define AVAUDIO 3
- #else
- #  define AVAUDIO 2
--- 
-1.8.1.5
-
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index fe5469dd0..2dc83cb5e 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -5,9 +5,9 @@
 
 _pkgname=bbswitch
 pkgname=bbswitch-libre
-pkgver=0.6
+pkgver=0.7
 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install
-pkgrel=8
+pkgrel=1
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url=("http://github.com/Bumblebee-Project/bbswitch")
@@ -19,7 +19,7 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=bbswitch.install
 source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
-md5sums=('c5496e3225c8e70d02a24bfd8a50faf6')
+md5sums=('b9df5ea40109ef9766448a0577c798e6')
 
 build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
index 8ce0f23cf..1195912e8 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id$
+# $Id: PKGBUILD 186011 2013-05-20 13:11:55Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor:  Mantas Mikulėnas <grawity@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname="gummiboot"
-pkgver="29"
-pkgrel="1.1"
-pkgdesc="Simple text-mode UEFI Boot Manager, Parabola rebranded"
+pkgver="31"
+pkgrel="1"
+pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)"
 url="http://freedesktop.org/wiki/Software/gummiboot"
 arch=('x86_64' 'i686' 'mips64el')
 license=('LGPL2.1')
-makedepends=('gnu-efi-libs' 'docbook-xsl')
+makedepends=('gnu-efi-libs' 'docbook-xsl' 'git')
 depends=('util-linux')
 conflicts=('gummiboot-efi')
 provides=('gummiboot-efi')
 replaces=('gummiboot-efi')
 options=('!strip')
-source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+source=("git://anongit.freedesktop.org/${pkgname}#tag=${pkgver}"
         'loader.conf'
         'parabola.conf')
 install="gummiboot.install"
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}/"
+	cd ${srcdir}/${pkgname}
 
 	./autogen.sh
 	./configure --sysconfdir=/etc --libexecdir=/usr/lib --libdir=/usr/lib
@@ -36,9 +37,10 @@ package() {
 	install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf"
 	install -D -m0644 "${srcdir}/parabola.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/parabola.conf"
 
-	cd "${srcdir}/${pkgname}-${pkgver}/"
+	cd ${srcdir}/${pkgname}
+
 	make DESTDIR="${pkgdir}" install
 }
-md5sums=('7e133411b805ce6fb5dd3e3bd08b88a2'
+md5sums=('SKIP'
          '3d700d13aec5ab1b78a921eaf22e5bfa'
-         '9f770584795496c0e3409679eaf7be3b')
+         '36ee74767ac8734dede1cbd0f4f275d7')
diff --git a/libre/gummiboot/gummiboot.install b/libre/gummiboot/gummiboot.install
index 770087361..20861d4c8 100644
--- a/libre/gummiboot/gummiboot.install
+++ b/libre/gummiboot/gummiboot.install
@@ -1,5 +1,7 @@
 post_install() {
-	echo ":: Run '/usr/bin/gummiboot install' to enable gummiboot"
+	mkdir -p /boot/EFI/gummiboot
+	/usr/bin/gummiboot update
+	echo ":: Run '/usr/bin/gummiboot install' to make gummiboot your default bootloader"
 }
 
 post_upgrade() {
diff --git a/libre/gummiboot/parabola.conf b/libre/gummiboot/parabola.conf
index bbb6dddfa..111072ea2 100644
--- a/libre/gummiboot/parabola.conf
+++ b/libre/gummiboot/parabola.conf
@@ -1,4 +1,4 @@
-## This is just an exmaple config file.
+## This is just an example config file.
 ## Please edit the paths and kernel parameters according to your system.
 
 title   Parabola GNU/Linux-libre
diff --git a/pcr/sword-svn/PKGBUILD b/pcr/sword-svn/PKGBUILD
new file mode 100644
index 000000000..8e29cdab8
--- /dev/null
+++ b/pcr/sword-svn/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+pkgname=sword-svn
+pkgver=2793
+pkgrel=1
+pkgdesc="Libraries for Bible programs - svn -version"
+arch=('i686' 'x86_64')
+url="http://www.crosswire.org/sword/"
+license=('GPL')
+depends=('curl' 'clucene' 'swig')
+makedepends=('subversion')
+provides=('sword')
+conflicts=('sword')
+source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/' 'automake.patch')
+md5sums=('SKIP' '24a4821088da78725b9374807d0d3508')
+options=('!makeflags')
+_svnmod=sword
+
+pkgver() {
+  cd $SRCDEST/${_svnmod}
+  svnversion
+}
+
+prepare() {
+  cd "$srcdir/$_svnmod"
+  patch -p1 < $srcdir/automake.patch
+}
+
+build() {
+  cd "$srcdir/$_svnmod"  
+  ./autogen.sh
+  CPPFLAGS+="-fpermissive" ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/$_svnmod"
+  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir/" install_config
+}
diff --git a/pcr/sword-svn/automake.patch b/pcr/sword-svn/automake.patch
new file mode 100644
index 000000000..3cfd5eb44
--- /dev/null
+++ b/pcr/sword-svn/automake.patch
@@ -0,0 +1,52 @@
+diff -Naur sword.orig/configure.ac sword.new/configure.ac
+--- sword.orig/configure.ac	2013-01-13 12:46:13.000000000 +0100
++++ sword.new/configure.ac	2013-01-13 12:47:34.000000000 +0100
+@@ -13,7 +13,7 @@
+ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE
+ 
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADERS(include/config.h)
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+diff -Naur sword.orig/examples/cmdline/Makefile.am sword.new/examples/cmdline/Makefile.am
+--- sword.orig/examples/cmdline/Makefile.am	2013-01-13 12:46:13.000000000 +0100
++++ sword.new/examples/cmdline/Makefile.am	2013-01-13 12:53:55.000000000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+ 
+diff -Naur sword.orig/tests/Makefile.am sword.new/tests/Makefile.am
+--- sword.orig/tests/Makefile.am	2013-01-13 12:46:14.000000000 +0100
++++ sword.new/tests/Makefile.am	2013-01-13 12:54:33.000000000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+ 
+diff -Naur sword.orig/utilities/Makefile.am sword.new/utilities/Makefile.am
+--- sword.orig/utilities/Makefile.am	2013-01-13 12:46:13.000000000 +0100
++++ sword.new/utilities/Makefile.am	2013-01-13 12:56:12.000000000 +0100
+@@ -1,8 +1,8 @@
+ AUTOMAKE_OPTIONS = 1.6
+ SUBDIRS = diatheke
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+ noinst_PROGRAMS = cipherraw lexdump \
author	Michał Masłowski <mtjm@mtjm.eu>	2013-05-31 12:35:56 +0200
committer	Michał Masłowski <mtjm@mtjm.eu>	2013-05-31 12:35:56 +0200
commit	0dc1411695376442c13f473499a876f085074d75 (patch)
tree	1ce41a87f86a15e6a72ae9e9198a05c755e293f0
parent	e6e5e22dc82259030c1c26dc78bb4e761861abfc (diff)
parent	94a3b302f520438e919ef8706ce9cf42ad7c2e11 (diff)