Merge branch 'testing'

42 files changed, 723 insertions, 711 deletions

diff --git a/abs/extra/camlp4/PKGBUILD b/abs/extra/camlp4/PKGBUILD
index 9f66a18..ad29815 100644
--- a/abs/extra/camlp4/PKGBUILD
+++ b/abs/extra/camlp4/PKGBUILD
@@ -3,16 +3,16 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=camlp4
-pkgver=4.02+6
+pkgver=4.04
 pkgrel=1
 pkgdesc='Caml preprocessor and pretty-printer'
 arch=('x86_64' 'i686')
 license=('GPL2')
 url='https://github.com/ocaml/camlp4/releases'
-depends=('ocaml')
-makedepends=('git')
+depends=('ocaml>=4.04.0')
+makedepends=('git' 'ocamlbuild')
 options=('!makeflags' '!emptydirs' 'staticlibs')
-source=("git://github.com/ocaml/camlp4#tag=$pkgver")
+source=("git://github.com/ocaml/camlp4#branch=$pkgver")
 md5sums=('SKIP')
 
 build() {
diff --git a/abs/extra/ffmpeg2.8/PKGBUILD b/abs/extra/ffmpeg2.8/PKGBUILD
index 8e00522..c676e62 100644
--- a/abs/extra/ffmpeg2.8/PKGBUILD
+++ b/abs/extra/ffmpeg2.8/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg2.8
-pkgver=2.8.7
-pkgrel=2
+pkgver=2.8.9
+pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video'
 arch=('i686' 'x86_64')
 url='http://ffmpeg.org/'
@@ -31,13 +31,6 @@ source=("http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2"
         'ffmpeg-Speed_up_wtv_index_creation.patch'
 )
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
-sha256sums=('8777ce4a335640fdd13680ba423ef6da330ff5071bfbe27cdbb452379167efe5'
-            'SKIP'
-            'f89a26cb409bab1ac00106db008eccf72c6390e04d7cde2a63fbb1f2e9fbc669'
-            'ca7eca1b9476c93efbdea457b64b0e5d925ad437f79168112aae52319d59d155'
-            'fa78aa79ff861edbb8b6443978a0da60c4241f7a7f3888b242031ba916fa7514'
-            'd1191e3e3fc980535e4835b5ef9b52fd15a14b58ef56ac6d2710bd589ce94b40'
-)
 
 prepare() {
   cd ${srcdir}/ffmpeg-${pkgver}
@@ -108,3 +101,9 @@ package() {
 
 # vim: ts=2 sw=2 et:
 
+md5sums=('67adbe4671838e3a203bd425ff94fde6'
+         'SKIP'
+         '83bc99a06f1ca6fd70ed35056937a522'
+         '6c1e7519c3b5d414ca98ad624691517d'
+         '615e1c198bc6e7c0e1e1d41c018fcb47'
+         '0dd0959744a887ed420f79ea0fcda8b7')
diff --git a/abs/extra/gd/PKGBUILD b/abs/extra/gd/PKGBUILD
index 4988f09..75242e6 100644
--- a/abs/extra/gd/PKGBUILD
+++ b/abs/extra/gd/PKGBUILD
@@ -1,43 +1,33 @@
 # $Id$
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=gd
-pkgver=2.1.1
+pkgver=2.2.3
 pkgrel=3
 pkgdesc="Library for the dynamic creation of images by programmers"
 arch=('i686' 'x86_64')
 url="http://www.libgd.org/"
 license=('custom')
-depends=('fontconfig' 'libvpx' 'libxpm' 'libtiff')
-makedepends=('git')
+depends=('fontconfig' 'libxpm' 'libwebp')
 optdepends=('perl: bdftogd script')
-source=("${pkgname}::git+https://github.com/libgd/libgd.git#tag=${pkgname}-${pkgver}"
-        gd-2.1.1-libvpx-1.4.0.patch)
-md5sums=('SKIP'
-         '9114dd8259aaa88b0a09188fe7b19afc')
-
-prepare() {
-  cd ${pkgname}
-  ./bootstrap.sh
-  patch -p1 -i "${srcdir}/gd-2.1.1-libvpx-1.4.0.patch"
-}
+source=("https://github.com/libgd/libgd/releases/download/gd-${pkgver}/libgd-${pkgver}.tar.xz")
+md5sums=('14e4134c129b4c166c3a0549a32ef340')
 
 build() {
-  cd ${pkgname}
+  cd libgd-${pkgver}
   ./configure \
     --prefix=/usr \
-    --disable-rpath \
-    --with-vpx=/usr \
-    --with-tiff=/usr
+    --disable-rpath
   make
 }
 
 check() {
-  cd ${pkgname}
-  make check
+  cd libgd-${pkgver}
+  [[ ${CARCH} == 'i686' ]] || make check
 }
 
 package() {
-  cd ${pkgname}
+  cd libgd-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/abs/extra/gd/gd-2.1.1-libvpx-1.4.0.patch b/abs/extra/gd/gd-2.1.1-libvpx-1.4.0.patch
deleted file mode 100644
index c698972..0000000
--- a/abs/extra/gd/gd-2.1.1-libvpx-1.4.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d41eb72cd4545c394578332e5c102dee69e02ee8 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Tue, 7 Apr 2015 13:11:03 +0200
-Subject: [PATCH] Fix build with latest libvpx 1.4.0
-
-These new constants exist at least since 1.0.0
-Compatibility ones have been droped in 1.4.0
----
- src/webpimg.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/webpimg.c b/src/webpimg.c
-index cf73d64..e49fcc6 100644
---- a/src/webpimg.c
-+++ b/src/webpimg.c
-@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8* Y,
-     codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
-     codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
- 
--    vpx_img_wrap(&img, IMG_FMT_I420,
-+    vpx_img_wrap(&img, VPX_IMG_FMT_I420,
-                  y_width, y_height, 16, (uint8*)(Y));
--    img.planes[PLANE_Y] = (uint8*)(Y);
--    img.planes[PLANE_U] = (uint8*)(U);
--    img.planes[PLANE_V] = (uint8*)(V);
--    img.stride[PLANE_Y] = y_stride;
--    img.stride[PLANE_U] = uv_stride;
--    img.stride[PLANE_V] = uv_stride;
-+    img.planes[VPX_PLANE_Y] = (uint8*)(Y);
-+    img.planes[VPX_PLANE_U] = (uint8*)(U);
-+    img.planes[VPX_PLANE_V] = (uint8*)(V);
-+    img.stride[VPX_PLANE_Y] = y_stride;
-+    img.stride[VPX_PLANE_U] = uv_stride;
-+    img.stride[VPX_PLANE_V] = uv_stride;
- 
-     res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
- 
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index d3e765f..732d627 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
 # or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
 
 pkgname=google-chrome
-pkgver=55.0.2883.75
+pkgver=56.0.2924.87
 pkgrel=1
 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
 arch=('x86_64')
@@ -44,10 +44,7 @@ package() {
   install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome/eula_text.html
 
   msg2 "Fixing Chrome icon resolution..."
-  sed -i "/Exec=/i\StartupWMClass=google-chrome" "$pkgdir"/usr/share/applications/google-chrome.desktop
-
-  msg2 "Fixing permissions of documentation folder..."
-  chmod 755 "$pkgdir"/usr/share/doc/google-chrome-$_channel/
+  sed -i "/Exec=/i\StartupWMClass=Google-chrome" "$pkgdir"/usr/share/applications/google-chrome.desktop
 
   msg2 "Removing Debian Cron job and duplicate product logos..."
   rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
@@ -56,6 +53,6 @@ package() {
   msg2 "Rename google-chrome-stable to google-chrome..."
   mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome
 }
-md5sums=('45b8ef99605e140ea46198175f8dd512'
+md5sums=('c0143f6d5b5ffd291def19d2763c41fe'
          'da54da9383ddffa44c5db45513239da2'
          '99fa93d5e7fb5d622cef0f9621f3ffa3')
diff --git a/abs/extra/graphviz/PKGBUILD b/abs/extra/graphviz/PKGBUILD
index 0ee8e34..2eb0135 100644
--- a/abs/extra/graphviz/PKGBUILD
+++ b/abs/extra/graphviz/PKGBUILD
@@ -4,39 +4,40 @@
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
-pkgver=2.38.0
-pkgrel=3
+pkgver=2.40.1
+pkgrel=1
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('CPL')
 arch=('i686' 'x86_64')
 depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4' 'gtk2')
+makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'python2' 'r' 'tk' 'qt4' 'gtk2')
 optdepends=('mono: sharp bindings'
             'guile: guile bindings'
             'lua51: lua bindings'
             'ocaml: ocaml bindings'
             'perl: perl bindings'
-            'php: php bindings'
             'python2: python bindings'
             'r: r bindings'
             'tcl: tcl bindings'
             'qt4: gvedit'
-            'gtk2: gtk output plugin')
+            'gtk2: gtk output plugin'
+            'xterm: vimdot')
 source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
-        'format-string.patch')
-sha1sums=('053c771278909160916ca5464a0a98ebf034c6ef'
-          '271d116bc022596a64b6ee061f3d2e50fa2e6025')
+        'ghostscript918.patch')
+sha1sums=('8a44d19bcdb50df1bd8e649de472ebf868468888'
+          'bcce75a535c277556e196638e59ea019b0a63fa1')
 
 install=install
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../format-string.patch # FS#42983
+	patch -p1 -i ../ghostscript918.patch
 }
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	export CXXFLAGS+=' -Dint64=int64_t' # for ocaml
 	export LIBPOSTFIX=/
 	export PYTHON=python2
 	export LUA=lua5.1
@@ -49,9 +50,13 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
+	cd "${pkgdir}/usr/lib"
+	install -d lua/5.1
+	mv lua/gv.so lua/5.1
+
 	# Workaround symlink upgrade bug (fixed in pacman trunk)
 	# Also deduplicates the tcl libraries (upstream bug?)
 	# Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead
-	rm -r "${pkgdir}/usr/lib/tcl8.6/graphviz"
-	ln -s ../graphviz/tcl "$pkgdir/usr/lib/tcl8.6/graphviz"
+	rm -r tcl8.6/graphviz
+	ln -s ../graphviz/tcl tcl8.6/graphviz
 }
diff --git a/abs/extra/graphviz/format-string.patch b/abs/extra/graphviz/format-string.patch
deleted file mode 100644
index 1cc5867..0000000
--- a/abs/extra/graphviz/format-string.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur old/lib/cgraph/scan.l new/lib/cgraph/scan.l
---- old/lib/cgraph/scan.l	2014-04-13 10:40:25.000000000 -1000
-+++ new/lib/cgraph/scan.l	2014-12-02 08:54:21.285050735 -1000
-@@ -149,7 +149,7 @@
- 	agxbput(&xb,buf);
- 	agxbput(&xb,fname);
- 	agxbput(&xb, " splits into two tokens\n");
--	agerr(AGWARN,agxbuse(&xb));
-+	agerr(AGWARN, "%s", agxbuse(&xb));
- 
- 	agxbfree(&xb);
- 	return 1;
-@@ -225,7 +225,7 @@
- 	agxbput (&xb, buf);
- 	agxbput (&xb, yytext);
- 	agxbput (&xb,"'\n");
--	agerr(AGERR,agxbuse(&xb));
-+	agerr(AGERR, "%s", agxbuse(&xb));
- 	agxbfree(&xb);
- }
- /* must be here to see flex's macro defns */
diff --git a/abs/extra/graphviz/ghostscript918.patch b/abs/extra/graphviz/ghostscript918.patch
new file mode 100644
index 0000000..189c513
--- /dev/null
+++ b/abs/extra/graphviz/ghostscript918.patch
@@ -0,0 +1,18 @@
+diff -uprb graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c graphviz-2.38.0/plugin/gs/gvloadimage_gs.c
+--- graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c	2014-04-13 23:40:25.000000000 +0300
++++ graphviz-2.38.0/plugin/gs/gvloadimage_gs.c	2015-11-11 00:08:32.916123704 +0200
+@@ -72,11 +72,11 @@ static void gs_error(GVJ_t * job, const
+ 
+     assert (err < 0);
+ 
+-    if (err >= e_VMerror) 
++    if (err >= gs_error_VMerror)
+ 	errsrc = "PostScript Level 1"; 
+-    else if (err >= e_unregistered)
++    else if (err >= gs_error_unregistered)
+ 	errsrc = "PostScript Level 2";
+-    else if (err >= e_invalidid)
++    else if (err >= gs_error_invalidid)
+ 	errsrc = "DPS error";
+     else
+ 	errsrc = "Ghostscript internal error";
diff --git a/abs/extra/handbrake/PKGBUILD b/abs/extra/handbrake/PKGBUILD
index 499f790..3b0c3e4 100644
--- a/abs/extra/handbrake/PKGBUILD
+++ b/abs/extra/handbrake/PKGBUILD
@@ -4,30 +4,32 @@
 # Contributor: Sebastien Piccand <sebcactus gmail com>
 
 pkgname=('handbrake' 'handbrake-cli')
-pkgver=0.10.2
-pkgrel=3
+pkgver=1.0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://handbrake.fr/"
 license=('GPL')
 makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify'
              'gst-plugins-base' 'gtk3' 'dbus-glib' 'fribidi' 'libass' 'lame'
              'fontconfig' 'freetype2' 'libxml2' 'libogg' 'libvorbis' 'cmake'
-             'libtheora' 'libsamplerate' 'libbluray' 'x264' 'libx264'
-             'libdvdnav' 'librsvg' 'libgudev')
-source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2)
-sha256sums=('4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699')
+             'libtheora' 'libsamplerate' 'ffmpeg' 'x264' 'libx264' 'x265'
+             'libvpx' 'libdvdnav' 'jansson' 'librsvg' 'libgudev')
+source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2
+        handbrake-fix-missing-x265-link-flag.patch)
+sha256sums=('18e4563cc150309df03f7e73462b823ba2eca61644a7a536c9930611f3f9aa1e'
+            '05e212e76b6e0b94a04de02cbeb7bf9db607059e19297b5bd3d0d143135285c4')
 
 prepare() {
   cd "$srcdir/HandBrake-$pkgver"
 
+  # https://bugs.gentoo.org/show_bug.cgi?id=552792
+  patch -Np1 -i ../handbrake-fix-missing-x265-link-flag.patch
+
   # Use more system libs
-  # We had ffmpeg here as well but it broke PGS subtitle processing
-  # https://forum.handbrake.fr/viewtopic.php?f=13&t=27581
-  sed -i \
-    -e '/MODULES += contrib\/libbluray/d' \
-    -e '/MODULES += contrib\/libdvdnav/d' \
-    -e '/MODULES += contrib\/libdvdread/d' \
-    make/include/main.defs
+  # Bundled libbluray is kept because it is patched locally
+  for _lib in ffmpeg x265 libvpx libdvdnav libdvdread; do
+    sed -i "/MODULES += contrib\/$_lib/d" make/include/main.defs
+  done
 }
 
 build() {
@@ -35,23 +37,19 @@ build() {
 
   ./configure \
     --prefix=/usr \
-    --force \
     --disable-gtk-update-checks
-  cd build
-  make
+  make -C build
 }
 
 package_handbrake() {
   pkgdesc="Multithreaded video transcoder"
   depends=('bzip2' 'gcc-libs' 'gst-plugins-base' 'libnotify' 'dbus-glib'
            'fribidi' 'libass' 'lame' 'gtk3' 'fontconfig' 'freetype2' 'libxml2'
-           'libogg' 'libvorbis' 'libtheora' 'libsamplerate' 'libbluray'
-           'libx264' 'libdvdnav' 'librsvg' 'libgudev' 'desktop-file-utils'
-           'hicolor-icon-theme')
-  depends+=('libx264.so')
+           'libogg' 'libvorbis' 'libtheora' 'libsamplerate' 'ffmpeg' 'libx264'
+           'x265' 'libvpx' 'libdvdnav' 'jansson' 'librsvg' 'libgudev'
+           'desktop-file-utils' 'hicolor-icon-theme')
   optdepends=('gst-plugins-good: for video previews'
               'gst-libav: for video previews')
-  install=$pkgname.install
 
   cd "$srcdir/HandBrake-$pkgver/build"
 
@@ -62,8 +60,8 @@ package_handbrake() {
 package_handbrake-cli() {
   pkgdesc="Multithreaded video transcoder (CLI)"
   depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi' 'libass' 'lame' 'libxml2'
-           'libtheora' 'libsamplerate' 'libbluray' 'libx264' 'libdvdnav')
-  depends+=('libx264.so')
+           'libtheora' 'libsamplerate' 'ffmpeg' 'libx264' 'x265' 'libvpx'
+           'libdvdnav' 'jansson')
 
   cd "$srcdir/HandBrake-$pkgver/build"
   install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
diff --git a/abs/extra/handbrake/handbrake-fix-missing-x265-link-flag.patch b/abs/extra/handbrake/handbrake-fix-missing-x265-link-flag.patch
new file mode 100644
index 0000000..a963fe0
--- /dev/null
+++ b/abs/extra/handbrake/handbrake-fix-missing-x265-link-flag.patch
@@ -0,0 +1,13 @@
+Written by: Peter Foley <pefoley2@pefoley.com>
+Gentoo Bug: #552792
+
+--- a/test/module.defs
++++ b/test/module.defs
+@@ -25,6 +25,7 @@
+ 
+ ifeq (1,$(FEATURE.x265))
+     TEST.GCC.D += USE_X265
++    TEST.GCC.l += x265
+ endif
+ 
+ TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
diff --git a/abs/extra/handbrake/handbrake.install b/abs/extra/handbrake/handbrake.install
deleted file mode 100644
index 87c29e4..0000000
--- a/abs/extra/handbrake/handbrake.install
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/handbrake/standard-presets-fix-type.patch b/abs/extra/handbrake/standard-presets-fix-type.patch
deleted file mode 100644
index 797c3fa..0000000
--- a/abs/extra/handbrake/standard-presets-fix-type.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Index: branches/0.10.x/gtk/src/standard_presets.xml

-===================================================================

---- branches/0.10.x/gtk/src/standard_presets.xml	(revision 6995)

-+++ branches/0.10.x/gtk/src/standard_presets.xml	(revision 7008)

-@@ -85,5 +85,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -216,5 +216,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -347,5 +347,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -478,5 +478,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -625,5 +625,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -772,5 +772,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -919,5 +919,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -1050,5 +1050,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -1181,5 +1181,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -1312,5 +1312,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -1458,5 +1458,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

-@@ -1605,5 +1605,5 @@

- 				<string></string>

- 				<key>PictureDenoiseFilter</key>

--				<integer>off</integer>

-+				<string>off</string>

- 				<key>PictureDenoiseCustom</key>

- 				<string></string>

diff --git a/abs/extra/jansson/PKGBUILD b/abs/extra/jansson/PKGBUILD
index a263809..5345281 100644
--- a/abs/extra/jansson/PKGBUILD
+++ b/abs/extra/jansson/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Dave Reisner <d@falconindy.com>
 
 pkgname=jansson
-pkgver=2.7
+pkgver=2.9
 pkgrel=1
 pkgdesc='C library for encoding, decoding and manipulating JSON data'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('glibc')
 license=('MIT')
 options=('staticlibs')
 source=("http://www.digip.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2")
-md5sums=('ffac352f9c5f80a6ae8145d451af2c0e')
+md5sums=('4b9d8fe6690ae3f10a227165bc02b696')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/abs/extra/libfastjson/PKGBUILD b/abs/extra/libfastjson/PKGBUILD
new file mode 100644
index 0000000..ab137ad
--- /dev/null
+++ b/abs/extra/libfastjson/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Sergej Pupykin <arch+pub@sergej.pp.ru>
+# Maintainer: Bob Gregory <pathogenix@gmail.com>
+
+pkgname=libfastjson
+pkgver=0.99.4
+pkgrel=1
+pkgdesc="A performance-focused json library for C"
+arch=('i686' 'x86_64')
+url="https://github.com/rsyslog/libfastjson"
+license=('GPL')
+depends=()
+source=($pkgname-$pkgver.tar.gz::https://github.com/rsyslog/$pkgname/archive/v$pkgver.tar.gz)
+sha256sums=('03ef63dcc88417e71c19ce4436804159e3397e3a20d3529efef6a43c3bef5c8d')
+
+build() {
+  cd "$pkgname-$pkgver"
+  autoreconf -fvi
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/abs/extra/librelp/PKGBUILD b/abs/extra/librelp/PKGBUILD
index a127fed..6a6e56a 100644
--- a/abs/extra/librelp/PKGBUILD
+++ b/abs/extra/librelp/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Kaiting Chen <kaiting.chen@kiwilight.com>
 
 pkgname='librelp'
-pkgver='1.2.7'
-pkgrel=3
+pkgver=1.2.12
+pkgrel=1
 pkgdesc="The Reliable Event Logging Protocol"
 url="http://www.librelp.com/"
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('gnutls')
 source=("http://download.rsyslog.com/librelp/librelp-${pkgver}.tar.gz")
-md5sums=('26e02602490af3a681a2a13e6ce29efb')
+md5sums=('b99eb5e5eb77b4fd999e440876106aee')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir"/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
diff --git a/abs/extra/libsamplerate/PKGBUILD b/abs/extra/libsamplerate/PKGBUILD
index d157dc5..8c1a852 100644
--- a/abs/extra/libsamplerate/PKGBUILD
+++ b/abs/extra/libsamplerate/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 136113 2011-08-23 03:20:21Z eric $
+# $Id$
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libsamplerate
-pkgver=0.1.8
+pkgver=0.1.9
 pkgrel=1
 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
 arch=('i686' 'x86_64')
 url="http://www.mega-nerd.com/SRC/index.html"
-license=('GPL')
+license=('BSD')
 depends=('libsndfile')
-options=('!libtool')
 source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz)
-md5sums=('1c7fb25191b4e6e3628d198a66a84f47')
-sha1sums=('e5fe82c4786be2fa33ca6bd4897db4868347fe70')
+sha1sums=('ed60f957a4ff87aa15cbb1f3dbd886fa7e5e9566')
+validpgpkeys=('73571E85C19F4281D8C97AA86CA41A7743B8D6C8')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
+
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/abs/extra/libvpx/PKGBUILD b/abs/extra/libvpx/PKGBUILD
index f4aa2d1..17af63a 100644
--- a/abs/extra/libvpx/PKGBUILD
+++ b/abs/extra/libvpx/PKGBUILD
@@ -1,10 +1,11 @@
 # $Id$
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
 pkgname=libvpx
-pkgver=1.5.0
-pkgrel=4
+pkgver=1.6.1
+pkgrel=1
 pkgdesc='VP8 and VP9 codec'
 arch=('i686' 'x86_64')
 url='http://www.webmproject.org/'
@@ -12,37 +13,35 @@ license=('BSD')
 depends=('glibc' 'gcc-libs')
 makedepends=('yasm' 'git')
 provides=('libvpx.so')
-source=($pkgname-$pkgver.tar.gz::https://github.com/webmproject/libvpx/archive/v$pkgver.tar.gz
-        0001-Fix-for-issue-1114-compile-error.patch)
-md5sums=('0c662bc7525afe281badb3175140d35c'
-         'a03e318d5d92270ed826b55d6d9dc828')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # https://bugs.chromium.org/p/webm/issues/detail?id=1114
-  patch -Np1 -i ../0001-Fix-for-issue-1114-compile-error.patch
-}
+source=("libvpx-${pkgver}.tar.gz::https://github.com/webmproject/libvpx/archive/v${pkgver}.tar.gz")
+sha256sums=('cda8bb6f0e4848c018177d3a576fa83ed96d762554d7010fe4cfb9d70c22e588')
 
 build() {
-  cd $pkgname-$pkgver
+  cd libvpx-${pkgver}
 
-  ./configure --prefix=/usr \
-    --enable-vp8 \
-    --enable-vp9 \
-    --enable-vp9-highbitdepth \
+  ./configure \
+    --prefix='/usr' \
     --enable-runtime-cpu-detect \
     --enable-shared \
-    --enable-postproc \
     --enable-pic \
-    --enable-experimental --enable-spatial-svc \
     --disable-install-docs \
-    --disable-install-srcs
+    --disable-install-srcs \
+    --enable-vp8 \
+    --enable-postproc \
+    --enable-vp9 \
+    --enable-vp9-highbitdepth \
+    --enable-experimental \
+    --enable-spatial-svc
+
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DIST_DIR="$pkgdir/usr" install
-  install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  cd libvpx-${pkgver}
+
+  make DIST_DIR="${pkgdir}"/usr install
+
+  install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/libvpx/
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/abs/extra/llvm/AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch b/abs/extra/llvm/AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch
new file mode 100644
index 0000000..f23b916
--- /dev/null
+++ b/abs/extra/llvm/AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch
@@ -0,0 +1,140 @@
+From 25e2616626caafb896517e18cd8aa724fba2b200 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <thomas.stellard@amd.com>
+Date: Tue, 29 Nov 2016 03:41:28 +0000
+Subject: [PATCH] Merging r280589:
+
+------------------------------------------------------------------------
+r280589 | nhaehnle | 2016-09-03 05:26:32 -0700 (Sat, 03 Sep 2016) | 19 lines
+
+AMDGPU: Fix an interaction between WQM and polygon stippling
+
+Summary:
+This fixes a rare bug in polygon stippling with non-monolithic pixel shaders.
+
+The underlying problem is as follows: the prolog part contains the polygon
+stippling sequence, i.e. a kill. The main part then enables WQM based on the
+_reduced_ exec mask, effectively undoing most of the polygon stippling.
+
+Since we cannot know whether polygon stippling will be used, the main part
+of a non-monolithic shader must always return to exact mode to fix this
+problem.
+
+Reviewers: arsenm, tstellarAMD, mareko
+
+Subscribers: arsenm, llvm-commits, kzhuravl
+
+Differential Revision: https://reviews.llvm.org/D23131
+
+------------------------------------------------------------------------
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_39@288105 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/Target/AMDGPU/SIInstructions.td   |  1 +
+ lib/Target/AMDGPU/SIWholeQuadMode.cpp |  7 -----
+ test/CodeGen/AMDGPU/wqm.ll            | 49 ++++++++++++++++++++++++++++++++---
+ 3 files changed, 46 insertions(+), 11 deletions(-)
+
+diff --git a/lib/Target/AMDGPU/SIInstructions.td b/lib/Target/AMDGPU/SIInstructions.td
+index 18b7d5d..dde5f2f 100644
+--- a/lib/Target/AMDGPU/SIInstructions.td
++++ b/lib/Target/AMDGPU/SIInstructions.td
+@@ -2029,6 +2029,7 @@ def SI_RETURN : PseudoInstSI <
+   let hasSideEffects = 1;
+   let SALU = 1;
+   let hasNoSchedulingInfo = 1;
++  let DisableWQM = 1;
+ }
+ 
+ let Uses = [EXEC], Defs = [EXEC, VCC, M0],
+diff --git a/lib/Target/AMDGPU/SIWholeQuadMode.cpp b/lib/Target/AMDGPU/SIWholeQuadMode.cpp
+index b200c15..1534d58 100644
+--- a/lib/Target/AMDGPU/SIWholeQuadMode.cpp
++++ b/lib/Target/AMDGPU/SIWholeQuadMode.cpp
+@@ -219,13 +219,6 @@ char SIWholeQuadMode::scanInstructions(MachineFunction &MF,
+       markInstruction(MI, Flags, Worklist);
+       GlobalFlags |= Flags;
+     }
+-
+-    if (WQMOutputs && MBB.succ_empty()) {
+-      // This is a prolog shader. Make sure we go back to exact mode at the end.
+-      Blocks[&MBB].OutNeeds = StateExact;
+-      Worklist.push_back(&MBB);
+-      GlobalFlags |= StateExact;
+-    }
+   }
+ 
+   return GlobalFlags;
+diff --git a/test/CodeGen/AMDGPU/wqm.ll b/test/CodeGen/AMDGPU/wqm.ll
+index 809a7ba..41e4264 100644
+--- a/test/CodeGen/AMDGPU/wqm.ll
++++ b/test/CodeGen/AMDGPU/wqm.ll
+@@ -17,17 +17,18 @@ main_body:
+ ;CHECK-LABEL: {{^}}test2:
+ ;CHECK-NEXT: ; %main_body
+ ;CHECK-NEXT: s_wqm_b64 exec, exec
+-;CHECK: image_sample
+ ;CHECK-NOT: exec
+-;CHECK: _load_dword v0,
+-define amdgpu_ps float @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) {
++define amdgpu_ps void @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) {
+ main_body:
+   %c.1 = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %c, <8 x i32> %rsrc, <4 x i32> %sampler, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0)
+   %c.2 = bitcast <4 x float> %c.1 to <4 x i32>
+   %c.3 = extractelement <4 x i32> %c.2, i32 0
+   %gep = getelementptr float, float addrspace(1)* %ptr, i32 %c.3
+   %data = load float, float addrspace(1)* %gep
+-  ret float %data
++
++  call void @llvm.SI.export(i32 15, i32 1, i32 1, i32 0, i32 1, float %data, float undef, float undef, float undef)
++
++  ret void
+ }
+ 
+ ; ... but disabled for stores (and, in this simple case, not re-enabled).
+@@ -414,6 +415,46 @@ entry:
+   ret void
+ }
+ 
++; Must return to exact at the end of a non-void returning shader,
++; otherwise the EXEC mask exported by the epilog will be wrong. This is true
++; even if the shader has no kills, because a kill could have happened in a
++; previous shader fragment.
++;
++; CHECK-LABEL: {{^}}test_nonvoid_return:
++; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec
++; CHECK: s_wqm_b64 exec, exec
++;
++; CHECK: s_and_b64 exec, exec, [[LIVE]]
++; CHECK-NOT: exec
++define amdgpu_ps <4 x float> @test_nonvoid_return() nounwind {
++  %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0)
++  %tex.i = bitcast <4 x float> %tex to <4 x i32>
++  %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0)
++  ret <4 x float> %dtex
++}
++
++; CHECK-LABEL: {{^}}test_nonvoid_return_unreachable:
++; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec
++; CHECK: s_wqm_b64 exec, exec
++;
++; CHECK: s_and_b64 exec, exec, [[LIVE]]
++; CHECK-NOT: exec
++define amdgpu_ps <4 x float> @test_nonvoid_return_unreachable(i32 inreg %c) nounwind {
++entry:
++  %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0)
++  %tex.i = bitcast <4 x float> %tex to <4 x i32>
++  %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0)
++
++  %cc = icmp sgt i32 %c, 0
++  br i1 %cc, label %if, label %else
++
++if:
++  store volatile <4 x float> %dtex, <4 x float>* undef
++  unreachable
++
++else:
++  ret <4 x float> %dtex
++}
+ 
+ declare void @llvm.amdgcn.image.store.v4i32(<4 x float>, <4 x i32>, <8 x i32>, i32, i1, i1, i1, i1) #1
+ declare void @llvm.amdgcn.buffer.store.f32(float, <4 x i32>, i32, i32, i1, i1) #1
diff --git a/abs/extra/llvm/PKGBUILD b/abs/extra/llvm/PKGBUILD
index f39c8d3..9e69c02 100644
--- a/abs/extra/llvm/PKGBUILD
+++ b/abs/extra/llvm/PKGBUILD
@@ -10,9 +10,9 @@
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lldb' 'clang' 'clang-tools-extra')
-pkgver=3.9.0
-pkgrel=1
-_ocaml_ver=4.02.3
+pkgver=3.9.1
+pkgrel=2
+_ocaml_ver=4.04.0
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -26,17 +26,21 @@ source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
         http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
         http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
         http://llvm.org/releases/$pkgver/lldb-$pkgver.src.tar.xz{,.sig}
+        AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch
+        msan-prevent-initialization-failure-with-newer-glibc.patch
         llvm-Config-llvm-config.h)
-sha256sums=('66c73179da42cee1386371641241f79ded250e117a79f571bbd69e56daa48948'
+sha256sums=('1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee'
             'SKIP'
-            '7596a7c7d9376d0c89e60028fe1ceb4d3e535e8ea8b89e0eb094e0dcb3183d28'
+            'e6c4cebb96dee827fa0470af313dff265af391cb6da8d429842ef208c8f25e63'
             'SKIP'
-            '5b7aec46ec8e999ec683c87ad744082e1133781ee4b01905b4bdae5d20785f14'
+            '29a5b65bdeff7767782d4427c7c64d54c3a8684bc6b217b74a70e575e4813635'
             'SKIP'
-            'e0e5224fcd5740b61e416c549dd3dcda92f10c524216c1edb5e979e42078a59a'
+            'd30967b1a5fa51a2503474aacc913e69fd05ae862d37bf310088955bdb13ec99'
             'SKIP'
-            '61280e07411e3f2b4cca0067412b39c16b0a9edd19d304d3fc90249899d12384'
+            '7e3311b2a1f80f4d3426e09f9459d079cab4d698258667e50a46dccbaaa460fc'
             'SKIP'
+            'adadc41090ab0eb33fe4449a0ea3f02b15d03f186262dd89576848a2c66d0ce6'
+            '8e4f194c2283b91644a7fff43bc4e58c36b5507f2a4d90b72f275c0bd7511c20'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
 validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'
               '11E521D646982372EB577A1F8F0871F202119294')
@@ -54,6 +58,12 @@ prepare() {
 
   mv "$srcdir/lldb-$pkgver.src" tools/lldb
 
+  # https://bugs.freedesktop.org/show_bug.cgi?id=99078
+  patch -Rp1 -i ../AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch
+
+  # https://reviews.llvm.org/D24736
+  patch -Np0 -d projects/compiler-rt <../msan-prevent-initialization-failure-with-newer-glibc.patch
+
   mkdir build
 }
 
@@ -64,14 +74,15 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLLVM_BUILD_LLVM_DYLIB=ON \
-    -DLLVM_DYLIB_EXPORT_ALL=ON \
     -DLLVM_LINK_LLVM_DYLIB=ON \
+    -DLLVM_INSTALL_UTILS=ON \
     -DLLVM_ENABLE_RTTI=ON \
     -DLLVM_ENABLE_FFI=ON \
     -DLLVM_BUILD_TESTS=ON \
     -DLLVM_BUILD_DOCS=ON \
     -DLLVM_ENABLE_SPHINX=ON \
     -DLLVM_ENABLE_DOXYGEN=OFF \
+    -DLLDB_DISABLE_LIBEDIT=1 \
     -DSPHINX_WARNINGS_AS_ERRORS=OFF \
     -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \
     -DLLVM_BINUTILS_INCDIR=/usr/include \
@@ -159,12 +170,16 @@ package_llvm-ocaml() {
 package_lldb() {
   pkgdesc="Next generation, high-performance debugger"
   url="http://lldb.llvm.org/"
-  depends=('libedit' 'libxml2' 'python2' 'python2-six')
+  depends=('libxml2' 'python2' 'python2-six')
 
   cd "$srcdir/llvm-$pkgver.src"
 
   make -C build/tools/lldb DESTDIR="$pkgdir" install
 
+  # https://bugs.archlinux.org/task/50759
+  sed -i "/import_module('_lldb')/s/_lldb/lldb.&/" \
+  "$pkgdir/usr/lib/python2.7/site-packages/lldb/__init__.py"
+
   # Remove bundled six library
   rm "$pkgdir/usr/lib/python2.7/site-packages/six.py"
 
@@ -226,10 +241,8 @@ package_clang-tools-extra() {
   make -C build/tools/clang/tools/extra DESTDIR="$pkgdir" install
 
   # Use Python 2
-  sed -i \
-    -e 's|env python$|&2|' \
-    -e 's|/usr/bin/python$|&2|' \
-    "$pkgdir"/usr/share/clang/{clang-tidy-diff,run-clang-tidy}.py
+  sed -i 's|/usr/bin/env python|&2|' \
+    "$pkgdir"/usr/share/clang/{clang-tidy-diff,run-clang-tidy,run-find-all-symbols}.py
 
   install -Dm644 tools/clang/tools/extra/LICENSE.TXT \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/abs/extra/llvm/msan-prevent-initialization-failure-with-newer-glibc.patch b/abs/extra/llvm/msan-prevent-initialization-failure-with-newer-glibc.patch
new file mode 100644
index 0000000..57387a6
--- /dev/null
+++ b/abs/extra/llvm/msan-prevent-initialization-failure-with-newer-glibc.patch
@@ -0,0 +1,103 @@
+Index: lib/msan/msan_interceptors.cc
+===================================================================
+--- lib/msan/msan_interceptors.cc	(revision 282231)
++++ lib/msan/msan_interceptors.cc	(revision 282232)
+@@ -64,6 +64,23 @@
+   return in_interceptor_scope;
+ }
+ 
++static uptr allocated_for_dlsym;
++static const uptr kDlsymAllocPoolSize = 1024;
++static uptr alloc_memory_for_dlsym[kDlsymAllocPoolSize];
++
++static bool IsInDlsymAllocPool(const void *ptr) {
++  uptr off = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
++  return off < sizeof(alloc_memory_for_dlsym);
++}
++
++static void *AllocateFromLocalPool(uptr size_in_bytes) {
++  uptr size_in_words = RoundUpTo(size_in_bytes, kWordSize) / kWordSize;
++  void *mem = (void *)&alloc_memory_for_dlsym[allocated_for_dlsym];
++  allocated_for_dlsym += size_in_words;
++  CHECK_LT(allocated_for_dlsym, kDlsymAllocPoolSize);
++  return mem;
++}
++
+ #define ENSURE_MSAN_INITED() do { \
+   CHECK(!msan_init_is_running); \
+   if (!msan_inited) { \
+@@ -227,7 +244,7 @@
+ 
+ INTERCEPTOR(void, free, void *ptr) {
+   GET_MALLOC_STACK_TRACE;
+-  if (!ptr) return;
++  if (!ptr || UNLIKELY(IsInDlsymAllocPool(ptr))) return;
+   MsanDeallocate(&stack, ptr);
+ }
+ 
+@@ -234,7 +251,7 @@
+ #if !SANITIZER_FREEBSD
+ INTERCEPTOR(void, cfree, void *ptr) {
+   GET_MALLOC_STACK_TRACE;
+-  if (!ptr) return;
++  if (!ptr || UNLIKELY(IsInDlsymAllocPool(ptr))) return;
+   MsanDeallocate(&stack, ptr);
+ }
+ #define MSAN_MAYBE_INTERCEPT_CFREE INTERCEPT_FUNCTION(cfree)
+@@ -907,27 +924,29 @@
+ 
+ INTERCEPTOR(void *, calloc, SIZE_T nmemb, SIZE_T size) {
+   GET_MALLOC_STACK_TRACE;
+-  if (UNLIKELY(!msan_inited)) {
++  if (UNLIKELY(!msan_inited))
+     // Hack: dlsym calls calloc before REAL(calloc) is retrieved from dlsym.
+-    const SIZE_T kCallocPoolSize = 1024;
+-    static uptr calloc_memory_for_dlsym[kCallocPoolSize];
+-    static SIZE_T allocated;
+-    SIZE_T size_in_words = ((nmemb * size) + kWordSize - 1) / kWordSize;
+-    void *mem = (void*)&calloc_memory_for_dlsym[allocated];
+-    allocated += size_in_words;
+-    CHECK(allocated < kCallocPoolSize);
+-    return mem;
+-  }
++    return AllocateFromLocalPool(nmemb * size);
+   return MsanCalloc(&stack, nmemb, size);
+ }
+ 
+ INTERCEPTOR(void *, realloc, void *ptr, SIZE_T size) {
+   GET_MALLOC_STACK_TRACE;
++  if (UNLIKELY(IsInDlsymAllocPool(ptr))) {
++    uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
++    uptr copy_size = Min(size, kDlsymAllocPoolSize - offset);
++    void *new_ptr = AllocateFromLocalPool(size);
++    internal_memcpy(new_ptr, ptr, copy_size);
++    return new_ptr;
++  }
+   return MsanReallocate(&stack, ptr, size, sizeof(u64), false);
+ }
+ 
+ INTERCEPTOR(void *, malloc, SIZE_T size) {
+   GET_MALLOC_STACK_TRACE;
++  if (UNLIKELY(!msan_inited))
++    // Hack: dlsym calls malloc before REAL(malloc) is retrieved from dlsym.
++    return AllocateFromLocalPool(size);
+   return MsanReallocate(&stack, nullptr, size, sizeof(u64), false);
+ }
+ 
+Index: lib/asan/asan_malloc_linux.cc
+===================================================================
+--- lib/asan/asan_malloc_linux.cc	(revision 282231)
++++ lib/asan/asan_malloc_linux.cc	(revision 282232)
+@@ -78,7 +78,11 @@
+   if (UNLIKELY(IsInDlsymAllocPool(ptr))) {
+     uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
+     uptr copy_size = Min(size, kDlsymAllocPoolSize - offset);
+-    void *new_ptr = asan_malloc(size, &stack);
++    void *new_ptr;
++    if (UNLIKELY(!asan_inited))
++      new_ptr = AllocateFromLocalPool(size);
++    else
++      new_ptr = asan_malloc(size, &stack);
+     internal_memcpy(new_ptr, ptr, copy_size);
+     return new_ptr;
+   }
diff --git a/abs/extra/netcdf/PKGBUILD b/abs/extra/netcdf/PKGBUILD
index c73dec6..e05e548 100644
--- a/abs/extra/netcdf/PKGBUILD
+++ b/abs/extra/netcdf/PKGBUILD
@@ -3,44 +3,47 @@
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=netcdf
-pkgver=4.4.1rc1
-pkgrel=1
+pkgver=4.4.1
+pkgrel=2
 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library"
 arch=("i686" "x86_64")
 url="http://www.unidata.ucar.edu/downloads/netcdf/index.jsp"
 depends=('gcc-libs' 'hdf5' 'curl')
 optdepends=('netcdf-fortran: fortran bindings' 'netcdf-cxx: c++ bindings')
+provides=('libnetcdf.so')
 options=('!makeflags')
 license=('custom')
 #source=("http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${pkgver}.tar.gz")
-source=("https://github.com/Unidata/netcdf-c/archive/v4.4.1-rc1.tar.gz")
-sha1sums=('7606c16814bf9b33a66815e4109d9ba2df4a4936')
+source=("https://github.com/Unidata/netcdf-c/archive/v${pkgver}.tar.gz")
+sha1sums=('1cae39472930a25d6ab1bdf6af2a0d85d09aedf9')
 
 build() {
-#  cd "${srcdir}"/${pkgname}-${pkgver}
-  cd "${srcdir}"/netcdf-c-4.4.1-rc1
+  # cd "${srcdir}"/${pkgname}-${pkgver}
+  cd "${srcdir}/netcdf-c-${pkgver}"
 #  autoreconf -fis
   ./configure --prefix=/usr --enable-shared --enable-netcdf-4 --enable-dap-netcdf
   make
 }
 
-# hdf5 tests fail, have not yet been updated to hdf5-1.10.0
-#check() {
-#  cd "${srcdir}"/${pkgname}-${pkgver}
-#  cd "${srcdir}"/netcdf-c-4.4.1-rc1
-#  make check
-#}
+# As of netcdf-c-4.4.1, all the tests pass except for one; a workaround is to
+# update CFLAGS so no optimization level is used (i.e., remove "-O2"). See
+# https://github.com/Unidata/netcdf-c/issues/244
+# check() {
+#   # cd "${srcdir}"/${pkgname}-${pkgver}
+#   cd "${srcdir}/netcdf-c-${pkgver}"
+#   make check
+# }
 
 package() {
 #  cd "${srcdir}"/${pkgname}-${pkgver}
-  cd "${srcdir}"/netcdf-c-4.4.1-rc1  
+  cd "${srcdir}/netcdf-c-${pkgver}"
   install -m755 -d "${pkgdir}"/usr/lib
   install -m755 -d "${pkgdir}"/usr/share/man
   make DESTDIR="${pkgdir}" install
 
 #  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/COPYRIGHT \
 #    "${pkgdir}"/usr/share/licenses/${pkgname}/COPYRIGHT
-  install -Dm644 "${srcdir}"/netcdf-c-4.4.1-rc1/COPYRIGHT \
+  install -Dm644 "${srcdir}"/netcdf-c-${pkgver}/COPYRIGHT \
         "${pkgdir}"/usr/share/licenses/${pkgname}/COPYRIGHT
 
 }
diff --git a/abs/extra/ocaml-ctypes/PKGBUILD b/abs/extra/ocaml-ctypes/PKGBUILD
index 3d0922c..66a5721 100644
--- a/abs/extra/ocaml-ctypes/PKGBUILD
+++ b/abs/extra/ocaml-ctypes/PKGBUILD
@@ -3,17 +3,17 @@
 # Contributor: Armin K. <krejzi at email dot com>
 
 pkgname=ocaml-ctypes
-pkgver=0.4.1
-pkgrel=3
+pkgver=0.10.2
+pkgrel=1
 pkgdesc="Library for binding to C libraries using pure OCaml"
 arch=('i686' 'x86_64')
 url="https://github.com/ocamllabs/ocaml-ctypes"
 license=('MIT')
-depends=('ocaml' 'libffi')
+depends=('ocaml=4.04.0' 'libffi')
 makedepends=('ocaml-findlib')
 options=('!strip' '!makeflags')
-source=($pkgname-$pkgver::https://github.com/ocamllabs/ocaml-ctypes/archive/$pkgver.tar.gz)
-sha256sums=('74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5')
+source=($pkgname-$pkgver.tar.gz::https://github.com/ocamllabs/ocaml-ctypes/archive/$pkgver.tar.gz)
+sha256sums=('9888667de03c330d3845e8ded0df53f9e1d234be2c3696517a1e98e176116cea')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/abs/extra/ocaml-findlib/PKGBUILD b/abs/extra/ocaml-findlib/PKGBUILD
index ce5bdff..efe122f 100644
--- a/abs/extra/ocaml-findlib/PKGBUILD
+++ b/abs/extra/ocaml-findlib/PKGBUILD
@@ -1,37 +1,46 @@
-# Maintainer: Lukas Fleischer <lfleischer@archlinux.org>
-# Contributor: Thomas S Hatch <thatch45 at gmail dot com>
-# Contributor: Sebastian Wiesner <lunaryorn googlemail com>
-# Contributor: Benjamin Andresen <benny(at)klapmuetz(dot)org>
-# Contributor: scj <scj archlinux us>
+# $Id$
+# Maintainer: Alexander F Rødseth <xyproto@archlinux.org>
+# Contributor: Lukas Fleischer <lfleischer@archlinux.org>
+# Contributor: Thomas S Hatch <thatch45@gmail.com>
+# Contributor: Sebastian Wiesner <lunaryorn@googlemail.com>
+# Contributor: Benjamin Andresen <benny@klapmuetz.org>
+# Contributor: scj <scj@archlinux.us>
+# Contributor: Alif <alive4ever@live.com>
 
 pkgname=ocaml-findlib
-pkgver=1.5.5
-pkgrel=3
-license=('MIT')
-arch=('i686' 'x86_64')
-pkgdesc='Objective Caml (OCaml) package manager'
+pkgver=1.7.1
+pkgrel=1
+pkgdesc='OCaml package manager'
+arch=('x86_64' 'i686')
 url='http://projects.camlcity.org/projects/findlib.html'
+license=('MIT')
 depends=('ocaml')
+makedepends=('setconf')
 source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz")
-md5sums=('703eae112f9e912507c3a2f8d8c48498')
-options=('staticlibs' '!strip' 'zipman' '!makeflags') # otherwise the bytecode gets broken
+sha256sums=('5d4b9a79e9abf8be0b509f6b8cf5696221cbe14fa2fbb2bb352342755fd15eef')
+options=('staticlibs' '!strip' 'zipman' '!makeflags')
 
 build() {
-  cd "$srcdir/findlib-$pkgver"
+  cd "findlib-$pkgver"
+
+  ./configure \
+    -sitelib /usr/lib/ocaml \
+    -config /etc/findlib.conf \
+    -mandir /usr/share/man
 
-  ./configure -config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man
   make all opt
 }
 
 package () {
-  cd "$srcdir/findlib-$pkgver"
+  cd "findlib-$pkgver"
 
-  make prefix="$pkgdir" install 
+  make prefix="$pkgdir" install
 
-  # add the old site-lib to the path to maintain compatibility with old style packages
-  sed -i 's/path=\"\/usr\/lib\/ocaml\"/path="\/usr\/lib\/ocaml:\/usr\/lib\/ocaml\/site-lib"/' \
-    "${pkgdir}/etc/findlib.conf"
+  # Add a directory to the path for compatibility with old-style packages
+  #setconf "$pkgdir/etc/findlib.conf" path='"/usr/lib/ocaml:/usr/lib/ocaml-site-lib"'
 
   install -m755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/ocaml-findlib/makefile.patch b/abs/extra/ocaml-findlib/makefile.patch
new file mode 100644
index 0000000..0e21a2d
--- /dev/null
+++ b/abs/extra/ocaml-findlib/makefile.patch
@@ -0,0 +1,13 @@
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -71,7 +71,7 @@ findlib.conf: findlib.conf.in
+ 
+ .PHONY: install-doc
+ install-doc:
+-	mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
++	mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
+ 	-cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
+ 	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
+ 
diff --git a/abs/extra/ocaml/PKGBUILD b/abs/extra/ocaml/PKGBUILD
index f1b1343..7f60fc6 100644
--- a/abs/extra/ocaml/PKGBUILD
+++ b/abs/extra/ocaml/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase='ocaml'
 pkgname=('ocaml' 'ocaml-compiler-libs')
-pkgver=4.02.3
-pkgrel=2
+pkgver=4.04.0
+pkgrel=1
 pkgdesc="A functional language with OO extensions"
 arch=('i686' 'x86_64')
 license=('LGPL2.1' 'custom: QPL-1.0')
@@ -12,8 +12,8 @@ url="http://caml.inria.fr/"
 depends=('gdbm')
 makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-4.02/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ef1a324608c97031cbd92a442d685ab7')
+source=(http://caml.inria.fr/distrib/ocaml-${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('1878ba4338e4fad5b057428e182fba806c545d57')
 options=('!makeflags' '!emptydirs' 'staticlibs')
 
 build() {
diff --git a/abs/extra/ocamlbuild/PKGBUILD b/abs/extra/ocamlbuild/PKGBUILD
new file mode 100644
index 0000000..25fa398
--- /dev/null
+++ b/abs/extra/ocamlbuild/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jürgen Hötzel <juergen@hoetzel.info>
+
+pkgname=ocamlbuild
+pkgver=0.9.3
+pkgrel=1
+pkgdesc='Build tool, that has built-in rules for building OCaml library and programs'
+arch=('x86_64' 'i686')
+license=('GPL2')
+url='https://github.com/ocaml/ocamlbuild/releases'
+depends=('ocaml>=4.04.0')
+options=('!makeflags')
+source=("https://github.com/ocaml/${pkgname}/archive/$pkgver.tar.gz")
+sha1sums=('16d15d90689b3748a2727e02e03c99a8c2d9ccc7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make configure
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+
diff --git a/abs/extra/openjpeg2/PKGBUILD b/abs/extra/openjpeg2/PKGBUILD
index 974266d..90f3161 100644
--- a/abs/extra/openjpeg2/PKGBUILD
+++ b/abs/extra/openjpeg2/PKGBUILD
@@ -1,25 +1,60 @@
-# $Id: PKGBUILD 99936 2013-10-31 02:34:11Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=openjpeg2
-pkgver=2.1.0
-pkgrel=1
+pkgver=2.1.2
+pkgrel=2
 pkgdesc="An open source JPEG 2000 codec, version ${pkgver}"
 arch=(i686 x86_64)
-license=('BSD')
+license=('custom: BSD')
 url="http://www.openjpeg.org"
-makedepends=('cmake')
-depends=('zlib')
-source=(http://downloads.sourceforge.net/project/openjpeg.mirror/$pkgver/openjpeg-$pkgver.tar.gz)
-md5sums=('f6419fcc233df84f9a81eb36633c6db6')
+makedepends=('cmake' 'doxygen')
+             #'fcgi' 'xerces2-java')
+depends=('zlib' 'libpng' 'libtiff' 'lcms2')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz"
+        repair_bugs_of_871_and_872.patch::https://github.com/szukw000/openjpeg/commit/cadff5fb.patch)
+sha256sums=('4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7'
+            'e352e9480925a31804d965c673545eeaa32d0a47605abaaa09b515ca956058ba')
+
+prepare() {
+  cd ${srcdir}
+  mkdir build
+  # Install doxygen docs to the right directory
+  sed -i -e "s:DESTINATION\ share/doc:DESTINATION\ share/doc/${pkgname}:" openjpeg-${pkgver}/doc/CMakeLists.txt
+  # http://seclists.org/oss-sec/2016/q4/649
+  cd ${srcdir}/openjpeg-$pkgver
+  patch -Np1 -i  ../repair_bugs_of_871_and_872.patch
+}
 
 build() {
-  cd "${srcdir}/openjpeg-${pkgver}"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOC=on .
+  cd "${srcdir}/build"
+
+  # CMAKE flags
+  # MJ2 executables: '-DBUILD_MJ2:bool=on' (default: 'OFF')
+  # JPWL executables and JPWL library: '-DBUILD_JPWL:bool=on' (default: 'OFF')
+  # JPIP client (java compiler recommended) library and executables: '-DBUILD_JPIP:bool=on' (default: 'OFF')
+  # JPIP server (need fcgi) library and executables: '-DBUILD_JPIP_SERVER:bool=on' (default: 'OFF')
+
+  cmake "../openjpeg-${pkgver}" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_DOC=on
+
+#    -DBUILD_MJ2=ON \
+#    -DBUILD_JPWL=ON \
+#    -DBUILD_JPIP=ON \
+#    -DBUILD_JPIP_SERVER=ON \
+#    -DBUILD_JP3D=ON # --help -LAH
+
   make
 }
 
 package() {
-  cd "${srcdir}/openjpeg-${pkgver}"
+  cd "${srcdir}/build"
   make DESTDIR="${pkgdir}" install
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg2"
+  mv ${pkgdir}/usr/share/doc/openjpeg-2.1/LICENSE ${pkgdir}/usr/share/licenses/openjpeg2
+  rmdir ${pkgdir}/usr/share/doc/openjpeg-2.1
 }
diff --git a/abs/extra/p7zip/7zFM.desktop b/abs/extra/p7zip/7zFM.desktop
deleted file mode 100644
index 62b8e85..0000000
--- a/abs/extra/p7zip/7zFM.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=7-Zip FM
-GenericName=7-Zip File Manager
-Type=Application
-Categories=GTK;Utility;Archiving;Compression;
-Terminal=false
-Icon=p7zip
-Exec=7zFM
diff --git a/abs/extra/p7zip/PKGBUILD b/abs/extra/p7zip/PKGBUILD
index 4bb2bb4..434bbeb 100644
--- a/abs/extra/p7zip/PKGBUILD
+++ b/abs/extra/p7zip/PKGBUILD
@@ -1,62 +1,55 @@
-# $Id: PKGBUILD 143961 2011-11-30 22:27:42Z andrea $
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=p7zip
-pkgver=9.20.1
-pkgrel=6
-pkgdesc='Command-line version of the 7zip compressed file archiver'
-url='http://p7zip.sourceforge.net/'
-license=('GPL' 'custom')
+pkgver=16.02
+pkgrel=2
+pkgdesc="Command-line file archiver with high compression ratio"
 arch=('i686' 'x86_64')
-depends=('gcc-libs' 'bash')
-optdepends=('wxgtk: GUI'
-            'desktop-file-utils: desktop entries')
-makedepends=('yasm' 'nasm' 'wxgtk')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2"
-        '7zFM.desktop')
-sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
-          'f2c370d6f1b286b7ce9a2804e22541b755616a40')
-
-install=install
+url="http://p7zip.sourceforge.net/"
+license=('LGPL' 'custom:unRAR')
+depends=('gcc-libs' 'sh')
+makedepends_i686=('nasm')
+makedepends_x86_64=('yasm')
+install=$pkgname.install
+source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_${pkgver}_src_all.tar.bz2)
+sha256sums=('5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f')
+
+prepare() {
+  cd "$srcdir/${pkgname}_$pkgver"
+
+  if [[ $CARCH = x86_64 ]]; then
+    cp makefile.linux_amd64_asm makefile.machine
+  else
+    cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+  fi
+}
 
 build() {
-	cd "${srcdir}/${pkgname}_${pkgver}"
-
-	[[ $CARCH = x86_64 ]] \
-	&& cp makefile.linux_amd64_asm makefile.machine \
-	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
-
-	make all4 OPTFLAGS="${CXXFLAGS}"
+  cd "$srcdir/${pkgname}_$pkgver"
+  make all3 OPTFLAGS="$CFLAGS"
 }
 
 package() {
-	cd "${srcdir}/${pkgname}_${pkgver}"
-
-	make install \
-		DEST_DIR="${pkgdir}" \
-		DEST_HOME="/usr" \
-		DEST_MAN="/usr/share/man"
-
-	# Licenses
-	install -d "${pkgdir}"/usr/share/licenses/p7zip
-	ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \
-		/usr/share/doc/p7zip/DOCS/License.txt \
-		/usr/share/doc/p7zip/DOCS/unRarLicense.txt
-
-	# Integration with stuff...
-	install -D GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
-	install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus}
-	cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/
-	cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/
-	ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx
-
-	find GUI/help -type d -exec chmod 755 {} \;
-	cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/
-
-	chmod -R u+w "${pkgdir}/usr"
+  cd "$srcdir/${pkgname}_$pkgver"
+
+  make install \
+    DEST_DIR="$pkgdir" \
+    DEST_HOME=/usr \
+    DEST_MAN=/usr/share/man
+
+  # Remove documentation for the GUI file manager
+  rm -r "$pkgdir/usr/share/doc/p7zip/DOC/MANUAL/fm"
+
+  install -d "${pkgdir}"/usr/share/licenses/p7zip
+  ln -s -t "$pkgdir/usr/share/licenses/p7zip/" \
+    /usr/share/doc/p7zip/DOC/License.txt \
+    /usr/share/doc/p7zip/DOC/unRarLicense.txt
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/p7zip/install b/abs/extra/p7zip/install
deleted file mode 100644
index 7f3cc43..0000000
--- a/abs/extra/p7zip/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	[[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-	[[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true
-}
-
-post_upgrade() {
-	post_install
-}
-
-
-post_remove() {
-	post_install
-}
diff --git a/abs/extra/p7zip/p7zip.install b/abs/extra/p7zip/p7zip.install
new file mode 100644
index 0000000..4c3bb82
--- /dev/null
+++ b/abs/extra/p7zip/p7zip.install
@@ -0,0 +1,9 @@
+post_upgrade() {
+  if (($(vercmp $2 9.38.1-3) < 0)); then
+    echo ':: The 7zFM graphical frontend is no longer included in this package.'
+    echo '   If you used it, consider installing one of the following packages:'
+    echo '   1) file-roller, 2) engrampa, 3) kdeutils-ark.'
+  fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD
index 4acf9a3..158c5f8 100644
--- a/abs/extra/plex-media-server/PKGBUILD
+++ b/abs/extra/plex-media-server/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: Praekon <praekon@googlemail.com>
 
 pkgname=plex-media-server
-pkgver=1.3.3.3148
-_pkgsum=b38628e
+pkgver=1.3.4.3285
+_pkgsum=b46e0ea
 pkgrel=1
 pkgdesc='Plex Media Server'
 arch=('armv7h' 'i686' 'x86_64')
@@ -57,6 +57,6 @@ md5sums=('dfd6778f5c0d3d64c2c3a71dca02b7cc'
          '97241861f2c0b7c82d1945a6c5de8e35'
          '506ec15815bba749a743780edd2323c8'
          'bd703bc750b989a27edd590eb8c8e9d7')
-md5sums_armv7h=('453a4b479a21be7fe2e867781872e2f4')
-md5sums_i686=('199d68eb86dbd4d031615f10348261b6')
-md5sums_x86_64=('6a3190505b96b7b167aefb9a99e388ee')
+md5sums_armv7h=('1f5359e970a9e6741668c4d713d44c25')
+md5sums_i686=('181350dcd403b2b59c635f50dc1d5ae4')
+md5sums_x86_64=('630650011eba73d01ae341b93ada0aea')
diff --git a/abs/extra/rrdtool/ChangeLog b/abs/extra/rrdtool/ChangeLog
deleted file mode 100644
index 10d12b8..0000000
--- a/abs/extra/rrdtool/ChangeLog
+++ /dev/null
@@ -1,67 +0,0 @@
-2010-08-19  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.4.4-2
-	* Rebuilt for python2
-
-2010-08-12  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.4.4-1
-	* Upstream update
-	* Corrected license
-	* Removed old patch
-
-2010-04-29  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.4.3-1
-	* Upstream update
-	* Cleaned up depends
-	* Specified localstatedir
-
-2010-01-18  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.4.2-2
-	* Rebuilt for libpng 1.4 and libjpeg 8
-
-2010-01-01  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.4.2-1
-	* Upstream update
-
-2009-11-07  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.4.1-1
-	* Upstream update
-	* Added lua binding
-	* Fixed optdepends array syntax (close FS#16053)
-	* Disabled rpath
-
-2009-05-21  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.3.8-1
-	* Upstream update
-	* Added intltool makedepends
-
-2009-05-02  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.3.7-1.1
-	* Disabled SMP build
-	* Added missing ruby binding for x86_64 (close FS#14539)
-
-2009-04-08  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.3.7-1
-	* Upstream update
-
-2009-01-21  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.3.6-1
-	* Upstream update
-
-2009-01-02  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.3.5-1
-	* Upstream update
-	* Replaced install scriptlet by optdepends
-	* Added libxml2 and pango depends
-	* Libtool slayed
-	* Added ChangeLog
diff --git a/abs/extra/rrdtool/PKGBUILD b/abs/extra/rrdtool/PKGBUILD
index fb5a6fe..1e997ad 100644
--- a/abs/extra/rrdtool/PKGBUILD
+++ b/abs/extra/rrdtool/PKGBUILD
@@ -2,36 +2,34 @@
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
-pkgver=1.4.8
-pkgrel=4
+pkgver=1.6.0
+pkgrel=2
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
 license=('GPL' 'custom')
 depends=('libxml2' 'pango' 'ttf-dejavu')
 makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua51')
-optdepends=('tcl: to use corresponding binding' \
-            'python2: to use corresponding binding' \
-            'ruby: to use corresponding binding' \
+optdepends=('perl: to use corresponding binding'
+	    'tcl: to use corresponding binding'
+            'python2: to use corresponding binding'
+            'ruby: to use corresponding binding'
             'lua51: to use corresponding binding')
 options=('!emptydirs' '!makeflags')
-source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz 
-        rrdtool-pangofont.patch rrdtool-systemd.patch)
-sha1sums=('56d68857f39e70bfa32360947614d8220702ed02'
-          '8c600285bdab7776c1d5301df7cf486d69eae048'
-          '963b600f8056d85305b6ff4554fa1e7b9b5a4ae1')
+source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
+sha1sums=('9866b41bda9416188f236d61d24f185b173fd571')
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' examples/stripes.py
   # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
-  sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.am
-  patch -p1 -i "${srcdir}/rrdtool-pangofont.patch"
-  patch -p1 -i "${srcdir}/rrdtool-systemd.patch"
+  sed -e 's/$(RUBY) ${abs_srcdir}\/ruby\/extconf.rb/& --vendor/' -i bindings/Makefile.am
+  aclocal
+  automake
 }
 
 build() {
   cd ${pkgname}-${pkgver}
-  autoreconf
   PYTHON=python2 LUA=/usr/bin/lua5.1 \
     LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
     ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
diff --git a/abs/extra/rrdtool/rrdtool-pangofont.patch b/abs/extra/rrdtool/rrdtool-pangofont.patch
deleted file mode 100644
index 60936d8..0000000
--- a/abs/extra/rrdtool/rrdtool-pangofont.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001
-From: Tobias Oetiker <tobi@oetiker.ch>
-Date: Wed, 24 Apr 2013 23:49:28 +0200
-Subject: [PATCH] move to non-deprecated pango_font_map_create_context
-
----
- configure.ac    | 2 +-
- src/rrd_graph.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2f9e395..d6b2722 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo,      cairo_font_options_create,     cairo.h,
- EX_CHECK_ALL(cairo,      cairo_svg_surface_create,      cairo-svg.h,            cairo-svg,   1.10.2,  http://cairographics.org/releases/, "")
- EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,            cairo-pdf,   1.10.2,  http://cairographics.org/releases/, "")
- EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.10.2,  http://cairographics.org/releases/, "")
--EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
-+EX_CHECK_ALL(pangocairo-1.0,  pango_font_map_create_context,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
- 
- fi
- EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,    2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "")
-diff --git a/src/rrd_graph.c b/src/rrd_graph.c
-index 5547aa6..25ae485 100644
---- a/src/rrd_graph.c
-+++ b/src/rrd_graph.c
-@@ -4282,7 +4282,7 @@ void rrd_graph_init(
-         fontmap = pango_cairo_font_map_get_default();
-     }
- 
--    context =  pango_cairo_font_map_create_context((PangoCairoFontMap*)fontmap);
-+    context =  pango_font_map_create_context(fontmap);
- 
-     pango_cairo_context_set_resolution(context, 100);
- 
--- 
-1.8.1.6
-
diff --git a/abs/extra/rrdtool/rrdtool-systemd.patch b/abs/extra/rrdtool/rrdtool-systemd.patch
deleted file mode 100644
index 856f9ef..0000000
--- a/abs/extra/rrdtool/rrdtool-systemd.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 78b519eb2ffa786d6427bb13277e9151ef7b111e Mon Sep 17 00:00:00 2001
-From: Tobias Oetiker <tobi@oetiker.ch>
-Date: Mon, 2 Jul 2012 15:05:32 +0000
-Subject: [PATCH] serviced config etc files for rrdtool
-
-git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2292 a5681a0c-68f1-0310-ab6d-d61299d08faa
----
- etc/rrdcached.service.in | 19 +++++++++++++++++++
- etc/rrdcached.socket.in  | 18 ++++++++++++++++++
- 2 files changed, 37 insertions(+)
- create mode 100644 etc/rrdcached.service.in
- create mode 100644 etc/rrdcached.socket.in
-
-diff --git a/etc/rrdcached.service.in b/etc/rrdcached.service.in
-new file mode 100644
-index 0000000..3b6f309
---- /dev/null
-+++ b/etc/rrdcached.service.in
-@@ -0,0 +1,19 @@
-+#
-+# To customize, copy this file to /etc/systemd/system/
-+# and edit there
-+#
-+
-+[Unit]
-+Description=Data caching daemon for rrdtool
-+Documentation=man:rrdcached(1)
-+
-+[Service]
-+# If you enable socket-activable rrdcached.socket,
-+# command line socket declarations will be ignored
-+ExecStart=@prefix@/bin/rrdcached -g
-+#WorkingDirectory=
-+#User=
-+#Group=
-+
-+[Install]
-+WantedBy=multi-user.target
-diff --git a/etc/rrdcached.socket.in b/etc/rrdcached.socket.in
-new file mode 100644
-index 0000000..7a2d63e
---- /dev/null
-+++ b/etc/rrdcached.socket.in
-@@ -0,0 +1,18 @@
-+#
-+# To customize, copy this file to /etc/systemd/system/
-+# and edit there
-+#
-+
-+[Unit]
-+Description=sockets activating rrdcached
-+Documentation=man:rrdcached(1)
-+
-+[Socket]
-+ListenStream=/tmp/rrdcached.sock
-+#ListenStream=[::1]:42217
-+#DirectoryMode=0755
-+#SocketMode=0666
-+#BindToDevice=
-+
-+[Install]
-+WantedBy=sockets.target
--- 
-1.8.4
-
-From 134ed0d33953e7e71c55454591c1078f7ae1db8a Mon Sep 17 00:00:00 2001
-From: Tobias Oetiker <tobi@oetiker.ch>
-Date: Mon, 2 Jul 2012 14:01:06 +0000
-Subject: [PATCH] wire up systemd support in autoconf -- tomek@pipebreaker.pl
-
-git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2291 a5681a0c-68f1-0310-ab6d-d61299d08faa
----
- Makefile.am       |  6 ++++++
- configure.ac      | 12 ++++++++++++
- doc/rrdcached.pod |  2 ++
- 3 files changed, 20 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 20b2e0a..11d16d3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -29,6 +29,12 @@ ACLOCAL_M4= $(top_srcdir)/aclocal.m4
- 
- #	$(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
- 
-+if HAVE_SYSTEMD
-+systemdsystemunit_DATA = \
-+	etc/rrdcached.socket \
-+	etc/rrdcached.service
-+endif
-+
- site-perl-inst: site-perl-install
- 
- site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile
-diff --git a/configure.ac b/configure.ac
-index 51c3f81..ab210d1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -918,6 +918,17 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory])
- if test -z "$RRDDOCDIR"; then
-    RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi
- 
-+# systemd check
-+PKG_PROG_PKG_CONFIG
-+AC_ARG_WITH([systemdsystemunitdir],
-+	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-+	[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
-+if test "x$with_systemdsystemunitdir" != xno; then
-+	AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-+	AC_OUTPUT([etc/rrdcached.socket etc/rrdcached.service])
-+fi
-+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
-+
- 
- CONFIGURE_PART(Apply Configuration Information)
-  
-@@ -993,6 +1004,7 @@ echo "       Build librrd MT: $enable_pthread"
- echo "           Use gettext: $USE_NLS"
- echo "           With libDBI: $have_libdbi"
- echo "          With libwrap: $have_libwrap"
-+echo "      With systemd dir: $with_systemdsystemunitdir"
- echo
- echo "             Libraries: $ALL_LIBS"
- echo
-diff --git a/doc/rrdcached.pod b/doc/rrdcached.pod
-index 18adcf1..7c0b30c 100644
---- a/doc/rrdcached.pod
-+++ b/doc/rrdcached.pod
-@@ -448,6 +448,8 @@ accepted commands to those needed by external clients. If, for example,
- external clients want to draw graphs of the cached data, they should only be
- allowed to use the C<FLUSH> command.
- 
-+Authorization does not work when rrcached is socket-activated by systemd. 
-+
- =head2 Encryption
- 
- There is no encryption.
--- 
-1.8.4
-
diff --git a/abs/extra/ruby/PKGBUILD b/abs/extra/ruby/PKGBUILD
index 0845452..2e104bd 100644
--- a/abs/extra/ruby/PKGBUILD
+++ b/abs/extra/ruby/PKGBUILD
@@ -3,49 +3,54 @@
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
-pkgname=ruby
-pkgver=1.9.3_p194
-pkgrel=2
-pkgdesc='An object-oriented language for quick and easy programming'
-arch=('i686' 'x86_64')
+pkgname=(ruby ruby-docs)
+pkgver=2.4.0
+pkgrel=1
+arch=(i686 x86_64)
 url='http://www.ruby-lang.org/en/'
-license=('BSD' 'custom')
-backup=('etc/gemrc')
-provides=('rubygems' 'rake')
-conflicts=('rake')
-depends=('openssl' 'libffi' 'libyaml')
-makedepends=('tk')
-optdepends=('tk: for Ruby/TK'
-            'ruby-docs: Ruby documentation')
-options=('!emptydirs' '!makeflags')
-install='ruby.install'
-source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
-        'gemrc')
-md5sums=('2278eff4cfed3cbc0653bc73085caa34'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
+license=(BSD custom)
+makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk)
+options=(!emptydirs)
+source=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz
+        gemrc)
+sha1sums=('038804bbd0e77508dd2510b729a9f3b325489b2e'
+          'dc536754c8fac2c3d82965c5a708cd8f79562d98')
 
 build() {
-  cd ruby-${pkgver//_/-}
+  cd ruby-${pkgver}
 
   PKG_CONFIG=/usr/bin/pkg-config ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --localstatedir=/var \
+    --sharedstatedir=/var/lib \
+    --libexecdir=/usr/lib/ruby \
     --enable-shared \
-    --enable-pthread \
     --disable-rpath \
-    --disable-install-doc
+    --with-dbm-type=gdbm_compat
 
   make
 }
 
 check() {
-  cd ruby-${pkgver//_/-}
+  cd ruby-${pkgver}
 
   make test
 }
 
-package() {
-  cd ruby-${pkgver//_/-}
+package_ruby() {
+  pkgdesc='An object-oriented language for quick and easy programming'
+  depends=(gdbm openssl libffi libyaml gmp zlib)
+  optdepends=(
+      'ruby-docs: Ruby documentation'
+      'tk: for Ruby/TK'
+  )
+  provides=(rubygems rake)
+  conflicts=(rake)
+  backup=(etc/gemrc)
+  install=ruby.install
+
+  cd ruby-${pkgver}
 
   make DESTDIR="${pkgdir}" install-nodoc
 
@@ -54,3 +59,14 @@ package() {
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
   install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
 }
+
+package_ruby-docs() {
+  pkgdesc='Documentation files for ruby'
+
+  cd ruby-${pkgver}
+
+  make DESTDIR="${pkgdir}" install-doc install-capi
+
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
+}
diff --git a/abs/extra/ruby/gemrc b/abs/extra/ruby/gemrc
index 3d11de1..6516311 100644
--- a/abs/extra/ruby/gemrc
+++ b/abs/extra/ruby/gemrc
@@ -1,4 +1,4 @@
-# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+# Read about the gemrc format at http://guides.rubygems.org/command-reference/#gem-environment
 
 # --user-install is used to install to $HOME/.gem/ by default since we want to separate
 #                pacman installed gems and gem installed gems
diff --git a/abs/extra/tigervnc/PKGBUILD b/abs/extra/tigervnc/PKGBUILD
index 6d5da40..db327ef 100644
--- a/abs/extra/tigervnc/PKGBUILD
+++ b/abs/extra/tigervnc/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=tigervnc
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 _xorgver=1.18.0
 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC."
 arch=('i686' 'x86_64')
@@ -19,18 +19,14 @@ makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
 	     'mesa' 'imagemagick')
 optdepends=('mesa: for OpenGL functionality in Xvnc')
 conflicts=('tightvnc')
+install=tiger.install
 source=($pkgname-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v${pkgver}.tar.gz
 	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
 	vncserver.service
 	vncviewer.desktop
+    vncsvc.rules
 	gethomedir.patch
 	xorg118.patch)
-md5sums=('78b736445781d86c48e942465a391ccc'
-         '3c1c1057d3ad27380d8dd87ffcc182cd'
-         '1aad8f06504b3e29a24ccfbaab617973'
-         'b200d83c60e80c6f9693ea19a2d9f5b0'
-         '22f1523a0eca56ad79cfabd0db6e2cf6'
-         '2fd32181679077eb7f7ca06cf25f443f')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -71,4 +67,17 @@ package() {
     $pkgdir/usr/lib/systemd/user/vncserver@.service
   install -Dm0644 $srcdir/vncserver.service $pkgdir/usr/lib/systemd/system/vncserver.service
   install -Dm0644 $srcdir/vncviewer.desktop $pkgdir/usr/share/applications/vncviewer.desktop
+
+  #LinHES sudo rules
+  mkdir -p $pkgdir/etc/sudoers.d/
+  chmod 750 $pkgdir/etc/sudoers.d/
+  chown -R root:root $pkgdir/etc/sudoers.d
+  install -o root -g root -m 0750 $srcdir/vncsvc.rules $pkgdir/etc/sudoers.d/vncsvc-tigervnc
 }
+md5sums=('78b736445781d86c48e942465a391ccc'
+         '3c1c1057d3ad27380d8dd87ffcc182cd'
+         '1aad8f06504b3e29a24ccfbaab617973'
+         'b200d83c60e80c6f9693ea19a2d9f5b0'
+         'f333a228ddbefffc6ce945754bc9c5c5'
+         '22f1523a0eca56ad79cfabd0db6e2cf6'
+         '2fd32181679077eb7f7ca06cf25f443f')
diff --git a/abs/extra/tigervnc/__changelog b/abs/extra/tigervnc/__changelog
new file mode 100644
index 0000000..d7903f8
--- /dev/null
+++ b/abs/extra/tigervnc/__changelog
@@ -0,0 +1,2 @@
+PKGBUILD: tiger.install: keep so the vncsvc user gets created
+PKGBUILD: vncsvc.rules: install sudo rules
diff --git a/abs/extra/tigervnc/tiger.install b/abs/extra/tigervnc/tiger.install
new file mode 100644
index 0000000..f04c011
--- /dev/null
+++ b/abs/extra/tigervnc/tiger.install
@@ -0,0 +1,21 @@
+post_install(){
+  groupadd -g 78 vncsvc &>/dev/null
+  useradd -u 78 -m -g vncsvc -d /home/vncsvc -s /bin/bash vncsvc &>/dev/null
+  usermod -a -G mythtv vncsvc
+  chown -R vncsvc:vncsvc /home/vncsvc &>/dev/null
+}
+
+post_upgrade(){
+  getent group vncsvc >/dev/null 2>&1 || groupadd -g 78 vncsvc &>/dev/null
+  getent passwd vncsvc >/dev/null 2>&1 || useradd -u 78 -g vncsvc -m -d /home/vncsvc -s /bin/bash vncsvc &>/dev/null
+  usermod -a -G mythtv vncsvc
+}
+
+post_remove(){
+  if getent passwd vncsvc >/dev/null 2>&1; then
+    userdel vncsvc
+  fi
+  if getent group vncsvc >/dev/null 2>&1; then
+    groupdel vncsvc
+  fi
+}
diff --git a/abs/extra/tigervnc/vncsvc.rules b/abs/extra/tigervnc/vncsvc.rules
new file mode 100644
index 0000000..49dd3ad
--- /dev/null
+++ b/abs/extra/tigervnc/vncsvc.rules
@@ -0,0 +1,3 @@
+vncsvc ALL=(ALL) NOPASSWD: /usr/MythVantage/bin/mythinstall -s *
+vncsvc ALL=(ALL) NOPASSWD: /usr/MythVantage/bin/MythVantage -s *
+vncsvc ALL=(ALL) NOPASSWD: /usr/MythVantage/bin/systemconfig.py