Wed Jun 25 03:21:53 UTC 2014

31 files changed, 158 insertions, 287 deletions

diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index 5721910ad..3bfd41435 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112345 2014-06-01 02:33:08Z svenstaro $
+# $Id: PKGBUILD 113526 2014-06-24 20:55:12Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
 # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
 pkgname=0ad
 pkgver=a16
 _pkgver=0.0.16-alpha
-pkgrel=2
+pkgrel=3
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
 url="http://play0ad.com/"
@@ -15,14 +15,19 @@ depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
          'gloox' 'miniupnpc' 'icu' 'nspr')
 makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
 source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
-        "http://trac.wildfiregames.com/raw-attachment/ticket/2552/miniupnpc_api.patch")
+        "http://trac.wildfiregames.com/raw-attachment/ticket/2552/miniupnpc_api.patch"
+        "gcc49-${pkgname}.patch::http://trac.wildfiregames.com/changeset/15334?format=diff&new=15334")
 md5sums=('3836bbcdf4edc57c2354b4fef6023146'
-         '6981595ba4b8eb21f9503304b090c9a9')
+         '6981595ba4b8eb21f9503304b090c9a9'
+         '5eda18c3f81cda68983bdeb7d7e20531')
 
 prepare() {
   cd "$srcdir/$pkgname-$_pkgver/"
-  patch -p0 -i "../miniupnpc_api.patch"
+  patch -Np0 -i "../miniupnpc_api.patch"
   sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.3/bin/cxxtestgen
+
+  # Fix FS#40839
+  patch -Np3 -i "../gcc49-${pkgname}.patch"
 }
 
 build() {
diff --git a/community/atanks/PKGBUILD b/community/atanks/PKGBUILD
index 393585c11..a1f519f53 100644
--- a/community/atanks/PKGBUILD
+++ b/community/atanks/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111486 2014-05-19 10:07:37Z spupykin $
+# $Id: PKGBUILD 113496 2014-06-24 11:01:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com>
 # Contributor: Charlie Cox <ccoxiv@yahoo.com>
 
 pkgname=atanks
-pkgver=5.9
+pkgver=6.0
 pkgrel=1
 pkgdesc="Atomic Tanks"
 url="http://atanks.sourceforge.net"
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64')
 makedepends=('sed')
 depends=('allegro4' 'gcc-libs')
 source=("http://downloads.sourceforge.net/project/atanks/atanks/atanks-${pkgver}/atanks-${pkgver}.tar.gz")
-md5sums=('76d92aba871d86b0752d3d01da2782b0')
+md5sums=('c6041d854ede9b886b7a9902714bd8b7')
 
 build() {
   cd atanks-${pkgver}
diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD
index abba92161..101b5e977 100644
--- a/community/glusterfs/PKGBUILD
+++ b/community/glusterfs/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 112465 2014-06-02 10:47:17Z spupykin $
+# $Id: PKGBUILD 113498 2014-06-24 11:02:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributors:
 #   Andrei Antoukh - niwi@niwi.be - http://www.niwi.be
 #   henning mueller <henning@orgizm.net>
 
 pkgname=glusterfs
-pkgver=3.5.0
-_basever=`echo $pkgver | cut -f1-2 -d.`
-pkgrel=2
+pkgver=3.5.1
+pkgrel=1
 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.'
 arch=(i686 x86_64)
 url='http://www.gluster.org/'
@@ -15,8 +14,8 @@ license=(GPL2 LGPL3)
 install=glusterfs.install
 depends=(fuse python2 libxml2)
 makedepends=(flex bison)
-source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz)
-md5sums=('5c141ba3e5306d550d9092e3d1ad6d50')
+source=($pkgname-$pkgver.tar.gz::https://github.com/gluster/glusterfs/archive/v$pkgver.tar.gz)
+md5sums=('8ca66470225704339b94317616977301')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
@@ -27,6 +26,7 @@ prepare() {
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  ./autogen.sh
   ./configure \
     --prefix=/usr \
     --sbindir=/usr/bin \
@@ -37,7 +37,6 @@ build() {
     --libexecdir=/usr/lib/$pkgname \
     --with-systemddir=/usr/lib/systemd/system \
     PYTHON=python2 LEXLIB=
-  ./gen-headers.py
   make
 }
 
diff --git a/community/kbibtex/PKGBUILD b/community/kbibtex/PKGBUILD
index 0520ba976..4a51fcb28 100644
--- a/community/kbibtex/PKGBUILD
+++ b/community/kbibtex/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 103296 2014-01-02 21:08:34Z schiv $
+# $Id: PKGBUILD 113521 2014-06-24 20:18:59Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Antonio Rojas <nqn1976 @ gmail.com>
 # Contributor: cmorlok <christianmorlok@web.de>
 
 pkgname=kbibtex
-pkgver=0.5
+pkgver=0.5.1
 _branch=0.5
 pkgrel=1
 pkgdesc="A BibTeX editor for KDE"
 arch=('i686' 'x86_64')
 url='http://home.gna.org/kbibtex/'
 license=('GPL')
-depends=('kdebase-runtime')
+depends=('kdebase-runtime' 'poppler-qt4')
 optdepends=('kdegraphics-okular: Document preview')
 makedepends=('cmake' 'automoc4')
 install=$pkgname.install
 source=("http://download.gna.org/$pkgname/$_branch/$pkgname-$pkgver.tar.xz")
-md5sums=('bbd2affd1edfb8f02a077c2c7cfc2038')
+md5sums=('133d4a1a7ec9242545f7616765384777')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD
index f7431fd08..a37085346 100644
--- a/community/ldc/PKGBUILD
+++ b/community/ldc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 106423 2014-03-02 22:29:17Z dicebot $
+# $Id: PKGBUILD 113509 2014-06-24 12:12:02Z dicebot $
 # Maintainer: Mihails Strasuns <public@dicebot.lv>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=('ldc' 'liblphobos-devel')
 groups=('dlang' 'dlang-ldc')
-pkgver=0.12.1
+pkgver=0.13.0
 epoch=1
-pkgrel=2
+pkgrel=1
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
 arch=('i686' 'x86_64')
 url="https://github.com/ldc-developers/ldc"
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index e99021395..2b500ecd0 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 113191 2014-06-15 21:55:33Z svenstaro $
+# $Id: PKGBUILD 113528 2014-06-24 21:19:53Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de> 
 
 pkgname=murmur
 pkgver=1.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="The voice chat application server for Mumble"
 arch=('i686' 'x86_64')
 url="http://mumble.sourceforge.net"
diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install
index 13eec8094..4c6abe245 100644
--- a/community/murmur/murmur.install
+++ b/community/murmur/murmur.install
@@ -1,6 +1,6 @@
 post_install() {
-    getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null
-    getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null
+    getent group murmur > /dev/null || groupadd -r -g 122 murmur 1>/dev/null
+    getent passwd murmur > /dev/null || useradd -r -u 122 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null
 
     chown -R murmur:murmur /var/lib/murmur
 
diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD
index 6df919ed4..ed45e185b 100644
--- a/community/python-sqlalchemy/PKGBUILD
+++ b/community/python-sqlalchemy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 108809 2014-04-04 10:16:01Z fyan $ 
+# $Id: PKGBUILD 113477 2014-06-24 04:09:38Z fyan $ 
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=python-sqlalchemy
 pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=0.9.4
+pkgver=0.9.6
 pkgrel=1
 arch=('i686' 'x86_64') # python2 package contain .so
 url="http://www.sqlalchemy.org/"
@@ -13,7 +13,7 @@ license=('MIT')
 makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools')
 checkdepends=('python-pytest' 'python2-pytest' 'python-mock' 'python2-mock')
 source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz")
-md5sums=('c008ea5e2565ec1418ee8461393a99b1')
+md5sums=('f8494d85834ba6a465b4a32078d36ee8')
 
 prepare() {
   cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
@@ -28,12 +28,11 @@ build() {
 }
 
 check() {
-  # Tests failing
   cd SQLAlchemy-${pkgver}
-  #python setup.py test
+  python setup.py test || warning "Tests failed"
  
   cd ../SQLAlchemy2-$pkgver  
-  #python2 setup.py test
+  python2 setup.py test || warning "Tests failed"
 }
 
 package_python-sqlalchemy() {
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 65b80bd18..93a0e95d4 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 113034 2014-06-11 15:06:38Z spupykin $
+# $Id: PKGBUILD 113502 2014-06-24 11:02:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.8.11
+pkgver=2.8.12
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz"
 	"redis.service"
 	"redis.logrotate"
 	"redis.tmpfiles.d")
-md5sums=('196e0cf387d8885439add8a3e1cab469'
+md5sums=('27645ca17ac1c269e67862fcc0f1d2e3'
          '5320aa6d0f31aadc1d6202ca40425aea'
          '9e2d75b7a9dc421122d673fe520ef17f'
          'dd9ab8022b4d963b2e5899170dfff490')
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index f9539a454..b5c4f14d0 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 103129 2013-12-26 21:26:17Z svenstaro $
+# $Id: PKGBUILD 113490 2014-06-24 09:52:31Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ondrej Martinak <omartinak@gmail.com>
 
 pkgname=sfml
 _commit=4a300547f3
 pkgver=2.1.0.$_commit
-pkgrel=1
+pkgrel=3
 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API'
 arch=('i686' 'x86_64')
 url='http://www.sfml-dev.org/'
@@ -34,7 +34,7 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 
-  install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-2.8/Modules/FindSFML.cmake"
+  install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-3.0/Modules/FindSFML.cmake"
 
   install -Dm644 ../license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index 84a013848..18ee6cee8 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109660 2014-04-17 13:09:54Z spupykin $
+# $Id: PKGBUILD 113512 2014-06-24 13:16:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
-pkgver=10.3.1
-pkgrel=2
+pkgver=11.0.0
+pkgrel=1
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64')
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -18,7 +18,7 @@ backup=('etc/conf.d/sysstat'
 	'etc/conf.d/sysstat.ioconf')
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
 	lib64-fix.patch)
-md5sums=('54f73330d26147b02b35adb2bb622aac'
+md5sums=('fbd773ae95d0d055011496dc1cef99e5'
          '7ffa6bf990609d85367070f71b40a34b')
 
 prepare() {
@@ -42,8 +42,7 @@ build() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   mkdir -p \
-    $pkgdir/etc/cron.hourly \
-    $pkgdir/etc/cron.daily \
+    $pkgdir/etc/cron.{hourly,daily} \
     $pkgdir/usr/lib/systemd/system
   make DESTDIR=$pkgdir install
   chown -R root:root $pkgdir
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 67ae5d3e2..af2560fa0 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112339 2014-05-31 16:37:12Z svenstaro $
+# $Id: PKGBUILD 113504 2014-06-24 11:16:56Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
@@ -6,7 +6,7 @@
 pkgname=wt
 pkgver=3.3.3
 _pkgver=3.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64')
 url="http://www.webtoolkit.eu/"
@@ -43,8 +43,7 @@ package() {
   cd ${srcdir}/${pkgname}-${_pkgver}/build
   make DESTDIR=${pkgdir} install
 
-  mkdir -p ${pkgdir}/usr/share/cmake-2.8/Modules
-  mv ${pkgdir}/usr/cmake/FindWt.cmake ${pkgdir}/usr/share/cmake-2.8/Modules/
+  install -Dm644 ${pkgdir}/usr/cmake/FindWt.cmake ${pkgdir}/usr/share/cmake-3.0/Modules/FindWt.cmake
   rm -r ${pkgdir}/usr/cmake
   rm -rf $pkgdir/var/run
 }
diff --git a/community/xonotic/PKGBUILD b/community/xonotic/PKGBUILD
index 46232f58b..e76331cf5 100644
--- a/community/xonotic/PKGBUILD
+++ b/community/xonotic/PKGBUILD
@@ -1,20 +1,24 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Alexander Suhoverhov <cy at ngs dot ru>
+# Contributor: Jookia <166291@gmail.com>
 pkgname=xonotic
 pkgver=0.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A free, fast-paced crossplatform first-person shooter"
 arch=('i686' 'x86_64')
 url="http://xonotic.org"
 license=('GPL')
-depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'libpng>=1.4.0' 'xonotic-data')
+depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga'
+         'libxxf86vm' 'sdl' 'libpng>=1.4.0' 'xonotic-data' 'hicolor-icon-theme'
+         'gtk-update-icon-cache' 'desktop-file-utils')
 makedepends=('unzip' 'mesa')
 source=("http://dl.xonotic.org/xonotic-${pkgver}-source.zip"
         "xonotic-glx.desktop"
         "xonotic-sdl.desktop")
 md5sums=('1cc50a79ac6abf27da916bfb5e066043'
-         '914c7b9163e92b35f0ab57fdb1653ac5'
-         'da7d812ff231c9332cd694b39757adda')
+         '129df417236445b086fe78cafd01756c'
+         '2d3367d90889112d73ac2b8c17fb5840')
+install=xonotic.install
 
 build() {
   # compile Xonotic-flavored fteqcc
@@ -47,7 +51,11 @@ package() {
 	# convenience files
 	mkdir -p $pkgdir/usr/share/applications
 	install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications
-	install -Dm644 $srcdir/Xonotic/misc/logos/icons_png/xonotic_512.png $pkgdir/usr/share/pixmaps/xonotic.png
+
+  for size in 16 22 24 32 48 64 128 256 512; do
+    install -Dm644 $srcdir/Xonotic/misc/logos/icons_png/xonotic_${size}.png \
+      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/xonotic.png"
+  done
 
   # crypto stuff
   cd $srcdir/Xonotic/source/d0_blind_id
diff --git a/community/xonotic/xonotic-glx.desktop b/community/xonotic/xonotic-glx.desktop
index 9f9e78cc1..ebce0e196 100644
--- a/community/xonotic/xonotic-glx.desktop
+++ b/community/xonotic/xonotic-glx.desktop
@@ -4,7 +4,7 @@ Version=2.5
 Encoding=UTF-8
 Name=Xonotic (GLX)
 Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/xonotic.png
+Icon=xonotic
 Exec=/usr/bin/xonotic-glx
 Terminal=false
 StartupNotify=false
diff --git a/community/xonotic/xonotic-sdl.desktop b/community/xonotic/xonotic-sdl.desktop
index 32b37f2c5..2c631916b 100644
--- a/community/xonotic/xonotic-sdl.desktop
+++ b/community/xonotic/xonotic-sdl.desktop
@@ -4,7 +4,7 @@ Version=2.5
 Encoding=UTF-8
 Name=Xonotic (SDL)
 Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/xonotic.png
+Icon=xonotic
 Exec=/usr/bin/xonotic-sdl
 Terminal=false
 StartupNotify=false
diff --git a/community/xonotic/xonotic.install b/community/xonotic/xonotic.install
new file mode 100644
index 000000000..c317fbaca
--- /dev/null
+++ b/community/xonotic/xonotic.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD
index fc1d8973c..2451fe415 100644
--- a/core/gettext/PKGBUILD
+++ b/core/gettext/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 203560 2014-01-13 16:35:40Z tpowa $
+# $Id: PKGBUILD 215409 2014-06-24 06:20:48Z tpowa $
 # Maintainer:
 
 pkgname=gettext
-pkgver=0.18.3.2
+pkgver=0.19.1
 pkgrel=1
 pkgdesc="GNU internationalization library"
 arch=('i686' 'x86_64')
@@ -10,11 +10,11 @@ url="http://www.gnu.org/software/gettext/"
 license=('GPL')
 groups=('base' 'base-devel')
 depends=('gcc-libs' 'acl' 'sh' 'glib2' 'libunistring')
-optdepends=('cvs: for autopoint tool')
+optdepends=('git: for autopoint infrastructure updates')
 options=(!docs)
 install=gettext.install
 source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('241aba309d07aa428252c74b40a818ef'
+md5sums=('8949a57e82abe88274a93174ade515e4'
          'SKIP')
 
 build() {
diff --git a/extra/alsa-tools/PKGBUILD b/extra/alsa-tools/PKGBUILD
index 99bb2feb4..b166c92b1 100644
--- a/extra/alsa-tools/PKGBUILD
+++ b/extra/alsa-tools/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Jochen Immendœrfer <jochen.immendoerfer@gmail.com>
 
 pkgname=alsa-tools
-pkgver=1.0.27
-pkgrel=5
+pkgver=1.0.28
+pkgrel=1
 pkgdesc="Advanced tools for certain sound cards"
 arch=('i686' 'x86_64')
 url="http://alsa-project.org/"
@@ -18,7 +18,7 @@ optdepends=('fltk: hdspconf, hdspmixer'
             'bash: couple of tools')
 provides=("$pkgname-emu10k1" "$pkgname-ice1712")
 source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2")
-md5sums=('1ea381d00a6069a98613aa7effa4cb51')
+md5sums=('e6c929175d8ee729c06d49b51439bad6')
 
 _tools=("as10k1" "echomixer" "envy24control" "hdajackretask" "hda-verb"
         "hdspconf" "hdsploader" "hdspmixer" "ld10k1" "mixartloader"
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index e19b81d66..81d4af7ae 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 214743 2014-06-09 08:04:40Z bpiotrowski $
+# $Id: PKGBUILD 215411 2014-06-24 06:53:36Z bpiotrowski $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=2.2.3
-pkgrel=2
+pkgver=2.2.4
+pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ depends=(
 )
 makedepends=('libvdpau' 'yasm' 'x264')
 source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('dbb5b6b69bd010916f17df0ae596e0b1'
+md5sums=('5b85aea53d8dcd5b0f7b497f233bc101'
          'SKIP')
 
 build() {
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index dfbd37a36..32edbfe2c 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 215389 2014-06-23 19:53:29Z heftig $
+# $Id: PKGBUILD 215426 2014-06-24 19:21:02Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
-pkgver=0.9.7
-pkgrel=2
+pkgver=0.9.7.1
+pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org/wiki/Folks"
+url="https://wiki.gnome.org/Projects/Folks"
 license=(LGPL2.1)
 depends=(telepathy-glib libgee libxml2 evolution-data-server zeitgeist)
 makedepends=(gobject-introspection intltool vala)
 install=folks.install
 options=('!emptydirs')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-${pkgver}.tar.xz)
-md5sums=('aeaeb5a8e7277b167b9f055f372b9d5d')
+md5sums=('18f3e0799fdea55be7e27bc16e73bd8a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index a230ff71d..18342a9bf 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213528 2014-05-24 00:33:42Z heftig $
+# $Id: PKGBUILD 215423 2014-06-24 19:18:03Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=(harfbuzz)
 pkgname=(harfbuzz harfbuzz-icu)
-pkgver=0.9.28
+pkgver=0.9.29
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 license=(MIT)
 makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('a567f7c58018af0a9751e18641fd8434bfcef8307122dabe47dd652ce8bde048')
+sha256sums=('601cea38c6fa0cf362dd9042c66cf4db711c5f9390de4ca46d6d2fc3f64de390')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 58f933952..837c2fbaa 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 215353 2014-06-23 10:40:14Z bisson $
+# $Id: PKGBUILD 215399 2014-06-23 22:12:53Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=inkscape
-pkgver=0.48.4
-pkgrel=17
+pkgver=0.48.5
+pkgrel=1
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
@@ -19,33 +19,20 @@ optdepends=('pstoedit: latex formulas'
             'python2-lxml: some extensions and filters'
             'uniconvertor: reading/writing to some proprietary formats')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'spuriouscomma.patch'
-        'ime-placement.patch'
-        'freetype.patch'
-        'gc74.patch'
-        'poppler-0.26.patch')
-sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c'
-          '7d1d5a6d1d2b0926721a994d5889c52890fc57c1'
-          'b12b948ca5ee7e02703a13aa8b8bccdf67947f12'
-          'aba4d98bebae088c3401fd9259ea3cf70b96fbbf'
-          '3e1b5b6852d668388a857bc7a73fb7731fb262b8'
-          'b60843f43e6d3b6cfcf4e253abb3f7ea7bc69c2a')
+        'ime-placement.patch')
+sha1sums=('83ddb0c96069638f712a869039989bfd7d79c6a8'
+          'b12b948ca5ee7e02703a13aa8b8bccdf67947f12')
 
 install=install
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../gc74.patch # FS#39106
-	patch -p0 -i ../freetype.patch # FS#37956
 	patch -p1 -i ../ime-placement.patch # FS#39898
-	patch -p0 -i ../spuriouscomma.patch
-	patch -p0 -i ../poppler-0.26.patch
 	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
 	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
 	sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
 	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
 	sed -i 's|"python"|"python2"|g' src/main.cpp
-	sed -i '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp}
 	sed -i '/extern unsigned GC_version;/c unsigned GC_version=GC_VERSION_MAJOR<<16+GC_VERSION_MINOR<<8+GC_VERSION_MICRO;' configure
 }
 
diff --git a/extra/inkscape/freetype.patch b/extra/inkscape/freetype.patch
deleted file mode 100644
index 84cdc1ca6..000000000
--- a/extra/inkscape/freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-=== modified file 'src/libnrtype/FontFactory.h'
---- src/libnrtype/FontFactory.h	2010-04-15 19:00:11 +0000
-+++ src/libnrtype/FontFactory.h	2013-11-28 05:54:34 +0000
-@@ -31,7 +31,8 @@
- #include <pango/pangowin32.h>
- #else
- #include <pango/pangoft2.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #endif
- 
- namespace Glib
-
-
diff --git a/extra/inkscape/gc74.patch b/extra/inkscape/gc74.patch
deleted file mode 100644
index 41615ac49..000000000
--- a/extra/inkscape/gc74.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- inkscape-0.48.4/src/gc-core.h.old	2013-12-31 01:22:38.976653890 +0400
-+++ inkscape-0.48.4/src/gc-core.h	2013-12-31 01:22:48.525653608 +0400
-@@ -57,7 +57,7 @@
-                                            CleanupFunc *old_func,
-                                            void **old_data);
-     int (*general_register_disappearing_link)(void **p_ptr,
--                                              void *base);
-+                                              const void *base);
-     int (*unregister_disappearing_link)(void **p_ptr);
-     std::size_t (*get_heap_size)();
-     std::size_t (*get_free_bytes)();
---- inkscape-0.48.4/src/gc.cpp.old	2013-12-31 01:23:50.462651778 +0400
-+++ inkscape-0.48.4/src/gc.cpp	2013-12-31 01:40:37.718622017 +0400
-@@ -70,8 +70,8 @@
-     return base + debug_base_fixup();
- }
- 
--int debug_general_register_disappearing_link(void **p_ptr, void *base) {
--    char *real_base=reinterpret_cast<char *>(base) - debug_base_fixup();
-+int debug_general_register_disappearing_link(void **p_ptr, const void *base) {
-+    char *real_base=const_cast<char *>(reinterpret_cast<const char *>(base)) - debug_base_fixup();
-     return GC_general_register_disappearing_link(p_ptr, real_base);
- }
- 
-@@ -90,7 +90,7 @@
-     }
- }
- 
--int dummy_general_register_disappearing_link(void **, void *) { return false; }
-+int dummy_general_register_disappearing_link(void **, const void *) { return false; }
- 
- int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
- 
-@@ -112,7 +112,11 @@
-     &GC_malloc_atomic_uncollectable,
-     &GC_base,
-     &GC_register_finalizer_ignore_self,
-+#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
-     &GC_general_register_disappearing_link,
-+#else
-+    (int (*)(void**, const void*))(&GC_general_register_disappearing_link),
-+#endif
-     &GC_unregister_disappearing_link,
-     &GC_get_heap_size,
-     &GC_get_free_bytes,
-@@ -202,7 +206,7 @@
-     die_because_not_initialized();
- }
- 
--int stub_general_register_disappearing_link(void **, void *) {
-+int stub_general_register_disappearing_link(void **, const void *) {
-     die_because_not_initialized();
-     return 0;
- }
diff --git a/extra/inkscape/poppler-0.26.patch b/extra/inkscape/poppler-0.26.patch
deleted file mode 100644
index 84b324a5d..000000000
--- a/extra/inkscape/poppler-0.26.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2014-04-28 13:42:17.843140695 +0000
-+++ src/extension/internal/pdfinput/pdf-parser.cpp	2014-04-28 14:05:10.646106685 +0000
-@@ -861,7 +861,7 @@
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
--	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
-+	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
- #else
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5);
- #endif
-@@ -1085,9 +1085,9 @@
-   res->lookupColorSpace(args[0].getName(), &obj);
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0], NULL);
-+    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj, NULL);
-+    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
-   }
- #else
-   if (obj.isNull()) {
-@@ -1120,9 +1120,9 @@
-   res->lookupColorSpace(args[0].getName(), &obj);
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0], NULL);
-+    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj, NULL);
-+    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
-   }
- #else
-   if (obj.isNull()) {
-@@ -1213,7 +1213,7 @@
-     }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1273,7 +1273,7 @@
-     }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1711,7 +1711,7 @@
-   GBool savedState = gFalse;
- 
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
--  if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
-+  if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {
-     return;
-   }
- #else
-@@ -2727,7 +2727,7 @@
-     }
-     if (!obj1.isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
--      colorSpace = GfxColorSpace::parse(&obj1, NULL);
-+      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #else
-       colorSpace = GfxColorSpace::parse(&obj1);
- #endif
-@@ -2816,7 +2816,7 @@
- 	}
-       }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
--      maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
-+      maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #else
-       maskColorSpace = GfxColorSpace::parse(&obj1);
- #endif
-@@ -3007,7 +3007,7 @@
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
--	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
-+	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
- #else
- 	blendingColorSpace = GfxColorSpace::parse(&obj3);
- #endif
diff --git a/extra/inkscape/spuriouscomma.patch b/extra/inkscape/spuriouscomma.patch
deleted file mode 100644
index bc538068f..000000000
--- a/extra/inkscape/spuriouscomma.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/widgets/desktop-widget.h~	2011-07-08 13:25:09.000000000 -0500
-+++ src/widgets/desktop-widget.h	2013-02-15 16:04:45.806910365 -0600
-@@ -239,7 +239,7 @@
- private:
-     GtkWidget *tool_toolbox;
-     GtkWidget *aux_toolbox;
--    GtkWidget *commands_toolbox,;
-+    GtkWidget *commands_toolbox;
-     GtkWidget *snap_toolbox;
- 
-     static void init(SPDesktopWidget *widget);
diff --git a/extra/kdebase-workspace/KDEBUG-336589.patch b/extra/kdebase-workspace/KDEBUG-336589.patch
new file mode 100644
index 000000000..a38336f3c
--- /dev/null
+++ b/extra/kdebase-workspace/KDEBUG-336589.patch
@@ -0,0 +1,26 @@
+commit e8241313fc979aefafc8c2a0207570d6394f1580
+Author: Martin Gräßlin <mgraesslin@kde.org>
+Date:   Mon Jun 23 07:45:44 2014 +0200
+
+    [libkwineffects] Require strict binding for intel driver
+    
+    According to driver devs it's a "buggy micro-optimisation", see
+    https://bugs.freedesktop.org/show_bug.cgi?id=80349#c1
+    
+    BUG: 336589
+    REVIEW: 118893
+
+diff --git a/libkwineffects/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp
+index 4b2e6f3..9a391a0 100644
+--- a/libkwineffects/kwinglplatform.cpp
++++ b/libkwineffects/kwinglplatform.cpp
+@@ -811,7 +811,8 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
+             m_supportsGLSL = false;
+ 
+         m_limitedGLSL = m_supportsGLSL && m_chipClass < I965;
+-        m_looseBinding = true;
++        // see https://bugs.freedesktop.org/show_bug.cgi?id=80349#c1
++        m_looseBinding = false;
+ 
+         if (m_chipClass < I915) {
+             m_recommendedCompositor = XRenderCompositing;
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index e8833f109..d60490577 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 214966 2014-06-10 23:03:23Z andrea $
+# $Id: PKGBUILD 215421 2014-06-24 16:59:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,7 +6,7 @@ pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.11.10
 _pkgver=4.13.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -29,7 +29,8 @@ backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
         'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'khotkeys-qt4.patch')
+        'khotkeys-qt4.patch'
+        'KDEBUG-336589.patch')
 sha1sums=('2968043563e25d2d2618c9f49fdfbab5fa14c8cd'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -39,7 +40,8 @@ sha1sums=('2968043563e25d2d2618c9f49fdfbab5fa14c8cd'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'd509dac592bd8b310df27991b208c95b6d907514'
-          'aa9d2e5a69986c4c3d47829721ea99edb473be12')
+          'aa9d2e5a69986c4c3d47829721ea99edb473be12'
+          'e7a21bd2371ce069627ddbfffb3cf5caddcb1bff')
 
 prepare() {
         mkdir build
@@ -55,6 +57,9 @@ prepare() {
 
         # KDEBUG#202629
         patch -p0 -i "${srcdir}"/terminate-server.patch
+
+        cd kwin
+        patch -p1 -i "${srcdir}"/KDEBUG-336589.patch
 }
 
 build() {
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 9b0ef8867..24eb11287 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 213135 2014-05-19 14:16:07Z svenstaro $
+# $Id: PKGBUILD 215428 2014-06-24 20:06:31Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
-_realname=OpenCV
-pkgver=2.4.8
-pkgrel=2
+pkgver=2.4.9
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -21,7 +20,7 @@ optdepends=('opencv-samples'
 source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip"
         'pkgconfig.patch'
         'fsh.patch')
-md5sums=('50cc1433b3654074206f5b3dbfd49848'
+md5sums=('7f958389e71c77abdf5efe1da988b80c'
          'c7cea48ed7d4f729ebdb9673bac41bd3'
          'c597598d142dd34d0eb4af7d6e9779d8')
 
@@ -51,15 +50,16 @@ _cmakeopts=('-D WITH_OPENCL=ON'
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # hack-fix pkg-config mess
+  msg2 "Fixing broken pkg-config (downstream)"
   # see https://bugs.archlinux.org/task/32430
   # and http://code.opencv.org/issues/1925
   patch -Np1 -i "$srcdir/pkgconfig.patch"
 
-  # hack-fix folder naming inconsistency that they won't fix
+  # TODO: this is mostly upstream frei0r; they hardcode the path
+  #msg2 "Hack-fixing folder naming inconsistency (downstream)"
   # see http://code.opencv.org/issues/2512
   # and https://bugs.archlinux.org/task/32342
-  patch -Np1 -i "$srcdir/fsh.patch"
+  #patch -Np1 -i "$srcdir/fsh.patch"
 
   # no longer including docs, see https://bugs.archlinux.org/task/34185
   # python2 compatibility for generating (html) docs
@@ -82,16 +82,17 @@ package_opencv() {
   make DESTDIR="$pkgdir" install
 
   # install license file
-  install -Dm644 "$srcdir/$pkgname-$pkgver/doc/license.txt" \
+  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   cd "$pkgdir/usr/share"
 
   # separate samples package; also be -R friendly
-  if [[ -d $pkgname/samples ]]; then
-    mv $pkgname/samples "$srcdir/opencv-samples"
-  elif [[ -d $_realname ]]; then
-    warn "Directory naming issue; samples package may not be built!"
+  if [[ -d OpenCV/samples ]]; then
+    mv OpenCV/samples "$srcdir/$pkgname-samples"
+    mv OpenCV $pkgname # otherwise folder naming is inconsistent
+  elif [[ ! -d OpenCV ]]; then
+    warning "Directory naming issue; samples package may not be built!"
   fi
 }
 
@@ -104,7 +105,7 @@ package_opencv-samples() {
   cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
 
   # install license file
-  install -Dm644 "$srcdir/opencv-$pkgver/doc/license.txt" \
+  install -Dm644 "$srcdir/opencv-$pkgver/LICENSE" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index 6db69127c..5a6fbe489 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210551 2014-04-14 20:13:38Z jgc $ 
+# $Id: PKGBUILD 215424 2014-06-24 19:18:52Z heftig $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
-pkgver=1.36.3
-pkgrel=2
+pkgver=1.36.5
+pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introsp
 install=pango.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
-sha256sums=('ad48e32917f94aa9d507486d44366e59355fcfd46ef86d119ddcba566ada5d22')
+sha256sums=('be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index d1d877db2..29b9b8b04 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 209917 2014-04-08 15:23:45Z anatolik $
+#$Id: PKGBUILD 215417 2014-06-24 15:10:27Z anatolik $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=sg3_utils
-pkgver=1.38
+pkgver=1.39
 pkgrel=1
 pkgdesc="Generic SCSI utilities"
 arch=(i686 x86_64)
@@ -10,7 +10,7 @@ url="http://sg.danny.cz/sg/sg3_utils.html"
 license=('GPL' 'custom:BSD')
 depends=('glibc')
 source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz)
-md5sums=('ee60a79cd4eb4fa8cebb83c0e9c3707c')
+md5sums=('01d9a5421d778d2707f90461836c3d11')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"