diff --git a/community/akonadi-calendar-tools/APKBUILD b/community/akonadi-calendar-tools/APKBUILD
index c31569d81356c7d70bfceff914d4d3aa7a4ebc4c..3a08de630e507fec814a8bfe76c72c9abf8e5e8e 100644
--- a/community/akonadi-calendar-tools/APKBUILD
+++ b/community/akonadi-calendar-tools/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-calendar-tools
 pkgver=21.12.3
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by akonadi-calendar -> kmailtransport -> libkgapi -> qt5-qtwebengine
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -19,13 +19,14 @@ makedepends="
 	kdoctools-dev
 	libkdepim-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-calendar-tools-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests available
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
diff --git a/community/akonadi-calendar/APKBUILD b/community/akonadi-calendar/APKBUILD
index dc83474e4104de117fa48d937ea2ebecc1350b17..9966d6c3236bf7ca28b98d1aa497704f742a9dd3 100644
--- a/community/akonadi-calendar/APKBUILD
+++ b/community/akonadi-calendar/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-calendar
 pkgver=21.12.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Akonadi calendar integration"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by kmailtransport -> libkgapi -> qt5-qtwebengine
@@ -23,6 +23,7 @@ depends_dev="
 	kmailtransport-dev
 	kwidgetsaddons-dev
 	kxmlgui-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
@@ -33,7 +34,7 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # Broken
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
diff --git a/community/akonadi-contacts/APKBUILD b/community/akonadi-contacts/APKBUILD
index 580fa61d2c20bdc80ec162d535c080bba9dd39f5..230fbc79e07cb71c4bcf4e5c29d5a0115dd387ff 100644
--- a/community/akonadi-contacts/APKBUILD
+++ b/community/akonadi-contacts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-contacts
 pkgver=21.12.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Libraries and daemons to implement Contact Management in Akonadi"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by akonadi
@@ -31,6 +31,7 @@ depends_dev="
 	libkleo-dev
 	prison-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
@@ -40,7 +41,7 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-cont
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
diff --git a/community/akonadi-import-wizard/APKBUILD b/community/akonadi-import-wizard/APKBUILD
index 274a52c56edb8b9117ca50ad6794045fa98eda43..cae235a399415d586e996edcffbe220afe8dbb86 100644
--- a/community/akonadi-import-wizard/APKBUILD
+++ b/community/akonadi-import-wizard/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-import-wizard
 pkgver=21.12.3
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by kmailtransport -> libkgapi -> qt5-qtwebengine
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -27,12 +27,13 @@ makedepends="
 	messagelib-dev
 	pimcommon-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-import-wizard-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
diff --git a/community/akonadi-mime/APKBUILD b/community/akonadi-mime/APKBUILD
index e26654979014053d4395f1ac7aa4e0ff7fb8ca6d..458782222ff3230c93b087135d296b4bdaf9cfb2 100644
--- a/community/akonadi-mime/APKBUILD
+++ b/community/akonadi-mime/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-mime
 pkgver=21.12.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Libraries and daemons to implement basic email handling"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by akonadi
@@ -22,6 +22,7 @@ depends_dev="
 	kxmlgui-dev
 	libxslt-dev
 	qt5-qtbase-dev
+	samurai
 	shared-mime-info
 	"
 makedepends="$depends_dev
@@ -31,7 +32,7 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-mime
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
diff --git a/community/akonadi-notes/APKBUILD b/community/akonadi-notes/APKBUILD
index 78b0a68457ee6d06c91885b0baefaa18df9b5756..65ee81c6f4bc768b6fb41ce3b17210c3dd9269d8 100644
--- a/community/akonadi-notes/APKBUILD
+++ b/community/akonadi-notes/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-notes
 pkgver=21.12.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Libraries and daemons to implement management of notes"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -12,6 +12,7 @@ depends_dev="
 	ki18n-dev
 	kmime-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
@@ -20,7 +21,7 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-note
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
@@ -35,6 +36,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 a3a7f8aa489dff12097e965c02dc798baec7084701c79f2b4d5792ca0da16a8d0929f36bc4d50df82ef08ce927289e9134c9a0e18215b32beebef7c845e24f6b  akonadi-notes-21.12.3.tar.xz
 "
diff --git a/community/akonadi-search/APKBUILD b/community/akonadi-search/APKBUILD
index 5d10e20b49a8d800e93a0af374d6ee8b3be6026f..ae681a7171a9b77b71d0197df9d45665b85a9d2a 100644
--- a/community/akonadi-search/APKBUILD
+++ b/community/akonadi-search/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-search
 pkgver=21.12.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Libraries and daemons to implement searching in Akonadi"
 # armhf blocked by extra-cmake-modules
 # riscv64 blocked by akonadi
@@ -25,6 +25,7 @@ depends_dev="
 	kmime-dev
 	krunner-dev
 	qt5-qtbase-dev
+	samurai
 	xapian-core-dev
 	"
 makedepends="$depends_dev
@@ -35,7 +36,7 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-sear
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
diff --git a/community/akonadi/APKBUILD b/community/akonadi/APKBUILD
index ea1bea3f3ab9e92973cc9644987517639b17868f..72b34ff8727109cad7e01bb6bc12562e6417122b 100644
--- a/community/akonadi/APKBUILD
+++ b/community/akonadi/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi
 pkgver=21.12.3
-pkgrel=0
+pkgrel=1
 pkgdesc="A cross-desktop storage service for PIM data and meta data providing concurrent read, write, and query access"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit
@@ -35,6 +35,7 @@ depends_dev="
 	libaccounts-qt-dev
 	libxml2-dev
 	qt5-qtbase-dev
+	samurai
 	shared-mime-info
 	sqlite-dev
 	"
@@ -52,7 +53,7 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-lang"
 build() {
 	# akonadi recurses while walking e-mail threads, so give it a decent stack
 	LDFLAGS="$LDFLAGS -Wl,-z,stack-size=1024768" \
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
diff --git a/community/akonadiconsole/APKBUILD b/community/akonadiconsole/APKBUILD
index f3128f083c06f0063b372783d0ae7a80e10de986..3fa478d5d4f021a8374206a4740bd7fae5dce306 100644
--- a/community/akonadiconsole/APKBUILD
+++ b/community/akonadiconsole/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadiconsole
 pkgver=21.12.3
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x, ppc64le and riscv64 blocked by akonadi
 # ppc64le blocked by calendarsupport
@@ -11,38 +11,39 @@ url="https://kontact.kde.org/"
 pkgdesc="Application for debugging Akonadi Resources"
 license="GPL-2.0-or-later AND GFDL-1.2-only"
 makedepends="
+	akonadi-contacts-dev
+	akonadi-dev
+	akonadi-search-dev
+	calendarsupport-dev
 	extra-cmake-modules
-	qt5-qtbase-dev
+	kcalendarcore-dev
+	kcompletion-dev
 	kcompletion-dev
 	kconfig-dev
 	kconfigwidgets-dev
+	kcontacts-dev
+	kcrash-dev
 	kdbusaddons-dev
 	kdoctools-dev
 	ki18n-dev
+	kio-dev
 	kitemmodels-dev
+	kitemviews-dev
+	kmime-dev
 	ktextwidgets-dev
 	kwidgetsaddons-dev
 	kxmlgui-dev
-	kcrash-dev
-	kcompletion-dev
-	kitemviews-dev
-	kio-dev
-	akonadi-dev
-	kcontacts-dev
-	kcalendarcore-dev
-	kmime-dev
-	akonadi-contacts-dev
-	calendarsupport-dev
-	messagelib-dev
 	libkdepim-dev
-	akonadi-search-dev
+	messagelib-dev
+	qt5-qtbase-dev
+	samurai
 	xapian-bindings
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/akonadiconsole-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib