mailmap/email: change my email-address

I use jean-louis.fuchs@adfinis-sygroup.ch in git from now on.

Addition: increment pkgver and fix lint errors.

18 files changed, 65 insertions, 86 deletions

diff --git a/.mailmap b/.mailmap
index 52b6d90a6b..c593cc0fdb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,6 +2,7 @@ Timo Teräs <timo.teras@iki.fi>
 Natanael Copa <ncopa@alpinelinux.org> <natanael.copa@gmail.com>
 Natanael Copa <ncopa@alpinelinux.org> <ncopa@ncopa-laptop.localdomain>
 Natanael Copa <ncopa@alpinelinux.org> <ncopa@alpine-netbook.(none)>
+Jean-Louis Fuchs <ganwell@fangorn.ch> <jean-louis.fuchs@adfinis-sygroup.ch>
 Kevin Daudt <kdaudt@alpinelinux.org> <ops@ikke.info>
 Lucas Ramage <ramage.lucas@protonmail.com> <oxr463@gmx.us>
 Lucas Ramage <ramage.lucas@protonmail.com> <ramage.lucas@openmailbox.org>
diff --git a/community/blind/APKBUILD b/community/blind/APKBUILD
index ee9ec91a9c..399fb01fa8 100644
--- a/community/blind/APKBUILD
+++ b/community/blind/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor:Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor:Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=blind
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="blind is a collection of command line video editing utilities"
 url="https://tools.suckless.org/blind/"
 arch="all"
@@ -13,15 +13,12 @@ source="https://dl.suckless.org/tools/blind-$pkgver.tar.gz
 	fix-readall.patch
 	test.ff.bz2
 "
-builddir="$srcdir/blind-$pkgver"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 check() {
-	cd "$builddir"
 	# Check if blind is operational
 	bunzip2 < "$srcdir/test.ff.bz2" | ./blind-from-image -f > test.bl
 	./blind-repeat 15 test.bl | ./blind-flop | ./blind-flip \
@@ -31,7 +28,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	make PREFIX="/usr" DESTDIR="$pkgdir" install
 	cp blind-rotate-* "$pkgdir/usr/bin/"
 }
diff --git a/community/girara/APKBUILD b/community/girara/APKBUILD
index c327cc9e87..e4d0fba07b 100644
--- a/community/girara/APKBUILD
+++ b/community/girara/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Andrew Hills <ahills@ednos.net>
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=girara
 pkgver=0.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="girara - gtk user interface that focuses on simplicity and minimalism"
 url="https://git.pwmt.org/pwmt/girara"
 arch="all"
-license="zlib"
+license="Zlib"
 checkdepends="dbus"
 makedepends="gtk+3.0-dev libnotify-dev json-c-dev intltool doxygen check-dev
 	xvfb ncurses meson ninja"
diff --git a/community/keyfinder-cli/APKBUILD b/community/keyfinder-cli/APKBUILD
index da2794835b..60d63005aa 100644
--- a/community/keyfinder-cli/APKBUILD
+++ b/community/keyfinder-cli/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=keyfinder-cli
 pkgver=1.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Musical key detection for digital audio (command line)"
 url="https://github.com/EvanPurkhiser/keyfinder-cli"
 arch="all"
diff --git a/community/libkeyfinder/APKBUILD b/community/libkeyfinder/APKBUILD
index dd0b81ba35..7ef3155bc9 100644
--- a/community/libkeyfinder/APKBUILD
+++ b/community/libkeyfinder/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=libkeyfinder
 pkgver=2.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Musical key detection for digital audio"
 url="http://www.ibrahimshaath.co.uk/keyfinder/"
 arch="all"
@@ -16,13 +16,11 @@ source="libkeyfinder-$pkgver.tar.gz::https://github.com/ibsh/libKeyFinder/archiv
 builddir="$srcdir/libKeyFinder-$pkgver"
 
 build() {
-	cd "$builddir"
 	qmake-qt5 PREFIX=/usr
 	make
 }
 
 package() {
-	cd "$builddir"
 	make INSTALL_ROOT="$pkgdir" install
 	install -Dm644 "$builddir"/README.md \
 		"$pkgdir"/usr/share/doc/$pkgname/README.md
diff --git a/community/libspectre/APKBUILD b/community/libspectre/APKBUILD
index 31508467ce..dddde2dbf6 100644
--- a/community/libspectre/APKBUILD
+++ b/community/libspectre/APKBUILD
@@ -1,24 +1,21 @@
 # Contributor: Andrew Hills <ahills@ednos.net>
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=libspectre
 pkgver=0.2.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A small library for rendering Postscript documents"
 url="http://www.freedesktop.org/wiki/Software/libspectre"
 arch="all"
-license="GPL-2.0"
+license="LGPL-2.0-or-later"
 makedepends="ghostscript-dev doxygen graphviz"
 checkdepends="cairo-dev file"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://libspectre.freedesktop.org/releases/$pkgname-$pkgver.tar.gz
+source="https://libspectre.freedesktop.org/releases/libspectre-$pkgver.tar.gz
 	test.ps
 	"
 
-builddir="$srcdir/$pkgname-$pkgver"
-
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,14 +29,13 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
 doc() {
-	mkdir -m 0755 -p "$subpkgdir"/usr/share/doc/libspectre
-	install -m 0644 "$builddir"/doc/html/* \
-		"$subpkgdir"/usr/share/doc/libspectre/
+	mkdir -p "$subpkgdir/usr/share/doc/$pkgname"
+	install -m644 "$builddir"/doc/html/* \
+		"$subpkgdir/usr/share/doc/$pkgname/"
 }
 
 check() {
diff --git a/community/ocaml-lablgtk/APKBUILD b/community/ocaml-lablgtk/APKBUILD
index cd84730a92..91e3cd215d 100644
--- a/community/ocaml-lablgtk/APKBUILD
+++ b/community/ocaml-lablgtk/APKBUILD
@@ -1,13 +1,13 @@
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=ocaml-lablgtk
 _pkgname=lablgtk
 pkgver=2.18.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An OCaml interface to GTK+ 2.x"
 url="http://lablgtk.forge.ocamlcore.org/"
 arch="all !x86 !armhf !armv7 !s390x"  # limited by ocaml aport
-license="LGPL-2.1-only-WITH-linking-exception"
+license="LGPL-2.1-or-later-WITH-OCaml-LGPL-linking-exception"
 depends="ocaml-runtime"
 depends_dev="$pkgname=$pkgver-r$pkgrel
 	gtk+-dev gtkspell-dev librsvg-dev gtksourceview2-dev"
diff --git a/community/py3-pyo/APKBUILD b/community/py3-pyo/APKBUILD
index 47019f17d4..9d1c92bbf2 100644
--- a/community/py3-pyo/APKBUILD
+++ b/community/py3-pyo/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=py3-pyo
 _pkgname=pyo
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="dedicated Python module for digital signal processing"
 url="http://ajaxsoundstudio.com/software/pyo/"
 arch="all"
diff --git a/community/unison/APKBUILD b/community/unison/APKBUILD
index 42cc4d334f..7d8a1b3eab 100644
--- a/community/unison/APKBUILD
+++ b/community/unison/APKBUILD
@@ -1,20 +1,20 @@
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=unison
 # Note: unison breaks compatibility between minor (major.minor) versions.
 pkgver=2.48.15_p4
 _pkgver=${pkgver/_p/v}
 _majorver=${_pkgver%.*}  # x.y
-pkgrel=0
+pkgrel=1
 pkgdesc="Efficient file-synchronization tool"
 url="https://www.cis.upenn.edu/~bcpierce/unison/"
 # ocaml is not built for x86, armhf, s390x
 # ocaml-lablgtk is not built for aarch64
 arch="all !x86 !armhf !armv7 !aarch64 !s390x"
-license="GPL-3.0+"
+license="GPL-3.0-or-later"
 makedepends="ocaml ocaml-lablgtk-dev linux-headers emacs-nox bash"
 subpackages="$pkgname-gui"
-source="$pkgname-$_pkgver.tar.gz::https://github.com/bcpierce00/$pkgname/archive/v$_pkgver.tar.gz
+source="unison-$_pkgver.tar.gz::https://github.com/bcpierce00/unison/archive/v$_pkgver.tar.gz
 	fix-inotify-check.patch
 	makefile-fix-clean.patch
 	fix-for-lablgtk-2.18.6.patch
@@ -22,11 +22,9 @@ source="$pkgname-$_pkgver.tar.gz::https://github.com/bcpierce00/$pkgname/archive
 # TODO: Enable check once this issue is fixed:
 # https://github.com/bcpierce00/unison/issues/73
 options="!check"
-builddir="$srcdir/$pkgname-$_pkgver/src"
+builddir="$srcdir/unison-$_pkgver/src"
 
 build() {
-	cd "$builddir"
-
 	# ocamlopt is a front-end for gcc which will create optimized ocaml
 	# binaries. It will call gcc, but it hasn't implemented all gcc options.
 	# -ccopt is the way to pass arbitrary options.
@@ -45,7 +43,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	install -m 755 -D unison-text \
 		"$pkgdir"/usr/bin/unison-text-$_majorver
 	install -m 755 -D unison-fsmonitor \
diff --git a/community/zathura-pdf-poppler/APKBUILD b/community/zathura-pdf-poppler/APKBUILD
index 83f93273e4..89701d93a7 100644
--- a/community/zathura-pdf-poppler/APKBUILD
+++ b/community/zathura-pdf-poppler/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Andrew Hills <ahills@ednos.net>
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=zathura-pdf-poppler
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Poppler plugin adds PDF support to zathura"
 options="!check" # No testsuite
 url="https://git.pwmt.org/pwmt/zathura-pdf-poppler"
diff --git a/community/zathura-ps/APKBUILD b/community/zathura-ps/APKBUILD
index 50580ac6d1..75917eaf2c 100644
--- a/community/zathura-ps/APKBUILD
+++ b/community/zathura-ps/APKBUILD
@@ -1,31 +1,25 @@
 # Contributor: Andrew Hills <ahills@ednos.net>
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=zathura-ps
 pkgver=0.2.6
-pkgrel=4
+pkgrel=5
 pkgdesc="zathura-ps - plugin adds PostScript support to zathura"
 url="https://git.pwmt.org/pwmt/zathura-ps"
 arch="all"
-license="zlib"
+license="Zlib"
 depends="zathura"
 makedepends="zathura-dev poppler-dev libspectre-dev meson ninja"
-source="https://git.pwmt.org/pwmt/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz"
-
 options="!check"
+source="https://git.pwmt.org/pwmt/zathura-ps/-/archive/$pkgver/zathura-ps-$pkgver.tar.gz"
 
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
-	meson build \
-		--prefix=/usr \
-		--buildtype=plain
+	meson build --prefix=/usr
 	ninja -C build
 }
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" ninja -C build install
 }
 
diff --git a/community/zathura/APKBUILD b/community/zathura/APKBUILD
index 2fafde29f9..7f67f8cd5b 100644
--- a/community/zathura/APKBUILD
+++ b/community/zathura/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Andrew Hills <ahills@ednos.net>
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=zathura
 pkgver=0.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="zathura - highly customizable and functional document viewer"
 url="https://git.pwmt.org/pwmt/zathura"
 arch="all"
diff --git a/main/py3-attrs/APKBUILD b/main/py3-attrs/APKBUILD
index 335a1086df..22f6ac740d 100644
--- a/main/py3-attrs/APKBUILD
+++ b/main/py3-attrs/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=py3-attrs
 pkgver=19.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Python classes without boilerplate"
 url="http://www.attrs.org"
 arch="noarch"
diff --git a/main/py3-fasteners/APKBUILD b/main/py3-fasteners/APKBUILD
index 33ad7e6c2c..82d3a567e4 100644
--- a/main/py3-fasteners/APKBUILD
+++ b/main/py3-fasteners/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=py3-fasteners
 pkgver=0.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A python package that provides useful locks"
 url="https://github.com/harlowja/fasteners/"
 arch="noarch"
diff --git a/main/py3-monotonic/APKBUILD b/main/py3-monotonic/APKBUILD
index 732f799df7..6f6b331039 100644
--- a/main/py3-monotonic/APKBUILD
+++ b/main/py3-monotonic/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=py3-monotonic
 pkgver=1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides a clock which never goes backwards."
 url="https://github.com/atdt/monotonic/"
 arch="noarch"
diff --git a/testing/ecasound/APKBUILD b/testing/ecasound/APKBUILD
index b270ecc735..20e4c62dc6 100644
--- a/testing/ecasound/APKBUILD
+++ b/testing/ecasound/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=ecasound
 pkgver=2.9.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Textmode multitrack audio processing"
 url="https://ecasound.seul.org/ecasound/"
 arch="all !s390x" # Testsuite fails
diff --git a/testing/shntool/APKBUILD b/testing/shntool/APKBUILD
index 03edb55cb4..a81edcc637 100644
--- a/testing/shntool/APKBUILD
+++ b/testing/shntool/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=shntool
 pkgver=3.0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-purpose WAVE data processing and reporting utility"
 url="http://shnutils.freeshell.org/shntool/"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="sox"
 subpackages="$pkgname-doc"
-source="http://shnutils.freeshell.org/shntool/dist/src/${pkgname}-${pkgver}.tar.gz
+source="http://shnutils.freeshell.org/shntool/dist/src/shntool-$pkgver.tar.gz
 	shntool-3.0.10-large-size.patch
 	shntool-3.0.10-large-times.patch
 	"
diff --git a/testing/vice/APKBUILD b/testing/vice/APKBUILD
index bcb7dd1069..8c5fb01a9c 100644
--- a/testing/vice/APKBUILD
+++ b/testing/vice/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
-# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
+# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
+# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=vice
 pkgver=3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="emulates the C64/DTV, C128, VIC20, almost all PETs, PLUS4 and CBM-II"
 url="http://vice-emu.sourceforge.net/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 makedepends="gtk+3.0-dev giflib-dev ffmpeg-dev jpeg-dev libpng-dev alsa-lib-dev
 	linux-headers texinfo automake autoconf bison flex xa bdftopcf mkfontdir
 	bash"
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/vice-emu/vice-$pkgver.tar.gz
 	disable-fc-cache.patch
 	fix__u_char.patch"
-builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	sed -i 's/\r//' "$builddir/src/opencbm.h"
@@ -24,7 +23,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure --prefix=/usr \
 		--libdir=/usr/lib \
 		--enable-native-gtk3ui \
@@ -34,7 +32,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" realdocdir="/usr/share/doc/vice" install
 }