diff --git a/c++utilities/default/PKGBUILD b/c++utilities/default/PKGBUILD
index 27613c5d..cda7193f 100644
--- a/c++utilities/default/PKGBUILD
+++ b/c++utilities/default/PKGBUILD
@@ -5,17 +5,18 @@
 
 _reponame=cpp-utilities
 pkgname=c++utilities
-pkgver=3.4.1
+pkgver=4.0.0
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Common C++ classes and routines such as argument parser, IO and conversion utilities"
+pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities'
 license=('GPL')
 depends=()
-optdepends=('c++utilities-doc: API documentation')
+optdepends=("$pkgname-doc: API documentation")
 makedepends=('cmake')
+checkdepends=('cppunit')
 url="https://github.com/Martchus/${_reponame}"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('133fd8619d9ebb9c8f0d683856f55cd71e17cacee178600389140fad59eb8977')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('903ac50b3c4104728d077cb851a9f9628c3cfdcba6a20e826b7cbe8debf44083')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
@@ -23,6 +24,11 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make check
+}
+
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/c++utilities/doc/PKGBUILD b/c++utilities/doc/PKGBUILD
index d9627930..da73bc63 100644
--- a/c++utilities/doc/PKGBUILD
+++ b/c++utilities/doc/PKGBUILD
@@ -5,16 +5,16 @@
 
 _name=c++utilities
 _reponame=cpp-utilities
-pkgname=c++utilities-doc
-pkgver=3.4.1
+pkgname=$_name-doc
+pkgver=4.0.0
 pkgrel=1
 arch=('any')
-pkgdesc="Common C++ classes and routines such as argument parser, IO and conversion utilities (API documentation)"
+pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (API documentation)'
 license=('GPL')
 makedepends=('cmake' 'doxygen' 'dia' 'graphviz')
 url="https://github.com/Martchus/${_reponame}"
-source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('133fd8619d9ebb9c8f0d683856f55cd71e17cacee178600389140fad59eb8977')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('903ac50b3c4104728d077cb851a9f9628c3cfdcba6a20e826b7cbe8debf44083')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/c++utilities/git/PKGBUILD b/c++utilities/git/PKGBUILD
index 74bdccc4..a0bb3b91 100644
--- a/c++utilities/git/PKGBUILD
+++ b/c++utilities/git/PKGBUILD
@@ -3,18 +3,19 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=c++utilities
 _reponame=cpp-utilities
 pkgname=c++utilities-git
+_name=${pkgname%-git}
 pkgver=50.4d6bf67
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Common C++ classes and routines such as argument parser, IO and conversion utilities"
+pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities'
 license=('GPL')
 depends=()
 makedepends=('cmake' 'git')
-provides=('c++utilities')
-conflicts=('c++utilities')
+checkdepends=('cppunit')
+provides=("${_name}")
+conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
@@ -30,6 +31,11 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make check
+}
+
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make DESTDIR="${pkgdir}" install
diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD
index 56471cd0..84e5766a 100644
--- a/c++utilities/mingw-w64/PKGBUILD
+++ b/c++utilities/mingw-w64/PKGBUILD
@@ -3,40 +3,47 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=c++utilities
 _reponame=cpp-utilities
 pkgname=mingw-w64-c++utilities
-pkgver=3.4.1
-pkgrel=2
+_name=${pkgname#mingw-w64-}
+pkgver=4.0.0
+pkgrel=1
 arch=('any')
-pkgdesc="Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)"
+pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)'
 license=('GPL')
-depends=('mingw-w64-crt')
-optdepends=('c++utilities-doc: API documentation')
+depends=('mingw-w64-crt' 'mingw-w64-libiconv')
+optdepends=("$pkgname-doc: API documentation")
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
-source=("c++utilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('133fd8619d9ebb9c8f0d683856f55cd71e17cacee178600389140fad59eb8977')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('903ac50b3c4104728d077cb851a9f9628c3cfdcba6a20e826b7cbe8debf44083')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+[[ $NO_STATIC_LIBS ]] || _configurations+=('static: -DENABLE_STATIC_LIBS:BOOL=ON -DDISABLE_SHARED_LIBS:BOOL=ON')
+[[ $NO_SHARED_LIBS ]] || _configurations+=('shared: -DENABLE_STATIC_LIBS:BOOL=OFF -DDISABLE_SHARED_LIBS:BOOL=OFF')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  # build utilities for each architecture
   export CXXFLAGS='-O0'
   for _arch in ${_architectures}; do
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ../
-    make
-    popd
+    for _config in "${_configurations[@]}"; do
+      msg2 "Building ${_config%%: *} version for ${_arch}"
+      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
+      ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ${_config#*: } ../
+      make
+      popd
+    done
   done
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   for _arch in ${_architectures}; do
-    pushd build-${_arch}
-    make DESTDIR="${pkgdir}" install-mingw-w64-strip
-    popd
+    for _config in "${_configurations[@]}"; do
+      msg2 "Packaging ${_config%%: *} version for ${_arch}"
+      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
+      make DESTDIR="${pkgdir}" install-mingw-w64-strip
+      popd
+    done
   done
 }
diff --git a/dbus-soundrecorder/default/PKGBUILD b/dbus-soundrecorder/default/PKGBUILD
index 4af9b8a4..5821f565 100644
--- a/dbus-soundrecorder/default/PKGBUILD
+++ b/dbus-soundrecorder/default/PKGBUILD
@@ -5,16 +5,16 @@
 
 _reponame=dbus-soundrecorder
 pkgname=dbus-soundrecorder
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Records sound from Pulse Audio using ffmpeg while watching D-Bus to determine tracks and meta data"
+pkgdesc='Records sound from Pulse Audio using ffmpeg while watching D-Bus to determine tracks and meta data'
 license=('GPL')
 depends=('c++utilities' 'qt5-base')
 makedepends=('cmake' 'qtutilities')
 url="https://github.com/Martchus/${_reponame}"
-source=("dbus-soundrecorder-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('0916dd0282447add537900472f2ef35c5f26feefb2fdb41a3a3d39fcabd226d8')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('641fe93f1d858d7e2b835dc5b47aef52673c5e8418302aea5725bb83963f3b37')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/diriterator/default/PKGBUILD b/diriterator/default/PKGBUILD
index fc6f3109..6ba8c620 100755
--- a/diriterator/default/PKGBUILD
+++ b/diriterator/default/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=diriterator
 pkgver=1.0.3
 pkgrel=2
-pkgdesc="Runs a script for each file in a directory hierarchy using GNU parallel."
+pkgdesc='Runs a script for each file in a directory hierarchy using GNU parallel.'
 arch=('any')
 license=('GPL')
 groups=
@@ -17,7 +17,7 @@ conflicts=
 replaces=
 backup=
 install=
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${pkgname}/archive/v${pkgver}.tar.gz")
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${pkgname}/archive/v${pkgver}.tar.gz")
 noextract=
 md5sums=('SKIP')
 
diff --git a/geocoordinatecalculator/default/PKGBUILD b/geocoordinatecalculator/default/PKGBUILD
index f6ab2f36..3ce94799 100644
--- a/geocoordinatecalculator/default/PKGBUILD
+++ b/geocoordinatecalculator/default/PKGBUILD
@@ -5,16 +5,16 @@
 
 _reponame=geocoordinatecalculator
 pkgname=geocoordinatecalculator
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more"
+pkgdesc='Tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more'
 license=('GPL')
 depends=('c++utilities')
 makedepends=('cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("geocoordinatecalculator-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('a0f6bc2b5217a24fc60aad44d093b0373f5b690a12665ac31db27f5b3a00345a')
+sha256sums=('190a95d7f0a86bc51b89a6cb3f42e9c77f0b2a60283491917f212bf2e919c93c')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/geocoordinatecalculator/mingw-w64/PKGBUILD b/geocoordinatecalculator/mingw-w64/PKGBUILD
index b2665989..22834426 100644
--- a/geocoordinatecalculator/mingw-w64/PKGBUILD
+++ b/geocoordinatecalculator/mingw-w64/PKGBUILD
@@ -6,18 +6,18 @@
 _name=geocoordinatecalculator
 _reponame=geocoordinatecalculator
 pkgname=mingw-w64-geocoordinatecalculator
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=1
 arch=('any')
-pkgdesc="Tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more (mingw-w64)"
+pkgdesc='Tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more (mingw-w64)'
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-c++utilities')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("geocoordinatecalculator-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('a0f6bc2b5217a24fc60aad44d093b0373f5b690a12665ac31db27f5b3a00345a')
+sha256sums=('190a95d7f0a86bc51b89a6cb3f42e9c77f0b2a60283491917f212bf2e919c93c')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/mediaplayerctl/default/PKGBUILD b/mediaplayerctl/default/PKGBUILD
index 60961f59..e257a378 100755
--- a/mediaplayerctl/default/PKGBUILD
+++ b/mediaplayerctl/default/PKGBUILD
@@ -6,8 +6,8 @@
 pkgname=mediaplayerctl
 pkgver=1.0.1
 pkgrel=1
-pkgdesc="Bash script to control media player applications using qdbus."
-arch=(any)
+pkgdesc='Bash script to control media player applications using qdbus.'
+arch=('any')
 license=('GPL')
 groups=
 provides=
@@ -17,7 +17,7 @@ conflicts=
 replaces=
 backup=
 install=
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${pkgname}/archive/v${pkgver}.tar.gz")
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${pkgname}/archive/v${pkgver}.tar.gz")
 noextract=
 sha256sums=('SKIP')
 
diff --git a/passwordfile/default/PKGBUILD b/passwordfile/default/PKGBUILD
index d7c6cc24..30fce75b 100644
--- a/passwordfile/default/PKGBUILD
+++ b/passwordfile/default/PKGBUILD
@@ -5,17 +5,19 @@
 
 _reponame=passwordfile
 pkgname=passwordfile
-pkgver=3.1.1
+pkgver=3.1.2
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL"
+pkgdesc='C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL'
 license=('GPL')
 depends=('c++utilities' 'openssl')
 makedepends=('cmake')
+checkdepends=('cppunit')
+optdepends=("$pkgname-doc: API documentation")
 install=
 url="https://github.com/Martchus/${_reponame}"
-source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('46068f8e0d789d2a516950f201275eddf3720bc67d941730e00c1efb100e6dc4')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('be8a4516787200fca740365a090cc2767ee50753152e0f0d59b631da60d490ee')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
@@ -23,6 +25,11 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make check
+}
+
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/passwordfile/doc/PKGBUILD b/passwordfile/doc/PKGBUILD
new file mode 100644
index 00000000..b3952154
--- /dev/null
+++ b/passwordfile/doc/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+_name=passwordfile
+_reponame=passwordfile
+pkgname=$_name-doc
+pkgver=3.1.2
+pkgrel=1
+arch=('any')
+pkgdesc='C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL (API documentation)'
+license=('GPL')
+makedepends=('cmake' 'doxygen' 'dia' 'graphviz' 'c++utilities')
+url="https://github.com/Martchus/${_reponame}"
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('be8a4516787200fca740365a090cc2767ee50753152e0f0d59b631da60d490ee')
+
+build() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"
+  make ${_name}_apidoc
+}
+
+package() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make DESTDIR="${pkgdir}" install-api-doc
+}
diff --git a/passwordfile/git/PKGBUILD b/passwordfile/git/PKGBUILD
index 5fd907bb..230b897c 100644
--- a/passwordfile/git/PKGBUILD
+++ b/passwordfile/git/PKGBUILD
@@ -3,18 +3,18 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=passwordfile
 _reponame=passwordfile
 pkgname=passwordfile-git
+_name=${pkgname%-git}
 pkgver=20.bcefbb6
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL"
+pkgdesc='C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL'
 license=('GPL')
 depends=('c++utilities' 'openssl')
 makedepends=('cmake' 'git')
-provides=('passwordfile')
-conflicts=('passwordfile')
+provides=("${_name}")
+conflicts=("${_name}")
 install=
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
diff --git a/passwordfile/mingw-w64/PKGBUILD b/passwordfile/mingw-w64/PKGBUILD
index 4fb7f5a2..fedcd5ff 100644
--- a/passwordfile/mingw-w64/PKGBUILD
+++ b/passwordfile/mingw-w64/PKGBUILD
@@ -3,39 +3,47 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=passwordfile
 _reponame=passwordfile
 pkgname=mingw-w64-passwordfile
-pkgver=3.1.1
-pkgrel=2
+_name=${pkgname#mingw-w64-}
+pkgver=3.1.2
+pkgrel=1
 arch=('any')
-pkgdesc="C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL (mingw-w64)"
+pkgdesc='C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL (mingw-w64)'
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-openssl')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
+optdepends=("$pkgname-doc: API documentation")
 url="https://github.com/Martchus/${_reponame}"
-source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('46068f8e0d789d2a516950f201275eddf3720bc67d941730e00c1efb100e6dc4')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('be8a4516787200fca740365a090cc2767ee50753152e0f0d59b631da60d490ee')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+[[ $NO_STATIC_LIBS ]] || _configurations+=('static: -DENABLE_STATIC_LIBS:BOOL=ON -DDISABLE_SHARED_LIBS:BOOL=ON')
+[[ $NO_SHARED_LIBS ]] || _configurations+=('shared: -DENABLE_STATIC_LIBS:BOOL=OFF -DDISABLE_SHARED_LIBS:BOOL=OFF')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  # build utilities for each architecture
   export CXXFLAGS='-O0'
   for _arch in ${_architectures}; do
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ../
-    make
-    popd
+    for _config in "${_configurations[@]}"; do
+      msg2 "Building ${_config%%: *} version for ${_arch}"
+      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
+      ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ${_config#*: } ../
+      make
+      popd
+    done
   done
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   for _arch in ${_architectures}; do
-    pushd build-${_arch}
-    make DESTDIR="${pkgdir}" install-mingw-w64-strip
-    popd
+    for _config in "${_configurations[@]}"; do
+      msg2 "Packaging ${_config%%: *} version for ${_arch}"
+      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
+      make DESTDIR="${pkgdir}" install-mingw-w64-strip
+      popd
+    done
   done
 }
diff --git a/passwordmanager/default/PKGBUILD b/passwordmanager/default/PKGBUILD
index f06169af..2e5ea106 100644
--- a/passwordmanager/default/PKGBUILD
+++ b/passwordmanager/default/PKGBUILD
@@ -5,16 +5,16 @@
 
 _reponame=passwordmanager
 pkgname=passwordmanager
-pkgver=2.1.1
-pkgrel=2
+pkgver=2.1.2
+pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL"
+pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
 license=('GPL')
 depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
 makedepends=('cmake' 'qt5-tools')
 url="https://github.com/Martchus/${_reponame}"
-source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('ad2b91f2b1a54668d06c258686ec48f41f3ffd34cbbcd1ec4bb2a3226e3a9b4b')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('fc76512ba3e596becc3585fd88e2ea7570a2527f8a230a54316b0f14ea17158a')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/passwordmanager/git/PKGBUILD b/passwordmanager/git/PKGBUILD
index eae5e2d1..99ae9449 100644
--- a/passwordmanager/git/PKGBUILD
+++ b/passwordmanager/git/PKGBUILD
@@ -3,18 +3,18 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=passwordmanager
 _reponame=passwordmanager
 pkgname=passwordmanager-git
+_name=${pkgname%-git}
 pkgver=36.90d37ae
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL"
+pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
 license=('GPL')
 depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
 makedepends=('cmake' 'qt5-tools' 'git')
-provides=('passwordmanager')
-conflicts=('passwordmanager')
+provides=("${_name}")
+conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
diff --git a/passwordmanager/mingw-w64/PKGBUILD b/passwordmanager/mingw-w64/PKGBUILD
index a2199249..9183f116 100644
--- a/passwordmanager/mingw-w64/PKGBUILD
+++ b/passwordmanager/mingw-w64/PKGBUILD
@@ -3,25 +3,24 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=passwordmanager
 _reponame=passwordmanager
 pkgname=mingw-w64-passwordmanager
-pkgver=2.1.1
-pkgrel=2
+_name=${pkgname#mingw-w64-}
+pkgver=2.1.2
+pkgrel=1
 arch=('any')
-pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64)"
+pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64)'
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qtutilities' 'mingw-w64-passwordfile' 'mingw-w64-openssl')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 url="https://github.com/Martchus/${_reponame}"
-source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('ad2b91f2b1a54668d06c258686ec48f41f3ffd34cbbcd1ec4bb2a3226e3a9b4b')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('fc76512ba3e596becc3585fd88e2ea7570a2527f8a230a54316b0f14ea17158a')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  # build utilities for each architecture
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" -DQUICK_GUI="no" ../
diff --git a/qtutilities/default/PKGBUILD b/qtutilities/default/PKGBUILD
index 13bde523..749f3567 100644
--- a/qtutilities/default/PKGBUILD
+++ b/qtutilities/default/PKGBUILD
@@ -5,16 +5,17 @@
 
 _reponame=qtutilities
 pkgname=qtutilities
-pkgver=4.0.0
+pkgver=5.0.0
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models"
+pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
 license=('GPL')
 depends=('c++utilities' 'qt5-base')
 makedepends=('cmake')
+optdepends=("$pkgname-doc: API documentation")
 url="https://github.com/Martchus/${_reponame}"
-source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('7213b676b3b2ed1d92ffccf7cb8ebd234a5bb6d7194646143d5dc295030eca5f')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('3f8a6ea49b889febbb012674c773140793ad974731616b7142917ff53ed29cc0')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/qtutilities/doc/PKGBUILD b/qtutilities/doc/PKGBUILD
new file mode 100644
index 00000000..c92b97f3
--- /dev/null
+++ b/qtutilities/doc/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+_name=qtutilities
+_reponame=$_name
+pkgname=$_name-doc
+pkgver=5.0.0
+pkgrel=1
+arch=('any')
+pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (API documentation)'
+license=('GPL')
+makedepends=('cmake' 'doxygen' 'dia' 'graphviz' 'c++utilities' 'qt5-base')
+url="https://github.com/Martchus/${_reponame}"
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('3f8a6ea49b889febbb012674c773140793ad974731616b7142917ff53ed29cc0')
+
+build() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"
+  make ${_name}_apidoc
+}
+
+package() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make DESTDIR="${pkgdir}" install-api-doc
+}
diff --git a/qtutilities/git/PKGBUILD b/qtutilities/git/PKGBUILD
index 5e0254e4..5dd72185 100644
--- a/qtutilities/git/PKGBUILD
+++ b/qtutilities/git/PKGBUILD
@@ -3,18 +3,18 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=qtutilities
 _reponame=qtutilities
 pkgname=qtutilities-git
+_name=${pkgname%-git}
 pkgver=35.721e79d
-pkgrel=6
+pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models"
+pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
 license=('GPL')
 depends=('c++utilities' 'qt5-base')
 makedepends=('cmake' 'git')
-provides=('qtutilities')
-conflicts=('qtutilities')
+provides=("${_name}")
+conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
diff --git a/qtutilities/mingw-w64/PKGBUILD b/qtutilities/mingw-w64/PKGBUILD
index d03e9151..7058da86 100644
--- a/qtutilities/mingw-w64/PKGBUILD
+++ b/qtutilities/mingw-w64/PKGBUILD
@@ -3,39 +3,53 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=qtutilities
 _reponame=qtutilities
 pkgname=mingw-w64-qtutilities
-pkgver=4.0.0
-pkgrel=2
+_name=${pkgname#mingw-w64-}
+pkgver=5.0.0
+pkgrel=1
 arch=('any')
-pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (mingw-w64)"
+pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (mingw-w64)'
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-c++utilities')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
+optdepends=("$pkgname-doc: API documentation")
 url="https://github.com/Martchus/${_reponame}"
-source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('7213b676b3b2ed1d92ffccf7cb8ebd234a5bb6d7194646143d5dc295030eca5f')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('3f8a6ea49b889febbb012674c773140793ad974731616b7142917ff53ed29cc0')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+[[ $NO_STATIC_LIBS ]] ||
+  makedepends+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-svg') \
+  optdepends+=('mingw-w64-qt5-base-static: use of static library'
+               'mingw-w64-qt5-svg: use of static library') \
+  _configurations+=('static: -DENABLE_STATIC_LIBS:BOOL=ON -DDISABLE_SHARED_LIBS:BOOL=ON')
+[[ $NO_SHARED_LIBS ]] || _configurations+=('shared: -DENABLE_STATIC_LIBS:BOOL=OFF -DDISABLE_SHARED_LIBS:BOOL=OFF')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  # build utilities for each architecture
   export CXXFLAGS='-O0'
+  export PREVENT_FORCING_SHARED_LIBS=ON
   for _arch in ${_architectures}; do
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ../
-    make
-    popd
+    for _config in "${_configurations[@]}"; do
+      msg2 "Building ${_config%%: *} version for ${_arch}"
+      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
+      echo ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ${_config#*: } ../
+      ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ${_config#*: } ../
+      make
+      popd
+    done
   done
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   for _arch in ${_architectures}; do
-    pushd build-${_arch}
-    make DESTDIR="${pkgdir}" install-mingw-w64-strip
-    popd
+    for _config in "${_configurations[@]}"; do
+      msg2 "Packaging ${_config%%: *} version for ${_arch}"
+      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
+      make DESTDIR="${pkgdir}" install-mingw-w64-strip
+      popd
+    done
   done
 }
diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD
index ecffe671..0709b98c 100644
--- a/repoindex/default/PKGBUILD
+++ b/repoindex/default/PKGBUILD
@@ -5,10 +5,10 @@
 
 _reponame=repoindex
 pkgname=(repoindex{,-header,-web,-gui})
-pkgver=0.2.3
+pkgver=0.2.4
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Repository browser for Arch Linux"
+pkgdesc='Repository browser for Arch Linux'
 license=('GPL')
 depends=('qt5-websockets' 'qt5-webengine' 'karchive' 'c++utilities' 'qtutilities')
 makedepends=('cmake' 'yuicompressor' 'qtutilities')
diff --git a/repoindex/git/PKGBUILD b/repoindex/git/PKGBUILD
index c6c49dc5..ce07a550 100644
--- a/repoindex/git/PKGBUILD
+++ b/repoindex/git/PKGBUILD
@@ -5,14 +5,17 @@
 
 _reponame=repoindex
 pkgname=(repoindex{,-header,-web,-gui})
+_name=${pkgname%-git}
 pkgver=0.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Repository browser for Arch Linux"
+pkgdesc='Repository browser for Arch Linux'
 license=('GPL')
 depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities')
 makedepends=('cmake' 'git' 'yuicompressor' 'qtutilities')
 backup=("etc/${_reponame}.conf")
+provides=("${_name}")
+conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 options=(emptydirs)
 source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
diff --git a/syncthingtray/default/PKGBUILD b/syncthingtray/default/PKGBUILD
new file mode 100644
index 00000000..6c0cd87f
--- /dev/null
+++ b/syncthingtray/default/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+# set the web view provider: either webkit, webengine, auto or none
+_webview_provider=webkit
+
+_reponame=syncthingtray
+pkgname=syncthingtray
+pkgver=0.0.1
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Tray application for Syncthing'
+license=('GPL')
+depends=('qtutilities' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
+[[ $_webview_provider == none ]] && depends+=('qt5-base')
+[[ $_webview_provider == webkit ]] && depends+=('qt5-webkit')
+[[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
+makedepends=('cmake' 'qt5-tools')
+url="https://github.com/Martchus/${_reponame}"
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('122a64f4d08caa2e1cca1dd279d4db85023d46ee9f12b041b341b8d7c33dea9d')
+
+build() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DWEBVIEW_PROVIDER="${_webview_provider}"
+  make
+}
+
+package() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/syncthingtray/git/PKGBUILD b/syncthingtray/git/PKGBUILD
new file mode 100644
index 00000000..522758f1
--- /dev/null
+++ b/syncthingtray/git/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+# set the web view provider: either webkit, webengine, auto or none
+_webview_provider=webkit
+
+_reponame=syncthingtray
+pkgname=syncthingtray
+_name=${pkgname%-git}
+pkgver=0.0.1
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Tray application for Syncthing'
+license=('GPL')
+depends=('qtutilities' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
+[[ $_webview_provider == none ]] && depends+=('qt5-base')
+[[ $_webview_provider == webkit ]] && depends+=('qt5-webkit')
+[[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
+makedepends=('cmake' 'qt5-tools' 'git')
+provides=("${_name}")
+conflicts=("${_name}")
+url="https://github.com/Martchus/${_reponame}"
+source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "${srcdir}/${pkgname}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+}
+
+build() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DWEBVIEW_PROVIDER="${_webview_provider}"
+  make
+}
+
+package() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/syncthingtray/mingw-w64/PKGBUILD b/syncthingtray/mingw-w64/PKGBUILD
new file mode 100644
index 00000000..44d89d16
--- /dev/null
+++ b/syncthingtray/mingw-w64/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+# set the web view provider: either webkit, webengine, auto or none
+_webview_provider=none
+
+_reponame=syncthingtray
+pkgname=mingw-w64-syncthingtray
+_name=${pkgname#mingw-w64-}
+pkgver=0.0.1
+pkgrel=1
+arch=('any')
+pkgdesc='Tray application for Syncthing (mingw-w64)'
+license=('GPL')
+depends=('mingw-w64-crt' 'mingw-w64-qt5-svg' 'mingw-w64-qtutilities' 'mingw-w64-openssl')
+[[ $_webview_provider == none ]] && depends+=('mingw-w64-qt5-base')
+[[ $_webview_provider == webkit ]] && depends+=('mingw-w64-qt5-webkit')
+[[ $_webview_provider == webengine ]] && depends+=('mingw-w64-qt5-webengine')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
+url="https://github.com/Martchus/${_reponame}"
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('122a64f4d08caa2e1cca1dd279d4db85023d46ee9f12b041b341b8d7c33dea9d')
+options=(!buildflags staticlibs !strip !emptydirs)
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+build() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \
+      -DWEBVIEW_PROVIDER="${_webview_provider}" \
+      ../
+    make
+    popd
+  done
+}
+
+package() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  for _arch in ${_architectures}; do
+    pushd build-${_arch}
+    make DESTDIR="${pkgdir}" install-mingw-w64-strip
+    popd
+  done
+}
diff --git a/tageditor/default/PKGBUILD b/tageditor/default/PKGBUILD
index 78c0a567..daaac22a 100644
--- a/tageditor/default/PKGBUILD
+++ b/tageditor/default/PKGBUILD
@@ -3,18 +3,18 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-# set the web view provider: either webkit, webengine or none
+# set the web view provider: either webkit, webengine, auto or none
 _webview_provider=webkit
 
-# set the JavaScript provider: either script, qml or none
+# set the JavaScript provider: either script, qml, auto or none
 _js_provider=qml
 
 _reponame=tageditor
 pkgname=tageditor
-pkgver=1.4.0
+pkgver=2.0.0
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska"
+pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska'
 license=('GPL')
 depends=('qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils')
 [[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt5-base')
@@ -24,8 +24,8 @@ depends=('qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils')
 [[ $_js_provider == qml ]] && depends+=('qt5-declarative')
 makedepends=('cmake' 'qt5-tools')
 url="https://github.com/Martchus/${_reponame}"
-source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('37281b85c633b2f91310c0747f6ae69a108961ee5de1fa5ad3ba27a1707359aa')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('b3818112660b14b5e50c2b2f9521a1aaa1dafc12145e340fc5b210ee36056e41')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD
index 9e3a7108..2e603e6f 100644
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@@ -3,19 +3,19 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-# set the web view provider: either webkit, webengine or none
+# set the web view provider: either webkit, webengine, auto or none
 _webview_provider=webkit
 
-# set the JavaScript provider: either script, qml or none
+# set the JavaScript provider: either script, qml, auto or none
 _js_provider=qml
 
-_name=tageditor
 _reponame=tageditor
 pkgname=tageditor-git
+_name=${pkgname%-git}
 pkgver=66.77a0bc2
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska"
+pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska'
 license=('GPL')
 depends=('qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils')
 [[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt5-base')
@@ -24,8 +24,8 @@ depends=('qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils')
 [[ $_js_provider == script ]] && depends+=('qt5-script')
 [[ $_js_provider == qml ]] && depends+=('qt5-declarative')
 makedepends=('cmake' 'qt5-tools' 'git')
-provides=('tageditor')
-conflicts=('tageditor')
+provides=("${_name}")
+conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
diff --git a/tageditor/mingw-w64-webview/PKGBUILD b/tageditor/mingw-w64-webview/PKGBUILD
index 7c87ba0c..65328fa9 100644
--- a/tageditor/mingw-w64-webview/PKGBUILD
+++ b/tageditor/mingw-w64-webview/PKGBUILD
@@ -3,16 +3,16 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-# set the web view provider: either webkit, webengine or none
+# set the web view provider: either webkit, webengine, auto or none
 _webview_provider=webkit
 
-# set the JavaScript provider: either script, qml or none
+# set the JavaScript provider: either script, qml, auto or none
 _js_provider=qml
 
-_name=tageditor
 _reponame=tageditor
 pkgname=mingw-w64-tageditor-webview
-pkgver=1.4.0
+_name=${pkgname#mingw-w64-}
+pkgver=2.0.0
 pkgrel=1
 arch=('any')
 pkgdesc="A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska"
@@ -27,14 +27,13 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 url="https://github.com/Martchus/${_reponame}"
 provides=('mingw-w64-tageditor')
 conflicts=('mingw-w64-tageditor')
-source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('37281b85c633b2f91310c0747f6ae69a108961ee5de1fa5ad3ba27a1707359aa')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('b3818112660b14b5e50c2b2f9521a1aaa1dafc12145e340fc5b210ee36056e41')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  # build utilities for each architecture
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake \
diff --git a/tageditor/mingw-w64/PKGBUILD b/tageditor/mingw-w64/PKGBUILD
index 494bba04..8ef9e494 100644
--- a/tageditor/mingw-w64/PKGBUILD
+++ b/tageditor/mingw-w64/PKGBUILD
@@ -3,19 +3,19 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-# set the web view provider: either webkit, webengine or none
+# set the web view provider: either webkit, webengine, auto or none
 _webview_provider=none
 
-# set the JavaScript provider: either script, qml or none
+# set the JavaScript provider: either script, qml, auto or none
 _js_provider=script
 
-_name=tageditor
 _reponame=tageditor
 pkgname=mingw-w64-tageditor
-pkgver=1.4.0
+_name=${pkgname#mingw-w64-}
+pkgver=2.0.0
 pkgrel=1
 arch=('any')
-pkgdesc="A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska"
+pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska'
 license=('GPL')
 depends=(mingw-w64-{crt,qtutilities,tagparser})
 [[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('mingw-w64-qt5-base')
@@ -25,14 +25,13 @@ depends=(mingw-w64-{crt,qtutilities,tagparser})
 [[ $_js_provider == qml ]] && depends+=('mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 url="https://github.com/Martchus/${_reponame}"
-source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('37281b85c633b2f91310c0747f6ae69a108961ee5de1fa5ad3ba27a1707359aa')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('b3818112660b14b5e50c2b2f9521a1aaa1dafc12145e340fc5b210ee36056e41')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  # build utilities for each architecture
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake \
diff --git a/tagparser/default/PKGBUILD b/tagparser/default/PKGBUILD
index 603887cf..40e34fd5 100644
--- a/tagparser/default/PKGBUILD
+++ b/tagparser/default/PKGBUILD
@@ -5,16 +5,17 @@
 
 _reponame=tagparser
 pkgname=tagparser
-pkgver=5.0.2
+pkgver=6.0.0
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska tags"
+pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags'
 license=('GPL')
 depends=('c++utilities' 'zlib')
 makedepends=('cmake')
+optdepends=("$pkgname-doc: API documentation")
 url="https://github.com/Martchus/${_reponame}"
-source=("tagparser-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('9cb10f449f1faef883e0f59ce185801661a44f8426e17274373c56911ec32cbc')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('0d4bb99ec71a2d11bb9b9ae766e082d0092f82b7d2c7b4d6d760eca9386afbb4')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/tagparser/doc/PKGBUILD b/tagparser/doc/PKGBUILD
new file mode 100644
index 00000000..449374bd
--- /dev/null
+++ b/tagparser/doc/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+_name=tagparser
+_reponame=tagparser
+pkgname=$_name-doc
+pkgver=6.0.0
+pkgrel=1
+arch=('any')
+pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (API documentation)'
+license=('GPL')
+makedepends=('cmake' 'doxygen' 'dia' 'graphviz' 'c++utilities')
+url="https://github.com/Martchus/${_reponame}"
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('0d4bb99ec71a2d11bb9b9ae766e082d0092f82b7d2c7b4d6d760eca9386afbb4')
+
+build() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"
+  make ${_name}_apidoc
+}
+
+package() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make DESTDIR="${pkgdir}" install-api-doc
+}
diff --git a/tagparser/git/PKGBUILD b/tagparser/git/PKGBUILD
index 593cdb88..ffd654f4 100644
--- a/tagparser/git/PKGBUILD
+++ b/tagparser/git/PKGBUILD
@@ -3,18 +3,18 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=tagparser
 _reponame=tagparser
 pkgname=tagparser-git
+_name=${pkgname%-git}
 pkgver=59.8cc75e1
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska tags"
+pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska tags'
 license=('GPL')
 depends=('c++utilities' 'zlib')
 makedepends=('cmake' 'git')
-provides=('videodownloader')
-conflicts=('videodownloader')
+provides=("${_name}")
+conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
diff --git a/tagparser/mingw-w64/PKGBUILD b/tagparser/mingw-w64/PKGBUILD
index 8080a772..c6449891 100644
--- a/tagparser/mingw-w64/PKGBUILD
+++ b/tagparser/mingw-w64/PKGBUILD
@@ -3,39 +3,47 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=tagparser
 _reponame=tagparser
 pkgname=mingw-w64-tagparser
-pkgver=5.0.2
+_name=${pkgname#mingw-w64-}
+pkgver=6.0.0
 pkgrel=1
 arch=('any')
-pkgdesc="C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska tags (mingw-w64)"
+pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (mingw-w64)'
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-zlib')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
+optdepends=("$pkgname-doc: API documentation")
 url="https://github.com/Martchus/${_reponame}"
-source=("tagparser-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('9cb10f449f1faef883e0f59ce185801661a44f8426e17274373c56911ec32cbc')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('0d4bb99ec71a2d11bb9b9ae766e082d0092f82b7d2c7b4d6d760eca9386afbb4')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+[[ $NO_STATIC_LIBS ]] || _configurations+=('static: -DENABLE_STATIC_LIBS:BOOL=ON -DDISABLE_SHARED_LIBS:BOOL=ON')
+[[ $NO_SHARED_LIBS ]] || _configurations+=('shared: -DENABLE_STATIC_LIBS:BOOL=OFF -DDISABLE_SHARED_LIBS:BOOL=OFF')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  # build utilities for each architecture
   export CXXFLAGS='-O0'
   for _arch in ${_architectures}; do
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ../
-    make
-    popd
+    for _config in "${_configurations[@]}"; do
+      msg2 "Building ${_config%%: *} version for ${_arch}"
+      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
+      ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ${_config#*: } ../
+      make
+      popd
+    done
   done
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   for _arch in ${_architectures}; do
-    pushd build-${_arch}
-    make DESTDIR="${pkgdir}" install-mingw-w64-strip
-    popd
+    for _config in "${_configurations[@]}"; do
+      msg2 "Packaging ${_config%%: *} version for ${_arch}"
+      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
+      make DESTDIR="${pkgdir}" install-mingw-w64-strip
+      popd
+    done
   done
 }
diff --git a/videodownloader/default/PKGBUILD b/videodownloader/default/PKGBUILD
index 9697c612..d30b9332 100644
--- a/videodownloader/default/PKGBUILD
+++ b/videodownloader/default/PKGBUILD
@@ -5,16 +5,16 @@
 
 _reponame=videodownloader
 pkgname=videodownloader
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)"
+pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)'
 license=('GPL')
 depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils')
 makedepends=('cmake' 'qt5-tools')
 url="https://github.com/Martchus/${_reponame}"
-source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('122a64f4d08caa2e1cca1dd279d4db85023d46ee9f12b041b341b8d7c33dea9d')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('4f2ffc1762b6f3fda50c7d1b5673e85e2dbfea50543f3219792f6126a30e1bce')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/videodownloader/git/PKGBUILD b/videodownloader/git/PKGBUILD
index 297eb7ea..f10ce8cb 100644
--- a/videodownloader/git/PKGBUILD
+++ b/videodownloader/git/PKGBUILD
@@ -3,18 +3,18 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=videodownloader
 _reponame=videodownloader
 pkgname=videodownloader-git
+_name=${pkgname%-git}
 pkgver=27.8960d5b
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)"
+pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)'
 license=('GPL')
 depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils')
 makedepends=('cmake' 'qt5-tools' 'git')
-provides=('videodownloader')
-conflicts=('videodownloader')
+provides=("${_name}")
+conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
diff --git a/videodownloader/mingw-w64/PKGBUILD b/videodownloader/mingw-w64/PKGBUILD
index 20aabc80..0f46485c 100644
--- a/videodownloader/mingw-w64/PKGBUILD
+++ b/videodownloader/mingw-w64/PKGBUILD
@@ -3,25 +3,24 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=videodownloader
 _reponame=videodownloader
 pkgname=mingw-w64-videodownloader
-pkgver=1.3.1
+_name=${pkgname#mingw-w64-}
+pkgver=1.3.2
 pkgrel=1
 arch=('any')
-pkgdesc="A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained, mingw-w64)"
+pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained, mingw-w64)'
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qtutilities' 'mingw-w64-openssl')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 url="https://github.com/Martchus/${_reponame}"
-source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('122a64f4d08caa2e1cca1dd279d4db85023d46ee9f12b041b341b8d7c33dea9d')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('4f2ffc1762b6f3fda50c7d1b5673e85e2dbfea50543f3219792f6126a30e1bce')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  # build utilities for each architecture
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ../