Update packages

2024-11-22 00:32:15 -05:00 · 2017-03-13 12:19:25 -04:00 · 2017-03-13 12:19:25 -04:00 · 34d3e06424
commit 34d3e06424
parent 915ad4949f
57 changed files with 207 additions and 625 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,4 +6,4 @@ src/**/*.xz
 src/**/*.log
 aur
 broke
-
+.SRCINFO
--- a/src/aurutils/PKGBUILD
+++ b/src/aurutils/PKGBUILD
@ -1,19 +1,20 @@
 pkgname=aurutils
-pkgver=1.4.2
-_commit=1b00b899eadbb816fe2e3f93b9497676049595e8
+pkgver=1.5.3
+_commit=01cbab783489eefc1859287bd0cb898de40c8100
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 arch=('any')
 url=https://github.com/AladW/aurutils
 license=('ISC')
-depends=('pacman>=5' 'expac>=7' 'git' 'jq' 'repose' 'pacutils>=0.4')
+depends=('pacman>=5' 'git' 'jq' 'pacutils>=0.4')
 checkdepends=('shellcheck')
 makedepends=('git')
 optdepends=('devtools: systemd-nspawn support'
            'vifm: build file interaction'
-	    'aria2>=1.23: alternative downloader'
-	    'parallel: alternative downloader'
-	    'datamash: check tsort input')
+            'aria2: threaded downloads'
+            'parallel: threaded downloads'
+            'expac: aursift script'
+            'repose: repo-add alternative')
 source=("$pkgname-$pkgver::git+$url#commit=$_commit")
 sha256sums=('SKIP')

--- a/src/ccextractor/PKGBUILD
+++ b/src/ccextractor/PKGBUILD
@ -7,7 +7,7 @@
 # https://github.com/cacack/pkgbuilds/tree/master/ccextractor

 pkgname=ccextractor
-pkgver=0.84
+pkgver=0.85
 pkgrel=1
 pkgdesc="A fast closed captions extractor for MPEG files."
 arch=('i686' 'x86_64')
@ -15,9 +15,9 @@ url="http://www.ccextractor.org"
 license=('GPL')
 depends=('gcc-libs' 'tesseract')
 source=(
-   http://downloads.sourceforge.net/ccextractor/$pkgname.src.$pkgver.zip
+   http://downloads.sourceforge.net/ccextractor/$pkgname-src-nowin.$pkgver.zip
 )
-sha512sums=('1d6671c4d42915a61f3fd48ea693d4791048bc052a9859fbe4bdf32e551aa880517f0b6712e7c7588fe49127e491324c1eee9c1a17cb805879d6a03c775480cd')
+sha512sums=('53adc017b7b1679302677e3773aabdcceddabdd8a6550cf8b9fb98150b7323a1cc6dbe67a48ebcdf22a4d013c00831907799032dd0f7f6f06943252be8177cec')

 build() {
  cd "$srcdir/$pkgname/linux"
--- a/src/displaylink/PKGBUILD
+++ b/src/displaylink/PKGBUILD
@ -2,24 +2,24 @@
 # Contributor: rhabbachi

 pkgname=displaylink
-pkgver=1.2.65
+pkgver=1.3.52
 pkgrel=1
 pkgdesc="Linux driver for DL-5xxx, DL-41xx and DL-3x00"
 arch=('i686' 'x86_64')
 url="http://www.displaylink.com/downloads/ubuntu.php"
 license=('custom' 'GPL2' 'LGPL2.1')
-depends=('evdi' 'libusb>=1.0.0')
+depends=('evdi>=1.3.43' 'libusb>=1.0.0')
 makedepends=('grep' 'gawk')
 install=
 changelog="release-note.txt"
-source=(displaylink-driver-$pkgver.zip::http://www.displaylink.com/downloads/file\?id\=708
+source=(displaylink-driver-$pkgver.zip::http://www.displaylink.com/downloads/file\?id\=744
 	udev.sh
        99-displaylink.rules 
 	displaylink.service 
        displaylink-sleep.sh)

 # Update with > updpkgsums
-md5sums=('6de248995d5f9b08fa2aca2acf8cd368'
+md5sums=('2df66116bdf2f6f0fd14fb492d63abc5'
         'd5de775e41af06edbd8073adc490139d'
         '20495d81c7d2540910ef86dc437b7fac'
         'c141a15e973481c7d961f8e135627ca4'
--- a/src/displaylink/release-note.txt
+++ b/src/displaylink/release-note.txt
@ -1,14 +1,14 @@
-=============================================================================
+=============================================================================
 =============================================================================

 DisplayLink Ubuntu Software Release Note

-Version: 1.2.65
-Date: 5th October 2016
+Version: 1.3.52
+Date: 15th February 2017

-DisplayLink DL-5xxx, DL-3x00 Firmware Version: 9.0.37.80577
-DisplayLink DL-41xx Firmware Version: 9.0.37.80577
-Extensible Virtual Display Interface version included: 1.2.64
+DisplayLink DL-5xxx, DL-41xx, DL-3x00 Firmware Version: 9.1.53.82735
+DisplayLink DL-6xxx Firmware Version: 9.1.53.82737
+Extensible Virtual Display Interface version included: 1.3.43

 =============================================================================
 =============================================================================
@ -17,25 +17,26 @@ Extensible Virtual Display Interface version included: 1.2.64
 A. Introduction
 ===============

-This is DisplayLink Driver Software v1.2.1 for Ubuntu. It provides initial, production quality support for DisplayLink USB 3.0 devices on specific variants of desktop Ubuntu Linux.
+This is DisplayLink Driver Software v1.3 for Ubuntu. It provides production quality support for DisplayLink USB 3.0 devices on specific variants of desktop Ubuntu Linux.

 The driver enables video support for products using DisplayLink USB 3.0 technology. Standard native Ubuntu drivers provide support for DisplayLink audio and Ethernet interfaces.


-A1. Important notes about DL5xxx, DL-3x00 and DL-41xx Firmware
+A1. Important notes about DL-6xxx, DL5xxx, DL-3x00 and DL-41xx Firmware
 =======================================================================

-This software release contains an embedded firmware image. DL-5xxx, DL-3xxx and DL-41xx devices will be automatically upgraded with this firmware upon connection if required.
+This software release contains an embedded firmware image. DL-6xxx, DL-5xxx, DL-3xxx and DL-41xx devices will be automatically upgraded with this firmware upon connection if required.

-The upgrade is silent, therefore screens connected to DL-5xxx, DL-3xxx or DL-41xx devices may require a few seconds to appear when devices are connected for the first time, or after devices have been used on other platforms and OSes.
+The upgrade is silent, therefore screens connected to DL-6xxx, DL-5xxx, DL-3xxx or DL-41xx devices may require a few seconds to appear when devices are connected for the first time, or after devices have been used on other platforms and OSes.

 B. Contents
 ===========

 A.  Introduction
-A1. Important notes about DL-5xxx, DL-3xxx and DL-41xx Firmware
+A1. Important notes about DL-6xxx, DL-5xxx, DL-3xxx and DL-41xx Firmware
 B.  Contents
-C.  Issues fixed
+C.  New features
+C1.  Issues fixed
 D.  Supported O/S variants
 E.  Release components
 F.  How to Install
@ -43,26 +44,31 @@ G.  Supported Features & Hardware
 H.  Limitations & Known issues
 I.  Future Development

-C. Issues fixed
+C. New features
+===============
+DisplayLink Driver Software v1.3 for Ubuntu delivers support for DL-6xxx generation devices. 
+
+C1. Issues fixed
 ===============

-Issues fixed since DisplayLink Driver Software v1.2 for Ubuntu (1.2.58)
+Issues fixed since DisplayLink Driver Software v1.2.1 for Ubuntu (1.2.65)
 -----------------------------------------------------------------------

-Extensible Virtual Display Interface module is not compatible with Linux kernel 4.8. (23848)
+Mixed content while switching between Firefox tabs on DisplayLink screen. (22540)

+Blank DisplayLink screen after machine restart if OS kernel was upgraded. (23735)

-Issues fixed since DisplayLink Driver Software v1.1 for Ubuntu (1.1.62)
-----------------------------------------------------------------------
+Leftovers on DisplayLink screen when using Gnome 2 (Metacity). (23970)

-High CPU usage with no activity on DisplayLink monitor. (22444)
+Blank DisplayLink screen at 1366x768 resolution. (24082)

-Kernel warning in dmesg after connecting DisplayLink monitor. (22530)
+Leftovers on DisplayLink screen when using KDE. (24113)

-Segmentation fault could occur while stopping DisplayLink daemon. (22536)
+Low performance on 4kp60 resolution (24379).

-DisplayLink systemd/upstart service is only loaded when a DisplayLink device is connected. (23187)
+In a multimonitor setup, disconnecting one DisplayLink screen may cause freeze of the remaining screen. (24207)

+After embedded firmware update one of the chained devices may not be visible in the system. (24514)

 D. Supported O/S variants
 =========================
@ -99,6 +105,7 @@ This driver will support up to 2 displays connected to DisplayLink devices. More
 Resolutions up to 4K are supported on the appropriate DisplayLink hardware.

 Device families supported:
+- DL-6xxx
 - DL-5xxx
 - DL-41xx
 - DL-3xxx
@ -121,4 +128,3 @@ DisplayLink are open to suggestions and feedback on improving the proposed archi
 - The communication between the EVDI kernel module and the wrapper libevdi library is not access-controlled or authenticated. This could be improved in future releases, making it harder to compromise the data EVDI is sending and receiving.

 - EVDI kernel module driver is currently a platform_driver, for multiple reasons; most importantly because virtual displays are not discoverable, i.e. cannot be enumerated at the hardware level. EVDI is also a generic device, not tied to any particular kind of device, transport layer or a bus.
-
--- a/src/duplicati-latest/PKGBUILD
+++ b/src/duplicati-latest/PKGBUILD
@ -2,16 +2,16 @@
 # Contributor: Danny Su <contact@dannysu.com>

 pkgname=duplicati-latest
-pkgver=2.0.1.43
+pkgver=2.0.1.32
 pkgrel=1
 pkgdesc='A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers'
 url='http://duplicati.com'
 license=('LGPL')
 install='duplicati.install'
-source=("https://github.com/duplicati/duplicati/releases/download/v2.0.1.43-2.0.1.43_canary_2017-01-19/duplicati-2.0.1.43_canary_2017-01-19.zip" 'duplicati.service')
-sha1sums=('f34b8ffd1b1a1e7308d435af9f4a380e1c40370c'
+source=("https://github.com/duplicati/duplicati/releases/download/v2.0.1.32-2.0.1.32_canary_2016-11-12/duplicati-2.0.1.32_canary_2016-11-12.zip" 'duplicati.service')
+sha1sums=('6ba8ef82b8c91f3a73be4de74f59cce1ca9c194c'
          '8298fe7fbe3ba71a9773220ab236eb6350e89f87')
-sha256sums=('82ffc08b24419b8f188a141703defef09347cb02a1541d9d443b58a64dbb0e7f'
+sha256sums=('73cd8ab89e815660782403943aa7a54001a65e530af6dcbe28634900c8cae23e'
            '3237249cb9de137c3284a5cd92a451f3a49ec2183c6254be4b5ef7969e04e4a1')
 arch=('i686' 'x86_64')
 depends=('gtk-sharp-2' 'mono')
--- a/src/emulationstation-autoscraper/PKGBUILD
+++ b/src/emulationstation-autoscraper/PKGBUILD
@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>

 pkgname=emulationstation-autoscraper
-pkgver=215.92a2e7e
+pkgver=232.d361868
 pkgrel=1
 pkgdesc="An auto-scraper for EmulationStation written in Go using hashes"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
--- a/src/emulationstation-git/PKGBUILD
+++ b/src/emulationstation-git/PKGBUILD
@ -17,8 +17,10 @@ depends+=('raspberrypi-firmware')
 else
 depends+=('libgl')
 fi
-source=('git://github.com/Herdinger/EmulationStation.git')
-md5sums=('SKIP')
+source=('git://github.com/Herdinger/EmulationStation.git'
+       'psp_scapper.patch')
+md5sums=('SKIP'
+         '3a5732b192e6c25ec655bc4bffa0a0c6')
 provides=('emulationstation')

 pkgver() {
@ -27,7 +29,9 @@ pkgver() {
 }

 build() {
-    mkdir "$srcdir/$_gitname/build"
+    cd "$srcdir/$_gitname"
+    patch -Np1 -i "$srcdir"/psp_scapper.patch
+    mkdir -p "$srcdir/$_gitname/build"
    cd "$srcdir/$_gitname/build"
    cmake ..
    make
--- a/src/emulationstation-git/psp_scapper.patch
+++ b/src/emulationstation-git/psp_scapper.patch
@ -0,0 +1,25 @@
+From f6fd3e591777b3b67d006a334788e4647136901c Mon Sep 17 00:00:00 2001
+From: Johnathan Jenkins <john@nixheads.co.uk>
+Date: Fri, 3 Feb 2017 08:42:21 -0800
+Subject: [PATCH] fix psp scapper
+
+---
+ es-app/src/scrapers/GamesDBScraper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/es-app/src/scrapers/GamesDBScraper.cpp b/es-app/src/scrapers/GamesDBScraper.cpp
+index 6fbe3ef..77fd239 100644
+--- a/es-app/src/scrapers/GamesDBScraper.cpp
+++ b/es-app/src/scrapers/GamesDBScraper.cpp
+@@ -58,7 +58,7 @@ const std::map<PlatformId, const char*> gamesdb_platformid_map = boost::assign::
+ 	(PLAYSTATION_3, "Sony Playstation 3")
+ 	(PLAYSTATION_4, "Sony Playstation 4")
+ 	(PLAYSTATION_VITA, "Sony Playstation Vita")
+-	(PLAYSTATION_PORTABLE, "Sony PSP")
+	(PLAYSTATION_PORTABLE, "Sony Playstation Portable")
+ 	(SUPER_NINTENDO, "Super Nintendo (SNES)")
+ 	(TURBOGRAFX_16, "TurboGrafx 16")
+ 	(WONDERSWAN, "WonderSwan")
+-- 
+2.11.0
+
--- a/src/evdi/PKGBUILD
+++ b/src/evdi/PKGBUILD
@ -18,26 +18,26 @@ backup=()
 options=()
 install=$pkgname.install
 changelog=$pkgname.Changelog
-source=($pkgname-$pkgver.tar.gz::https://github.com/DisplayLink/evdi/archive/v$pkgver.tar.gz)
+source=($pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/DisplayLink/evdi/archive/v$pkgver.tar.gz)
 noextract=()
 md5sums=('08b08e873f5b4f70929a126427150152')

 build() {
-  # We only need to build the library in this step, dmks will build the module
-  cd "$pkgname-$pkgver/library"
+# We only need to build the library in this step, dmks will build the module
+cd "$pkgname-$pkgver/library"

-  make
+make
 }

 package() {
-  # Predfine some target folders
-  SRCDIR="$pkgdir/usr/src/$pkgname-$pkgver"		# This one is needed for dkms
-  LIBNAME=lib$pkgname
+# Predfine some target folders
+SRCDIR="$pkgdir/usr/src/$pkgname-$pkgver"	# This one is needed for dkms
+LIBNAME=lib$pkgname

-  cd "$pkgname-$pkgver"
+cd "$pkgname-$pkgver"

-  install -D -m 755 library/$LIBNAME.so $pkgdir/usr/lib/$LIBNAME.so
+install -D -m 755 library/$LIBNAME.so $pkgdir/usr/lib/$LIBNAME.so

-  install -d $SRCDIR
-  install -D -m 755 module/* $SRCDIR
+install -d $SRCDIR
+install -D -m 755 module/* $SRCDIR
 }
--- a/src/evdi/evdi.Changelog
+++ b/src/evdi/evdi.Changelog
@ -2,7 +2,8 @@ v1.3.43
 Adding support for indicating an area limit a client that connects to EVDI has.

 v1.3.42
-Adding support for indicating an area limit a client that connects to EVDI has.
+Fixes for Kernels 4.9 and 4.10.
+API change: Extension of evdi_connect function, allowing to register modes that the client supports, regardless of the fact they are not necessarily listed in the EDID of a monitor.

 v1.2.64
 Highlights: fixes for kernel 4.8.
--- a/src/filebot/PKGBUILD
+++ b/src/filebot/PKGBUILD
@ -4,9 +4,9 @@
 # Contributor: Nathan Owe <ndowens04 at gmail>

 pkgname=filebot
-pkgver=4.7.7
-pkgrel=5
-_jnaver=4.2.2
+pkgver=4.7.8
+pkgrel=1
+_jnaver=4.3.0
 pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums."
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
 url="http://filebot.sourceforge.net/"
@ -25,9 +25,9 @@ source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/FileBot_$pkgv
        https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz
        $pkgname-arch.sh $pkgname.svg $pkgname.desktop)

-md5sums=('58d35910d5d164454c7840122a17dace'
-         '51d0359bcdb999ec0a655c68d399f304'
-         '3b51756c50a54447a5e6fb6c052e3453'
+md5sums=('3828ca9ef0fd1b711d555ec0ac60222c'
+         '2de8ba99fc91809935e6c2ab02f49a82'
+         'd94b4245dd3b226872f05fd2bf75bd1c'
         '04f46be047049448dba3f0de29fe192d'
         'f37edd0bba7570904d28ab1681c7a7f3')

--- a/src/filebot/filebot-arch.sh
+++ b/src/filebot/filebot-arch.sh
@ -18,11 +18,5 @@ EXTRACTOR="ApacheVFS"			# use Apache Commons VFS2 with junrar plugin
 # EXTRACTOR="SevenZipNativeBindings"	# use the lib7-Zip-JBinding.so native library

 # start filebot
-java -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false \
-Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djava.net.useSystemProxies=false \
-Djna.nosys=false -Dapplication.deployment=portable \
-Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" \
-Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip \
-Djna.library.path=/usr/share/java \
-$JAVA_OPTS -jar /usr/share/java/filebot/filebot.jar "$@"
+java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=portable -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip -Djna.library.path=/usr/share/java $JAVA_OPTS -jar /usr/share/java/filebot/filebot.jar "$@"

--- a/src/gajim-plugin-omemo/PKGBUILD
+++ b/src/gajim-plugin-omemo/PKGBUILD
@ -2,8 +2,8 @@

 pkgname=gajim-plugin-omemo
 _pkgname=omemo
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption."
 arch=(any)
 url="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
@ -12,7 +12,7 @@ depends=("gajim" "python2-qrcode" "python2-setuptools" "python2-cryptography" "p
 provides=('gajim-plugin-omemo')
 conflicts=('gajim-plugin-omemo-git')
 source=("${_pkgname}-${pkgver}.zip::https://ftp.gajim.org/plugins_0.16_zip/${_pkgname}.zip")
-sha512sums=('803239df407ea1083f71159f1e8e14a1638a717cf31105328a28613a13568abc7157f5d34d6c3c8c51e236055c8bf6e012db361c37f5c4d92c017262fae29d8d')
+sha512sums=(SKIP)

 package() {
  cd ${srcdir}/${_pkgname}
--- a/src/intellij-idea-ultimate-edition/PKGBUILD
+++ b/src/intellij-idea-ultimate-edition/PKGBUILD
@ -1,8 +1,8 @@
 # Maintainer: Urs Wolfer <uwolfer @ fwo.ch>

 pkgname=intellij-idea-ultimate-edition
-pkgver=2016.3.4
-_buildver=163.12024.16
+pkgver=2016.3.5
+_buildver=163.13906.18
 pkgrel=1
 pkgdesc="An intelligent IDE for Java, Groovy and other programming languages with advanced refactoring features intensely focused on developer productivity."
 arch=('any')
@ -15,10 +15,9 @@ source=(https://download.jetbrains.com/idea/ideaIU-$pkgver-no-jdk.tar.gz \
        intellijidea.sh \
        jetbrains-idea.desktop
 )
-sha256sums=('f4453fa68b1a06488a1741354b5b99089c42ee206de99d1210d49ca4c23946d0'
+sha256sums=('45d3aa69a3f275ccf51e46db1d67777d24e65ce5f998d6565e632796e2766512'
            'ed7883b33b6fa9f2e303e5549bd238ceb552ec11ca116730271a58aca685229a'
-            '83af2ba8f9f14275a6684e79d6d4bd9b48cd852c047dacfc81324588fa2ff92b'
-)
+            '83af2ba8f9f14275a6684e79d6d4bd9b48cd852c047dacfc81324588fa2ff92b')
 package() {
  cd "$srcdir"

--- a/src/iucode-tool/PKGBUILD
+++ b/src/iucode-tool/PKGBUILD
@ -1,6 +1,6 @@
 # Maintainer: Andreas Bosch <admin@progandy.de>
 pkgname=iucode-tool
-pkgver=2.1.1
+pkgver=2.1.2
 pkgrel=1
 pkgdesc="Tool to manipulate Intel® IA-32/X86-64 microcode bundles"
 arch=(x86_64 i686)
@ -10,7 +10,7 @@ makedepends=()
 source=("https://gitlab.com/iucode-tool/releases/raw/master/${pkgname}_${pkgver}.tar.xz"
    "https://gitlab.com/iucode-tool/releases/raw/master/${pkgname}_${pkgver}.tar.xz.asc")
 noextract=()
-sha256sums=('8f94ec73f5d4d1a6801aaa894fa1c6544d9b27aec16e1a00e18e8241c7e0f6ba'
+sha256sums=('01f1c02ba6935e0ac8440fb594c2ef57ce4437fcbce539e3ef329f55a6fd71ab'
            'SKIP')
 validpgpkeys=('C467A717507BBAFED3C160920BD9E81139CB4807') # Henrique de Moraes Holschuh <hmh@hmh.eng.br>

--- a/src/jdk/PKGBUILD
+++ b/src/jdk/PKGBUILD
@ -11,12 +11,10 @@ pkgdesc="Oracle Java Development Kit"
 arch=('i686' 'x86_64')
 url=http://www.oracle.com/technetwork/java/javase/downloads/index.html
 license=('custom')
-depends=('ca-certificates-java' 'desktop-file-utils' 'hicolor-icon-theme' 'java-environment-common'
-         'java-runtime-common' 'libx11' 'libxrender' 'libxslt' 'libxtst' 'shared-mime-info' 'xdg-utils')
+depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' 'nss' 'xdg-utils')
 optdepends=('alsa-lib: for basic sound support'
            'eclipse: to use "Oracle Java Mission Control" plugins in Eclipse'
-            'gtk2: for Gtk+ look and feel (desktop)'
-            'ttf-font: fonts')
+            'gtk2: for Gtk+ look and feel (desktop)')
 provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major"
          "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major"
          "java-openjfx=$_major")
--- a/src/kodi-addon-pvr-hts-git/.SRCINFO
+++ b/src/kodi-addon-pvr-hts-git/.SRCINFO
@ -1,24 +0,0 @@
-# Generated by mksrcinfo v8
-# Mon Jan  9 18:34:43 UTC 2017
-pkgbase = kodi-addon-pvr-hts-git
-	pkgdesc = Tvheadend HTSP PVR client addon for Kodi
-	pkgver = r510.9261047
-	pkgrel = 1
-	url = https://github.com/kodi-pvr/pvr.hts
-	arch = armv7h
-	arch = i686
-	arch = x86_64
-	license = GPL
-	makedepends = cmake
-	makedepends = git
-	makedepends = kodi-platform-git
-	depends = kodi
-	depends = libplatform-legacy
-	provides = kodi-addon-pvr-hts
-	conflicts = kodi-addon-pvr-hts
-	conflicts = kodi-pvr-addons
-	source = kodi-addon-pvr-hts-git::git+https://github.com/kodi-pvr/pvr.hts.git#branch=Jarvis
-	md5sums = SKIP
-
-pkgname = kodi-addon-pvr-hts-git
-
--- a/src/kodi-addon-pvr-hts-git/PKGBUILD
+++ b/src/kodi-addon-pvr-hts-git/PKGBUILD
@ -1,63 +0,0 @@
-# Maintainer: Michael Lass <bevan@bi-co.net>
-
-# This PKGBUILD is maintained on github:
-# https://github.com/michaellass/AUR
-
-###############################################################################
-# INSTRUCTIONS                                                                #
-# ------------                                                                #
-#                                                                             #
-# API changes between different Kodi versions make it necessary to specify    #
-# the version of Kodi you want to build this package for. You can choose      #
-# between Isengard (15), Jarvis (16) and git master (99). Do so in the        #
-# following line.                                                             #
-###############################################################################
-
-API=16
-
-pkgname=kodi-addon-pvr-hts-git
-pkgver=r510.9261047
-pkgrel=1
-pkgdesc='Tvheadend HTSP PVR client addon for Kodi'
-arch=('armv7h' 'i686' 'x86_64')
-url="https://github.com/kodi-pvr/pvr.hts"
-license=('GPL')
-makedepends=('cmake' 'git' 'kodi-platform-git')
-depends=('kodi')
-provides=('kodi-addon-pvr-hts')
-conflicts=('kodi-addon-pvr-hts' 'kodi-pvr-addons')
-source=("${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git")
-md5sums=('SKIP')
-
-case "$API" in
-  15)  depends+=('libplatform-legacy')
-       source[0]="${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git#branch=Isengard" ;;
-  16)  depends+=('libplatform-legacy')
-       source[0]="${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git#branch=Jarvis" ;;
-  17)  depends+=('p8-platform')
-       source[0]="${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git#branch=Krypton" ;;
-  99)  depends+=('p8-platform') ;;
-  *)   error "Unknown API version. Follow instructions in PKGBUILD." && false
-esac
-
-pkgver() {
-  cd "$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-build() {
-  mkdir -p "$pkgname/build"
-  cd "$pkgname/build"
-
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib/kodi \
-    -DCMAKE_BUILD_TYPE=Release \
-    ..
-  make
-}
-
-package() {
-  cd "$pkgname/build"
-  make DESTDIR="$pkgdir" install
-}
--- a/src/kodi-platform-git/.SRCINFO
+++ b/src/kodi-platform-git/.SRCINFO
@ -1,22 +0,0 @@
-# Generated by mksrcinfo v8
-# Tue Feb 23 23:00:57 UTC 2016
-pkgbase = kodi-platform-git
-	pkgdesc = Kodi platform support library
-	pkgver = r38.15edaf7
-	pkgrel = 1
-	url = https://github.com/xbmc/kodi-platform
-	arch = armv7h
-	arch = i686
-	arch = x86_64
-	license = GPL
-	makedepends = cmake
-	makedepends = git
-	depends = kodi
-	depends = libplatform-legacy
-	provides = kodi-platform
-	conflicts = kodi-platform
-	source = kodi-platform-git::git+https://github.com/xbmc/kodi-platform.git#commit=15edaf78d
-	md5sums = SKIP
-
-pkgname = kodi-platform-git
-
--- a/src/kodi-platform-git/PKGBUILD
+++ b/src/kodi-platform-git/PKGBUILD
@ -1,67 +0,0 @@
-# Maintainer: Michael Lass <bevan@bi-co.net>
-
-# This PKGBUILD is maintained on github:
-# https://github.com/michaellass/AUR
-
-###############################################################################
-# INSTRUCTIONS                                                                #
-# ------------                                                                #
-#                                                                             #
-# API changes between different Kodi versions make it necessary to specify    #
-# the version of Kodi you want to build this package for. You can choose      #
-# between Isengard (15), Jarvis (16) and git master (99). Do so in the        #
-# following line.                                                             #
-###############################################################################
-
-API=16
-
-pkgname=kodi-platform-git
-pkgver=r38.15edaf7
-pkgrel=1
-pkgdesc='Kodi platform support library'
-arch=('armv7h' 'i686' 'x86_64')
-url="https://github.com/xbmc/kodi-platform"
-license=('GPL')
-makedepends=('cmake' 'git')
-depends=('kodi')
-provides=('kodi-platform')
-conflicts=('kodi-platform')
-source=("${pkgname}::git+https://github.com/xbmc/kodi-platform.git")
-md5sums=('SKIP')
-
-# Corresponding commit IDs are taken from
-# https://github.com/xbmc/xbmc/blob/$BRANCH/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt
-case "$API" in
-  15)  depends+=('libplatform-legacy')
-       source[0]="${pkgname}::git+https://github.com/xbmc/kodi-platform.git#commit=054a42f66" ;;
-  16)  depends+=('libplatform-legacy')
-       source[0]="${pkgname}::git+https://github.com/xbmc/kodi-platform.git#commit=15edaf78d" ;;
-  17)  depends+=('p8-platform')
-       source[0]="${pkgname}::git+https://github.com/xbmc/kodi-platform.git#commit=c8188d826" ;;
-  99)  depends+=('p8-platform') ;;
-  *)   error "Unknown API version. Follow instructions in PKGBUILD." && false
-esac
-
-pkgver() {
-  cd "$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-build() {
-  mkdir -p "$pkgname/build"
-  cd "$pkgname/build"
-
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_PREFIX_PATH=/usr/lib/kodi \
-    ..
-  make
-}
-
-package() {
-  cd "$pkgname/build"
-  make DESTDIR="$pkgdir" install
-}
--- a/src/lgogdownloader/PKGBUILD
+++ b/src/lgogdownloader/PKGBUILD
@ -1,7 +1,7 @@
 # Maintainer: Joe Davison <joe@warhaggis.com>

 pkgname=lgogdownloader
-pkgver=3.1
+pkgver=3.2
 pkgrel=1
 pkgdesc="An open source downloader for GOG.com games, uses the GOG.com API"
 url="https://sites.google.com/site/gogdownloader/"
@ -10,7 +10,7 @@ license=(WTFPL)
 depends=('boost' 'jsoncpp' 'liboauth' 'rhash' 'tinyxml2' 'htmlcxx' 'curl')
 makedepends=('help2man' 'cmake')
 source=("http://sites.google.com/site/gogdownloader/$pkgname-$pkgver.tar.gz")
-sha256sums=('010d98e23108f605a553efd42ae68abd9ec78db1b2cd18cab89f8fb7e20484c9')
+sha256sums=('9e60af50c18533884ca317778b291152d5f04d93dfd3dc2579f6f965538b2031')

 prepare() {
 	cd $srcdir/$pkgname-$pkgver
--- a/src/libcommuni/PKGBUILD
+++ b/src/libcommuni/PKGBUILD
@ -1,10 +1,10 @@
 # Maintainer: Stephen Brennan <smb196@case.edu>
 pkgname=libcommuni
-pkgver=3.4.0
+pkgver=3.5.0
 pkgrel=1
 epoch=
 pkgdesc="A cross-platform IRC framework written with Qt."
-arch=('x86_64' 'i686')
+arch=('any')
 url="https://communi.github.io/"
 license=('custom')
 groups=()
@ -21,7 +21,7 @@ install=
 changelog=
 source=("libcommuni-v$pkgver.tar.gz::https://github.com/communi/$pkgname/archive/v$pkgver.tar.gz")
 noextract=()
-md5sums=(987fa2143324ab3f1843483053bf711f)
+md5sums=(2b62f599800962b2350cbd7ca2fc05ae)
 validpgpkeys=()

 build() {
--- a/src/libgcj17-bin/PKGBUILD
+++ b/src/libgcj17-bin/PKGBUILD
@ -4,7 +4,7 @@
 # Contributor: Roberto Calabrese <robertocalabrese75 [at] gmail.com>

 pkgname=libgcj17-bin
-pkgver=6.3.0_6
+pkgver=6.3.0_8
 pkgrel=1
 pkgdesc="Dynamically load and interpret java class files. Built from binary \
 executables available in Debian repositories."
@ -16,8 +16,8 @@ depends=(zlib)

 source_i686=(http://httpredir.debian.org/debian/pool/main/g/gcc-6/${pkgname%-*}_${pkgver%_*}-${pkgver##*_}_i386.deb)
 source_x86_64=(http://httpredir.debian.org/debian/pool/main/g/gcc-6/${pkgname%-*}_${pkgver%_*}-${pkgver##*_}_amd64.deb)
-sha1sums_i686=('b5eca3a78e97da121f7ebbccafd7a97510dea558')
-sha1sums_x86_64=('5679d0ac94b48623a23e717b23d33321edeedb44')
+sha1sums_i686=('6aad7cc2eee10e84b08d801000db52a67cc59bcb')
+sha1sums_x86_64=('c31fdd2970a62a377c11018fede8f684b7dd5a06')

 prepare() {
  tar xf data.tar.*
--- a/src/libretro-atari800-git/PKGBUILD
+++ b/src/libretro-atari800-git/PKGBUILD
@ -1,11 +1,11 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>

 pkgname=libretro-atari800-git
-pkgver=15.6e1883b
-pkgrel=2
+pkgver=27.ee20fb8
+pkgrel=1
 pkgdesc="libretro implementation of Atari800 v3.1.0 (Atari 5200/400/800/XL/XE) (WIP)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url="https://github.com/r-type/libretro-atari800.git"
+url="https://github.com/libretro/libretro-atari800"
 license=('GPL2')
 groups=('libretro')
 depends=('zlib')
@ -13,7 +13,7 @@ makedepends=('git')

 _libname=atari800_libretro
 _gitname=libretro-atari800
-source=("git+https://github.com/r-type/${_gitname}.git"
+source=("git+https://github.com/libretro/${_gitname}.git"
 	"${_libname}.info"
 	"cfg.patch"
 	"joycfg.patch")
@ -37,5 +37,5 @@ build() {

 package() {
  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
-  install -Dm644 "${_libname}.info" "${pkgdir}/usr/lib/libretro/${_libname}.info"
+  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
 }
--- a/src/libretro-stella-git/PKGBUILD
+++ b/src/libretro-stella-git/PKGBUILD
@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>

 pkgname=libretro-stella-git
-pkgver=161.1207fe7
+pkgver=174.2c7eca0
 pkgrel=1
 pkgdesc="libretro implementation of Stella. (Atari 2600)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
--- a/src/libretro-virtualjaguar-git/PKGBUILD
+++ b/src/libretro-virtualjaguar-git/PKGBUILD
@ -1,7 +1,7 @@
 # Maintainer: Oliver Jaksch <arch-aur@com-in.de>

 pkgname=libretro-virtualjaguar-git
-pkgver=158.0414745
+pkgver=162.4f92ba6
 pkgrel=1
 pkgdesc="libretro implementation of Virtual Jaguar. (Atari Jaguar)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
--- a/src/lostfiles/PKGBUILD
+++ b/src/lostfiles/PKGBUILD
@ -1,14 +1,14 @@
 # Contributor: graysky <graysky AT archlinux dot us>

 pkgname=lostfiles
-pkgver=3.25
+pkgver=3.26
 pkgrel=1
 pkgdesc='Find orphaned files not owned by any Arch packages'
 arch=('any')
 license=('GPL2')
 url="https://github.com/graysky2/lostfiles"
 source=("https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('1c6a8c8fb98bdda81331ad6df91eb210a7bb8cfc2aa990f55a1b7713917e98c4')
+sha256sums=('42c5408b1bbc32eafebf16b0f843c775b39356b6edecdff5437d3e58c1c614ed')

 package() {
 	cd "$pkgname-$pkgver"
--- a/src/memtest86-efi/PKGBUILD
+++ b/src/memtest86-efi/PKGBUILD
@ -2,8 +2,8 @@

 _pkgbasename=memtest86
 pkgname=$_pkgbasename-efi
-pkgver=7.2
-pkgrel=3
+pkgver=7.3
+pkgrel=1
 pkgdesc="A free, thorough, stand alone memory test as an EFI application"
 arch=('i686' 'x86_64')
 url="http://www.memtest86.com"
@ -20,7 +20,7 @@ source=("$_pkgbasename-$pkgver.iso.tar.gz::http://www.memtest86.com/downloads/$_
 	"systemd-boot.conf"
 	"memtest86-efi-update.hook"
 	"memtest86-efi-remove.hook")
-md5sums=('5ac971dbe3af784c1847a693f587a667'
+md5sums=('af15200db0570c2ff3a24790982f8a2b'
         '5dc6005ffd904163c40ceb06e68a467b'
         '6c096df3f55baf3e27c3bd605a418aa2'
         '8b4aa0e2f5d769d902459c8f8d514336'
--- a/src/pacaur/PKGBUILD
+++ b/src/pacaur/PKGBUILD
@ -1,5 +1,5 @@
 pkgname=pacaur
-pkgver=4.6.10
+pkgver=4.7.5
 pkgrel=1
 pkgdesc="An AUR helper that minimizes user interaction"
 arch=('any')
@ -9,7 +9,7 @@ depends=('cower' 'expac' 'sudo' 'git')
 makedepends=('perl')
 backup=('etc/xdg/pacaur/config')
 source=("https://github.com/rmarquis/$pkgname/archive/$pkgver.tar.gz")
-md5sums=('d708774040efc197534eff3886d70425')
+md5sums=('d96b96c0d1b20372af55c6de9fb3b623')

 build() {
    cd "$pkgname-$pkgver"
@ -20,23 +20,23 @@ build() {
 package() {
    cd "$pkgname-$pkgver"

-    mkdir -p $pkgdir/etc/xdg/pacaur
-    install -D -m644 ./config $pkgdir/etc/xdg/pacaur/config
-    mkdir -p $pkgdir/usr/bin
-    install -D -m755 ./$pkgname $pkgdir/usr/bin/$pkgname
-    mkdir -p $pkgdir/usr/share/bash-completion/completions
+    mkdir -p "$pkgdir/etc/xdg/pacaur"
+    install -D -m644 ./config "$pkgdir/etc/xdg/pacaur/config"
+    mkdir -p "$pkgdir/usr/bin"
+    install -D -m755 ./pacaur "$pkgdir/usr/bin/$pkgname"
+    mkdir -p "$pkgdir/usr/share/bash-completion/completions"
    install -D -m644 ./bash.completion\
-        $pkgdir/usr/share/bash-completion/completions/$pkgname
-    mkdir -p $pkgdir/usr/share/zsh/site-functions
+        "$pkgdir/usr/share/bash-completion/completions/$pkgname"
+    mkdir -p "$pkgdir/usr/share/zsh/site-functions"
    install -D -m644 ./zsh.completion\
-        $pkgdir/usr/share/zsh/site-functions/_pacaur
-    mkdir -p $pkgdir/usr/share/man/man8
-    install -D -m644 ./pacaur.8 $pkgdir/usr/share/man/man8/pacaur.8
-    mkdir -p $pkgdir/usr/share/licenses/pacaur
-    install -D -m644 ./LICENSE $pkgdir/usr/share/licenses/pacaur/LICENSE
-    for i in {ca,da,de,es,fr,hu,it,ja,nl,pl,pt,ru,sk,sr,sr@latin,tr}; do
-        mkdir -p $pkgdir/usr/share/locale/$i/LC_MESSAGES/
-        msgfmt ./po/$i.po -o $pkgdir/usr/share/locale/$i/LC_MESSAGES/pacaur.mo
+        "$pkgdir/usr/share/zsh/site-functions/_pacaur"
+    mkdir -p "$pkgdir/usr/share/man/man8"
+    install -D -m644 ./pacaur.8 "$pkgdir/usr/share/man/man8/pacaur.8"
+    mkdir -p "$pkgdir/usr/share/licenses/pacaur"
+    install -D -m644 ./LICENSE "$pkgdir/usr/share/licenses/pacaur/LICENSE"
+    for i in {ca,da,de,es,fi,fr,hu,it,ja,nb,nl,pl,pt,ru,sk,sl,sr,sr@latin,tr,zh_CN}; do
+        mkdir -p "$pkgdir/usr/share/locale/$i/LC_MESSAGES/"
+        msgfmt ./po/$i.po -o "$pkgdir/usr/share/locale/$i/LC_MESSAGES/pacaur.mo"
    done
 }

--- a/src/pdftk-bin/PKGBUILD
+++ b/src/pdftk-bin/PKGBUILD
@ -5,8 +5,10 @@
 # Contributor: Liu Chang <goduck777@gmail.com>

 pkgname=pdftk-bin
-pkgver=2.02_4_b1
-_deb_pkgver=2.02-4+b1
+pkgver=2.02_4_b2
+# There's no b2 for i686...
+_deb_pkgver_32=2.02-4+b1
+_deb_pkgver_64=2.02-4+b2
 pkgrel=2
 pkgdesc="Swiss army knife for PDFs. Built from binary executables available in Debian repositories."
 url=http://www.pdfhacks.com/pdftk
@ -16,11 +18,11 @@ depends=(libgcj17-bin gcc-libs)
 provides=(pdftk)
 conflicts=(pdftk pdfchain-all-inclusive)

-source_i686=(http://httpredir.debian.org/debian/pool/main/p/pdftk/pdftk_${_deb_pkgver}_i386.deb)
-source_x86_64=(http://httpredir.debian.org/debian/pool/main/p/pdftk/pdftk_${_deb_pkgver}_amd64.deb)
+source_i686=(http://httpredir.debian.org/debian/pool/main/p/pdftk/pdftk_${_deb_pkgver_32}_i386.deb)
+source_x86_64=(http://httpredir.debian.org/debian/pool/main/p/pdftk/pdftk_${_deb_pkgver_64}_amd64.deb)

 sha1sums_i686=('7cc5b82bef21627019eb1e908f006c3529961a2e')
-sha1sums_x86_64=('516b2d789a94fa998e18407808ffa67f28bbff18')
+sha1sums_x86_64=('21ceeaa5ea7d1628dfb0da069126468e446d0572')

 package() {
  tar -xf data.tar.?z -C "$pkgdir" ./usr
--- a/src/prosody-hg-stable/PKGBUILD
+++ b/src/prosody-hg-stable/PKGBUILD
@ -62,7 +62,8 @@ build() {
    --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1 \
    --cflags="${CFLAGS} -fPIC -Wall -Wextra -D_GNU_SOURCE" \
    --ldflags="${LDFLAGS} -shared" --no-example-certs \
-    --runwith=lua5.1
+    --runwith=lua5.1 \
+    --lua-version=5.1 
  make
 }

--- a/src/prosody-hg-stable/prosody.install
+++ b/src/prosody-hg-stable/prosody.install
@ -5,7 +5,7 @@ post_install() {
    chown prosody:jabber var/lib/prosody
    [ -d var/log/prosody ] && chown prosody:jabber var/log/prosody

-    echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody"
+    echo ">> Documentation: https://wiki.archlinux.org/index.php/Prosody"
 }

 post_upgrade() {
--- a/src/python-authres/PKGBUILD
+++ b/src/python-authres/PKGBUILD
@ -4,8 +4,7 @@
 # Contributor: Samed Beyribey <ras0ir@eventualis.org>
 pkgname=python-authres
 _pkgname=authentication-results-python
-pkgver=0.800
-_pkgver=0.8
+pkgver=0.900
 pkgrel=1
 pkgdesc="Python Authentication-Results headers generation and parsing"
 arch=('any')
@ -13,8 +12,11 @@ url="http://launchpad.net/authentication-results-python"
 license=('Apache')
 depends=('python')
 conflicts=('python2-authres')
-source=(https://launchpad.net/$_pkgname/$pkgver/$_pkgver/+download/authres-$pkgver.tar.gz)
-sha256sums=('d28e3976a7d418917cbbf384018aa0e8a0489e41bfd9847309c5f8efb19f6efd')
+source=("https://launchpad.net/$_pkgname/$pkgver/$pkgver/+download/authres-$pkgver.tar.gz"
+        "https://launchpad.net/$_pkgname/$pkgver/$pkgver/+download/authres-$pkgver.tar.gz.asc")
+sha256sums=('de91d6cc6e5c6fef545bbf0a810a765fab4ca162906d14f3f2a6b9858602c186'
+            'SKIP')
+validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1')  # Donald Scott Kitterman <scott@kitterman.com>
 
 build() {
  cd "$srcdir/authres-$pkgver"
@ -29,6 +31,6 @@ check() {

 package() {
  cd "$srcdir/authres-$pkgver"
-  python setup.py install --root=$pkgdir --optimize=1
+  python setup.py install --root="$pkgdir" --skip-build --optimize=1
 }

--- a/src/python-configshell-fb/PKGBUILD
+++ b/src/python-configshell-fb/PKGBUILD
@ -1,7 +1,7 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net 
 pkgname=('python-configshell-fb' 'python2-configshell-fb')
 _pkgname=configshell-fb
-pkgver=1.1.fb20
+pkgver=1.1.fb22
 pkgrel=1
 pkgdesc="python framework for building simple CLI applications (free branch)"
 arch=('any')
@ -10,7 +10,7 @@ license=('Apache')
 options=()
 makedepends=('python-setuptools' 'python2-setuptools')
 source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$_pkgname-$pkgver.tar.gz)
-sha256sums=('4a9f4b59ccd256a1c4d4c270be43798853a91d9fec29bd0ba006b88b7476f383')
+sha256sums=('a20b95791cdba6f7587869f4fa4337e8e4effbdec102ac6f7de349fe3b5bc612')

 package_python-configshell-fb() {
  depends=('python-pyparsing' 'python-urwid')
--- a/src/python-postfix-policyd-spf/PKGBUILD
+++ b/src/python-postfix-policyd-spf/PKGBUILD
@ -3,9 +3,9 @@
 # Contributor: Samed Beyribey <ras0ir@eventualis.org>
 pkgname=python-postfix-policyd-spf
 _pkgname=pypolicyd-spf
-pkgver=1.3.2
-_pkgver=1.3
-pkgrel=2
+pkgver=2.0.1
+_pkgver=2.0
+pkgrel=1
 pkgdesc="Python Postfix Sender Policy Framework (SPF) filter"
 arch=('any')
 url="https://launchpad.net/pypolicyd-spf/"
@ -16,7 +16,7 @@ conflicts=('python2-postfix-policyd-spf')
 options=(!emptydirs)
 backup=(etc/python-policyd-spf/policyd-spf.conf)
 source=(https://launchpad.net/$_pkgname/$_pkgver/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
-md5sums=('3f064042190dabe2e74300e1118fff94')
+md5sums=('d93d14bb41bccd076ee05535822cbb80')
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
--- a/src/python-rtslib-fb/PKGBUILD
+++ b/src/python-rtslib-fb/PKGBUILD
@ -1,8 +1,8 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=('python-rtslib-fb' 'python2-rtslib-fb')
 _pkgname=rtslib-fb
-pkgver=2.1.fb60
-pkgrel=2
+pkgver=2.1.fb62
+pkgrel=1
 pkgdesc="free branch version of the LIO target API"
 arch=('any')
 url="https://github.com/agrover/rtslib-fb"
@ -12,7 +12,7 @@ backup=()
 options=()
 install=
 source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$_pkgname-$pkgver.tar.gz target.service)
-sha256sums=('11b664f02219e5108c4a996f5bc7445500912cff5696b3f51be2f6a1b243e957'
+sha256sums=('45ab59d7b97fc62613dd24b153a543cc16e1f0cca7ae38b86e4b0c2cc16ac10c'
            '74b9e5c11eab1781aa8b43680b429080ae800fbcdafd29626791b5426a4cdea8')

 prepare() {
--- a/src/python2-axolotl-git/PKGBUILD
+++ b/src/python2-axolotl-git/PKGBUILD
@ -3,7 +3,7 @@

 pkgname='python2-axolotl-git'
 _pkgname='python-axolotl'
-pkgver=0.1.35.r0.g72f7c44
+pkgver=r39.9585d72
 pkgrel=1
 pkgdesc="Python port of libaxolotl"
 url="https://github.com/tgalal/python-axolotl"
--- a/src/qemu-user-static/PKGBUILD
+++ b/src/qemu-user-static/PKGBUILD
@ -3,7 +3,7 @@

 pkgname=qemu-user-static
 pkgver=2.8
-pkgrel=1
+pkgrel=3
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation, statically linked."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@ -13,10 +13,10 @@ optdepends=('binfmt-support: to allow handling foreign ELF binaries and executin
 conflicts=()
 _arch=i386
 [ "$CARCH" = 'x86_64' ] && _arch=amd64
-_debsrc=${pkgname}_${pkgver}+dfsg-1_${_arch}.deb
+_debsrc=${pkgname}_${pkgver}+dfsg-3_${_arch}.deb
 source=(http://ftp.debian.org/debian/pool/main/q/qemu/${_debsrc})
-sha1sums=('371671a57e287c3363b6b39bcc9fcc9e958b4518')
-[ "$CARCH" = 'i686' ] && sha1sums=('d4907e884ce34bb33a52608a7d110e69115e252d')
+sha1sums=('b25ffe5cc9d403805c61633f789ec51f67826903')
+[ "$CARCH" = 'i686' ] && sha1sums=('aee7d2ae336a4971c566f3c915092aedc297e4ef')

 prepare() {
  cd "$srcdir"
--- a/src/rpm-org/PKGBUILD
+++ b/src/rpm-org/PKGBUILD
@ -5,7 +5,7 @@
 # Author: Wintershade <Wintershade AT google mail DOT com>

 pkgname=rpm-org
-pkgver=4.13.0
+pkgver=4.13.0.1
 _pkgver=$pkgver
 #_pkgver=4.12.0-rc1
 pkgrel=1
@ -19,9 +19,10 @@ optdepends=('libdbus: systemd inhibit plugin')
 conflicts=('rpm' 'rpmextract')
 options=('!libtool')
 provides=("rpm=${pkgver}" 'rpmextract=1.0-4')
-source=(https://github.com/rpm-software-management/rpm/releases/download/rpm-${pkgver}-release/rpm-${pkgver}.tar.bz2
+#source=(https://github.com/rpm-software-management/rpm/releases/download/rpm-${pkgver}-release/rpm-${pkgver}.tar.bz2
+source=(http://ftp.rpm.org/releases/rpm-4.13.x/rpm-$pkgver.tar.bz2
 	rpmextract.sh rpmlib-filesystem-check.patch bfdfix.patch)
-sha1sums=('c6ce4f879ca6a75340921093105e5ef9d33381d3'
+sha1sums=('9566f95f38fcb214e439c552f378c2f64ba0aff9'
          '74849919207885ae024f1ab8ed68a76474d67ad7'
          '0c5fa516dde1f10211af896c729e4b00c313e12b'
          '456d4a2c9f71c2e3bfa5011800855a73a55aa5bc')
--- a/src/sabnzbd/PKGBUILD
+++ b/src/sabnzbd/PKGBUILD
@ -1,6 +1,6 @@
 pkgname=sabnzbd
 _pkgname=SABnzbd
-pkgver=1.2.0
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="A web-interface based binary newsgrabber with NZB file support"
 url="http://www.sabnzbd.org"
@ -14,7 +14,7 @@ install="${pkgname}.install"
 backup=("etc/conf.d/sabnzbd" "opt/${pkgname}/${pkgname}.ini")
 source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.gz"
        "${pkgname}" "${pkgname}.desktop" "addnzb.sh" "nzb.png" "sabnzbd.png" "x-nzb.xml" "${pkgname}.service" "${pkgname}.confd")
-md5sums=('8524968cd83db6f9b9f3a81878a09a58'
+md5sums=('8ba1c06f43c90d072ffb0a0402c10b35'
         '48d60a1c626503c7fef1bc5374390513'
         '36e5f0f60f28f67102682f80e33c6d4b'
         '69b9bcbcf67ff3e7a4cdd9f26e001341'
--- a/src/searx/PKGBUILD
+++ b/src/searx/PKGBUILD
@ -4,7 +4,7 @@

 pkgname=searx
 pkgver=0.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A privacy-respecting, hackable metasearch engine"
 arch=('any')
 url="https://asciimoo.github.io/searx/"
@ -29,7 +29,7 @@ source=("https://github.com/asciimoo/searx/archive/v$pkgver.zip"
        'searx.service')
 sha512sums=('f1f28d6135ef2a8e254a700ae9ef3366fccc83f1c2c2574f4d276347304bae6aa397f5d3a4bad4f66b19b13470c6cc724eee2c68bc004a4876a7804a7c79b97a'
            'daf98a69d87dc78ea645a02146d67b0a2903b3b219edadf2e3c987c20d0751ac147b72fe185c74bfe3e0b154ed8ee4b9b503e7ca922548fad52157aada05803c'
-            '354ec9c88018108ce0a652647faefaa23afb7afe53b42259a43adf9395b854d02c2b6d350b8d17cf105a9283f62aee0788f7dc96c2676f67c77941d3ef6edc0c')
+            '64ab805f7e0089d9b638c2972687ba60331304b3d63bfff138ce8b7903d999f40854067c384cafbc6c635afc335bd084b758cbb7c5cac397d97ed1f31e67ac6e')


 package() {
--- a/src/searx/searx.service
+++ b/src/searx/searx.service
@ -13,7 +13,9 @@ ProtectHome=true
 # Prevent writes to /usr, /boot, and /etc
 ProtectSystem=full
 ExecStart=/usr/bin/searx-run
-Restart=on-abort
+
+Restart=on-failure
+RestartSec=1

 [Install]
 WantedBy=multi-user.target
--- a/src/sonarr/PKGBUILD
+++ b/src/sonarr/PKGBUILD
@ -1,7 +1,7 @@
 # Maintainer: Daniel Egeberg <daniel.egeberg@gmail.com>
 # Contributor: Justin Dray <justin@dray.be>
 pkgname="sonarr"
-pkgver="2.0.0.4472"
+pkgver="2.0.0.4645"
 pkgrel=1
 pkgdesc="PVR for newsgroup users. Formerly known as NZBDrone"
 arch=(any)
@ -22,7 +22,7 @@ source=("https://update.sonarr.tv/v2/master/mono/NzbDrone.master.${pkgver}.mono.
        "sonarr.sh"
        "sonarr.service")
 noextract=()
-sha512sums=('bc8bab331ffe79c311bded399f7b192e374eaebd955f4c9a66c61dcbb45437723912b3b0e5b2d6a686b1559f87258710a3b6dd382142e1fd621108a0fe7987e5'
+sha512sums=('03b10d7b59c38d6322ce684fe70ffea83db106626f4fff1bd844b6587980eb6fddac2cfdb45c76348eb0f18e289b20bed39ea597bceb061652eaee0862786545'
            '84efa2eebd9afe6b74203aefdc3fdbd4088ecfad17dbe929396f1ffc639743b615a9b75566a0b45d6b7925bd5675368015047c6d65c1421ffe8712728f350695'
            '438de225c38c26aaa15cae243b18d0be85f3f0e54f1297bf182082a0bdbd936d21928cdcdb899f0f18c6ec32ee88c2e0f0d29b8a2a1cdf98a8e1907cd6f36a2c')

--- a/src/targetcli-fb/PKGBUILD
+++ b/src/targetcli-fb/PKGBUILD
@ -1,6 +1,6 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=targetcli-fb
-pkgver=2.1.fb43
+pkgver=2.1.fb45
 pkgrel=1
 pkgdesc="free branch of the targetcli LIO administration shell (iSCSI + Co)"
 arch=('any')
@ -10,14 +10,13 @@ groups=()
 depends=('python-rtslib-fb>=2.1.fb52' 'python-configshell-fb>=1.1.fb17'
         'python-dbus')
 makedepends=('python-setuptools')
-# TODO: optdepend on python-ethtool when available for python3
-optdepends=()
+optdepends=('python-ethtool')
 provides=('targetcli')
 backup=()
 options=()
 install=
 source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$pkgname-$pkgver.tar.gz)
-sha256sums=('63e7c85df26ffd2b1ef34e9113585d7eb8b3fd8d4bf84ebe025a14bf518e7459')
+sha256sums=('f977897450521a848c077e0faf7d8025d0af1b8859e3abfaeecbf7083a08008c')


 build() {
--- a/src/ttf-oxygen/PKGBUILD
+++ b/src/ttf-oxygen/PKGBUILD
@ -19,6 +19,7 @@ source=("http://download.kde.org/stable/plasma/$pkgver/oxygen-fonts-$pkgver.tar.
 sha256sums=('a02f6580e9a53cb16694a99adbb6dbf76f17584f3e97f469a22286299507838c')

 prepare() {
+  [[ -d build ]] && rm -rf build
  mkdir build
 }

--- a/src/tvheadend-git/.SRCINFO
+++ b/src/tvheadend-git/.SRCINFO
@ -1,35 +0,0 @@
-# Generated by mksrcinfo v8
-# Sat Apr 23 00:44:47 UTC 2016
-pkgbase = tvheadend-git
-	pkgdesc = TV streaming server for Linux
-	pkgver = 4.1.r1931.gc3eefc6
-	pkgrel = 1
-	url = https://tvheadend.org/
-	install = tvheadend.install
-	arch = i686
-	arch = x86_64
-	arch = arm
-	arch = armv6h
-	arch = armv7h
-	license = GPL3
-	makedepends = git
-	makedepends = python
-	depends = avahi
-	depends = openssl
-	depends = uriparser
-	depends = ffmpeg
-	depends = linuxtv-dvb-apps
-	optdepends = xmltv: For an alternative source of programme listings
-	provides = tvheadend
-	conflicts = tvheadend
-	conflicts = hts-tvheadend
-	conflicts = hts-tvheadend-svn
-	conflicts = tvheadend-git
-	backup = etc/conf.d/tvheadend
-	source = tvheadend-git::git+https://github.com/tvheadend/tvheadend.git#branch=master
-	source = dvb-scan-tables::git+https://github.com/tvheadend/dtv-scan-tables.git#branch=tvheadend
-	md5sums = SKIP
-	md5sums = SKIP
-
-pkgname = tvheadend-git
-
--- a/src/tvheadend-git/.gitignore
+++ b/src/tvheadend-git/.gitignore
@ -1,10 +0,0 @@
-pkg
-src
-*.tar.xz
-*.tar.gz
-*.sig
-*.log
-tvheadend
-tvheadend-git
-dvb-scan-tables
-
--- a/src/tvheadend-git/PKGBUILD
+++ b/src/tvheadend-git/PKGBUILD
@ -1,74 +0,0 @@
-# Maintainer: Dan Ziemba <zman0900@gmail.com>
-# Contributor: Benjamin Hedrich <kiwisauce (a) pagenotfound (dot) de>
-
-# To enable hdhomerun, add 'libhdhomerun' to depends and '--enable-hdhomerun_client' to
-# the configure command in build().
-
-pkgname=tvheadend-git
-_gitname='tvheadend-git'
-pkgver=4.1.r2435.g6129d04a2
-pkgrel=1
-pkgdesc="TV streaming server for Linux"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url="https://tvheadend.org/"
-license=('GPL3')
-depends=('avahi' 'openssl' 'uriparser' 'ffmpeg' 'linuxtv-dvb-apps')
-makedepends=('git' 'python')
-optdepends=('xmltv: For an alternative source of programme listings')
-provides=('tvheadend')
-conflicts=('tvheadend' 'hts-tvheadend' 'hts-tvheadend-svn' 'tvheadend-git')
-install=tvheadend.install
-backup=('etc/conf.d/tvheadend')
-
-source=("${_gitname}::git+https://github.com/tvheadend/tvheadend.git#branch=master"
-        "dvb-scan-tables::git+https://github.com/tvheadend/dtv-scan-tables.git#branch=tvheadend")
-md5sums=('SKIP'
-         'SKIP')
-
-pkgver() {
-    cd "${srcdir}/${_gitname}"
-    git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-    cd "${srcdir}"
-    _dvbscan="${_gitname}/data/dvb-scan"
-    cp -a "dvb-scan-tables" "${_dvbscan}"
-    rm -rf "${_dvbscan}/.git"
-    touch "${_dvbscan}/.stamp"
-}
-
-build() {
-    cd "${srcdir}/${_gitname}"
-    ./configure --prefix=/usr --mandir=/usr/share/man/man1 --release \
-        --python=python3 \
-        --disable-ffmpeg_static --enable-libav \
-        --disable-libx264_static --enable-libx264 \
-        --disable-libx265_static --enable-libx265 \
-        --disable-libvpx_static \
-        --disable-libtheora_static \
-        --disable-libvorbis_static \
-        --disable-libfdkaac_static \
-        --disable-libmfx_static --disable-qsv \
-        --disable-nvenc \
-        --disable-hdhomerun_static
-    make
-}
-
-package() {
-    cd "${srcdir}/${_gitname}"
-    make DESTDIR="$pkgdir/" install
-
-    install -D -m 644 "${srcdir}/${_gitname}/rpm/tvheadend.service" \
-        "$pkgdir/usr/lib/systemd/system/tvheadend.service"
-    sed -i 's|/etc/sysconfig|/etc/conf.d|g' "$pkgdir/usr/lib/systemd/system/tvheadend.service"
-
-    install -d "$pkgdir/etc/conf.d"
-    cat << EOF > "$pkgdir/etc/conf.d/tvheadend"
-# Configuration file for the tvheadend service.
-
-MALLOC_ARENA_MAX=4
-OPTIONS="-u hts -g video -6 --http_port 9981 --htsp_port 9982"
-EOF
-}
-
--- a/src/tvheadend-git/tvheadend.install
+++ b/src/tvheadend-git/tvheadend.install
@ -1,24 +0,0 @@
-HTS_USER=hts
-HTS_UID=1337
-HTS_GROUP=video
-
-post_install() {
-  if ! getent passwd $HTS_USER &> /dev/null; then
-    useradd -u $HTS_UID -g $HTS_GROUP -m -s /bin/false $HTS_USER &> /dev/null
-    passwd -l $HTS_USER &> /dev/null
-    echo "  ==> User '$HTS_USER' created"
-  fi
-
-cat << 'EOM'
-  ==> All configuration is maintained through the web interface:
-  ==>
-  ==> http://localhost:9981/
-  ==>
-  ==> Default login without username/password.
-EOM
-}
-
-post_remove() {
-  userdel $HTS_USER &> /dev/null
-  echo "  ==> User '$HTS_USER' removed"
-}
--- a/src/tvheadend/.SRCINFO
+++ b/src/tvheadend/.SRCINFO
@ -1,33 +0,0 @@
-pkgbase = tvheadend
-	pkgdesc = TV streaming server for Linux
-	pkgver = 4.0.9
-	pkgrel = 3
-	url = https://tvheadend.org/projects/tvheadend
-	install = tvheadend.install
-	arch = i686
-	arch = x86_64
-	arch = arm
-	arch = armv6h
-	arch = armv7h
-	arch = aarch64
-	license = GPL3
-	makedepends = git
-	makedepends = wget
-	makedepends = python2
-	depends = avahi
-	depends = linuxtv-dvb-apps
-	depends = ffmpeg2.8
-	depends = uriparser
-	optdepends = xmltv: For an alternative source of programme listings
-	optdepends = libiconv: For conversion of character encodings
-	provides = tvheadend
-	conflicts = tvheadend-git
-	source = https://github.com/tvheadend/tvheadend/archive/v4.0.9.tar.gz
-	source = tvheadend.service
-	source = tvheadend-4.0.9-1.patch
-	sha512sums = ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e
-	sha512sums = 456084a08ce0e02a4a32d67a8a7937d45695cb4b08b29297ead8a7e9d2a92963335f653f56d4c9346f4b2729868408fafbcd4caebf9fc8cdaa90171514cf4a57
-	sha512sums = 166985b311e1e004afed53af1fdd58b0f29f3fd09af367abca270f94564f5f821027e60220f9e588a8895939eae360e99947f45b863fbbc0b541c99389d82bad
-
-pkgname = tvheadend
-
--- a/src/tvheadend/PKGBUILD
+++ b/src/tvheadend/PKGBUILD
@ -1,44 +0,0 @@
-# Maintainer:  Alex Mekkering <amekkering at gmail dot com>
-# Contributor: Bjoern Franke <bjo@nord-west.org>
-
-pkgname=tvheadend
-
-pkgver=4.0.9
-pkgrel=3
-pkgdesc="TV streaming server for Linux"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url="https://tvheadend.org/projects/tvheadend"
-license=('GPL3')
-depends=('avahi' 'linuxtv-dvb-apps' 'ffmpeg2.8' 'uriparser')
-makedepends=('git' 'wget' 'python2')
-optdepends=('xmltv: For an alternative source of programme listings'
-	    'libiconv: For conversion of character encodings')
-provides=('tvheadend')
-conflicts=('tvheadend-git')
-install=tvheadend.install
-
-source=("https://github.com/tvheadend/tvheadend/archive/v$pkgver.tar.gz" 
-	'tvheadend.service'
-	'tvheadend-4.0.9-1.patch'
-)
-sha512sums=('ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e'
-            '456084a08ce0e02a4a32d67a8a7937d45695cb4b08b29297ead8a7e9d2a92963335f653f56d4c9346f4b2729868408fafbcd4caebf9fc8cdaa90171514cf4a57'
-            '166985b311e1e004afed53af1fdd58b0f29f3fd09af367abca270f94564f5f821027e60220f9e588a8895939eae360e99947f45b863fbbc0b541c99389d82bad')
- 
-prepare() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    patch -p1 -i ../tvheadend-4.0.9-1.patch
-    env PKG_CONFIG_PATH=/usr/lib/ffmpeg2.8/pkgconfig ./configure --prefix=/usr --python=python2
-}
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR="$pkgdir/" install
-    chmod 0644 ${pkgdir}/usr/share/man/man1/tvheadend.1
-    install -D -m 644 "$srcdir/tvheadend.service" "$pkgdir/usr/lib/systemd/system/tvheadend.service"
-}
--- a/src/tvheadend/tvheadend-4.0.9-1.patch
+++ b/src/tvheadend/tvheadend-4.0.9-1.patch
@ -1,21 +0,0 @@
-diff -aur package.pristine/src/htsmsg.c package.new/src/htsmsg.c
--- package.pristine/src/htsmsg.c	2016-06-08 13:49:21.423171678 +0200
-+++ package.new/src/htsmsg.c	2016-06-08 13:50:20.489342743 +0200
-@@ -760,13 +760,15 @@
-     case HMF_MAP:
-       printf("MAP) = {\n");
-       htsmsg_print0(&f->hmf_msg, indent + 1);
-      for(i = 0; i < indent; i++) printf("\t"); printf("}\n");
-+      for(i = 0; i < indent; i++) printf("\t");
-+      printf("}\n");
-       break;
- 
-     case HMF_LIST:
-       printf("LIST) = {\n");
-       htsmsg_print0(&f->hmf_msg, indent + 1);
-      for(i = 0; i < indent; i++) printf("\t"); printf("}\n");
-+      for(i = 0; i < indent; i++) printf("\t");
-+      printf("}\n");
-       break;
-       
-     case HMF_STR:
--- a/src/tvheadend/tvheadend.install
+++ b/src/tvheadend/tvheadend.install
@ -1,24 +0,0 @@
-HTS_USER=hts
-HTS_UID=1337
-HTS_GROUP=video
-
-post_install() {
-  if ! getent passwd $HTS_USER &> /dev/null; then
-    useradd -u $HTS_UID -g $HTS_GROUP -m -s /bin/false $HTS_USER &> /dev/null
-    passwd -l $HTS_USER &> /dev/null
-    echo "  ==> User '$HTS_USER' created"
-  fi
-
-cat << 'EOM'
-  ==> All configuration is maintained through the web interface:
-  ==>
-  ==> http://localhost:9981/
-  ==>
-  ==> Default login without username/password.
-EOM
-}
-
-post_remove() {
-  userdel $HTS_USER &> /dev/null
-  echo "  ==> User '$HTS_USER' removed"
-}
--- a/src/tvheadend/tvheadend.service
+++ b/src/tvheadend/tvheadend.service
@ -1,14 +0,0 @@
-[Unit]
-Description=tvheadend
-After=tmp.mount network.target
-
-[Service]
-Type=forking
-PIDFile=/run/tvheadend.pid
-ExecStart=/usr/bin/tvheadend -f -p /run/tvheadend.pid -C -u hts -g video
-ExecStop=/usr/bin/rm /run/tvheadend.pid
-Restart=always
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
--- a/src/wallabag/PKGBUILD
+++ b/src/wallabag/PKGBUILD
@ -1,14 +1,14 @@
 # Maintainer: Philipp Schmitt (philipp<at>schmitt<dot>co)

 pkgname=wallabag
-pkgver=2.1.4
+pkgver=2.2.2
 pkgrel=1
 pkgdesc='Self hostable application for saving web pages'
 arch=('any')
 url='http://www.wallabag.org/'
 license=('MIT')
 depends=(
-    'php>=5.3.3'
+    'php>=5.5'
    'php-gd'
    'php-tidy'
    'pcre'
@ -21,9 +21,8 @@ optdepends=(
 )
 install="$pkgname.install"
 options=(!strip)
-source=("https://framabag.org/wallabag-release-${pkgver}.tar.gz")
-#source=("${pkgname}-release-${pkgver}.tar.gz::http://wllbg.org/latest-v2-package") # you may try this URL, if the above one is not available
-sha256sums=('eb64205a4d7c161527edd08bed22e8dd9799fe8a4130c5964c18cba3a94c9768')
+source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz")
+sha256sums=('40d98bd556116dbc28f92339f0e5b93836ece87dcb01e7aaa628ea98855a1f51')
 backup=("etc/webapps/${pkgname}/parameters.yml"
        "usr/share/webapps/${pkgname}/parameters.yml"
        "var/lib/${pkgname}/data/db/wallabag.sqlite"
@ -47,5 +46,7 @@ package() {
    ln -s "/var/lib/${pkgname}/"{data,var} "${pkgdir}/usr/share/webapps/${pkgname}/"
    chown -R http:http "$_VAR_DIR"

+    sed -i "${_VAR_DIR}/var/bootstrap.php.cache" -e "s@__DIR__.'/../@'/usr/share/webapps/${pkgname}/@"
+
    chown -R http:http "${pkgdir}/usr/share/webapps/${pkgname}"
 }
--- a/src/wallabag/wallabag.install
+++ b/src/wallabag/wallabag.install
@ -12,8 +12,8 @@ post_install() {
    echo -n "To setup your webserver and enable the needed php extensions, "
    echo "please read: http://doc.wallabag.org/en/master/user/installation.html"
    echo ""
-    echo -n "If you upgraded from 2.0.x, you might need to check the upgrade guide: "
-    echo "http://doc.wallabag.org/en/master/user/upgrade-2.0.x-2.1.1.html"
+    echo -n "If you upgraded from 2.0.x or 2.1.x, you might need to check "
+    echo "the upgrade guide: http://doc.wallabag.org/en/master/user/upgrade.html"
 }